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

NEW: add warnings when sending print job 

tpu can not be used with ams

Change-Id: Icf93b0daed017eb1b378daba00b754bbf18ad354
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-29 19:20:04 +08:00 committed by Lane.Wei
parent e020ad3c39
commit e7408b171a
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1906,6 +1906,15 @@ bool SelectMachineDialog::is_same_printer_model()
return true;
}
void SelectMachineDialog::show_errors(wxString &info)
{
if (confirm_dlg == nullptr) {
confirm_dlg = new SecondaryCheckDialog(this, wxID_ANY, _L("Errors"));
}
confirm_dlg->update_text(info);
confirm_dlg->on_show();
}
void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
{
std::vector<wxString> confirm_text;
@ -1940,9 +1949,15 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
//check for unidentified material
auto mapping_result = m_mapping_popup.parse_ams_mapping(obj_->amsList);
auto has_unknown_filament = false;
// check if ams mapping is has errors, tpu
bool has_tpu_filament = false;
for (auto i = 0; i < m_ams_mapping_result.size(); i++) {
auto tid = m_ams_mapping_result[i].tray_id;
std::string filament_type = boost::to_upper_copy(m_ams_mapping_result[i].type);
if (filament_type == "TPU") {
has_tpu_filament = true;
}
for (auto miter : mapping_result) {
//matching
if (miter.id == tid) {
@ -1954,6 +1969,12 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
}
}
if (has_tpu_filament && obj_->has_ams() && ams_check->GetValue()) {
wxString tpu_tips = wxString::Format(_L("The %s filament is too soft to be used with the AMS"), "TPU");
show_errors(tpu_tips);
return;
}
if (has_unknown_filament) {
has_slice_warnings = true;
confirm_text.push_back(_L("There are some unknown filaments in the AMS mappings. Please check whether they are the required filaments. If they are okay, press \"Confirm\" to start printing.") + "\n");

1
src/slic3r/GUI/SelectMachine.hpp
View File

@ -417,6 +417,7 @@ protected:
void update_printer_combobox(wxCommandEvent &event);
void on_cancel(wxCloseEvent &event);
void show_errors(wxString &info);
void on_ok_btn(wxCommandEvent &event);
void on_ok();
void on_refresh(wxCommandEvent &event);