From d945e2c3ed5271ced399af8f77f0b11003eecb81 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Wed, 24 Jul 2024 15:13:59 +0800 Subject: [PATCH] FIX: hide parem extruder sync button for diff nozzles Change-Id: If332da20427177bf593a9ba22f31a76e1ed1a303 Jira: STUDIO-7717, STUDIO-7716, STUDIO-7706 --- src/slic3r/GUI/Tab.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 67444d59e..f36982926 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -5170,6 +5170,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event) if (m_variant_sizer) { wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo; m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder ")); + if (m_extruder_sync) m_extruder_sync->Show(m_extruder_sync->IsThisEnabled()); GetParent()->Layout(); } @@ -5185,6 +5186,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event) if (m_variant_sizer) { wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo; m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder ")); + if (m_extruder_sync) m_extruder_sync->Show(m_extruder_sync->IsThisEnabled()); GetParent()->Layout(); } @@ -5679,6 +5681,7 @@ void TabPrinter::set_extruder_volume_type(int extruder_id, NozzleVolumeType type assert(nozzle_volumes->values.size() > (size_t)extruder_id); nozzle_volumes->values[extruder_id] = type; on_value_change((boost::format("nozzle_volume_type#%1%") % extruder_id).str(), int(type)); + update_dirty(); } // Return a callback to create a TabPrinter widget to edit bed shape @@ -5839,6 +5842,7 @@ void Tab::update_extruder_variants(int extruder_id, bool reload) m_extruder_switch->SetLabels(wxString::Format(_L("Left: %s"), left), wxString::Format(_L("Right: %s"), right)); m_extruder_switch->SetValue(extruder_id == 1); m_extruder_switch->Enable(true); + m_extruder_sync->Enable(left == right); } else { m_extruder_switch->Enable(false); } @@ -5856,6 +5860,7 @@ void Tab::update_extruder_variants(int extruder_id, bool reload) if (m_variant_sizer) { wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo; m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && m_active_page && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder ")); + if (m_extruder_sync) m_extruder_sync->Show(m_extruder_sync->IsThisEnabled()); GetParent()->Layout(); } }