GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-24 05:04:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix filament override for coFloatOrPercent / coFloatsOrPercents

Browse Source 
supermerill/SuperSlicer#1618
This commit is contained in:
supermerill 2021-10-08 12:29:37 +02:00
parent 5d711f2420
commit 812dfdb484
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,8 +311,10 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
str.Replace(" ", "", true);
str.Replace("m", "", true);
if (!str.ToCDouble(&val))
{
if (m_opt.nullable && str == na_value()) {
val = ConfigOptionFloatsNullable::nil_value();
str = "nan";
} else if (!str.ToCDouble(&val)) {
if (!check_value) {
m_value.clear();
break;
@ -480,7 +482,6 @@ void TextCtrl::BUILD() {
m_opt.default_value->getFloat() :
m_opt.get_default_value<ConfigOptionPercents>()->get_at(m_opt_idx);
text_value = double_to_string(val, m_opt.precision);
m_last_meaningful_value = text_value;
break;
}
case coFloatsOrPercents:
@ -507,6 +508,7 @@ void TextCtrl::BUILD() {
default:
break;
}
m_last_meaningful_value = text_value;
const long style = m_opt.multiline ? wxTE_MULTILINE : wxTE_PROCESS_ENTER/*0*/;
auto temp = new wxTextCtrl(m_parent, wxID_ANY, text_value, wxDefaultPosition, size, style);