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

Support for a numeric input with both dot and comma

Browse Source 
as a valid decimal separator.

Fixes Česká verze hustota filamentu #1705
This commit is contained in:
bubnikv 2019-01-29 10:21:21 +01:00
parent c4bc45cff4
commit c973500ee6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,9 +143,11 @@ void Field::get_value_by_opt_type(wxString& str)
break; break;
} }
double val; double val;
// Replace the first occurence of comma in decimal number.
str.Replace(",", ".", false);
if(!str.ToCDouble(&val)) if(!str.ToCDouble(&val))
{ {
show_error(m_parent, _(L("Input value contains incorrect symbol(s).\nUse, please, only digits"))); show_error(m_parent, _(L("Invalid numeric input.")));
set_value(double_to_string(val), true); set_value(double_to_string(val), true);
} }
if (m_opt.min > val || val > m_opt.max) if (m_opt.min > val || val > m_opt.max)
@ -163,10 +165,12 @@ void Field::get_value_by_opt_type(wxString& str)
if (m_opt.type == coFloatOrPercent && !str.IsEmpty() && str.Last() != '%') if (m_opt.type == coFloatOrPercent && !str.IsEmpty() && str.Last() != '%')
{ {
double val; double val;
// Replace the first occurence of comma in decimal number.
str.Replace(",", ".", false);
if (!str.ToCDouble(&val)) if (!str.ToCDouble(&val))
{ {
show_error(m_parent, _(L("Input value contains incorrect symbol(s).\nUse, please, only digits"))); show_error(m_parent, _(L("Invalid numeric input.")));
set_value(double_to_string(val), true); set_value(double_to_string(val), true);
} }
else if (m_opt.sidetext.rfind("mm/s") != std::string::npos && val > m_opt.max || else if (m_opt.sidetext.rfind("mm/s") != std::string::npos && val > m_opt.max ||
m_opt.sidetext.rfind("mm ") != std::string::npos && val > 1) m_opt.sidetext.rfind("mm ") != std::string::npos && val > 1)
@ -334,6 +338,7 @@ void TextCtrl::propagate_value()
boost::any& TextCtrl::get_value() boost::any& TextCtrl::get_value()
{ {
wxString ret_str = static_cast<wxTextCtrl*>(window)->GetValue(); wxString ret_str = static_cast<wxTextCtrl*>(window)->GetValue();
// modifies ret_string!
get_value_by_opt_type(ret_str); get_value_by_opt_type(ret_str);
return m_value; return m_value;
@ -727,11 +732,13 @@ boost::any& Choice::get_value()
else if (m_opt.gui_type == "f_enum_open") { else if (m_opt.gui_type == "f_enum_open") {
const int ret_enum = static_cast<wxComboBox*>(window)->GetSelection(); const int ret_enum = static_cast<wxComboBox*>(window)->GetSelection();
if (ret_enum < 0 || m_opt.enum_values.empty() || m_opt.type == coStrings) if (ret_enum < 0 || m_opt.enum_values.empty() || m_opt.type == coStrings)
// modifies ret_string!
get_value_by_opt_type(ret_str); get_value_by_opt_type(ret_str);
else else
m_value = atof(m_opt.enum_values[ret_enum].c_str()); m_value = atof(m_opt.enum_values[ret_enum].c_str());
} }
else else
// modifies ret_string!
get_value_by_opt_type(ret_str); get_value_by_opt_type(ret_str);
return m_value; return m_value;