3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NEW:AMS control supports gradient color filaments display

Browse source 
Change-Id: I38d8a313d84b3acf643b489a1e62ebd073b35c1d
This commit is contained in:
tao wang 2023-03-20 16:21:30 +08:00 • committed by Lane.Wei
parent d43c7d5c92
commit 8d6c56e4aa
4 changed files with 57 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3149,6 +3149,16 @@ int MachineObject::parse_json(std::string payload)
} else {
curr_tray->color = "";
}
curr_tray->cols.clear();
if (tray_it->contains("cols")) {
if ((*tray_it)["cols"].is_array()) {
for (auto it = (*tray_it)["cols"].begin(); it != (*tray_it)["cols"].end(); it++) {
curr_tray->cols.push_back(it.value().get<std::string>());
}
}
}
if (tray_it->contains("remain")) {
curr_tray->remain = (*tray_it)["remain"].get<int>();
} else {
@ -3297,6 +3307,16 @@ int MachineObject::parse_json(std::string payload)
else {
vt_tray.color = "";
}
vt_tray.cols.clear();
if (jj["vt_tray"].contains("cols")) {
if (jj["vt_tray"].is_array()) {
for (auto it = jj["vt_tray"].begin(); it != jj["vt_tray"].end(); it++) {
vt_tray.cols.push_back(it.value().get<std::string>());
}
}
}
if (jj["vt_tray"].contains("remain")) {
vt_tray.remain = jj["vt_tray"]["remain"].get<int>();
}
@ -3371,6 +3391,16 @@ int MachineObject::parse_json(std::string payload)
tray_it->second->nozzle_temp_min = std::to_string(jj["nozzle_temp_min"].get<int>());
tray_it->second->type = jj["tray_type"].get<std::string>();
tray_it->second->color = jj["tray_color"].get<std::string>();
/*tray_it->second->cols.clear();
if (jj.contains("cols")) {
if (jj["cols"].is_array()) {
for (auto it = jj["cols"].begin(); it != jj["cols"].end(); it++) {
tray_it->second->cols.push_back(it.value().get<std::string>());
}
}
}*/
tray_it->second->setting_id = jj["tray_info_idx"].get<std::string>();
// delay update
tray_it->second->set_hold_count();