3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into xsdata

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-08-25 22:34:03 +02:00
commit d786dd6c1c
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/Slic3r/GUI/Plater.pm
View file

@ -1096,6 +1096,11 @@ sub object_settings_dialog {
($obj_idx, undef) = $self->selected_object;
}
# validate config before opening the settings dialog because
# that dialog can't be closed if validation fails, but user
# can't fix any error which is outside that dialog
return unless $self->validate_config;
my $dlg = Slic3r::GUI::Plater::ObjectSettingsDialog->new($self,
object => $self->{objects}[$obj_idx],
);
@ -1169,6 +1174,16 @@ sub selected_object {
return ($obj_idx, $self->{objects}[$obj_idx]),
}
sub validate_config {
my $self = shift;
eval {
$self->skeinpanel->config->validate;
};
return 0 if Slic3r::GUI::catch_error($self);
return 1;
}
sub statusbar {
my $self = shift;
return $self->skeinpanel->GetParent->{statusbar};