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

Follow up on 569200eb99

Browse Source 
Improved formatting of the vector of dimensions, improved wordings
of error messages and tooltips.
This commit is contained in:
Vojtech Bubnik 2020-12-12 08:34:43 +01:00
parent e78ad6ffa9
commit 621610da75
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/PrintConfig.cpp
View File

@ -64,7 +64,7 @@ void PrintConfigDef::init_common_params()
def = this->add("thumbnails", coPoints); def = this->add("thumbnails", coPoints);
def->label = L("G-code thumbnails"); def->label = L("G-code thumbnails");
def->tooltip = L("Picture sizes to be stored into a .gcode and .sl1 files"); def->tooltip = L("Picture sizes to be stored into a .gcode and .sl1 files, in the following format: \"XxY, XxY, ...\"");
def->mode = comExpert; def->mode = comExpert;
def->gui_type = "one_string"; def->gui_type = "one_string";
def->set_default_value(new ConfigOptionPoints()); def->set_default_value(new ConfigOptionPoints());

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

@ -57,9 +57,10 @@ wxString double_to_string(double const value, const int max_precision /*= 4*/)
wxString get_thumbnails_string(const std::vector<Vec2d>& values) wxString get_thumbnails_string(const std::vector<Vec2d>& values)
{ {
wxString ret_str; wxString ret_str;
if (!values.empty()) for (size_t i = 0; i < values.size(); ++ i) {
for (auto el : values) const Vec2d& el = values[i];
ret_str += wxString::Format("%ix%i, ", int(el[0]), int(el[1])); ret_str += wxString::Format((i == 0) ? "%ix%i" : ", %ix%i", int(el[0]), int(el[1]));
}
return ret_str; return ret_str;
} }
@ -359,7 +360,7 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
if (!m_value.empty()) if (!m_value.empty())
text_value = get_thumbnails_string(boost::any_cast<std::vector<Vec2d>>(m_value)); text_value = get_thumbnails_string(boost::any_cast<std::vector<Vec2d>>(m_value));
set_value(text_value, true); set_value(text_value, true);
show_error(m_parent, format_wxstr(_L("Invalid input format. It must be represented like \"%1%\""),"XxY, XxY, ..." )); show_error(m_parent, format_wxstr(_L("Invalid input format. Expected vector of dimensions in the following format: \"%1%\""),"XxY, XxY, ..." ));
} }
} }