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

ENH:disable printing when mapping is invalid 

jira:[STUDIO-10250]

Change-Id: Ie14e601db9c844e7b23fd0f1e1fd688c03999144
This commit is contained in:
tao wang 2025-02-10 19:46:33 +08:00 committed by lane.wei
parent 89efa6cb27
commit 2c433396fa
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1769,6 +1769,8 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
update_print_status_msg(_L("AMS is setting up. Please try again later."), false, false, true);
} else if (status == PrintDialogStatus::PrintStatusDisableAms) {
update_print_status_msg(wxEmptyString, false, true, true);
} else if (status == PrintDialogStatus::PrintStatusInvalidMapping) {
update_print_status_msg(wxEmptyString, false, false, true);
} else if (status == PrintDialogStatus::PrintStatusNeedUpgradingAms) {
wxString msg_text;
if (params.size() > 0)
@ -3236,6 +3238,17 @@ void SelectMachineDialog::update_show_status()
}
}
// disable print when there is no mapping
if (obj_->m_extder_data.total_extder_count > 1) {
for (auto mres : m_ams_mapping_result) {
if (mres.ams_id.empty() && mres.slot_id.empty()) {
show_status(PrintDialogStatus::PrintStatusInvalidMapping);
return;
}
}
}
// no ams
if (!obj_->has_ams() || m_checkbox_list["use_ams"]->getValue() != "on") {
if (!has_tips(obj_)) {
@ -3262,10 +3275,6 @@ void SelectMachineDialog::update_show_status()
return;
}
//if (m_ams_mapping_result.empty()) {
// do_ams_mapping(obj_);
//}
const auto& full_config = wxGetApp().preset_bundle->full_config();
size_t nozzle_nums = full_config.option<ConfigOptionFloatsNullable>("nozzle_diameter")->values.size();
@ -4511,6 +4520,7 @@ std::string SelectMachineDialog::get_print_status_info(PrintDialogStatus status)
case PrintStatusUnsupportedPrinter: return "PrintStatusUnsupportedPrinter";
case PrintStatusTimelapseNoSdcard: return "PrintStatusTimelapseNoSdcard";
case PrintStatusNotSupportedPrintAll: return "PrintStatusNotSupportedPrintAll";
case PrintStatusInvalidMapping: return "PrintStatusInvalidMapping";
}
return "unknown";
}

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

@ -101,7 +101,8 @@ enum PrintDialogStatus {
PrintStatusTimelapseWarning,
PrintStatusMixAmsAndVtSlotWarning,
PrintStatusPublicInitFailed,
PrintStatusPublicUploadFiled
PrintStatusPublicUploadFiled,
PrintStatusInvalidMapping
};
class Material