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

ENH: support filament soften check

Browse source 
jira: [STUDIO-11922]
Change-Id: I819c47e847ca30120c9fffeab3e9e1955b7f6beb
(cherry picked from commit 5b5489cc95803d1dadc0f6a1246ca39710e9196c)
This commit is contained in:
xin.zhang 2025-05-09 19:48:26 +08:00 • committed by Noisyfox
parent 6871bdd3b9
commit 7fcdfe1cfc
5 changed files with 70 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -921,6 +921,10 @@ AmsTray *MachineObject::get_ams_tray(std::string ams_id, std::string tray_id)
return nullptr;
}
std::string MachineObject::get_filament_id(std::string ams_id, std::string tray_id) const {
return this->get_tray(ams_id, tray_id).setting_id;
}
void MachineObject::_parse_ams_status(int ams_status)
{
ams_status_sub = ams_status & 0xFF;
@ -6037,7 +6041,7 @@ bool MachineObject::contains_tray(const std::string &ams_id, const std::string &
}
} else {
for (const auto& tray : vt_slot) {
if (tray.id == tray_id) { return true; }
if (tray.id == ams_id) { return true; }
}
}
@ -6055,7 +6059,7 @@ AmsTray MachineObject::get_tray(const std::string &ams_id, const std::string &tr
}
else {
for (const auto &tray : vt_slot) {
if (tray.id == tray_id) { return tray; }
if (tray.id == ams_id) { return tray; }
}
}