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

ENH:Fix issue where printing cannot be sent

Browse Source 
jira:[STUDIO-12212]

Change-Id: I91ba978ee9f8b70a003ccd77a156350444283745
This commit is contained in:
milk 2025-05-15 12:21:06 +08:00 committed by lane.wei
parent f3dfb7a084
commit d22550e0aa
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/GUI/SelectMachine.cpp
View File

@ -279,6 +279,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_text_printer_msg = new PrinterMsgPanel(m_basic_panel); m_text_printer_msg = new PrinterMsgPanel(m_basic_panel);
m_text_printer_msg->SetMinSize(wxSize(FromDIP(420), -1)); m_text_printer_msg->SetMinSize(wxSize(FromDIP(420), -1));
m_text_printer_msg->SetMaxSize(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->SetFont(::Label::Body_13);
m_text_printer_msg->Hide(); m_text_printer_msg->Hide();
@ -414,8 +415,9 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_filament_panel->Hide(); m_filament_panel->Hide();
m_statictext_ams_msg = new PrinterMsgPanel(m_scroll_area); m_statictext_ams_msg = new PrinterMsgPanel(m_scroll_area);
m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(645), -1)); m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(655), -1));
m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(645), -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->SetFont(::Label::Body_13);
m_statictext_ams_msg->Hide(); 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); } // for (const auto &info : m_pre_print_checker.filamentList) { update_ams_status_msg(info.msg, info.level == Error ? true : false); }
std::vector<wxString> filamentList_msgs; std::vector<wxString> filamentList_msgs;
bool filamentList_color = false ; bool has_filamen_error = false;
for (const auto &info : m_pre_print_checker.filamentList) { for (const auto &info : m_pre_print_checker.filamentList) {
filamentList_msgs.push_back(info.msg); 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<wxString> printerList_msgs; std::vector<wxString> printerList_msgs;
bool printermsg_color = false; bool has_printer_error = false;
for (const auto &info : m_pre_print_checker.printerList) { for (const auto &info : m_pre_print_checker.printerList) {
printerList_msgs.push_back(info.msg); 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_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 **/ /** normal check **/
// show_status(PrintDialogStatus::PrintStatusReadyToGo); show_status(PrintDialogStatus::PrintStatusReadyToGo);
} }
bool SelectMachineDialog::has_timelapse_warning(wxString &msg_text) bool SelectMachineDialog::has_timelapse_warning(wxString &msg_text)