mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:default selected virtual tray 

jira:[STUDIO-4520]

Change-Id: I77dd20d50dba84431b6a0242c15308934dc9e94a
This commit is contained in:
tao wang 2023-10-24 20:29:32 +08:00 committed by Lane.Wei
parent 29e78705ab
commit 519e8a7fe7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -3106,7 +3106,7 @@ void AMSControl::Reset()
std::vector<AMSinfo> ams_info{ams1, ams2, ams3, ams4}; std::vector<AMSinfo> ams_info{ams1, ams2, ams3, ams4};
std::vector<AMSinfo>::iterator it; std::vector<AMSinfo>::iterator it;
UpdateAms(ams_info, false, true); UpdateAms(ams_info, true);
m_current_show_ams = ""; m_current_show_ams = "";
m_current_ams = ""; m_current_ams = "";
m_current_senect = ""; m_current_senect = "";
@ -3194,7 +3194,7 @@ void AMSControl::reset_vams()
} }
void AMSControl::UpdateAms(std::vector<AMSinfo> info, bool keep_selection, bool is_reset) void AMSControl::UpdateAms(std::vector<AMSinfo> info, bool is_reset)
{ {
std::string curr_ams_id = GetCurentAms(); std::string curr_ams_id = GetCurentAms();
std::string curr_can_id = GetCurrentCan(curr_ams_id); std::string curr_can_id = GetCurrentCan(curr_ams_id);
@ -3253,6 +3253,10 @@ void AMSControl::UpdateAms(std::vector<AMSinfo> info, bool keep_selection, bool
SwitchAms(info[0].ams_id); 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) void AMSControl::AddAmsItems(AMSinfo info)

2
src/slic3r/GUI/Widgets/AMSControl.hpp
View File

@ -668,7 +668,7 @@ public:
void UpdateStepCtrl(bool is_extrusion_exist); void UpdateStepCtrl(bool is_extrusion_exist);
void CreateAms(); void CreateAms();
void UpdateAms(std::vector<AMSinfo> info, bool keep_selection = true, bool is_reset = false); void UpdateAms(std::vector<AMSinfo> info, bool is_reset = true);
void AddAms(AMSinfo info); void AddAms(AMSinfo info);
void AddAmsItems(AMSinfo info); void AddAmsItems(AMSinfo info);
void AddExtraAms(AMSinfo info); void AddExtraAms(AMSinfo info);