juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: clear the previous status

Browse Source 
jira: [STUDIO-9690]
Change-Id: Id1df7d7998ac2a03c98514e447bc0ecefcb920b7
(cherry picked from commit 9744d9a6b1505cc7014963f4859f0315a0fdacfa)
This commit is contained in:
xin.zhang
2025-01-10 11:54:33 +08:00
committed by Noisyfox
parent d6fc1826e3
commit 63a796e14a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,6 +1379,14 @@ std::map<int, MachineObject::ModuleVersionInfo> MachineObject::get_ams_version()
return result; return result;
} }
void MachineObject::clear_version_info()
{
air_pump_version_info = ModuleVersionInfo();
laser_version_info = ModuleVersionInfo();
cutting_module_version_info = ModuleVersionInfo();
module_vers.clear();
}
void MachineObject::store_version_info(const ModuleVersionInfo& info) void MachineObject::store_version_info(const ModuleVersionInfo& info)
{ {
if (info.isAirPump()) if (info.isAirPump())
@@ -3153,7 +3161,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (j.contains("info")) { if (j.contains("info")) {
if (j["info"].contains("command") && j["info"]["command"].get<std::string>() == "get_version") { if (j["info"].contains("command") && j["info"]["command"].get<std::string>() == "get_version") {
json j_module = j["info"]["module"]; json j_module = j["info"]["module"];
module_vers.clear(); clear_version_info();
for (auto it = j_module.begin(); it != j_module.end(); it++) { for (auto it = j_module.begin(); it != j_module.end(); it++) {
ModuleVersionInfo ver_info; ModuleVersionInfo ver_info;
ver_info.name = (*it)["name"].get<std::string>(); ver_info.name = (*it)["name"].get<std::string>();

2
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -802,6 +802,8 @@ public:
wxString get_upgrade_result_str(int upgrade_err_code); wxString get_upgrade_result_str(int upgrade_err_code);
// key: ams_id start as 0,1,2,3 // key: ams_id start as 0,1,2,3
std::map<int, ModuleVersionInfo> get_ams_version(); std::map<int, ModuleVersionInfo> get_ams_version();
void clear_version_info();
void store_version_info(const ModuleVersionInfo& info); void store_version_info(const ModuleVersionInfo& info);
/* printing */ /* printing */