3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Improved error handling when importing configuration from a G-code.

Browse source
This commit is contained in:
bubnikv 2017-06-14 20:18:46 +02:00
parent f7334f58d3
commit 2ac981e422
5 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/Slic3r/GUI/MainFrame.pm
View file

@ -548,12 +548,13 @@ sub load_config_file {
$file = Slic3r::decode_path($dlg->GetPaths);
$dlg->Destroy;
}
for my $tab (values %{$self->{options_tabs}}) {
# Dont proceed further if the config file cannot be loaded.
return undef if ! $tab->load_config_file($file);
}
$Slic3r::GUI::Settings->{recent}{config_directory} = dirname($file);
wxTheApp->save_settings;
$last_config = $file;
for my $tab (values %{$self->{options_tabs}}) {
$tab->load_config_file($file);
}
}
sub export_configbundle {

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

@ -455,17 +455,21 @@ sub load_config_file {
my $i = first { $self->{presets}[$_]{file} eq $file && $self->{presets}[$_]{external} } 1..$#{$self->{presets}};
if (!$i) {
my $preset_name = basename($file); # keep the .ini suffix
push @{$self->{presets}}, Slic3r::GUI::Tab::Preset->new(
my $preset_new = Slic3r::GUI::Tab::Preset->new(
file => $file,
name => $preset_name,
external => 1,
);
# Try to load the config file before it is entered into the list. If the loading fails, an undef is returned.
return undef if ! defined $preset_new->config;
push @{$self->{presets}}, $preset_new;
$self->{presets_choice}->Append($preset_name);
$i = $#{$self->{presets}};
}
$self->{presets_choice}->SetSelection($i - $self->{default_suppressed});
$self->on_select_preset;
$self->_on_presets_changed;
return 1;
}
sub load_config {
@ -1710,13 +1714,15 @@ sub on_preset_loaded {
sub load_config_file {
my $self = shift;
$self->SUPER::load_config_file(@_);
Slic3r::GUI::warning_catcher($self)->(
"Your configuration was imported. However, Slic3r is currently only able to import settings "
. "for the first defined filament. We recommend you don't use exported configuration files "
. "for multi-extruder setups and rely on the built-in preset management system instead.")
if @{ $self->{config}->nozzle_diameter } > 1;
if ($self->SUPER::load_config_file(@_)) {
Slic3r::GUI::warning_catcher($self)->(
"Your configuration was imported. However, Slic3r is currently only able to import settings "
. "for the first defined filament. We recommend you don't use exported configuration files "
. "for multi-extruder setups and rely on the built-in preset management system instead.")
if @{ $self->{config}->nozzle_diameter } > 1;
return 1;
}
return undef;
}
package Slic3r::GUI::Tab::Page;
@ -1862,7 +1868,11 @@ sub config {
# apply preset values on top of defaults
my $config = Slic3r::Config->new_from_defaults(@$keys);
my $external_config = Slic3r::Config->load($self->file);
my $external_config = eval { Slic3r::Config->load($self->file); };
if ($@) {
Slic3r::GUI::show_error(undef, $@);
return undef;
}
$config->set($_, $external_config->get($_))
for grep $external_config->has($_), @$keys;