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

FIX: error code pop-up window without retry button in some code

Browse Source 
JIRA: STUDIO-6922

Change-Id: I67464bebaba4558618301592c455db8824bbfe30
This commit is contained in:
Kunlong Ma 2024-04-22 17:20:39 +08:00 committed by Lane.Wei
parent 2e1bf04f65
commit 89c72781f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/StatusPanel.cpp
View File

@ -83,7 +83,8 @@ static std::vector<std::string> message_containing_retry{
"07FF 8011", "07FF 8011",
"07FF 8012", "07FF 8012",
"07FF 8013", "07FF 8013",
"12FF 8007" "12FF 8007",
"1200 8006"
}; };
static std::vector<std::string> message_containing_done{ static std::vector<std::string> message_containing_done{
@ -2176,18 +2177,18 @@ void StatusPanel::update_error_message()
::sprintf(buf, "%08X", obj->print_error); ::sprintf(buf, "%08X", obj->print_error);
std::string print_error_str = std::string(buf); std::string print_error_str = std::string(buf);
if (print_error_str.size() > 4) { if (print_error_str.size() > 4) {
print_error_str.insert(4, "-"); print_error_str.insert(4, " ");
} }
wxString error_msg = wxGetApp().get_hms_query()->query_print_error_msg(obj->print_error); wxString error_msg = wxGetApp().get_hms_query()->query_print_error_msg(obj->print_error);
std::vector<int> used_button; std::vector<int> used_button;
wxString error_image_url = wxGetApp().get_hms_query()->query_print_error_url_action(obj->print_error,obj->dev_id, used_button); wxString error_image_url = wxGetApp().get_hms_query()->query_print_error_url_action(obj->print_error,obj->dev_id, used_button);
// special case // special case
if (print_error_str == "0300-8003" || print_error_str == "0300-8002" || print_error_str == "0300-800A") if (print_error_str == "0300 8003" || print_error_str == "0300 8002" || print_error_str == "0300 800A")
used_button.emplace_back(PrintErrorDialog::PrintErrorButton::JUMP_TO_LIVEVIEW); used_button.emplace_back(PrintErrorDialog::PrintErrorButton::JUMP_TO_LIVEVIEW);
if (!error_msg.IsEmpty()) { if (!error_msg.IsEmpty()) {
wxDateTime now = wxDateTime::Now(); wxDateTime now = wxDateTime::Now();
wxString show_time = wxString::Format("%d%02d%02d", now.GetDay(), now.GetHour(), now.GetMinute()); wxString show_time = now.Format("%Y-%m-%d %H:%M:%S");
error_msg = wxString::Format("%s\n[%s %s]", error_msg = wxString::Format("%s\n[%s %s]",
error_msg, error_msg,