From a650db29031d1d34b89b52b46a75ed0fa22eb4e2 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Mon, 12 May 2025 20:29:38 +0800 Subject: [PATCH] FIX: disable filament editing if printing jira: [STUDIO-12153] Change-Id: I2397360439d5baaf673c9fc306f3b08eb068cfec (cherry picked from commit 8308fe3964f72cd911ac472923e8b27b0b3f9c61) --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 20 +++++++++++--------- src/slic3r/GUI/AMSMaterialsSetting.hpp | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 0291ec5115..82c0f32393 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -414,21 +414,23 @@ void AMSMaterialsSetting::update() { if (obj) { update_widgets(); - if (obj->is_in_printing() || obj->can_resume()) { - enable_confirm_button(false); - } else { - enable_confirm_button(true); - } + update_filament_editing(obj->is_in_printing() || obj->can_resume()); } } -void AMSMaterialsSetting::enable_confirm_button(bool en) +void AMSMaterialsSetting::update_filament_editing(bool is_printing) { - if (!en) { + if (is_printing) { + m_comboBox_filament->Enable(obj->is_support_filament_setting_inprinting); + m_comboBox_cali_result->Enable(obj->is_support_filament_setting_inprinting); m_button_confirm->Show(obj->is_support_filament_setting_inprinting); + m_button_reset->Show(obj->is_support_filament_setting_inprinting); } else { - m_button_confirm->Show(en); + m_comboBox_filament->Enable(true); + m_comboBox_cali_result->Enable(true); + m_button_reset->Show(true); + m_button_confirm->Show(true); } if (!m_is_third) { @@ -447,7 +449,7 @@ void AMSMaterialsSetting::enable_confirm_button(bool en) } m_tip_readonly->Wrap(FromDIP(380)); - m_tip_readonly->Show(!en); + m_tip_readonly->Show(is_printing); } } diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp index a3aec743be..02737a5032 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.hpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp @@ -103,7 +103,6 @@ public: void input_min_finish(); void input_max_finish(); void update(); - void enable_confirm_button(bool en); bool Show(bool show) override; void Popup(wxString filament = wxEmptyString, wxString sn = wxEmptyString, wxString temp_min = wxEmptyString, wxString temp_max = wxEmptyString, @@ -147,6 +146,8 @@ protected: bool is_virtual_tray(); void update_widgets(); + void update_filament_editing(bool is_printing); + protected: StateColor m_btn_bg_green; StateColor m_btn_bg_gray;