juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Ams control display

Browse Source 
jira: NONE

Change-Id: I221eb4167dad894c9e7f32141d33c5c96934df96
(cherry picked from commit 065c8d029eb9df4deb85ce22fe41896fa7c2a883)
This commit is contained in:
hang.xu
2024-07-24 16:13:46 +08:00
committed by Noisyfox
parent 504b34b6d4
commit 53a1827731
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/images/ams_extra_framework_mid_new.svg Normal file
View File

@@ -0,0 +1,7 @@
<svg width="37" height="141" viewBox="0 0 37 141" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.981 21.3223L36.981 22.8848V29.7598L20.981 31.3223V21.3223Z" fill="#ACACAC"/>
<path d="M20.981 121.322L36.981 122.885V129.76L20.981 131.322V121.322Z" fill="#ACACAC"/>
<path d="M7.98096 31.3223L7.98096 21.3223L0.980957 22.1035L0.980956 30.541L7.98096 31.3223Z" fill="#ACACAC"/>
<path d="M7.98096 131.322L7.98096 121.322L0.980957 122.104L0.980956 130.541L7.98096 131.322Z" fill="#ACACAC"/>
<rect x="7.98096" y="0.322266" width="19" height="140" rx="9.5" fill="#CECECE"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 586 B

15
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -2619,7 +2619,6 @@ void StatusPanel::update_ams(MachineObject *obj)
m_ams_control->SetAmsModel(AMSModel::EXT_AMS, ams_mode); m_ams_control->SetAmsModel(AMSModel::EXT_AMS, ams_mode);
show_ams_group(false); show_ams_group(false);
m_ams_control->show_auto_refill(false); m_ams_control->show_auto_refill(false);
} }
else { else {
@@ -3894,6 +3893,8 @@ void StatusPanel::on_ams_selected(wxCommandEvent &event)
{ {
if (obj) { if (obj) {
std::string curr_ams_id = m_ams_control->GetCurentAms(); std::string curr_ams_id = m_ams_control->GetCurentAms();
std::string curr_selected_ams_id = std::to_string(event.GetInt());
if (curr_ams_id.compare(std::to_string(VIRTUAL_TRAY_MAIN_ID)) == 0) { if (curr_ams_id.compare(std::to_string(VIRTUAL_TRAY_MAIN_ID)) == 0) {
//update_ams_control_state(curr_ams_id, true); //update_ams_control_state(curr_ams_id, true);
return; return;
@@ -3921,7 +3922,17 @@ void StatusPanel::on_ams_selected(wxCommandEvent &event)
void StatusPanel::on_ams_guide(wxCommandEvent& event) void StatusPanel::on_ams_guide(wxCommandEvent& event)
{ {
wxString ams_wiki_url = "https://wiki.bambulab.com/en/software/bambu-studio/use-ams-on-bambu-studio"; wxString ams_wiki_url;
if (m_ams_control && m_ams_control->m_is_none_ams_mode == AMSModel::GENERIC_AMS) {
ams_wiki_url = "https://wiki.bambulab.com/en/software/bambu-studio/use-ams-on-bambu-studio";
}
else if (m_ams_control && m_ams_control->m_is_none_ams_mode == AMSModel::AMS_LITE) {
ams_wiki_url = "https://wiki.bambulab.com/en/ams-lite";
}
else {
ams_wiki_url = "https://wiki.bambulab.com/en/software/bambu-studio/use-ams-on-bambu-studio";
}
wxLaunchDefaultBrowser(ams_wiki_url); wxLaunchDefaultBrowser(ams_wiki_url);
} }