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

Bugfix: enabling/disabling support material didn't cause skirt to be recalculated

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-08-08 01:37:39 +02:00
parent 04d2e4124f
commit c0a6b1a9cc
3 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Slic3r/Test.pm
View file

@ -206,7 +206,7 @@ sub add_facet {
package Slic3r::Test::Print;
use Moo;
has 'print' => (is => 'ro', required => 1);
has 'print' => (is => 'ro', required => 1, handles => [qw(process apply_config)]);
has 'models' => (is => 'ro', required => 1);
1;

48
t/skirt_brim.t
View file

@ -1,4 +1,4 @@
use Test::More tests => 3;
use Test::More tests => 4;
use strict;
use warnings;
@ -9,6 +9,7 @@ BEGIN {
use List::Util qw(first);
use Slic3r;
use Slic3r::Geometry qw(unscale convex_hull);
use Slic3r::Test;
{
@ -78,4 +79,49 @@ use Slic3r::Test;
ok Slic3r::Test::gcode($print), 'successful G-code generation when skirt is smaller than brim width';
}
{
my $config = Slic3r::Config->new_from_defaults;
$config->set('layer_height', 0.4);
$config->set('first_layer_height', 0.4);
$config->set('skirts', 1);
$config->set('skirt_distance', 0);
$config->set('support_material_speed', 99);
$config->set('perimeter_extruder', 1);
$config->set('support_material_extruder', 2);
$config->set('cooling', 0); # to prevent speeds to be altered
$config->set('first_layer_speed', '100%'); # to prevent speeds to be altered
my $print = Slic3r::Test::init_print('overhang', config => $config);
$print->process;
# we enable support material after skirt has been generated
$config->set('support_material', 1);
$print->apply_config($config);
my $skirt_length = 0;
my @extrusion_points = ();
my $tool = undef;
Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
my ($self, $cmd, $args, $info) = @_;
if ($cmd =~ /^T(\d+)/) {
$tool = $1;
} elsif (defined $self->Z && $self->Z == $config->first_layer_height) {
# we're on first layer
if ($info->{extruding} && $info->{dist_XY} > 0) {
my $speed = ($args->{F} // $self->F) / 60;
if ($speed == $config->support_material_speed && $tool == $config->perimeter_extruder-1) {
# skirt uses support material speed but first object's extruder
$skirt_length += $info->{dist_XY};
} else {
push @extrusion_points, my $point = Slic3r::Point->new_scale($args->{X}, $args->{Y});
}
}
}
});
my $convex_hull = convex_hull(\@extrusion_points);
my $hull_perimeter = unscale($convex_hull->split_at_first_point->length);
ok $skirt_length > $hull_perimeter, 'skirt lenght is large enough to contain object with support';
}
__END__

3
xs/src/libslic3r/PrintObject.cpp
View file

@ -228,6 +228,9 @@ PrintObject::invalidate_step(PrintObjectStep step)
} else if (step == posSlice) {
this->invalidate_step(posPerimeters);
this->invalidate_step(posSupportMaterial);
} else if (step == posSupportMaterial) {
this->_print->invalidate_step(psSkirt);
this->_print->invalidate_step(psBrim);
}
return invalidated;