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

- Add Slic3r::Config::get_raw() for getting the raw, uncalculated values.

Browse source 
- Use get_raw() for saving and displaying options in GUI
This commit is contained in:
Henrik Brix Andersen 2012-06-19 15:32:56 +02:00
parent 8d25e6490a
commit 4031cf26b4
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ sub new {
$size = Wx::Size->new($opt->{width} || -1, $opt->{height} || -1);
}
my ($get, $set) = $opt->{type} eq 's@' ? qw(serialize deserialize) : qw(get set);
my ($get, $set) = $opt->{type} eq 's@' ? qw(serialize deserialize) : qw(get_raw set);
$field = Wx::TextCtrl->new($parent, -1, Slic3r::Config->$get($opt_key),
Wx::wxDefaultPosition, $size, $style);
@ -52,13 +52,13 @@ sub new {
push @reload_callbacks, sub { $field->SetValue(Slic3r::Config->$get($opt_key)) };
} elsif ($opt->{type} eq 'bool') {
$field = Wx::CheckBox->new($parent, -1, "");
$field->SetValue(Slic3r::Config->get($opt_key));
$field->SetValue(Slic3r::Config->get_raw($opt_key));
EVT_CHECKBOX($parent, $field, sub { Slic3r::Config->set($opt_key, $field->GetValue) });
push @reload_callbacks, sub { $field->SetValue(Slic3r::Config->get($opt_key)) };
push @reload_callbacks, sub { $field->SetValue(Slic3r::Config->get_raw($opt_key)) };
} elsif ($opt->{type} eq 'point') {
$field = Wx::BoxSizer->new(wxHORIZONTAL);
my $field_size = Wx::Size->new(40, -1);
my $value = Slic3r::Config->get($opt_key);
my $value = Slic3r::Config->get_raw($opt_key);
$field->Add($_) for (
Wx::StaticText->new($parent, -1, "x:"),
my $x_field = Wx::TextCtrl->new($parent, -1, $value->[0], Wx::wxDefaultPosition, $field_size),
@ -67,14 +67,14 @@ sub new {
);
my $set_value = sub {
my ($i, $value) = @_;
my $val = Slic3r::Config->get($opt_key);
my $val = Slic3r::Config->get_raw($opt_key);
$val->[$i] = $value;
Slic3r::Config->set($opt_key, $val);
};
EVT_TEXT($parent, $x_field, sub { $set_value->(0, $x_field->GetValue) });
EVT_TEXT($parent, $y_field, sub { $set_value->(1, $y_field->GetValue) });
push @reload_callbacks, sub {
my $value = Slic3r::Config->get($opt_key);
my $value = Slic3r::Config->get_raw($opt_key);
$x_field->SetValue($value->[0]);
$y_field->SetValue($value->[1]);
};
@ -85,7 +85,7 @@ sub new {
Slic3r::Config->set($opt_key, $opt->{values}[$field->GetSelection]);
});
push @reload_callbacks, sub {
my $value = Slic3r::Config->get($opt_key);
my $value = Slic3r::Config->get_raw($opt_key);
$field->SetSelection(grep $opt->{values}[$_] eq $value, 0..$#{$opt->{values}});
};
$reload_callbacks[-1]->();