juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-12 11:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: sync ams info to extruder group

Browse Source 
Change-Id: Id0aace998a759c6e91aabb2685306e54e06d152e
Jira: STUDIO-9828
(cherry picked from commit 2bae63e3819bc2dc04dc64c1d53b10d2f04edeff)
This commit is contained in:
chunmao.guo
2025-01-16 11:31:43 +08:00
committed by Noisyfox
parent 93824d5b50
commit d1de8c47d7
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/GUI/Plater.cpp
View File

@@ -394,8 +394,10 @@ struct ExtruderGroup : StaticGroup
return; return;
ams_n4 = n4; ams_n4 = n4;
ams_n1 = n1; ams_n1 = n1;
if (btn_edit) { if (btn_edit) {
update_ams(); if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status();
} }
} }
@@ -1748,15 +1750,9 @@ Sidebar::Sidebar(Plater *parent)
p->single_extruder = new ExtruderGroup(p->m_panel_printer_content, -1, _L("Nozzle")); p->single_extruder = new ExtruderGroup(p->m_panel_printer_content, -1, _L("Nozzle"));
auto switch_diameter = [this](wxCommandEvent & evt) { auto switch_diameter = [this](wxCommandEvent & evt) {
auto extruder = dynamic_cast<ExtruderGroup *>(dynamic_cast<ComboBox *>(evt.GetEventObject())->GetParent()); auto extruder = dynamic_cast<ExtruderGroup *>(dynamic_cast<ComboBox *>(evt.GetEventObject())->GetParent());
p->is_switching_diameter = true;
auto result = p->switch_diameter(extruder == p->single_extruder); auto result = p->switch_diameter(extruder == p->single_extruder);
if (result) { p->is_switching_diameter = false;
if (extruder != p->single_extruder) {
extruder->combo_diameter->SetSelection(evt.GetInt());
extruder->diameter = evt.GetString();
}
} else {
extruder->combo_diameter->SetValue(extruder->diameter);
}
}; };
p->left_extruder->combo_diameter->Bind(wxEVT_COMBOBOX, switch_diameter); p->left_extruder->combo_diameter->Bind(wxEVT_COMBOBOX, switch_diameter);
p->right_extruder->combo_diameter->Bind(wxEVT_COMBOBOX, switch_diameter); p->right_extruder->combo_diameter->Bind(wxEVT_COMBOBOX, switch_diameter);
@@ -2364,12 +2360,15 @@ void Sidebar::update_presets(Preset::Type preset_type)
if (is_dual_extruder) { if (is_dual_extruder) {
AMSCountPopupWindow::UpdateAMSCount(0, p->left_extruder); AMSCountPopupWindow::UpdateAMSCount(0, p->left_extruder);
AMSCountPopupWindow::UpdateAMSCount(1, p->right_extruder); AMSCountPopupWindow::UpdateAMSCount(1, p->right_extruder);
update_extruder_diameter(*p->left_extruder); if (!p->is_switching_diameter) {
update_extruder_diameter(*p->right_extruder); update_extruder_diameter(*p->left_extruder);
update_extruder_diameter(*p->right_extruder);
}
p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, 48)); p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, 48));
} else { } else {
AMSCountPopupWindow::UpdateAMSCount(0, p->single_extruder); AMSCountPopupWindow::UpdateAMSCount(0, p->single_extruder);
update_extruder_diameter(*p->single_extruder); if (!p->is_switching_diameter)
update_extruder_diameter(*p->single_extruder);
p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, 32)); p->image_printer_bed->SetBitmap(create_scaled_bitmap(image_path, this, 32));
} }