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

ENH: modify to new upgrade protocol

Browse source 
Change-Id: I8d431ec3c5e9c81e7a7438c6b1db9febf01d4706
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-08-31 09:19:02 +08:00 • committed by Lane.Wei
parent d54461413f
commit 801b15966a
1 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,26 +336,47 @@ void MachineInfoPanel::update_version_text(MachineObject* obj)
} else { } else {
// update version text // update version text
auto it = obj->module_vers.find("ota"); auto it = obj->module_vers.find("ota");
if (obj->upgrade_new_version
&& !obj->ota_new_version_number.empty()) { // old protocol
if (it != obj->module_vers.end()) { if (obj->new_ver_list.empty() && !obj->m_new_ver_list_exist) {
wxString ver_text = wxString::Format("%s->%s", it->second.sw_ver, obj->ota_new_version_number); if (obj->upgrade_new_version
m_staticText_ver_val->SetLabelText(ver_text); && !obj->ota_new_version_number.empty()) {
if (it != obj->module_vers.end()) {
wxString ver_text = wxString::Format("%s->%s", it->second.sw_ver, obj->ota_new_version_number);
m_staticText_ver_val->SetLabelText(ver_text);
}
else {
m_staticText_ver_val->SetLabelText("-");
}
m_ota_new_version_img->Show();
} }
else { else {
m_staticText_ver_val->SetLabelText("-"); if (it != obj->module_vers.end()) {
wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
m_staticText_ver_val->SetLabelText(ver_text);
}
else {
m_staticText_ver_val->SetLabelText("-");
}
m_ota_new_version_img->Hide();
} }
m_ota_new_version_img->Show(); } else {
} auto ota_it = obj->new_ver_list.find("ota");
else { if (ota_it == obj->new_ver_list.end()) {
if (it != obj->module_vers.end()) {
wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version")); wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
m_staticText_ver_val->SetLabelText(ver_text); m_staticText_ver_val->SetLabelText(ver_text);
m_ota_new_version_img->Hide();
} else {
if (ota_it->second.sw_new_ver != ota_it->second.sw_ver) {
m_ota_new_version_img->Show();
wxString ver_text = wxString::Format("%s->%s", ota_it->second.sw_ver, ota_it->second.sw_new_ver);
m_staticText_ver_val->SetLabelText(ver_text);
} else {
m_ota_new_version_img->Hide();
wxString ver_text = wxString::Format("%s(%s)", it->second.sw_ver, _L("Latest version"));
m_staticText_ver_val->SetLabelText(ver_text);
}
} }
else {
m_staticText_ver_val->SetLabelText("-");
}
m_ota_new_version_img->Hide();
} }
} }
} }