3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: fix HMS display blank string

Browse source 
Change-Id: I36fe5879a5db76fba65095ce409b3f0060689de6
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-09-25 17:38:53 +08:00 • committed by Lane.Wei
parent fae9036f01
commit 66a2f49008
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/HMS.cpp
View file

@ -150,9 +150,12 @@ wxString HMSQuery::query_hms_msg(std::string long_error_code)
if (m_hms_json.contains("device_hms")) { if (m_hms_json.contains("device_hms")) {
if (m_hms_json["device_hms"].contains(lang_code)) { if (m_hms_json["device_hms"].contains(lang_code)) {
for (auto item = m_hms_json["device_hms"][lang_code].begin(); item != m_hms_json["device_hms"][lang_code].end(); item++) { for (auto item = m_hms_json["device_hms"][lang_code].begin(); item != m_hms_json["device_hms"][lang_code].end(); item++) {
if (item->contains("ecode") && (*item)["ecode"].get<std::string>() == long_error_code) { if (item->contains("ecode")) {
if (item->contains("intro")) { std::string temp_string = (*item)["ecode"].get<std::string>();
return wxString::FromUTF8((*item)["intro"].get<std::string>()); if (boost::to_upper_copy(temp_string) == long_error_code) {
if (item->contains("intro")) {
return wxString::FromUTF8((*item)["intro"].get<std::string>());
}
} }
} }
} }

8
src/slic3r/GUI/HMSPanel.cpp
View file

@ -148,7 +148,13 @@ HMSPanel::~HMSPanel() {
void HMSPanel::append_hms_panel(HMSItem& item) { void HMSPanel::append_hms_panel(HMSItem& item) {
m_notify_item = new HMSNotifyItem(m_scrolledWindow, item); m_notify_item = new HMSNotifyItem(m_scrolledWindow, item);
m_top_sizer->Add(m_notify_item, 0, wxALIGN_CENTER_HORIZONTAL); wxString msg = wxGetApp().get_hms_query()->query_hms_msg(item.get_long_error_code());
if (!msg.empty())
m_top_sizer->Add(m_notify_item, 0, wxALIGN_CENTER_HORIZONTAL);
else {
// debug for hms display error info
m_top_sizer->Add(m_notify_item, 0, wxALIGN_CENTER_HORIZONTAL);
}
} }
void HMSPanel::delete_hms_panels() { void HMSPanel::delete_hms_panels() {