3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX:update the confirm content before sending for print

Browse source 
Change-Id: I9f6d8060c0c142ee966042a49a4158cb5697c5af
This commit is contained in:
tao wang 2023-04-13 17:50:05 +08:00 • committed by Lane.Wei
parent a8a057e514
commit 9ca8593604
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2074,13 +2074,13 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
std::vector<wxString> confirm_text; std::vector<wxString> confirm_text;
confirm_text.push_back(_L("Please check the following infomation and click Confirm to continue sending print:") + "\n"); confirm_text.push_back(_L("Please check the following:") + "\n\n");
#if 1 #if 1
//Check Printer Model Id //Check Printer Model Id
bool is_same_printer_type = is_same_printer_model(); bool is_same_printer_type = is_same_printer_model();
if (!is_same_printer_type) if (!is_same_printer_type)
confirm_text.push_back(_L("The printer type used to generate G-code is not the same type as the currently selected physical printer. It is recommend to re-slice by selecting the same printer type.") + "\n"); confirm_text.push_back(_L("The printer type selected when generating G-Code is not consistent with the currently selected printer. It is recommended that you use the same printer type for slicing.") + "\n");
#else #else
bool is_same_printer_type = true; bool is_same_printer_type = true;
#endif #endif
@ -2169,14 +2169,19 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
confirm_dlg.on_hide(); confirm_dlg.on_hide();
this->on_ok(); this->on_ok();
}); });
confirm_text.push_back(_L("Please click the confirm button if you still want to proceed with printing.") + "\n");
wxString info_msg = wxEmptyString; wxString info_msg = wxEmptyString;
for (auto i = 0; i < confirm_text.size(); i++) { for (auto i = 0; i < confirm_text.size(); i++) {
if (i == 0) { if (i == 0) {
info_msg += confirm_text[i]; info_msg += confirm_text[i];
} }
else if (i == confirm_text.size() - 1) {
info_msg += confirm_text[i];
}
else { else {
info_msg += wxString::Format("%d:%s\n",i, confirm_text[i]); info_msg += wxString::Format("%d. %s\n",i, confirm_text[i]);
} }
} }