From 293787609b61126916c0439a85b91a8e1f13d4bd Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Mon, 17 Mar 2025 10:31:19 +0800 Subject: [PATCH] FIX: show all re-fill while sending print jira: [STUDIO-10888] Change-Id: I2b1a98eddd2c34a83a73ef7cbef39ab05d569aef (cherry picked from commit ee76a2191ff633af3311ef659b9feb63e7bdedeb) --- src/slic3r/GUI/AmsMappingPopup.cpp | 14 -------------- src/slic3r/GUI/AmsMappingPopup.hpp | 1 - src/slic3r/GUI/SelectMachine.cpp | 1 - src/slic3r/GUI/SyncAmsInfoDialog.cpp | 1 - 4 files changed, 17 deletions(-) diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index d5cbc604c9..be0e5cad5d 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -2069,20 +2069,6 @@ void AmsReplaceMaterialDialog::create() Fit(); } -void AmsReplaceMaterialDialog::update_mapping_result( std::vector result) -{ - m_tray_used.clear(); - for (int i = 0; i < result.size(); i++) { - - if (result[i].tray_id == VIRTUAL_TRAY_MAIN_ID || result[i].tray_id == VIRTUAL_TRAY_DEPUTY_ID) - { - continue; - } - - m_tray_used.push_back(wxGetApp().transition_tridid(result[i].tray_id).ToStdString()); - } -} - void AmsReplaceMaterialDialog::update_machine_obj(MachineObject* obj) { if (obj) diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 118fb25250..de8db8e40a 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -433,7 +433,6 @@ public: public: void update_machine_obj(MachineObject* obj); - void update_mapping_result(std::vector result); void paintEvent(wxPaintEvent& evt); void on_dpi_changed(const wxRect& suggested_rect) override; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 9cda07ae51..04693e25b0 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -963,7 +963,6 @@ void SelectMachineDialog::popup_filament_backup() if (!dev) return; if (dev->get_selected_machine()/* && dev->get_selected_machine()->filam_bak.size() > 0*/) { AmsReplaceMaterialDialog* m_replace_material_popup = new AmsReplaceMaterialDialog(this); - m_replace_material_popup->update_mapping_result(m_ams_mapping_result); m_replace_material_popup->update_machine_obj(dev->get_selected_machine()); m_replace_material_popup->ShowModal(); } diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 3f4030fecf..605ecd9c4c 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1200,7 +1200,6 @@ void SyncAmsInfoDialog::popup_filament_backup() if (!dev) return; if (dev->get_selected_machine() /* && dev->get_selected_machine()->filam_bak.size() > 0*/) { AmsReplaceMaterialDialog *m_replace_material_popup = new AmsReplaceMaterialDialog(this); - m_replace_material_popup->update_mapping_result(m_ams_mapping_result); m_replace_material_popup->update_machine_obj(dev->get_selected_machine()); m_replace_material_popup->ShowModal(); }