diff options
| author | supermerill <merill@fr.fr> | 2018-07-26 12:06:47 +0300 |
|---|---|---|
| committer | supermerill <merill@fr.fr> | 2018-07-26 13:23:48 +0300 |
| commit | c1f3380339fd25fd84076ab1fe57302ae576ab9f (patch) | |
| tree | eed5ae5d0e96be3d082af5bad567e8c6b08e80e4 /t | |
| parent | 6b2bd269cdc4694c90da0a3e532afa4ed291d118 (diff) | |
| parent | e0e6a238107b3614fde83d79a6e6056d0a378e2a (diff) | |
Merge commit 'e0e6a238107b3614fde83d79a6e6056d0a378e2a' into master_slic3rPE_PR
Diffstat (limited to 't')
| -rw-r--r-- | t/combineinfill.t | 1 | ||||
| -rw-r--r-- | t/fill.t | 1 | ||||
| -rw-r--r-- | t/perimeters.t | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/t/combineinfill.t b/t/combineinfill.t index 5402a84f5..563ecb9c1 100644 --- a/t/combineinfill.t +++ b/t/combineinfill.t @@ -61,6 +61,7 @@ plan tests => 8; $config->set('infill_every_layers', 2); $config->set('perimeter_extruder', 1); $config->set('infill_extruder', 2); + $config->set('wipe_into_infill', 0); $config->set('support_material_extruder', 3); $config->set('support_material_interface_extruder', 3); $config->set('top_solid_layers', 0); @@ -202,6 +202,7 @@ for my $pattern (qw(rectilinear honeycomb hilbertcurve concentric)) { $config->set('bottom_solid_layers', 0); $config->set('infill_extruder', 2); $config->set('infill_extrusion_width', 0.5); + $config->set('wipe_into_infill', 0); $config->set('fill_density', 40); $config->set('cooling', [ 0 ]); # for preventing speeds from being altered $config->set('first_layer_speed', '100%'); # for preventing speeds from being altered diff --git a/t/perimeters.t b/t/perimeters.t index 0f8b89578..0a2df78d0 100644 --- a/t/perimeters.t +++ b/t/perimeters.t @@ -175,7 +175,7 @@ use Slic3r::Test; if ($info->{extruding} && $info->{dist_XY} > 0) { $cur_loop ||= [ [$self->X, $self->Y] ]; push @$cur_loop, [ @$info{qw(new_X new_Y)} ]; - } else { + } elsif ($cmd ne 'M73') { # skips remaining time lines (M73) if ($cur_loop) { $has_cw_loops = 1 if Slic3r::Polygon->new(@$cur_loop)->is_clockwise; $cur_loop = undef; @@ -201,7 +201,7 @@ use Slic3r::Test; if ($info->{extruding} && $info->{dist_XY} > 0) { $cur_loop ||= [ [$self->X, $self->Y] ]; push @$cur_loop, [ @$info{qw(new_X new_Y)} ]; - } else { + } elsif ($cmd ne 'M73') { # skips remaining time lines (M73) if ($cur_loop) { $has_cw_loops = 1 if Slic3r::Polygon->new_scale(@$cur_loop)->is_clockwise; if ($self->F == $config->external_perimeter_speed*60) { @@ -308,7 +308,7 @@ use Slic3r::Test; if ($info->{extruding} && $info->{dist_XY} > 0 && ($args->{F} // $self->F) == $config->perimeter_speed*60) { $perimeters{$self->Z}++ if !$in_loop; $in_loop = 1; - } else { + } elsif ($cmd ne 'M73') { # skips remaining time lines (M73) $in_loop = 0; } }); @@ -432,7 +432,7 @@ use Slic3r::Test; push @seam_points, Slic3r::Point->new_scale($self->X, $self->Y); } $was_extruding = 1; - } else { + } elsif ($cmd ne 'M73') { # skips remaining time lines (M73) $was_extruding = 0; } }); |