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

ENH:select vams when none ams mode 

Change-Id: Id47e2e89d7b6661cb2f6b147f82bd699237396c9
This commit is contained in:
tao wang 2023-01-18 17:05:43 +08:00 committed by Lane.Wei
parent cf46b21003
commit e144fce341
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2066,10 +2066,10 @@ void AMSControl::EnterNoneAMSMode()
m_button_extruder_feed->Hide(); m_button_extruder_feed->Hide();
m_button_extruder_back->Hide(); m_button_extruder_back->Hide();
ShowFilamentTip(false); ShowFilamentTip(false);
m_amswin->Layout(); m_amswin->Layout();
m_amswin->Fit(); m_amswin->Fit();
Layout(); Layout();
m_is_none_ams_mode = true;
} }
void AMSControl::ExitNoneAMSMode() void AMSControl::ExitNoneAMSMode()
@ -2088,6 +2088,7 @@ void AMSControl::ExitNoneAMSMode()
m_amswin->Layout(); m_amswin->Layout();
m_amswin->Fit(); m_amswin->Fit();
Layout(); Layout();
m_is_none_ams_mode = false;
} }
void AMSControl::EnterCalibrationMode(bool read_to_calibration) void AMSControl::EnterCalibrationMode(bool read_to_calibration)
@ -2222,6 +2223,14 @@ void AMSControl::show_vams(bool show)
m_vams_sizer->Show(show); m_vams_sizer->Show(show);
show_vams_kn_value(show); show_vams_kn_value(show);
Layout(); Layout();
if (show && m_is_none_ams_mode) {
if (m_current_ams == "") {
wxMouseEvent event(wxEVT_LEFT_DOWN);
event.SetEventObject(m_vams_lib);
wxPostEvent(m_vams_lib, event);
}
}
} }
void AMSControl::show_vams_kn_value(bool show) void AMSControl::show_vams_kn_value(bool show)

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

@ -514,6 +514,7 @@ public:
std::string GetCurrentCan(std::string amsid); std::string GetCurrentCan(std::string amsid);
wxColour GetCanColour(std::string amsid, std::string canid); wxColour GetCanColour(std::string amsid, std::string canid);
bool m_is_none_ams_mode{false};
void SetActionState(AMSAction action, bool support_virtual_tray = true); void SetActionState(AMSAction action, bool support_virtual_tray = true);
void EnterNoneAMSMode(); void EnterNoneAMSMode();
void ExitNoneAMSMode(); void ExitNoneAMSMode();