diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index f8aa2fef1..4a190f854 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3534,11 +3534,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*/ @@ -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 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 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()) { 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*/