juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-30 08:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the extruder override logic. All role-based extruder options now default to 0, meaning no override is defined and the default (inherited) extruder is used. The default extruder option does not use the shortcut logic anymore (it was thus moved to be a CLI-specific logic)

Browse Source
This commit is contained in:
Alessandro Ranellucci
2014-03-26 00:08:15 +01:00
parent 2e6213fea6
commit 0ff33f47f1
8 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
xs/t/15_config.t
View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
use Slic3r::XS;
use Test::More tests => 95;
use Test::More tests => 99;
foreach my $config (Slic3r::Config->new, Slic3r::Config::Full->new) {
$config->set('layer_height', 0.3);
@@ -127,20 +127,60 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Full->new) {
}
{
my $config = Slic3r::Config->new;
$config->set('extruder', 2);
is $config->get('extruder'), 2, 'shortcut option value is kept in dynamic config';
ok !$config->has('perimeter_extruder'), 'shortcut is not expanded in dynamic config';
{
my $config2 = Slic3r::Config::Full->new;
$config2->set('extruder', 2);
is $config2->get('perimeter_extruder'), 2, 'shortcut is expanded in static config (set)';
my $config = Slic3r::Config->new;
$config->set('infill_extruder', 2);
my $config2 = Slic3r::Config::PrintRegion->new;
$config2->apply($config);
is $config2->get('infill_extruder'), $config->get('infill_extruder'),
'non-zero infill_extruder is applied';
}
{
my $config3 = Slic3r::Config::Full->new;
$config3->apply_dynamic($config);
is $config3->get('perimeter_extruder'), 2, 'shortcut is expanded in static config (apply)';
my $config = Slic3r::Config->new;
$config->set('infill_extruder', 0);
my $config2 = Slic3r::Config::PrintRegion->new;
$config2->set('infill_extruder', 3);
$config2->apply($config);
isnt $config2->get('infill_extruder'), $config->get('infill_extruder'),
'zero infill_extruder is not applied';
}
{
my $config = Slic3r::Config->new;
$config->set('extruder', 3);
my $config2 = Slic3r::Config::PrintRegion->new;
$config2->set('infill_extruder', 2);
$config2->apply($config);
is $config2->get('infill_extruder'), 2, 'extruder does not overwrite non-zero role extruders';
is $config2->get('perimeter_extruder'), 3, 'extruder overwrites zero role extruders';
}
}
{
{
my $config = Slic3r::Config->new;
$config->set('support_material_extruder', 2);
my $config2 = Slic3r::Config::PrintObject->new;
$config2->apply($config);
is $config2->get('support_material_extruder'), $config->get('support_material_extruder'),
'non-zero support_material_extruder is applied';
}
{
my $config = Slic3r::Config->new;
$config->set('support_material_extruder', 0);
my $config2 = Slic3r::Config::PrintObject->new;
$config2->set('support_material_extruder', 3);
$config2->apply($config);
isnt $config2->get('support_material_extruder'), $config->get('support_material_extruder'),
'zero support_material_extruder is not applied';
}
{
my $config = Slic3r::Config->new;
$config->set('extruder', 3);
my $config2 = Slic3r::Config::PrintObject->new;
$config2->set('support_material_extruder', 2);
$config2->apply($config);
is $config2->get('support_material_extruder'), 2, 'extruder does not overwrite non-zero role extruders';
is $config2->get('support_material_interface_extruder'), 3, 'extruder overwrites zero role extruders';
}
}