juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-26 20:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ams filament & process config dirty

Browse Source 
Change-Id: I80d9b30c82aa2830b821e7317370756d4e99e36d
(cherry picked from commit b45e30543e4dbddd7a4da5612660c34d1db659f8)
This commit is contained in:
chunmao.guo
2024-07-03 15:15:13 +08:00
committed by Noisyfox
parent e2c3926c76
commit 269fdcb324
3 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1946,24 +1946,22 @@ std::map<int, DynamicPrintConfig> Sidebar::build_filament_ams_list(MachineObject
return tray_config;
};
auto vt_tray = obj->vt_tray;
if (obj->ams_support_virtual_tray) {
int extruder = 0x10000;
//for (auto &vt_tray : obj->vt_slot) {
filament_ams_list.emplace(extruder + VIRTUAL_TRAY_MAIN_ID, build_tray_config(vt_tray, "Ext"));
extruder = 0;
//}
int extruder = 0x10000; // Main (first) extruder at right
for (auto & vt_tray : obj->vt_slot) {
filament_ams_list.emplace(extruder + VIRTUAL_TRAY_MAIN_ID, build_tray_config(vt_tray, "Ext"));
extruder = 0;
}
}
auto list = obj->amsList;
for (auto ams : list) {
char n = ams.first.front() - '0' + 'A';
int extruder = /*ams.nozzle ? 0 :*/ 0x10000;
int extruder = ams.second->nozzle ? 0 : 0x10000; // Main (first) extruder at right
for (auto tray : ams.second->trayList) {
char t = tray.first.front() - '0' + '1';
filament_ams_list.emplace(extruder + ((n - 'A') * 4 + t - '1'),
build_tray_config(*tray.second, std::string(1, n) + std::string(1, t)));
extruder = 0;
}
}
return filament_ams_list;