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

Make sure all extruders are outside skirt at toolchange when standby_temperature is enabled

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-11-15 15:52:11 +01:00
parent f733ef5f6b
commit 5e78f8a0b0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Slic3r/Print.pm
View File

@ -803,7 +803,13 @@ sub write_gcode {
# calculate wiping points if needed # calculate wiping points if needed
if ($self->config->standby_temperature) { if ($self->config->standby_temperature) {
my $outer_skirt = Slic3r::Polygon->new(@{convex_hull([ map $_->pp, map @$_, @{$self->skirt} ])}); my $outer_skirt = Slic3r::Polygon->new(@{convex_hull([ map $_->pp, map @$_, @{$self->skirt} ])});
$gcodegen->standby_points([ map $_->clone, map @$_, map $_->subdivide(scale 10), @{offset([$outer_skirt], scale 3)} ]); my @skirts = ();
foreach my $extruder (@{$self->extruders}) {
push @skirts, my $s = $outer_skirt->clone;
$s->translate(map scale($_), @{$extruder->extruder_offset});
}
my $convex_hull = Slic3r::Polygon->new(@{convex_hull([ map @$_, map $_->pp, @skirts ])});
$gcodegen->standby_points([ map $_->clone, map @$_, map $_->subdivide(scale 10), @{offset([$convex_hull], scale 3)} ]);
} }
# prepare the layer processor # prepare the layer processor

14
t/multi.t
View File

@ -10,19 +10,23 @@ BEGIN {
use List::Util qw(first); use List::Util qw(first);
use Math::ConvexHull::MonotoneChain qw(convex_hull); use Math::ConvexHull::MonotoneChain qw(convex_hull);
use Slic3r; use Slic3r;
use Slic3r::Geometry qw(scale);
use Slic3r::Test; use Slic3r::Test;
{ {
my $config = Slic3r::Config->new_from_defaults; my $config = Slic3r::Config->new_from_defaults;
$config->set('raft_layers', 2);
$config->set('infill_extruder', 2); $config->set('infill_extruder', 2);
$config->set('support_material_extruder', 3);
$config->set('standby_temperature', 1); $config->set('standby_temperature', 1);
$config->set('temperature', [200, 180]); $config->set('extruder_offset', [ [0,0], [20,0], [0,20] ]);
$config->set('first_layer_temperature', [206, 186]); $config->set('temperature', [200, 180, 170]);
$config->set('first_layer_temperature', [206, 186, 166]);
my $print = Slic3r::Test::init_print('20mm_cube', config => $config); my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
my $tool = undef; my $tool = undef;
my @tool_temp = (0,0); my @tool_temp = (0,0,0);
my @toolchange_points = (); my @toolchange_points = ();
my @extrusion_points = (); my @extrusion_points = ();
Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
@ -46,9 +50,9 @@ use Slic3r::Test;
} }
$tool_temp[$t] = $args->{S}; $tool_temp[$t] = $args->{S};
} elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) {
push @extrusion_points, Slic3r::Point->new_scale($args->{X}, $args->{Y}); push @extrusion_points, my $point = Slic3r::Point->new_scale($args->{X}, $args->{Y});
$point->translate(map scale($_), @{ $config->extruder_offset->[$tool] });
} }
# TODO: check that toolchanges retraction and restart happen outside skirt
}); });
my $convex_hull = Slic3r::Polygon->new(@{convex_hull([ map $_->pp, @extrusion_points ])}); my $convex_hull = Slic3r::Polygon->new(@{convex_hull([ map $_->pp, @extrusion_points ])});
ok !(first { $convex_hull->encloses_point($_) } @toolchange_points), 'all toolchanges happen outside skirt'; ok !(first { $convex_hull->encloses_point($_) } @toolchange_points), 'all toolchanges happen outside skirt';