From 44db9102ae538b0558ff7f14bfc588e59558ee5b Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 15 Jan 2025 22:18:59 +0800 Subject: [PATCH] FIX:multi printer control using ext pool jira:[STUDIO-9610] Change-Id: I32e7d6701f12e32facd5b0ac536129526582c954 --- src/slic3r/GUI/AmsMappingPopup.cpp | 7 +++++-- src/slic3r/GUI/SendMultiMachinePage.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 72a45c745..23614b63e 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -518,8 +518,11 @@ void AmsMapingPopup::update_ams_data_multi_machines() tray_datas.push_back(td); } - m_amsmapping_container_list[m_amsmapping_container_list_index]->Show(); - add_ams_mapping(tray_datas, m_amsmapping_container_list[m_amsmapping_container_list_index], m_amsmapping_container_sizer_list[m_amsmapping_container_list_index]); + + if (m_amsmapping_container_list.size() > m_amsmapping_container_list_index ) { + m_amsmapping_container_list[m_amsmapping_container_list_index]->Show(); + add_ams_mapping(tray_datas, m_amsmapping_container_list[m_amsmapping_container_list_index], m_amsmapping_container_sizer_list[m_amsmapping_container_list_index]); + } m_warning_text->Show(m_has_unmatch_filament); diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 5edc6bb5a..5e68358be 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -1097,9 +1097,9 @@ wxPanel* SendMultiMachinePage::create_page() wxBoxSizer* title_filament = create_item_title(_L("Filament"), main_page, ""); wxBoxSizer* radio_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* use_external_sizer = create_item_radiobox(_L("Use External Spool"), main_page, "", 0, "use_external"); - wxBoxSizer* use_ams_sizer = create_item_radiobox(_L("Use AMS"), main_page, "", 0, "use_ams"); + //wxBoxSizer* use_ams_sizer = create_item_radiobox(_L("Use AMS"), main_page, "", 0, "use_ams"); radio_sizer->Add(use_external_sizer, 0, wxLeft, FromDIP(20)); - radio_sizer->Add(use_ams_sizer, 0, wxLeft, FromDIP(5)); + //radio_sizer->Add(use_ams_sizer, 0, wxLeft, FromDIP(5)); sizer->Add(title_filament, 0, wxEXPAND, 0); sizer->Add(radio_sizer, 0, wxLEFT, FromDIP(20)); sizer->AddSpacer(FromDIP(5)); @@ -1408,7 +1408,8 @@ void SendMultiMachinePage::sync_ams_list() if (extruder >= materials.size() || extruder < 0 || extruder >= display_materials.size()) continue; MaterialItem* item = new MaterialItem(m_main_page, colour_rgb, _L(display_materials[extruder])); - item->set_ams_info(wxColour("#CECECE"), "A1", 0, std::vector()); + //item->set_ams_info(wxColour("#CECECE"), "A1", 0, std::vector()); + item->set_ams_info(wxColour("#CECECE"), "Ext", 0, std::vector()); m_ams_list_sizer->Add(item, 0, wxALL, FromDIP(4)); item->Bind(wxEVT_LEFT_UP, [this, item, materials, extruder](wxMouseEvent& e) {});