From 519e8a7fe753dca37f8f81892129bed556bd4e9c Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 24 Oct 2023 20:29:32 +0800 Subject: [PATCH] ENH:default selected virtual tray jira:[STUDIO-4520] Change-Id: I77dd20d50dba84431b6a0242c15308934dc9e94a --- src/slic3r/GUI/Widgets/AMSControl.cpp | 8 ++++++-- src/slic3r/GUI/Widgets/AMSControl.hpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index fee8e2220..e8693e54c 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -3106,7 +3106,7 @@ void AMSControl::Reset() std::vector ams_info{ams1, ams2, ams3, ams4}; std::vector::iterator it; - UpdateAms(ams_info, false, true); + UpdateAms(ams_info, true); m_current_show_ams = ""; m_current_ams = ""; m_current_senect = ""; @@ -3194,7 +3194,7 @@ void AMSControl::reset_vams() } -void AMSControl::UpdateAms(std::vector info, bool keep_selection, bool is_reset) +void AMSControl::UpdateAms(std::vector info, bool is_reset) { std::string curr_ams_id = GetCurentAms(); std::string curr_can_id = GetCurrentCan(curr_ams_id); @@ -3253,6 +3253,10 @@ void AMSControl::UpdateAms(std::vector info, bool keep_selection, bool SwitchAms(info[0].ams_id); } } + + if (m_ams_model == AMSModel::NO_AMS && !m_vams_lib->is_selected()) { + m_vams_lib->OnSelected(); + } } void AMSControl::AddAmsItems(AMSinfo info) diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 2decf228e..090788eef 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -668,7 +668,7 @@ public: void UpdateStepCtrl(bool is_extrusion_exist); void CreateAms(); - void UpdateAms(std::vector info, bool keep_selection = true, bool is_reset = false); + void UpdateAms(std::vector info, bool is_reset = true); void AddAms(AMSinfo info); void AddAmsItems(AMSinfo info); void AddExtraAms(AMSinfo info);