From 3fe8d450d9d094b1234c131ccca3cd0431a1e19d Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 9 May 2024 11:41:03 +0800 Subject: [PATCH] FIX:Fixed error in displaying the name of Bambu filaments Change-Id: Ib42194c07b6eefe793eec81a588debc9d622d951 --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index ed8bf03c7..b6098858c 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -800,7 +800,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi int selection_idx = -1, idx = 0; wxArrayString filament_items; - + wxString bambu_filament_name; std::set filament_id_set; PresetBundle * preset_bundle = wxGetApp().preset_bundle; @@ -854,6 +854,8 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi if (filament_it->filament_id == ams_filament_id) { selection_idx = idx; + bambu_filament_name = filament_it->alias; + // update if nozzle_temperature_range is found ConfigOption *opt_min = filament_it->config.option("nozzle_temperature_range_low"); @@ -893,7 +895,13 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi if (!m_is_third) { m_comboBox_filament->Hide(); m_readonly_filament->Show(); - m_readonly_filament->SetLabel("Bambu " + filament); + if (bambu_filament_name.empty()) { + m_readonly_filament->SetLabel("Bambu " + filament); + } + else { + m_readonly_filament->SetLabel(bambu_filament_name); + } + m_input_nozzle_min->GetTextCtrl()->SetValue(temp_min); m_input_nozzle_max->GetTextCtrl()->SetValue(temp_max); }