From 25c85aada5b188c7d0dff041a877b1d594fbba30 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Fri, 25 Nov 2011 11:15:20 +0100
Subject: [PATCH] Renamed "filament packing density" to "extrusion multiplier".
 Same values. #4

---
 lib/Slic3r.pm                | 2 +-
 lib/Slic3r/Config.pm         | 5 +++--
 lib/Slic3r/Extruder.pm       | 2 +-
 lib/Slic3r/GUI/SkeinPanel.pm | 2 +-
 slic3r.pl                    | 9 +++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index 5339579cb..190cf8be0 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -43,7 +43,7 @@ our $g0                 = 0;
 
 # filament options
 our $filament_diameter  = 3;    # mm
-our $filament_packing_density = 1;
+our $extrusion_multiplier = 1;
 our $temperature        = 200;
 
 # speed options
diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index ae297e071..abbe6e7c2 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -36,9 +36,10 @@ our $Options = {
         label   => 'Diameter (mm)',
         type    => 'f',
     },
-    'filament_packing_density' => {
-        label   => 'Packing density',
+    'extrusion_multiplier' => {
+        label   => 'Extrusion multiplier',
         type    => 'f',
+        aliases => [qw(filament_packing_density)],
     },
     'temperature' => {
         label   => 'Temperature (°C)',
diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm
index c9cd5eae8..f64b0e1a4 100644
--- a/lib/Slic3r/Extruder.pm
+++ b/lib/Slic3r/Extruder.pm
@@ -103,7 +103,7 @@ sub extrude {
         * (($Slic3r::nozzle_diameter**2) / ($Slic3r::filament_diameter ** 2))
         * $Slic3r::flow_speed_ratio 
         * $self->flow_ratio
-        * $Slic3r::filament_packing_density
+        * $Slic3r::extrusion_multiplier
         * $path->depth_layers;
     
     # extrude arc or line
diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index f59d50316..66bcfdfba 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -21,7 +21,7 @@ sub new {
         },
         filament => {
             title => 'Filament',
-            options => [qw(filament_diameter filament_packing_density temperature)],
+            options => [qw(filament_diameter extrusion_multiplier temperature)],
         },
         speed => {
             title => 'Speed',
diff --git a/slic3r.pl b/slic3r.pl
index 03f374f48..8861ba479 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -34,7 +34,7 @@ GetOptions(
     
     # filament options
     'filament-diameter=f'           => \$Slic3r::filament_diameter,
-    'filament-packing-density=f'    => \$Slic3r::filament_packing_density,
+    'extrusion-multiplier=f'        => \$Slic3r::extrusion_multiplier,
     'temperature=i'                 => \$Slic3r::temperature,
     
     # speed options
@@ -145,9 +145,10 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
     
   Filament options:
     --filament-diameter Diameter in mm of your raw filament (default: $Slic3r::filament_diameter)
-    --filament-packing-density
-                        Ratio of the extruded volume over volume pushed 
-                        into the extruder (default: $Slic3r::filament_packing_density)
+    --extrusion-multiplier
+                        Change this to alter the amount of plastic extruded. There should be very little
+                        need to change this value, which is only useful to compensate for
+                        filament packing (default: $Slic3r::extrusion_multiplier)
     --temperature       Extrusion temperature, set 0 to disable (default: $Slic3r::temperature)
     
   Speed options: