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

FIX:fix device menu display error_code info 

Change-Id: I1c06de3025ba9ac2a9b77bcc9aadc426b847b590
This commit is contained in:
xiangdong.yang 2022-08-04 15:27:17 +08:00 committed by Lane.Wei
parent 430021267c
commit 5ab97d9312
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1138,15 +1138,15 @@ void StatusPanel::on_subtask_abort(wxCommandEvent &event)
void StatusPanel::error_info_reset() void StatusPanel::error_info_reset()
{ {
m_staticline->Hide();
m_panel_error_txt->Hide();
m_panel_error_txt->GetParent()->Layout();
m_error_text->SetLabel(""); m_error_text->SetLabel("");
before_error_code = 0; before_error_code = 0;
} }
void StatusPanel::on_subtask_clean(wxCommandEvent &event) void StatusPanel::on_subtask_clean(wxCommandEvent &event)
{ {
m_staticline->Hide();
m_panel_error_txt->Hide();
m_panel_error_txt->GetParent()->Layout();
error_info_reset(); error_info_reset();
} }
@ -1250,20 +1250,21 @@ void StatusPanel::update_error_message()
{ {
if (obj->print_error <= 0) { if (obj->print_error <= 0) {
before_error_code = obj->print_error; before_error_code = obj->print_error;
if (m_panel_error_txt->IsShown())
error_info_reset();
return; return;
} }
if (before_error_code != obj->print_error) { if (before_error_code != obj->print_error) {
if (!get_error_message_thread) { get_error_message_thread = new boost::thread(Slic3r::create_thread([&] {
get_error_message_thread = new boost::thread(Slic3r::create_thread([&] { std::string message = show_error_message(obj->print_error);
std::string message = show_error_message(obj->print_error); wxCommandEvent event(EVT_UPDATE_ERROR_MESSAGE);
wxCommandEvent event(EVT_UPDATE_ERROR_MESSAGE); event.SetString(wxString(message));
event.SetString(wxString(message)); event.SetEventObject(this);
event.SetEventObject(this); wxPostEvent(this, event);
wxPostEvent(this, event); }));
})); before_error_code = obj->print_error;
}
before_error_code = obj->print_error;
} }
} }
@ -2236,8 +2237,6 @@ void StatusPanel::set_default()
m_ams_control_box->Hide(); m_ams_control_box->Hide();
m_ams_control->Reset(); m_ams_control->Reset();
clean_tasklist_info(); clean_tasklist_info();
m_staticline->Hide();
m_panel_error_txt->Hide();
error_info_reset(); error_info_reset();
} }