From 0ed96db43935484342370eaa0f0641b0d496f9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= <romandvorak@mlab.cz>
Date: Thu, 23 Jul 2020 05:26:17 +0200
Subject: [PATCH] Used filament outputs (gcode comments) in more
 computer-parseable format (#4969)

* Used filament outputs (gcode comments) in more computer-parseable format

* Auto stash before rebase of "refs/heads/filament_calculations"

* Used filament outputs (gcode comments) in more computer-parseable format

* Auto stash before rebase of "refs/heads/filament_calculations"
---
 lib/Slic3r/Print/GCode.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Slic3r/Print/GCode.pm b/lib/Slic3r/Print/GCode.pm
index 2bf12d912..0cd16cc32 100644
--- a/lib/Slic3r/Print/GCode.pm
+++ b/lib/Slic3r/Print/GCode.pm
@@ -337,26 +337,26 @@ sub export {
         my $filament_weight = $extruded_volume * $extruder->filament_density / 1000;
         my $filament_cost = $filament_weight * ($extruder->filament_cost / 1000);
         $self->print->set_filament_stats($extruder->id, $used_filament);
-        
-        printf $fh "; filament used = %.1fmm (%.1fcm3)\n",
-            $used_filament, $extruded_volume/1000;
+
+        printf $fh "; filament_length_m = %.4f \n", $used_filament/1000;
+        printf $fh "; filament_volume_cm3 = %.4f\n", $extruded_volume/1000;
         if ($filament_weight > 0) {
             $self->print->total_weight($self->print->total_weight + $filament_weight);
-            printf $fh "; filament used = %.1fg\n",
+            printf $fh "; filament mass_g = %.2f\n",
                    $filament_weight;
             if ($filament_cost > 0) {
                 $self->print->total_cost($self->print->total_cost + $filament_cost);
-                printf $fh "; filament cost = %.1f\n",
+                printf $fh "; filament_cost = %.2f\n",
                        $filament_cost;
             }
         }
-        
+
         $self->print->total_used_filament($self->print->total_used_filament + $used_filament);
         $self->print->total_extruded_volume($self->print->total_extruded_volume + $extruded_volume);
     }
-    printf $fh "; total filament cost = %.1f\n",
+    printf $fh "; total_filament_cost = %.1f\n",
            $self->print->total_cost;
-    
+
     # append full config
     print $fh "\n";
     foreach my $config ($self->print->config, $self->print->default_object_config, $self->print->default_region_config) {