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

Fix of https://github.com/prusa3d/Slic3r/issues/218

Browse source 
Cut function bug in accepting a numerical value
This commit is contained in:
bubnikv 2017-04-05 15:55:02 +02:00
parent 7ffb3590c4
commit c40de7e424
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Slic3r/GUI/OptionsGroup/Field.pm
View file

@ -547,13 +547,17 @@ sub BUILD {
$sizer->Add($textctrl, 0, wxALIGN_CENTER_VERTICAL, 0); $sizer->Add($textctrl, 0, wxALIGN_CENTER_VERTICAL, 0);
EVT_SLIDER($self->parent, $slider, sub { EVT_SLIDER($self->parent, $slider, sub {
$self->_update_textctrl; if (! $self->disable_change_event) {
$self->textctrl->SetLabel($self->get_value);
$self->_on_change($self->option->opt_id); $self->_on_change($self->option->opt_id);
}
}); });
EVT_TEXT($self->parent, $textctrl, sub { EVT_TEXT($self->parent, $textctrl, sub {
my $value = $textctrl->GetValue; my $value = $textctrl->GetValue;
if ($value =~ /^-?\d+(\.\d*)?$/) { if ($value =~ /^-?\d+(\.\d*)?$/) {
$self->set_value($value); $self->disable_change_event(1);
$self->slider->SetValue($value*$self->scale);
$self->disable_change_event(0);
$self->_on_change($self->option->opt_id); $self->_on_change($self->option->opt_id);
} }
}); });
@ -567,7 +571,7 @@ sub set_value {
$self->disable_change_event(1); $self->disable_change_event(1);
$self->slider->SetValue($value*$self->scale); $self->slider->SetValue($value*$self->scale);
$self->_update_textctrl; $self->textctrl->SetLabel($self->get_value);
$self->disable_change_event(0); $self->disable_change_event(0);
} }
@ -576,11 +580,6 @@ sub get_value {
return $self->slider->GetValue/$self->scale; return $self->slider->GetValue/$self->scale;
} }
sub _update_textctrl {
my ($self) = @_;
$self->textctrl->SetLabel($self->get_value);
}
sub enable { sub enable {
my ($self) = @_; my ($self) = @_;