From d22550e0aaede366ff91cca8cea01df3769733ab Mon Sep 17 00:00:00 2001 From: milk Date: Thu, 15 May 2025 12:21:06 +0800 Subject: [PATCH] ENH:Fix issue where printing cannot be sent jira:[STUDIO-12212] Change-Id: I91ba978ee9f8b70a003ccd77a156350444283745 --- src/slic3r/GUI/SelectMachine.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 852115631..0ec6651a2 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -279,6 +279,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_text_printer_msg = new PrinterMsgPanel(m_basic_panel); m_text_printer_msg->SetMinSize(wxSize(FromDIP(420), -1)); m_text_printer_msg->SetMaxSize(wxSize(FromDIP(420), -1)); + m_text_printer_msg->SetBackgroundColour(m_colour_def_color); m_text_printer_msg->SetFont(::Label::Body_13); m_text_printer_msg->Hide(); @@ -414,8 +415,9 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_filament_panel->Hide(); m_statictext_ams_msg = new PrinterMsgPanel(m_scroll_area); - m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(645), -1)); - m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(645), -1)); + m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(655), -1)); + m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(655), -1)); + m_statictext_ams_msg->SetBackgroundColour(m_colour_def_color); m_statictext_ams_msg->SetFont(::Label::Body_13); m_statictext_ams_msg->Hide(); @@ -1504,23 +1506,26 @@ void SelectMachineDialog::update_print_status_msg() // for (const auto &info : m_pre_print_checker.filamentList) { update_ams_status_msg(info.msg, info.level == Error ? true : false); } std::vector filamentList_msgs; - bool filamentList_color = false ; + bool has_filamen_error = false; for (const auto &info : m_pre_print_checker.filamentList) { filamentList_msgs.push_back(info.msg); - filamentList_color = info.level == Error ? true : false; + if (!has_filamen_error) + has_filamen_error = (info.level == Error); + } - update_ams_status_msg(filamentList_msgs, filamentList_color, false); + update_ams_status_msg(filamentList_msgs, has_filamen_error, false); std::vector printerList_msgs; - bool printermsg_color = false; + bool has_printer_error = false; for (const auto &info : m_pre_print_checker.printerList) { printerList_msgs.push_back(info.msg); - printermsg_color = info.level == Error ? true : false; + if (!has_printer_error) + has_printer_error = (info.level == Error ); update_printer_status_msg_tips(info.tips); } - update_priner_status_msg(printerList_msgs, printermsg_color,false); + update_priner_status_msg(printerList_msgs, has_printer_error, false); } @@ -3618,7 +3623,7 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_) } /** normal check **/ - // show_status(PrintDialogStatus::PrintStatusReadyToGo); + show_status(PrintDialogStatus::PrintStatusReadyToGo); } bool SelectMachineDialog::has_timelapse_warning(wxString &msg_text)