From 554ce5004c7c8b19f2f1d6c9a5c632996e4efa18 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Tue, 17 Jun 2025 10:46:09 +0800 Subject: [PATCH] FIX: fix the error display of default k value jira: STUDIO-12546 Change-Id: Ibb674de256c306123c1ab7761945eda18704fe0e (cherry picked from commit d3174f35d81654a36a85194b94c2cec1ee263ded) --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 4 +--- src/slic3r/GUI/Widgets/AMSItem.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 570a972a8a..bba00e8266 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -1242,9 +1242,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) PACalibResult default_item; default_item.cali_idx = -1; default_item.filament_id = ams_filament_id; - std::vector machine_list = {"N1", "N2S", "C11", "C12", "C13", "BL-P001", "BL-P002"}; - auto iter = std::find(machine_list.begin(), machine_list.end(), obj->printer_type); - if (iter == machine_list.end()) { + if (obj->is_support_auto_flow_calibration) { default_item.k_value = -1; default_item.n_coef = -1; } diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index b0ef5108e8..86afa1adaf 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -1054,7 +1054,7 @@ void AMSLib::render_generic_text(wxDC &dc) show_k_value = false; } else if (m_info.cali_idx == -1 || (m_obj && (CalibUtils::get_selected_calib_idx(m_obj->pa_calib_tab, m_info.cali_idx) == -1))) { - if (m_obj && m_obj->is_multi_extruders()) + if (m_obj && m_obj->is_support_auto_flow_calibration) show_k_value = false; else get_default_k_n_value(m_info.filament_id, m_info.k, m_info.n);