3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-15 08:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: move the ams mapping check

Browse source 
jira: [STUDIO-11094]
Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68
(cherry picked from commit fd795f19163a1e310753ce6834672ce3b504d3c2)
This commit is contained in:
xin.zhang 2025-03-24 21:59:39 +08:00 • committed by Noisyfox
parent 5ce2ec11a8
commit 343003a3c9
1 changed files with 5 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3517,11 +3517,11 @@ void SelectMachineDialog::update_show_status()
if (m_checkbox_list["use_ams"]->getValue() != "on") {
m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result);
}
if (!m_ams_mapping_res && !obj_->is_valid_mapping_result(m_ams_mapping_result)) {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
return;
} else {
if (!m_ams_mapping_res && !obj_->is_valid_mapping_result(m_ams_mapping_result)) {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
return;
}
}
/*Warnings*/
@ -3555,40 +3555,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 (has_timelapse_warning()) {
@ -3605,10 +3571,6 @@ void SelectMachineDialog::update_show_status()
}
}
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
return;
}
}
/*STUDIO-10970 check the k value and flow cali option*/