GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-12 06:58:59 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: update the version string of AMS

Browse Source 
jira: [STUDIO-11814]
Change-Id: If452bc66cde7a3c155b8928bf9842f5e45063a87
This commit is contained in:
xin.zhang 2025-04-23 11:44:05 +08:00 committed by lane.wei
parent 4b7610d216
commit 298d4acee0
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/slic3r/GUI/UpgradePanel.cpp
View File

@ -683,13 +683,8 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
} }
} else { } else {
m_ahb_panel->m_ams_new_version_img->Hide(); m_ahb_panel->m_ams_new_version_img->Hide();
if (obj->ahb_new_version_number.empty()) { wxString ver_text = wxString::Format("%s(%s)", obj->module_vers.find("ahb")->second.sw_ver, _L("Latest version"));
wxString ver_text = wxString::Format("%s", obj->module_vers.find("ahb")->second.sw_ver); hub_ver = ver_text;
hub_ver = ver_text;
} else {
wxString ver_text = wxString::Format("%s(%s)", obj->module_vers.find("ahb")->second.sw_ver, _L("Latest version"));
hub_ver = ver_text;
}
} }
} else { } else {
auto ver_item = obj->new_ver_list.find("ahb"); auto ver_item = obj->new_ver_list.find("ahb");
@ -858,26 +853,16 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
} }
else { else {
amspanel->m_ams_new_version_img->Hide(); amspanel->m_ams_new_version_img->Hide();
if (obj->ams_new_version_number.empty()) { wxString ver_text = wxString::Format("%s", it->second.sw_ver, _L("Latest version"));
wxString ver_text = wxString::Format("%s", it->second.sw_ver); if ((it->second.firmware_status & 0x3) == FIRMWARE_STASUS::BETA)
if ((it->second.firmware_status & 0x3) == FIRMWARE_STASUS::BETA) { {
amspanel->m_staticText_beta_version->Show(); amspanel->m_staticText_beta_version->Show();
}
else {
amspanel->m_staticText_beta_version->Hide();
}
ams_ver = ver_text;
} }
else { else
wxString ver_text = wxString::Format("%s", it->second.sw_ver, _L("Latest version")); {
if ((it->second.firmware_status & 0x3) == FIRMWARE_STASUS::BETA) { amspanel->m_staticText_beta_version->Hide();
amspanel->m_staticText_beta_version->Show();
}
else {
amspanel->m_staticText_beta_version->Hide();
}
ams_ver = ver_text;
} }
ams_ver = ver_text;
} }
} }
else if (!it->second.sw_new_ver.empty() && (it->second.sw_new_ver != it->second.sw_ver)) { else if (!it->second.sw_new_ver.empty() && (it->second.sw_new_ver != it->second.sw_ver)) {
@ -1384,7 +1369,7 @@ void UpgradePanel::update(MachineObject *obj)
"The firmware version is abnormal. Repairing and updating are required before printing. Do you want to update now? You can also update later on printer or update next time starting the studio." "The firmware version is abnormal. Repairing and updating are required before printing. Do you want to update now? You can also update later on printer or update next time starting the studio."
)); ));
consistency_dlg->on_show(); consistency_dlg->on_show();
} }
} }
//update panels //update panels