3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 23:54:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
- Use get_raw() for saving and displaying options in GUI

Forward-ported from 4031cf26b4
This commit is contained in:
Henrik Brix Andersen 2012-06-21 13:28:55 +02:00
parent f2617bffda
commit 60ff9938ef
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Slic3r/Config.pm
View file

@ -632,6 +632,14 @@ sub get {
return $value; return $value;
} }
sub get_raw {
my $class = @_ == 2 ? shift : undef;
my ($opt_key) = @_;
no strict 'refs';
my $value = ${"Slic3r::$opt_key"};
return $value;
}
sub set { sub set {
my $class = @_ == 3 ? shift : undef; my $class = @_ == 3 ? shift : undef;
my ($opt_key, $value) = @_; my ($opt_key, $value) = @_;
@ -643,8 +651,8 @@ sub serialize {
my $class = @_ == 2 ? shift : undef; my $class = @_ == 2 ? shift : undef;
my ($opt_key) = @_; my ($opt_key) = @_;
return $Options->{$opt_key}{serialize} return $Options->{$opt_key}{serialize}
? $Options->{$opt_key}{serialize}->(get($opt_key)) ? $Options->{$opt_key}{serialize}->(get_raw($opt_key))
: get($opt_key); : get_raw($opt_key);
} }
sub deserialize { sub deserialize {
@ -678,7 +686,7 @@ sub save {
foreach my $opt (sort keys %$Options) { foreach my $opt (sort keys %$Options) {
next if defined $group && not ($opt ~~ @{$Groups{$group}}); next if defined $group && not ($opt ~~ @{$Groups{$group}});
next if $Options->{$opt}{gui_only}; next if $Options->{$opt}{gui_only};
my $value = get($opt); my $value = get_raw($opt);
$value = $Options->{$opt}{serialize}->($value) if $Options->{$opt}{serialize}; $value = $Options->{$opt}{serialize}->($value) if $Options->{$opt}{serialize};
$ini->{_}{$opt} = $value; $ini->{_}{$opt} = $value;
} }
@ -704,7 +712,7 @@ sub setenv {
sub current { sub current {
my $class = shift; my $class = shift;
return { map +($_ => get($_)), sort keys %$Options }; return { map +($_ => get_raw($_)), sort keys %$Options };
} }
sub read_ini { sub read_ini {

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

@ -48,7 +48,7 @@ sub new {
$style = &Wx::wxTE_MULTILINE if $opt->{multiline}; $style = &Wx::wxTE_MULTILINE if $opt->{multiline};
my $size = Wx::Size->new($opt->{width} || -1, $opt->{height} || -1); my $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);
if ($opt->{type} eq 'i') { if ($opt->{type} eq 'i') {
my $value = Slic3r::Config->$get($opt_key); my $value = Slic3r::Config->$get($opt_key);
@ -61,13 +61,13 @@ sub new {
$reload_callbacks{$opt_key} = sub { $field->SetValue(Slic3r::Config->$get($opt_key)) }; $reload_callbacks{$opt_key} = sub { $field->SetValue(Slic3r::Config->$get($opt_key)) };
} elsif ($opt->{type} eq 'bool') { } elsif ($opt->{type} eq 'bool') {
$field = Wx::CheckBox->new($parent, -1, ""); $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); $onChange->($opt_key) }); EVT_CHECKBOX($parent, $field, sub { Slic3r::Config->set($opt_key, $field->GetValue); $onChange->($opt_key) });
$reload_callbacks{$opt_key} = sub { $field->SetValue(Slic3r::Config->get($opt_key)) }; $reload_callbacks{$opt_key} = sub { $field->SetValue(Slic3r::Config->get_raw($opt_key)) };
} elsif ($opt->{type} eq 'point') { } elsif ($opt->{type} eq 'point') {
$field = Wx::BoxSizer->new(wxHORIZONTAL); $field = Wx::BoxSizer->new(wxHORIZONTAL);
my $field_size = Wx::Size->new(40, -1); my $field_size = Wx::Size->new(40, -1);
my $value = Slic3r::Config->get($opt_key); my $value = Slic3r::Config->get_raw($opt_key);
my @items = ( my @items = (
Wx::StaticText->new($parent, -1, "x:"), Wx::StaticText->new($parent, -1, "x:"),
my $x_field = Wx::TextCtrl->new($parent, -1, $value->[0], Wx::wxDefaultPosition, $field_size), my $x_field = Wx::TextCtrl->new($parent, -1, $value->[0], Wx::wxDefaultPosition, $field_size),
@ -80,14 +80,14 @@ sub new {
} }
my $set_value = sub { my $set_value = sub {
my ($i, $value) = @_; my ($i, $value) = @_;
my $val = Slic3r::Config->get($opt_key); my $val = Slic3r::Config->get_raw($opt_key);
$val->[$i] = $value; $val->[$i] = $value;
Slic3r::Config->set($opt_key, $val); Slic3r::Config->set($opt_key, $val);
}; };
EVT_TEXT($parent, $x_field, sub { $set_value->(0, $x_field->GetValue); $onChange->($opt_key) }); EVT_TEXT($parent, $x_field, sub { $set_value->(0, $x_field->GetValue); $onChange->($opt_key) });
EVT_TEXT($parent, $y_field, sub { $set_value->(1, $y_field->GetValue); $onChange->($opt_key) }); EVT_TEXT($parent, $y_field, sub { $set_value->(1, $y_field->GetValue); $onChange->($opt_key) });
$reload_callbacks{$opt_key} = sub { $reload_callbacks{$opt_key} = sub {
my $value = Slic3r::Config->get($opt_key); my $value = Slic3r::Config->get_raw($opt_key);
$x_field->SetValue($value->[0]); $x_field->SetValue($value->[0]);
$y_field->SetValue($value->[1]); $y_field->SetValue($value->[1]);
}; };
@ -99,7 +99,7 @@ sub new {
$onChange->($opt_key); $onChange->($opt_key);
}); });
$reload_callbacks{$opt_key} = sub { $reload_callbacks{$opt_key} = 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}}); $field->SetSelection(grep $opt->{values}[$_] eq $value, 0..$#{$opt->{values}});
}; };
$reload_callbacks{$opt_key}->(); $reload_callbacks{$opt_key}->();