mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix display error in UpgradePanel 

Change-Id: I1be4a8879baa6a43ebd8d69eeb95cc83d53bc16d
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-12-13 11:39:01 +08:00 committed by Lane.Wei
parent 38705f87a9
commit 41d08e0924
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,28 +533,23 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj)
AmsPanel *amspanel = m_amspanel_list[ams_index]; AmsPanel *amspanel = m_amspanel_list[ams_index];
amspanel->Show(); amspanel->Show();
auto it = ver_list.find(atoi(iter->first.c_str())); auto it = ver_list.find(atoi(iter->first.c_str()));
auto ams_id = std::stoi(iter->second->id); auto ams_id = std::stoi(iter->second->id);
wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1));
ams_name = ams_text;
if (it == ver_list.end()) { if (it == ver_list.end()) {
// hide this ams // hide this ams
wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1));
ams_name = ams_text;
ams_sn = "-"; ams_sn = "-";
ams_ver = "-"; ams_ver = "-";
} else { } else {
// update ams img
if (m_obj->upgrade_display_state == (int)MachineObject::UpgradingDisplayState::UpgradingInProgress) { if (m_obj->upgrade_display_state == (int)MachineObject::UpgradingDisplayState::UpgradingInProgress) {
ams_ver = "-"; ams_ver = "-";
amspanel->m_ams_new_version_img->Hide(); amspanel->m_ams_new_version_img->Hide();
} }
else { else {
// update ams img
wxString ams_text = wxString::Format("AMS%s", std::to_string(ams_id + 1));
ams_name = ams_text;
if (obj->new_ver_list.empty() && !obj->m_new_ver_list_exist) { if (obj->new_ver_list.empty() && !obj->m_new_ver_list_exist) {
if (obj->upgrade_new_version if (obj->upgrade_new_version
&& obj->ams_new_version_number.compare(it->second.sw_ver) != 0) { && obj->ams_new_version_number.compare(it->second.sw_ver) != 0) {