juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the ext does not support filament backup; add protection

Browse Source 
jira: [STUDIO-10812]
Change-Id: I01b6de1e23d00932b373920105542b8e8770e809
(cherry picked from commit 19697b2dcd2a4f20d977379cc76dff8e02e938f2)
This commit is contained in:
xin.zhang
2025-03-12 11:15:22 +08:00
committed by Noisyfox
parent d1d4a68a8f
commit 4fc4916ed0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2025,6 +2025,12 @@ void AmsReplaceMaterialDialog::update_mapping_result( std::vector<FilamentInfo>
{
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());
}
}

6
src/slic3r/GUI/GUI_App.cpp
View File

@@ -3787,6 +3787,12 @@ void GUI_App::load_gcode(wxWindow* parent, wxString& input_file) const
wxString GUI_App::transition_tridid(int trid_id) const
{
if (trid_id == VIRTUAL_TRAY_MAIN_ID || trid_id == VIRTUAL_TRAY_DEPUTY_ID)
{
assert(0);
return wxString("Ext");
}
wxString maping_dict[] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
if (trid_id >= 128 * 4) {