From 2abd8fe2407ae0ac9f9b9231f23b674773c04712 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Tue, 15 Nov 2011 12:02:31 +0100
Subject: [PATCH] Bugfix: bottom layer speed settings were ignored.
---
lib/Slic3r/Extruder.pm | 10 +++++++---
lib/Slic3r/Print.pm | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm
index b24ebb576..b1fc895b2 100644
--- a/lib/Slic3r/Extruder.pm
+++ b/lib/Slic3r/Extruder.pm
@@ -1,6 +1,7 @@
package Slic3r::Extruder;
use Moo;
+has 'layer' => (is => 'rw');
has 'shift_x' => (is => 'ro', default => sub {0} );
has 'shift_y' => (is => 'ro', default => sub {0} );
has 'z' => (is => 'rw', default => sub {0} );
@@ -34,9 +35,12 @@ has 'retract_speed' => (
use Slic3r::Geometry qw(points_coincide PI X Y);
use XXX;
-sub move_z {
+sub change_layer {
my $self = shift;
- my ($z) = @_;
+ my ($layer) = @_;
+
+ $self->layer($layer);
+ my $z = $Slic3r::z_offset + $layer->print_z * $Slic3r::resolution;
my $gcode = "";
@@ -236,7 +240,7 @@ sub _Gx {
my $dec = $self->dec;
# apply the speed reduction for print moves on bottom layer
- my $speed_multiplier = $e && $self->z == $Slic3r::z_offset
+ my $speed_multiplier = $e && $self->layer->id == 0
? $Slic3r::bottom_layer_speed_ratio
: 1;
diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index ef1e9bcd8..cc1660b77 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -464,7 +464,7 @@ sub export_gcode {
# write gcode commands layer by layer
foreach my $layer (@{ $self->layers }) {
# go to layer
- printf $fh $extruder->move_z($Slic3r::z_offset + $layer->print_z * $Slic3r::resolution);
+ printf $fh $extruder->change_layer($layer);
# extrude skirts
printf $fh $extruder->extrude_loop($_, 'skirt') for @{ $layer->skirts };