3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-28 11:50:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: access the ext

Browse source 
jira: [STUDIO-10970]
Change-Id: I65889835a4ced2d0d3547cacc505d6e1d874497e
(cherry picked from commit 7bc1108a2ecd8f00ba057034e74f9d1b8eac135f)
This commit is contained in:
xin.zhang 2025-03-24 10:00:00 +08:00 • committed by Noisyfox
parent 1aee0189d4
commit 890fe61af2
3 changed files with 46 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/slic3r/GUI/DeviceManager.cpp
View file

@ -5897,6 +5897,42 @@ AmsTray MachineObject::parse_vt_tray(json vtray)
return vt_tray;
}
bool MachineObject::contains_tray(const std::string &ams_id, const std::string &tray_id) const
{
if (ams_id != VIRTUAL_AMS_MAIN_ID_STR && ams_id != VIRTUAL_AMS_DEPUTY_ID_STR) {
auto ams_iter = amsList.find(ams_id);
if (ams_iter != amsList.end()) {
auto tray_iter = ams_iter->second->trayList.find(tray_id);
if (tray_iter != ams_iter->second->trayList.end()) { return true;}
}
} else {
for (const auto& tray : vt_slot) {
if (tray.id == tray_id) { return true; }
}
}
return false;
}
AmsTray MachineObject::get_tray(const std::string &ams_id, const std::string &tray_id) const
{
if (ams_id != VIRTUAL_AMS_MAIN_ID_STR && ams_id != VIRTUAL_AMS_DEPUTY_ID_STR) {
auto ams_iter = amsList.find(ams_id);
if (ams_iter != amsList.end()) {
auto tray_iter = ams_iter->second->trayList.find(tray_id);
if (tray_iter != ams_iter->second->trayList.end()) { return *tray_iter->second; }
}
}
else {
for (const auto &tray : vt_slot) {
if (tray.id == tray_id) { return tray; }
}
}
assert(0);/*use contains_tray() check first*/
return AmsTray(tray_id);
}
bool MachineObject::check_enable_np(const json& print) const
{
if (print.contains("cfg") && print.contains("fun") && print.contains("aux") && print.contains("stat"))