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

FIX: move the ams mapping check 

jira: [STUDIO-11094]
Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68
This commit is contained in:
xin.zhang 2025-03-24 21:59:39 +08:00 committed by lane.wei
parent 0902dc0623
commit fd795f1916
1 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3534,11 +3534,11 @@ void SelectMachineDialog::update_show_status()
if (m_checkbox_list["use_ams"]->getValue() != "on") { if (m_checkbox_list["use_ams"]->getValue() != "on") {
m_ams_mapping_result.clear(); m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result); sync_ams_mapping_result(m_ams_mapping_result);
} } else {
if (!m_ams_mapping_res && !obj_->is_valid_mapping_result(m_ams_mapping_result)) {
if (!m_ams_mapping_res && !obj_->is_valid_mapping_result(m_ams_mapping_result)) { show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid); return;
return; }
} }
/*Warnings*/ /*Warnings*/
@ -3572,41 +3572,6 @@ void SelectMachineDialog::update_show_status()
} }
} }
if (!obj_->is_support_ams_mapping()) {
int exceed_index = -1;
if (obj_->is_mapping_exceed_filament(m_ams_mapping_result, exceed_index)) {
std::vector<wxString> params;
params.push_back(wxString::Format("%02d", exceed_index+1));
show_status(PrintDialogStatus::PrintStatusNeedUpgradingAms, params);
} else {
if (obj_->is_valid_mapping_result(m_ams_mapping_result)) {
if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingByOrder);
}
} else {
int mismatch_index = -1;
for (int i = 0; i < m_ams_mapping_result.size(); i++) {
if (m_ams_mapping_result[i].mapping_result == MappingResult::MAPPING_RESULT_TYPE_MISMATCH) {
mismatch_index = m_ams_mapping_result[i].id;
break;
}
}
std::vector<wxString> params;
if (mismatch_index >= 0) {
params.push_back(wxString::Format("%02d", mismatch_index+1));
params.push_back(wxString::Format("%02d", mismatch_index+1));
}
show_status(PrintDialogStatus::PrintStatusAmsMappingU0Invalid, params);
}
}
return;
}
if (m_ams_mapping_res) { if (m_ams_mapping_res) {
if (has_timelapse_warning()) { if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning); show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
@ -3622,10 +3587,6 @@ void SelectMachineDialog::update_show_status()
} }
} }
} }
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
return;
}
} }
/*STUDIO-10970 check the k value and flow cali option*/ /*STUDIO-10970 check the k value and flow cali option*/