amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Default extruder wasn't applied to perimeter extruder. Includes regression test. #1868

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-04-19 11:43:41 +02:00
parent 0c50ab5323
commit f51921a11a
3 changed files with 55 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Slic3r/Model.pm
View file

@ -82,6 +82,11 @@ sub set_material {
); );
} }
sub get_material {
my ($self, $material_id) = @_;
return $self->materials->{$material_id};
}
sub duplicate_objects_grid { sub duplicate_objects_grid {
my ($self, $grid, $distance) = @_; my ($self, $grid, $distance) = @_;
@ -356,6 +361,11 @@ sub add_volume {
); );
} }
if (defined $new_volume->material_id && !defined $self->model->get_material($new_volume->material_id)) {
# TODO: this should be a trigger on Volume::material_id
$self->model->set_material($new_volume->material_id);
}
push @{$self->volumes}, $new_volume; push @{$self->volumes}, $new_volume;
# invalidate cached bounding box # invalidate cached bounding box

52
t/multi.t
View file

@ -1,4 +1,4 @@
use Test::More tests => 8; use Test::More tests => 12;
use strict; use strict;
use warnings; use warnings;
@ -86,13 +86,9 @@ use Slic3r::Test;
} }
{ {
my $model = Slic3r::Model->new; my $model = stacked_cubes();
my $object = $model->add_object; my $lower_config = $model->get_material('lower')->config;
my $lower_config = $model->set_material('lower')->config; my $upper_config = $model->get_material('upper')->config;
my $upper_config = $model->set_material('upper')->config;
$object->add_volume(mesh => Slic3r::Test::mesh('20mm_cube'), material_id => 'lower');
$object->add_volume(mesh => Slic3r::Test::mesh('20mm_cube', translate => [0,0,20]), material_id => 'upper');
$object->add_instance(offset => [0,0]);
$lower_config->set('extruder', 1); $lower_config->set('extruder', 1);
$lower_config->set('bottom_solid_layers', 0); $lower_config->set('bottom_solid_layers', 0);
@ -142,4 +138,44 @@ use Slic3r::Test;
} }
} }
{
my $model = stacked_cubes();
my $config = Slic3r::Config->new_from_defaults;
$config->set('skirts', 0);
my $print = Slic3r::Test::init_print($model, config => $config);
is $model->get_material('lower')->config->extruder, 1, 'auto_assign_extruders() assigned correct extruder to first volume';
is $model->get_material('upper')->config->extruder, 2, 'auto_assign_extruders() assigned correct extruder to second volume';
my $tool = undef;
my %T0 = my %T1 = (); # Z => 1
Slic3r::GCode::Reader->new->parse(my $gcode = Slic3r::Test::gcode($print), sub {
my ($self, $cmd, $args, $info) = @_;
if ($cmd =~ /^T(\d+)/) {
$tool = $1;
} elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) {
if ($tool == 0) {
$T0{$self->Z} = 1;
} elsif ($tool == 1) {
$T1{$self->Z} = 1;
}
}
});
ok !(defined first { $_ > 20 } keys %T0), 'T0 is never used for upper object';
ok !(defined first { $_ < 20 } keys %T1), 'T1 is never used for lower object';
}
sub stacked_cubes {
my $model = Slic3r::Model->new;
my $object = $model->add_object;
$object->add_volume(mesh => Slic3r::Test::mesh('20mm_cube'), material_id => 'lower');
$object->add_volume(mesh => Slic3r::Test::mesh('20mm_cube', translate => [0,0,20]), material_id => 'upper');
$object->add_instance(offset => [0,0]);
return $model;
}
__END__ __END__

2
xs/src/PrintConfig.hpp
View file

@ -944,7 +944,7 @@ class DynamicPrintConfig : public DynamicConfig
if (!this->has("infill_extruder")) if (!this->has("infill_extruder"))
this->option("infill_extruder", true)->setInt(extruder); this->option("infill_extruder", true)->setInt(extruder);
if (!this->has("perimeter_extruder")) if (!this->has("perimeter_extruder"))
this->option("infill_extruder", true)->setInt(extruder); this->option("perimeter_extruder", true)->setInt(extruder);
if (!this->has("support_material_extruder")) if (!this->has("support_material_extruder"))
this->option("support_material_extruder", true)->setInt(extruder); this->option("support_material_extruder", true)->setInt(extruder);
if (!this->has("support_material_interface_extruder")) if (!this->has("support_material_interface_extruder"))