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

Added control of "Invalid numeric input" for the PointCtrl

Browse Source
This commit is contained in:
YuSanka 2020-04-05 23:18:22 +02:00
parent b578b7ec87
commit ce2e53dbfa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/Field.cpp
View File

@ -1291,9 +1291,13 @@ void PointCtrl::set_value(const boost::any& value, bool change_event)
boost::any& PointCtrl::get_value() boost::any& PointCtrl::get_value()
{ {
double x, y; double x, y;
x_textctrl->GetValue().ToDouble(&x); if (!x_textctrl->GetValue().ToDouble(&x) ||
y_textctrl->GetValue().ToDouble(&y); !y_textctrl->GetValue().ToDouble(&y))
{
set_value(m_value.empty() ? Vec2d(0.0, 0.0) : m_value, true);
show_error(m_parent, _L("Invalid numeric input."));
}
else
if (m_opt.min > x || x > m_opt.max || if (m_opt.min > x || x > m_opt.max ||
m_opt.min > y || y > m_opt.max) m_opt.min > y || y > m_opt.max)
{ {
@ -1303,7 +1307,7 @@ boost::any& PointCtrl::get_value()
if (y > m_opt.max) y = m_opt.max; if (y > m_opt.max) y = m_opt.max;
set_value(Vec2d(x, y), true); set_value(Vec2d(x, y), true);
show_error(m_parent, _(L("Input value is out of range"))); show_error(m_parent, _L("Input value is out of range"));
} }
return m_value = Vec2d(x, y); return m_value = Vec2d(x, y);