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

Bugfix: when an external config was selected in any section, exported settings didn't reflect other sections properly

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-08-08 19:36:34 +02:00
parent 2f2bc8210a
commit 4fcecf5ef6
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Slic3r/Config.pm
View file

@ -835,7 +835,9 @@ sub new_from_cli {
sub merge {
my $class = shift;
return $class->new(map %$_, @_);
my $config = $class->new;
$config->apply($_) for @_;
return $config;
}
sub load {

26
lib/Slic3r/GUI/SkeinPanel.pm
View file

@ -232,16 +232,22 @@ sub config {
# retrieve filament presets and build a single config object for them
my $filament_config;
foreach my $preset_idx ($self->{plater}->filament_presets) {
my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx);
my $config = $self->{options_tabs}{filament}->get_preset_config($preset);
if (!$filament_config) {
$filament_config = $config;
next;
}
foreach my $opt_key (keys %$config) {
next unless ref $filament_config->get($opt_key) eq 'ARRAY';
push @{ $filament_config->get($opt_key) }, $config->get($opt_key)->[0];
if ($self->{plater}->filament_presets == 1) {
$filament_config = $self->{options_tabs}{filament}->config;
} else {
# TODO: handle dirty presets.
# perhaps plater shouldn't expose dirty presets at all in multi-extruder environments.
foreach my $preset_idx ($self->{plater}->filament_presets) {
my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx);
my $config = $self->{options_tabs}{filament}->get_preset_config($preset);
if (!$filament_config) {
$filament_config = $config;
next;
}
foreach my $opt_key (keys %$config) {
next unless ref $filament_config->get($opt_key) eq 'ARRAY';
push @{ $filament_config->get($opt_key) }, $config->get($opt_key)->[0];
}
}
}

3
lib/Slic3r/GUI/Tab.pm
View file

@ -210,7 +210,8 @@ sub get_preset_config {
}
# apply preset values on top of defaults
$config->apply(Slic3r::Config->load($preset->{file}));
my $external_config = Slic3r::Config->load($preset->{file});
$config->set($_, $external_config->get($_)) for @{$self->{options}};
}
return $config;