GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-21 17:34:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed tests broken by the spiral vase change

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-17 18:53:13 +01:00
parent 94ed08c14d
commit 4c577043f4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r/GCode/SpiralVase.pm
View File

@ -9,6 +9,8 @@ use Slic3r::Geometry qw(unscale);
sub BUILD { sub BUILD {
my ($self) = @_; my ($self) = @_;
$self->reader->Z($self->config->z_offset);
$self->reader->apply_print_config($self->config); $self->reader->apply_print_config($self->config);
} }

3
lib/Slic3r/Print/GCode.pm
View File

@ -324,8 +324,7 @@ sub process_layer {
# check whether we're going to apply spiralvase logic # check whether we're going to apply spiralvase logic
if (defined $self->_spiral_vase) { if (defined $self->_spiral_vase) {
$self->_spiral_vase->enable( $self->_spiral_vase->enable(
($layer->id > 0 || $self->print->config->brim_width == 0 $layer->id > 0
|| $self->print->config->interior_brim_width == 0 || $self->print->config->brim_connections_width == 0)
&& ($self->print->config->skirts == 0 && ($self->print->config->skirts == 0
|| ($layer->id >= $self->print->config->skirt_height && !$self->print->has_infinite_skirt)) || ($layer->id >= $self->print->config->skirt_height && !$self->print->has_infinite_skirt))
&& !defined(first { $_->region->config->bottom_solid_layers > $layer->id } @{$layer->regions}) && !defined(first { $_->region->config->bottom_solid_layers > $layer->id } @{$layer->regions})

2
t/shells.t
View File

@ -186,7 +186,7 @@ use Slic3r::Test;
my $first_layer_temperature_set = 0; my $first_layer_temperature_set = 0;
my $temperature_set = 0; my $temperature_set = 0;
my @z_steps = (); my @z_steps = ();
Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { Slic3r::GCode::Reader->new(Z => $config->z_offset)->parse(Slic3r::Test::gcode($print), sub {
my ($self, $cmd, $args, $info) = @_; my ($self, $cmd, $args, $info) = @_;
if ($cmd eq 'G1') { if ($cmd eq 'G1') {