3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: ooze_prevention brought the extruder too far. Includes regression test

Browse Source
This commit is contained in:
Alessandro Ranellucci 2014-05-15 19:22:41 +02:00
parent ac0a91a162
commit 58ffaca2df
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/GCode.pm
View File

@ -544,7 +544,7 @@ sub _G0_G1 {
sub _Gx { sub _Gx {
my ($self, $gcode, $e, $F, $comment) = @_; my ($self, $gcode, $e, $F, $comment) = @_;
use XXX; ZZZ "here" if $F =~ /move/i;
$gcode .= sprintf " F%.3f", $F; $gcode .= sprintf " F%.3f", $F;
# output extrusion distance # output extrusion distance
@ -583,7 +583,13 @@ sub set_extruder {
# set the current extruder to the standby temperature # set the current extruder to the standby temperature
if ($self->standby_points && defined $self->extruder) { if ($self->standby_points && defined $self->extruder) {
# move to the nearest standby point # move to the nearest standby point
$gcode .= $self->travel_to($self->last_pos->nearest_point($self->standby_points)); {
my $last_pos = $self->last_pos->clone;
$last_pos->translate(scale +$self->shift_x, scale +$self->shift_y);
my $standby_point = $last_pos->nearest_point($self->standby_points);
$standby_point->translate(scale -$self->shift_x, scale -$self->shift_y);
$gcode .= $self->travel_to($standby_point);
}
my $temp = defined $self->layer && $self->layer->id == 0 my $temp = defined $self->layer && $self->layer->id == 0
? $self->extruder->first_layer_temperature ? $self->extruder->first_layer_temperature

14
t/multi.t
View File

@ -1,4 +1,4 @@
use Test::More tests => 12; use Test::More tests => 13;
use strict; use strict;
use warnings; use warnings;
@ -10,6 +10,7 @@ BEGIN {
use List::Util qw(first); use List::Util qw(first);
use Slic3r; use Slic3r;
use Slic3r::Geometry qw(scale convex_hull); use Slic3r::Geometry qw(scale convex_hull);
use Slic3r::Geometry::Clipper qw(offset);
use Slic3r::Test; use Slic3r::Test;
{ {
@ -39,9 +40,11 @@ use Slic3r::Test;
: $config->temperature->[$tool]; : $config->temperature->[$tool];
die 'standby temperature was not set before toolchange' die 'standby temperature was not set before toolchange'
if $tool_temp[$tool] != $expected_temp + $config->standby_temperature_delta; if $tool_temp[$tool] != $expected_temp + $config->standby_temperature_delta;
# ignore initial toolchange
push @toolchange_points, Slic3r::Point->new_scale($self->X, $self->Y);
} }
$tool = $1; $tool = $1;
push @toolchange_points, Slic3r::Point->new_scale($self->X, $self->Y);
} elsif ($cmd eq 'M104' || $cmd eq 'M109') { } elsif ($cmd eq 'M104' || $cmd eq 'M109') {
my $t = $args->{T} // $tool; my $t = $args->{T} // $tool;
if ($tool_temp[$t] == 0) { if ($tool_temp[$t] == 0) {
@ -55,7 +58,12 @@ use Slic3r::Test;
} }
}); });
my $convex_hull = convex_hull(\@extrusion_points); my $convex_hull = convex_hull(\@extrusion_points);
ok !(first { $convex_hull->contains_point($_) } @toolchange_points), 'all toolchanges happen outside skirt'; ok !(defined first { $convex_hull->contains_point($_) } @toolchange_points), 'all toolchanges happen outside skirt';
# offset the skirt by the maximum displacement between extruders plus a safety extra margin
my $delta = scale(20 * sqrt(2) + 1);
my $outer_convex_hull = offset([$convex_hull], +$delta)->[0];
ok !(defined first { !$outer_convex_hull->contains_point($_) } @toolchange_points), 'all toolchanges happen within expected area';
} }
{ {