From 28bdf64fef8d7cbef15f27ffcc2c841595ba08c7 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 26 Mar 2025 09:56:57 +0800 Subject: [PATCH] FIX:m_show_type should init default jira: github 6146 Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c --- src/slic3r/GUI/AmsMappingPopup.hpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 275650c1f..ebe5e2289 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -224,7 +224,7 @@ public: bool m_has_unmatch_filament {false}; bool m_supporting_mix_print {false}; //For single extruder, can ams and ext print together? int m_current_filament_id; - ShowType m_show_type; + ShowType m_show_type{ShowType::RIGHT}; std::string m_tag_material; wxBoxSizer *m_sizer_main{nullptr}; wxBoxSizer *m_sizer_ams{nullptr}; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 833e1f620..59372688e 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3963,9 +3963,10 @@ void SelectMachineDialog::reset_and_sync_ams_list() { m_mapping_popup.set_show_type(ShowType::RIGHT); } + } else { + m_mapping_popup.set_show_type(ShowType::RIGHT); } - //m_mapping_popup.set_show_type(ShowType::RIGHT); - if (obj_ && obj_->is_support_ams_mapping()) { + if (obj_) { if (m_mapping_popup.IsShown()) return; wxPoint pos = item->ClientToScreen(wxPoint(0, 0)); pos.y += item->GetRect().height; @@ -4468,6 +4469,8 @@ void SelectMachineDialog::set_default_from_sdcard() } else if (m_filaments_map[m_current_filament_id] == 2) { m_mapping_popup.set_show_type(ShowType::RIGHT); } + } else { + m_mapping_popup.set_show_type(ShowType::RIGHT); } if (obj_ && obj_->dev_id == m_printer_last_select)