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

Show extruder switch in motion ability page

Browse Source
This commit is contained in:
Noisyfox
2026-05-17 22:35:41 +08:00
parent 956fcea7e2
commit 78daf90c95
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Tab.cpp
View File

@@ -486,23 +486,18 @@ void Tab::create_preset_tab()
m_main_sizer->Add(m_tabctrl, 0, wxEXPAND | wxALL, 0 ); m_main_sizer->Add(m_tabctrl, 0, wxEXPAND | wxALL, 0 );
// Orca: don't show extruder switch for now
#if 0
if (dynamic_cast<TabPrinter *>(this) || dynamic_cast<TabPrint *>(this)) { if (dynamic_cast<TabPrinter *>(this) || dynamic_cast<TabPrint *>(this)) {
m_extruder_switch = new SwitchButton(panel); m_extruder_switch = new SwitchButton(panel);
m_extruder_switch->SetMaxSize({em_unit(this) * 24, -1}); m_extruder_switch->SetMaxSize({em_unit(this) * 24, -1});
m_extruder_switch->SetLabels(_L("Left"), _L("Right")); m_extruder_switch->SetLabels(_L("Left"), _L("Right"));
m_extruder_switch->Bind(wxEVT_TOGGLEBUTTON, [this] (auto & evt) { m_extruder_switch->Bind(wxEVT_TOGGLEBUTTON, [this] (auto & evt) {
evt.Skip(); evt.Skip();
dynamic_cast<TabPrint *>(this)->switch_excluder(evt.GetInt()); switch_excluder(evt.GetInt());
reload_config(); reload_config();
update_changed_ui(); update_changed_ui();
}); });
m_main_sizer->Add(m_extruder_switch, 0, wxALIGN_CENTER | wxTOP, m_em_unit); m_main_sizer->Add(m_extruder_switch, 0, wxALIGN_CENTER | wxTOP, m_em_unit);
} } else if (dynamic_cast<TabFilament *>(this)) {
#endif
if (dynamic_cast<TabFilament *>(this)) {
m_variant_combo = new MultiSwitchButton(panel); m_variant_combo = new MultiSwitchButton(panel);
m_variant_combo->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this](auto &evt) { m_variant_combo->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this](auto &evt) {
evt.Skip(); evt.Skip();
@@ -6491,7 +6486,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
m_active_page = page; m_active_page = page;
if (m_extruder_switch) { if (m_extruder_switch) {
m_main_sizer->Show(m_extruder_switch, !m_active_page->m_opt_id_map.empty()); m_main_sizer->Show(m_extruder_switch, m_extruder_switch->IsEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder"));
GetParent()->Layout(); GetParent()->Layout();
} else if (m_variant_combo) { } else if (m_variant_combo) {
m_main_sizer->Show(m_variant_combo, m_variant_combo->IsEnabled() && !m_active_page->m_opt_id_map.empty()); m_main_sizer->Show(m_variant_combo, m_variant_combo->IsEnabled() && !m_active_page->m_opt_id_map.empty());