juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-21 04:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fit proceed action change

Browse Source 
Jira: [STUDIO-14689]
Change-Id: Ia6a842b5b3bd542c25e67545528b847513d533f1
(cherry picked from commit 4cd33fded68797eb3098cb359ba1708b7f0c8bee)
This commit is contained in:
hemai
2025-09-18 20:15:59 +08:00
committed by Noisyfox
parent d3bf96f067
commit 2c675b1365
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -2994,21 +2994,22 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
if (!key_field_only) if (!key_field_only)
{ {
if (is_studio_cmd(sequence_id) && jj.contains("command") && jj.contains("err_code") && jj.contains("result")) if (is_studio_cmd(sequence_id) && jj.contains("command") && jj.contains("err_code"))
{
if (jj["err_code"].is_number())
{ {
if (jj["err_code"].is_number()) { add_command_error_code_dlg(jj["err_code"].get<int>());}
}
/* proceed action*/
else if (is_studio_cmd(sequence_id) && jj.contains("command") && jj.contains("err_code") && jj.contains("err_index")) {
json action_json; json action_json;
if (jj.contains("err_index")) {
/* proceed action*/
action_json["command"] = jj["command"]; action_json["command"] = jj["command"];
action_json["err_code"] = jj["err_code"]; action_json["err_code"] = jj["err_code"];
action_json["err_index"] = jj["err_index"]; action_json["err_index"] = jj["err_index"];
action_json["err_ignored"] = jj.contains("err_ignored") ? jj["err_ignored"] : json::array(); action_json["err_ignored"] = jj.contains("err_ignored") ? jj["err_ignored"] : json::array();
}
add_command_error_code_dlg(jj["err_code"].get<int>(), action_json); add_command_error_code_dlg(jj["err_code"].get<int>(), action_json);
} }
} }
}
if (jj["command"].get<std::string>() == "push_status") { if (jj["command"].get<std::string>() == "push_status") {
m_push_count++; m_push_count++;