vitalif
/
Slic3r
mirror of https://github.com/vitalif/Slic3r
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle read_from_file() exceptions in GUI. #1619

xs-bb
Alessandro Ranellucci 2013-12-17 16:11:42 +01:00
parent 21ca1901c1
commit 94743d3af0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/GUI/Plater.pm
View File

@ -382,7 +382,10 @@ sub load_file {
$process_dialog->Pulse;
local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
my $model = Slic3r::Model->read_from_file($input_file);
my $model = eval { Slic3r::Model->read_from_file($input_file) };
Slic3r::GUI::show_error($self, $@) if $@;
$self->load_model_object($_) for @{$model->objects};
$process_dialog->Destroy;

7
lib/Slic3r/GUI/SkeinPanel.pm
View File

@ -134,7 +134,8 @@ sub quick_slice {
Slic3r::GUI->save_settings;
my $print = $self->init_print;
my $model = Slic3r::Model->read_from_file($input_file);
my $model = eval { Slic3r::Model->read_from_file($input_file) };
Slic3r::GUI::show_error($self, $@) if $@;
if ($model->has_objects_with_no_instances) {
# apply a default position to all objects not having one
@ -374,7 +375,9 @@ sub combine_stls {
$output_file = $dlg->GetPath;
}
my @models = map Slic3r::Model->read_from_file($_), @input_files;
my @models = eval { map Slic3r::Model->read_from_file($_), @input_files };
Slic3r::GUI::show_error($self, $@) if $@;
my $new_model = Slic3r::Model->new;
my $new_object = $new_model->add_object;
for my $m (0 .. $#models) {