diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 3d504c71d6..9d606261c6 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1875,6 +1875,7 @@ void GUI_App::init_networking_callbacks() obj->is_tunnel_mqtt = tunnel; obj->command_request_push_all(); obj->command_get_version(); + GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); } }); }); @@ -1907,6 +1908,7 @@ void GUI_App::init_networking_callbacks() obj->command_get_version(); event.SetInt(0); event.SetString(obj->dev_id); + GUI::wxGetApp().sidebar().load_ams_list(obj->dev_id, obj); } else if (state == ConnectStatus::ConnectStatusFailed) { obj->set_access_code(""); obj->erase_user_access_code(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2b209cf722..122a635e75 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1371,7 +1371,7 @@ void Sidebar::load_ams_list(std::string const &device, MachineObject* obj) if (!obj) { p->ams_list_device = device; - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": %1% items") % filament_ams_list.size(); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " clear list"; wxGetApp().preset_bundle->filament_ams_list = filament_ams_list; for (auto c : p->combos_filament) c->update(); @@ -1384,8 +1384,8 @@ void Sidebar::load_ams_list(std::string const &device, MachineObject* obj) DynamicPrintConfig vt_tray_config; vt_tray_config.set_key_value("filament_id", new ConfigOptionStrings{ vt_tray.setting_id }); vt_tray_config.set_key_value("filament_type", new ConfigOptionStrings{ vt_tray.type }); - vt_tray_config.set_key_value("tray_name", new ConfigOptionStrings{ std::string("Ext")}); - vt_tray_config.set_key_value("filament_colour", new ConfigOptionStrings{ "#" + vt_tray.color.substr(0, 8) }); + vt_tray_config.set_key_value("tray_name", new ConfigOptionStrings{std::string("Ext")}); + vt_tray_config.set_key_value("filament_colour", new ConfigOptionStrings{into_u8(wxColour("#" + vt_tray.color).GetAsString(wxC2S_HTML_SYNTAX))}); vt_tray_config.set_key_value("filament_exist", new ConfigOptionBools{ vt_tray.is_exists }); filament_ams_list.emplace(VIRTUAL_TRAY_ID, std::move(vt_tray_config)); @@ -1402,8 +1402,8 @@ void Sidebar::load_ams_list(std::string const &device, MachineObject* obj) tray_config.set_key_value("filament_id", new ConfigOptionStrings{tray.second->setting_id}); tray_config.set_key_value("filament_type", new ConfigOptionStrings{tray.second->type}); tray_config.set_key_value("tray_name", new ConfigOptionStrings{std::string(1, n) + std::string(1, t)}); - tray_config.set_key_value("filament_colour", new ConfigOptionStrings{ "#" + tray.second->color.substr(0, 8) }); - tray_config.set_key_value("filament_exist", new ConfigOptionBools{ tray.second->is_exists }); + tray_config.set_key_value("filament_colour", new ConfigOptionStrings{into_u8(wxColour("#" + tray.second->color).GetAsString(wxC2S_HTML_SYNTAX))}); + tray_config.set_key_value("filament_exist", new ConfigOptionBools{tray.second->is_exists}); filament_ams_list.emplace(((n - 'A') * 4 + t - '1'), std::move(tray_config)); } @@ -5583,7 +5583,7 @@ void Plater::priv::on_select_bed_type(wxCommandEvent &evt) { ComboBox* combo = static_cast(evt.GetEventObject()); int selection = combo->GetSelection(); - wxString bed_type_name = combo->GetString(selection); + std::string bed_type_name = print_config_def.get("curr_bed_type")->enum_values[selection]; DynamicPrintConfig& proj_config = wxGetApp().preset_bundle->project_config; const t_config_enum_values* keys_map = print_config_def.get("curr_bed_type")->enum_keys_map; @@ -5591,7 +5591,7 @@ void Plater::priv::on_select_bed_type(wxCommandEvent &evt) if (keys_map) { BedType new_bed_type = btCount; for (auto item : *keys_map) { - if (_L(item.first) == bed_type_name) { + if (item.first == bed_type_name) { new_bed_type = (BedType)item.second; break; } diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 6db12a0ca6..c7434ae4d7 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -916,6 +916,7 @@ void PlaterPresetComboBox::update() //unsigned char rgb[3]; filament_color = m_preset_bundle->project_config.opt_string("filament_colour", (unsigned int) m_filament_idx); wxColor clr(filament_color); + clr_picker->SetBackgroundColour(clr); clr_picker->SetBitmap(*get_extruder_color_icons(true)[m_filament_idx]); #ifdef __WXOSX__ clr_picker->SetLabel(clr_picker->GetLabel()); // Let setBezelStyle: be called