juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: show all re-fill while sending print

Browse Source 
jira: [STUDIO-10888]
Change-Id: I2b1a98eddd2c34a83a73ef7cbef39ab05d569aef
(cherry picked from commit ee76a2191ff633af3311ef659b9feb63e7bdedeb)
This commit is contained in:
xin.zhang
2025-03-17 10:31:19 +08:00
committed by Noisyfox
parent 5ce8613053
commit 293787609b
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@@ -2069,20 +2069,6 @@ void AmsReplaceMaterialDialog::create()
Fit(); Fit();
} }
void AmsReplaceMaterialDialog::update_mapping_result( std::vector<FilamentInfo> 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) void AmsReplaceMaterialDialog::update_machine_obj(MachineObject* obj)
{ {
if (obj) if (obj)

1
src/slic3r/GUI/AmsMappingPopup.hpp
View File

@@ -433,7 +433,6 @@ public:
public: public:
void update_machine_obj(MachineObject* obj); void update_machine_obj(MachineObject* obj);
void update_mapping_result(std::vector<FilamentInfo> result);
void paintEvent(wxPaintEvent& evt); void paintEvent(wxPaintEvent& evt);
void on_dpi_changed(const wxRect& suggested_rect) override; void on_dpi_changed(const wxRect& suggested_rect) override;

1
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -963,7 +963,6 @@ void SelectMachineDialog::popup_filament_backup()
if (!dev) return; if (!dev) return;
if (dev->get_selected_machine()/* && dev->get_selected_machine()->filam_bak.size() > 0*/) { if (dev->get_selected_machine()/* && dev->get_selected_machine()->filam_bak.size() > 0*/) {
AmsReplaceMaterialDialog* m_replace_material_popup = new AmsReplaceMaterialDialog(this); 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->update_machine_obj(dev->get_selected_machine());
m_replace_material_popup->ShowModal(); m_replace_material_popup->ShowModal();
} }

1
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -1200,7 +1200,6 @@ void SyncAmsInfoDialog::popup_filament_backup()
if (!dev) return; if (!dev) return;
if (dev->get_selected_machine() /* && dev->get_selected_machine()->filam_bak.size() > 0*/) { if (dev->get_selected_machine() /* && dev->get_selected_machine()->filam_bak.size() > 0*/) {
AmsReplaceMaterialDialog *m_replace_material_popup = new AmsReplaceMaterialDialog(this); 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->update_machine_obj(dev->get_selected_machine());
m_replace_material_popup->ShowModal(); m_replace_material_popup->ShowModal();
} }