From 512da73aae735e5a2c14a89f8731181ae2eb386c Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 14 Aug 2024 18:09:50 +0800 Subject: [PATCH] FIX:ban wipe_tower in measure and assembly gizmo jira: STUDIO-7860 Change-Id: I6c02d970007719110ac627b1c0f1435b229e9854 --- src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp | 3 +++ src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index 924ab29a7..a10ef3c3a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -44,6 +44,9 @@ std::string GLGizmoAssembly::on_get_name() const bool GLGizmoAssembly::on_is_activable() const { const Selection& selection = m_parent.get_selection(); + if (selection.is_wipe_tower()) { + return false; + } const int selection_volumes_count = 2; if (wxGetApp().plater()->canvas3D()->get_canvas_type() == GLCanvas3D::ECanvasType::CanvasAssembleView) { if (abs(m_parent.get_explosion_ratio() - 1.0f) < 1e-2 && selection.volumes_count() >= selection_volumes_count) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index f8caea475..d4c0e2d67 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -493,6 +493,9 @@ std::string GLGizmoMeasure::on_get_name() const bool GLGizmoMeasure::on_is_activable() const { const Selection& selection = m_parent.get_selection(); + if (selection.is_wipe_tower()) { + return false; + } if (wxGetApp().plater()->canvas3D()->get_canvas_type() == GLCanvas3D::ECanvasType::CanvasAssembleView) { if (abs(m_parent.get_explosion_ratio() - 1.0f) < 1e-2 && selection.volumes_count() > 0) { return true;