From f3064e223df468eb9901e65c8f0abab2dae91f15 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Tue, 5 Nov 2024 12:24:58 +0800 Subject: [PATCH] FIX: the default value is not correct and the pa profile not display in AMS setting dialog after switch nozzle diameter jira: 8620 Change-Id: If40bfe41ae13f5199f09baae3af09757498f1edf --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 4 ++++ src/slic3r/GUI/Widgets/AMSControl.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 345176c67..9d8cb606d 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -1172,6 +1172,10 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[cali_select_idx].k_value)); m_input_n_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[cali_select_idx].n_coef)); } + else { + m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[0].k_value)); + m_input_n_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[0].n_coef)); + } } else { if (!ams_filament_id.empty()) { diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index c85b29e68..75814368a 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -55,7 +55,7 @@ bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, boo info.ctype = it->second->ctype; info.material_name = it->second->get_display_filament_type(); info.cali_idx = it->second->cali_idx; - info.filament_id = it->second->filament_setting_id; + info.filament_id = it->second->setting_id; if (!it->second->color.empty()) { info.material_colour = AmsTray::decode_color(it->second->color); } else {