Updated PrintConfig default values for machine limits

+ fixed incorrect default value setting for the TextCtrl

xs/src/slic3r/GUI/Field.cpp

@@ -35,6 +35,22 @@ namespace Slic3r { namespace GUI {
 		set_undo_bitmap(&bmp);
 		set_undo_to_sys_bitmap(&bmp);
 
+		switch (m_opt.type)
+		{
+		case coPercents:
+		case coFloats:
+		case coStrings:	
+		case coBools:		
+		case coInts: {
+			auto tag_pos = m_opt_id.find("#");
+			if (tag_pos != std::string::npos)
+				m_opt_idx = stoi(m_opt_id.substr(tag_pos + 1, m_opt_id.size()));
+			break;
+		}
+		default:
+			break;
+		}
+
 		BUILD();
 	}
 
@@ -151,10 +167,10 @@ namespace Slic3r { namespace GUI {
 		case coFloat:
 		{
 			double val = m_opt.type == coFloats ?
-				static_cast<const ConfigOptionFloats*>(m_opt.default_value)->get_at(0) :
+				static_cast<const ConfigOptionFloats*>(m_opt.default_value)->get_at(m_opt_idx) :
 				m_opt.type == coFloat ? 
 					m_opt.default_value->getFloat() :
-					static_cast<const ConfigOptionPercents*>(m_opt.default_value)->get_at(0);
+					static_cast<const ConfigOptionPercents*>(m_opt.default_value)->get_at(m_opt_idx);
 			text_value = double_to_string(val);
 			break;
 		}
@@ -164,10 +180,8 @@ namespace Slic3r { namespace GUI {
 		case coStrings:
 		{
 			const ConfigOptionStrings *vec = static_cast<const ConfigOptionStrings*>(m_opt.default_value);
-			if (vec == nullptr || vec->empty()) break;
-			if (vec->size() > 1)
-				break;
-			text_value = vec->values.at(0);
+			if (vec == nullptr || vec->empty()) break; //for the case of empty default value
+			text_value = vec->get_at(m_opt_idx);
 			break;
 		}
 		default:
@@ -249,7 +263,7 @@ void CheckBox::BUILD() {
 
 	bool check_value =	m_opt.type == coBool ? 
 						m_opt.default_value->getBool() : m_opt.type == coBools ? 
-						static_cast<ConfigOptionBools*>(m_opt.default_value)->values.at(0) : 
+						static_cast<ConfigOptionBools*>(m_opt.default_value)->get_at(m_opt_idx) : 
     					false;
 
 	auto temp = new wxCheckBox(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size); 
@@ -408,7 +422,7 @@ void Choice::set_selection()
 		break;
 	}
 	case coStrings:{
-		text_value = static_cast<const ConfigOptionStrings*>(m_opt.default_value)->values.at(0);
+		text_value = static_cast<const ConfigOptionStrings*>(m_opt.default_value)->get_at(m_opt_idx);
 
 		size_t idx = 0;
 		for (auto el : m_opt.enum_values)
@@ -572,7 +586,7 @@ void ColourPicker::BUILD()
 	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
 	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
 
-	wxString clr(static_cast<ConfigOptionStrings*>(m_opt.default_value)->values.at(0));
+	wxString clr(static_cast<ConfigOptionStrings*>(m_opt.default_value)->get_at(m_opt_idx));
 	auto temp = new wxColourPickerCtrl(m_parent, wxID_ANY, clr, wxDefaultPosition, size);
 		
 	// 	// recast as a wxWindow to fit the calling convention

xs/src/slic3r/GUI/Field.hpp

@@ -95,6 +95,7 @@ public:
     /// Copy of ConfigOption for deduction purposes
     const ConfigOptionDef			m_opt {ConfigOptionDef()};
 	const t_config_option_key		m_opt_id;//! {""};
+	int								m_opt_idx = 0;
 
     /// Sets a value for this control.
     /// subclasses should overload with a specific version

xs/src/slic3r/GUI/Tab.cpp

@@ -1734,7 +1734,7 @@ void TabPrinter::append_option_line(ConfigOptionsGroupShp optgroup, const std::s
 	optgroup->append_line(line);
 }
 
-PageShp TabPrinter::create_kinematics_page()
+PageShp TabPrinter::build_kinematics_page()
 {
 	auto page = add_options_page(_(L("Machine limits")), "cog.png", true);
 
@@ -1806,7 +1806,7 @@ void TabPrinter::build_extruder_pages()
 		}
 
 	if (existed_page < n_before_extruders && is_marlin_flavor){
-		auto page = create_kinematics_page();
+		auto page = build_kinematics_page();
 		m_pages.insert(m_pages.begin() + n_before_extruders, page);
 	}
 

xs/src/slic3r/GUI/Tab.hpp

@@ -333,7 +333,7 @@ public:
 	void		update() override;
 	void		update_serial_ports();
 	void		extruders_count_changed(size_t extruders_count);
-	PageShp		create_kinematics_page();
+	PageShp		build_kinematics_page();
 	void		build_extruder_pages();
 	void		on_preset_loaded() override;
 	void		init_options_list() override;