From 5287f6cae1f42b87286599b6e261dbebc8951989 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 22 Dec 2023 11:39:16 +0800 Subject: [PATCH] ENH:adjusting the warning level of timelpase jira:[STUDIO-5662] Change-Id: I4902b22d316f5e09a97a62c88b8a98e55c405434 --- src/slic3r/GUI/SelectMachine.cpp | 54 +++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 639505a20..c0b58dba3 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3447,15 +3447,16 @@ void SelectMachineDialog::update_show_status() } } - if (has_timelapse_warning()) { - show_status(PrintDialogStatus::PrintStatusTimelapseWarning); - return; - } - // no ams if (!obj_->has_ams() || !m_checkbox_list["use_ams"]->GetValue()) { - if (!has_tips(obj_)) - show_status(PrintDialogStatus::PrintStatusReadingFinished); + if (!has_tips(obj_)) { + if (has_timelapse_warning()) { + show_status(PrintDialogStatus::PrintStatusTimelapseWarning); + } + else { + show_status(PrintDialogStatus::PrintStatusReadingFinished); + } + } return; } @@ -3463,7 +3464,14 @@ void SelectMachineDialog::update_show_status() if (!m_checkbox_list["use_ams"]->GetValue()) { m_ams_mapping_result.clear(); sync_ams_mapping_result(m_ams_mapping_result); - show_status(PrintDialogStatus::PrintStatusDisableAms); + + if (has_timelapse_warning()) { + show_status(PrintDialogStatus::PrintStatusTimelapseWarning); + } + else { + show_status(PrintDialogStatus::PrintStatusDisableAms); + } + return; } } @@ -3482,7 +3490,14 @@ void SelectMachineDialog::update_show_status() show_status(PrintDialogStatus::PrintStatusNeedUpgradingAms, params); } else { if (obj_->is_valid_mapping_result(m_ams_mapping_result)) { - show_status(PrintDialogStatus::PrintStatusAmsMappingByOrder); + + 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++) { @@ -3503,20 +3518,31 @@ void SelectMachineDialog::update_show_status() } if (m_ams_mapping_res) { - show_status(PrintDialogStatus::PrintStatusAmsMappingSuccess); + if (has_timelapse_warning()) { + show_status(PrintDialogStatus::PrintStatusTimelapseWarning); + } + else { + show_status(PrintDialogStatus::PrintStatusAmsMappingSuccess); + } return; } else { if (obj_->is_valid_mapping_result(m_ams_mapping_result)) { - if (!has_tips(obj_)) - show_status(PrintDialogStatus::PrintStatusAmsMappingValid); - return; + if (!has_tips(obj_)){ + if (has_timelapse_warning()) { + show_status(PrintDialogStatus::PrintStatusTimelapseWarning); + } + else { + show_status(PrintDialogStatus::PrintStatusAmsMappingValid); + } + return; + } } else { show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid); return; } - } + } } bool SelectMachineDialog::has_timelapse_warning()