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

FIX: Clicking to continue printing does not take effect in error code

Browse Source 
JIRA: STUDIO-6830
Detected an incomplete printing task error pop-up when power outage occurred. Clicking to continue printing did not take effect

Change-Id: Ie85a1602093dabac861cd1f41ea21e1c312c83e9
This commit is contained in:
Kunlong Ma 2024-04-19 17:03:54 +08:00 committed by Lane.Wei
parent 2ab668db50
commit 60077e83e6
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/slic3r/GUI/ReleaseNote.cpp
View File

@ -964,7 +964,6 @@ void PrintErrorDialog::update_text_image(wxString text, wxString image_url)
m_staticText_release_note->SetMaxSize(wxSize(FromDIP(300), -1)); m_staticText_release_note->SetMaxSize(wxSize(FromDIP(300), -1));
m_staticText_release_note->SetMinSize(wxSize(FromDIP(300), -1)); m_staticText_release_note->SetMinSize(wxSize(FromDIP(300), -1));
m_staticText_release_note->SetLabelText(text); m_staticText_release_note->SetLabelText(text);
//m_staticText_release_note->SetForegroundColour(wxColour("#5C5C5C"));
m_vebview_release_note->Layout(); m_vebview_release_note->Layout();
auto text_size = m_staticText_release_note->GetBestSize(); auto text_size = m_staticText_release_note->GetBestSize();
@ -1049,67 +1048,60 @@ void PrintErrorDialog::init_button_list() {
init_button(RESUME_PRINTING, _L("Resume Printing")); init_button(RESUME_PRINTING, _L("Resume Printing"));
m_button_list[RESUME_PRINTING]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[RESUME_PRINTING]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId()); post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
e.SetEventObject(this); e.Skip();
GetEventHandler()->ProcessEvent(evt); });
this->on_hide();
});
init_button(RESUME_PRINTING_DEFECTS, _L("Resume Printing(defects acceptable)")); init_button(RESUME_PRINTING_DEFECTS, _L("Resume Printing(defects acceptable)"));
m_button_list[RESUME_PRINTING_DEFECTS]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[RESUME_PRINTING_DEFECTS]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId()); post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
e.SetEventObject(this); e.Skip();
GetEventHandler()->ProcessEvent(evt); });
this->on_hide();
});
init_button(RESUME_PRINTING_PROBELM_SOLVED, _L("Resume Printing(problem solved)")); init_button(RESUME_PRINTING_PROBELM_SOLVED, _L("Resume Printing(problem solved)"));
m_button_list[RESUME_PRINTING_PROBELM_SOLVED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[RESUME_PRINTING_PROBELM_SOLVED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
//load filament and resume printing post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId()); e.Skip();
e.SetEventObject(this); });
GetEventHandler()->ProcessEvent(evt);
this->on_hide();
});
init_button(STOP_PRINTING, _L("Stop Printing")); init_button(STOP_PRINTING, _L("Stop Printing"));
m_button_list[STOP_PRINTING]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[STOP_PRINTING]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_PRINT_ERROR_STOP)); post_event(wxCommandEvent(EVT_PRINT_ERROR_STOP));
e.Skip(); e.Skip();
}); });
init_button(CHECK_ASSISTANT, _L("Check Assistant")); init_button(CHECK_ASSISTANT, _L("Check Assistant"));
m_button_list[CHECK_ASSISTANT]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[CHECK_ASSISTANT]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_JUMP_TO_HMS)); post_event(wxCommandEvent(EVT_JUMP_TO_HMS));
this->on_hide(); this->on_hide();
}); });
init_button(FILAMENT_EXTRUDED, _L("Filament Extruded, Continue")); init_button(FILAMENT_EXTRUDED, _L("Filament Extruded, Continue"));
m_button_list[FILAMENT_EXTRUDED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[FILAMENT_EXTRUDED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE)); post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE));
e.Skip(); e.Skip();
}); });
init_button(RETRY_FILAMENT_EXTRUDED, _L("Not Extruded Yet,Retry")); init_button(RETRY_FILAMENT_EXTRUDED, _L("Not Extruded Yet, Retry"));
m_button_list[RETRY_FILAMENT_EXTRUDED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[RETRY_FILAMENT_EXTRUDED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId()); wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId());
e.SetEventObject(this); e.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt); GetEventHandler()->ProcessEvent(evt);
this->on_hide(); this->on_hide();
}); });
init_button(CONTINUE, _L("Finished, Continue")); init_button(CONTINUE, _L("Finished, Continue"));
m_button_list[CONTINUE]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[CONTINUE]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE)); post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE));
e.Skip(); e.Skip();
}); });
init_button(LOAD_VIRTUAL_TRAY, _L("Load Filament")); init_button(LOAD_VIRTUAL_TRAY, _L("Load Filament"));
m_button_list[LOAD_VIRTUAL_TRAY]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[LOAD_VIRTUAL_TRAY]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_LOAD_VAMS_TRAY)); post_event(wxCommandEvent(EVT_LOAD_VAMS_TRAY));
e.Skip(); e.Skip();
}); });
init_button(OK_BUTTON, _L("OK")); init_button(OK_BUTTON, _L("OK"));
m_button_list[OK_BUTTON]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[OK_BUTTON]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
@ -1117,7 +1109,7 @@ void PrintErrorDialog::init_button_list() {
e.SetEventObject(this); e.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt); GetEventHandler()->ProcessEvent(evt);
this->on_hide(); this->on_hide();
}); });
init_button(FILAMENT_LOAD_RESUME, _L("Filament Loaded, Resume")); init_button(FILAMENT_LOAD_RESUME, _L("Filament Loaded, Resume"));
m_button_list[FILAMENT_LOAD_RESUME]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { m_button_list[FILAMENT_LOAD_RESUME]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {

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

@ -2187,12 +2187,8 @@ void StatusPanel::update_error_message()
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 show_time = wxString::Format("%d%02d%02d", now.GetDay(), now.GetHour(), now.GetMinute());
#if !BBL_RELEASE_TO_PUBLIC
show_time = now.Format("%Y-%m-%d %H:%M:%S");
#else
show_time = now.Format("%H:%M:%S");
#endif
error_msg = wxString::Format("%s\n[%s %s]", error_msg = wxString::Format("%s\n[%s %s]",
error_msg, error_msg,
print_error_str, show_time); print_error_str, show_time);