3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-17 09:52:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: show the new version

Browse source 
jira: [STUDIO-11558]
Change-Id: I70fcb2fb8700ddcf08c922895a93c126f17a632e
(cherry picked from commit 9beeebdba14f14ca470d98a12e7e7eb648749f86)
This commit is contained in:
xin.zhang 2025-04-15 11:44:06 +08:00 • committed by Noisyfox
parent 174f225849
commit 25fd5606de
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3304,6 +3304,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
ver_info.sw_ver = (*it)["sw_ver"].get<std::string>();
if ((*it).contains("sw_new_ver"))
ver_info.sw_new_ver = (*it)["sw_new_ver"].get<std::string>();
if ((*it).contains("visible") && (*it).contains("new_ver")) {
ver_info.sw_new_ver = (*it)["new_ver"].get<std::string>();
}
if ((*it).contains("sn"))
ver_info.sn = (*it)["sn"].get<std::string>();
if ((*it).contains("hw_ver"))

4
src/slic3r/GUI/UpgradePanel.cpp
View file

@ -880,6 +880,10 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
}
}
}
else if (!it->second.sw_new_ver.empty() && (it->second.sw_new_ver != it->second.sw_ver)) {
amspanel->m_ams_new_version_img->Show();
ams_ver = wxString::Format("%s->%s", it->second.sw_ver, it->second.sw_new_ver);
}
else {
std::string ams_idx = (boost::format("ams/%1%") % ams_id).str();
auto ver_item = obj->new_ver_list.find(ams_idx);