3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adapt GUI to new XS Config

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-12-22 01:27:09 +01:00
parent 4515d90052
commit 9fb62e671f
5 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/Slic3r/GUI/OptionsGroup.pm
View file

@ -381,9 +381,17 @@ sub _set_config {
my ($opt_key, $index, $value) = @_;
my ($get_m, $serialized) = $self->_config_methods($opt_key, $index);
defined $index
? $self->config->$get_m($opt_key)->[$index] = $value
: $self->config->set($opt_key, $value, $serialized);
if (defined $index) {
my $values = $self->config->$get_m($opt_key);
$values->[$index] = $value;
$self->config->set($opt_key, $values);
} else {
if ($serialized) {
$self->config->set_deserialize($opt_key, $value);
} else {
$self->config->set($opt_key, $value);
}
}
}
sub _config_methods {

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

@ -686,6 +686,9 @@ sub export_gcode {
catch_error => sub { Slic3r::GUI::catch_error($self, @_) && $self->on_export_failed },
);
}
# this method gets executed in a separate thread by wxWidgets since it's a button handler
Slic3r::thread_cleanup() if $Slic3r::have_threads;
}
sub export_gcode2 {
@ -766,6 +769,9 @@ sub export_stl {
my $output_file = $self->_get_export_file('STL') or return;
Slic3r::Format::STL->write_file($output_file, $self->make_model, binary => 1);
$self->statusbar->SetStatusText("STL file exported to $output_file");
# this method gets executed in a separate thread by wxWidgets since it's a button handler
Slic3r::thread_cleanup() if $Slic3r::have_threads;
}
sub export_amf {
@ -774,6 +780,9 @@ sub export_amf {
my $output_file = $self->_get_export_file('AMF') or return;
Slic3r::Format::AMF->write_file($output_file, $self->make_model);
$self->statusbar->SetStatusText("AMF file exported to $output_file");
# this method gets executed in a separate thread by wxWidgets since it's a menu handler
Slic3r::thread_cleanup() if $Slic3r::have_threads;
}
sub _get_export_file {
@ -850,7 +859,9 @@ sub make_thumbnail {
};
@_ = ();
$Slic3r::have_threads ? threads->create($cb)->detach : $cb->();
$Slic3r::have_threads
? threads->create(sub { $cb->(); Slic3r::thread_cleanup(); })->detach
: $cb->();
}
sub on_thumbnail_made {

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

@ -305,7 +305,7 @@ sub load_config {
my ($config) = @_;
foreach my $tab (values %{$self->{options_tabs}}) {
$tab->set_value($_, $config->$_) for keys %$config;
$tab->set_value($_, $config->$_) for @{$config->get_keys};
}
}

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

@ -291,7 +291,8 @@ sub set_value {
sub reload_values {
my $self = shift;
$self->set_value($_, $self->{config}->get($_)) for keys %{$self->{config}};
$self->set_value($_, $self->{config}->get($_))
for @{$self->{config}->get_keys};
}
sub update_tree {
@ -735,7 +736,9 @@ sub config {
# remove all unused values
foreach my $opt_key ($self->_extruder_options) {
splice @{ $config->{$opt_key} }, $self->{extruders_count};
my $values = $config->get($opt_key);
splice @$values, $self->{extruders_count};
$config->set($opt_key, $values);
}
return $config;