3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a slider for the cutting GUI

Browse Source
This commit is contained in:
Alessandro Ranellucci 2014-04-25 18:36:08 +02:00
parent 8db4913b04
commit 2a2ba15665
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Slic3r/GUI/OptionsGroup.pm
View File

@ -3,7 +3,7 @@ use Moo;
use List::Util qw(first); use List::Util qw(first);
use Wx qw(:combobox :font :misc :sizer :systemsettings :textctrl); use Wx qw(:combobox :font :misc :sizer :systemsettings :textctrl);
use Wx::Event qw(EVT_CHECKBOX EVT_COMBOBOX EVT_SPINCTRL EVT_TEXT EVT_KILL_FOCUS); use Wx::Event qw(EVT_CHECKBOX EVT_COMBOBOX EVT_SPINCTRL EVT_TEXT EVT_KILL_FOCUS EVT_SLIDER);
=head1 NAME =head1 NAME
@ -184,7 +184,7 @@ sub _build_field {
my $field; my $field;
my $tooltip = $opt->{tooltip}; my $tooltip = $opt->{tooltip};
if ($opt->{type} =~ /^(i|f|s|s@|percent)$/) { if ($opt->{type} =~ /^(i|f|s|s@|percent|slider)$/) {
my $style = 0; my $style = 0;
$style = wxTE_MULTILINE if $opt->{multiline}; $style = wxTE_MULTILINE if $opt->{multiline};
# default width on Windows is too large # default width on Windows is too large
@ -215,6 +215,20 @@ sub _build_field {
}); });
EVT_TEXT($self->parent, $field, $on_change); EVT_TEXT($self->parent, $field, $on_change);
EVT_KILL_FOCUS($field, $on_kill_focus); EVT_KILL_FOCUS($field, $on_kill_focus);
} elsif ($opt->{type} eq 'slider') {
my $scale = 10;
$field = Wx::BoxSizer->new(wxHORIZONTAL);
my $slider = Wx::Slider->new($self->parent, -1, ($opt->{default} // $opt->{min})*$scale, ($opt->{min} // 0)*$scale, ($opt->{max} // 100)*$scale, wxDefaultPosition, $size);
my $statictext = Wx::StaticText->new($self->parent, -1, $slider->GetValue/$scale);
$field->Add($_, 0, wxALIGN_CENTER_VERTICAL, 0) for $slider, $statictext;
$self->_setters->{$opt_key} = sub {
$field->SetValue($_[0]*$scale);
};
EVT_SLIDER($self->parent, $slider, sub {
my $value = $slider->GetValue/$scale;
$statictext->SetLabel($value);
$self->_on_change($opt_key, $value);
});
} else { } else {
$field = Wx::TextCtrl->new($self->parent, -1, $opt->{default}, wxDefaultPosition, $size, $style); $field = Wx::TextCtrl->new($self->parent, -1, $opt->{default}, wxDefaultPosition, $size, $style);
$self->_setters->{$opt_key} = sub { $field->ChangeValue($_[0]) }; $self->_setters->{$opt_key} = sub { $field->ChangeValue($_[0]) };

4
lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
View File

@ -34,9 +34,11 @@ sub new {
options => [ options => [
{ {
opt_key => 'z', opt_key => 'z',
type => 'f', type => 'slider',
label => 'Z', label => 'Z',
default => $self->{cut_options}{z}, default => $self->{cut_options}{z},
min => 0,
max => $self->{model_object}->bounding_box->size->z,
}, },
{ {
opt_key => 'keep_upper', opt_key => 'keep_upper',