From 7002b94419aa78ff7d4b4b329a965bf05e15c6e7 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 7 Oct 2022 08:40:23 +0200 Subject: [PATCH] Measuring - Gizmo measure disabled for scaled volumes --- src/libslic3r/Technologies.hpp | 1 + src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 04ecfae670..817136e7a4 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -68,6 +68,7 @@ #define ENABLE_RAYCAST_PICKING_DEBUG (0 && ENABLE_RAYCAST_PICKING) // Enable Measure Gizmo #define ENABLE_MEASURE_GIZMO (1 && ENABLE_RAYCAST_PICKING) +#define DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES (1 && ENABLE_MEASURE_GIZMO) #define ENABLE_MEASURE_GIZMO_DEBUG (0 && ENABLE_MEASURE_GIZMO) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index a6efc09e78..f2638d0588 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -290,8 +290,12 @@ bool GLGizmoMeasure::on_is_activable() const bool res = (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA) ? selection.is_single_full_instance() : selection.is_single_volume() || selection.is_single_volume_instance(); - if (res) + if (res) { res &= !selection.get_first_volume()->is_sinking(); +#if DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES + res &= Geometry::Transformation(selection.get_first_volume()->world_matrix()).get_scaling_factor().isApprox(Vec3d::Ones()); +#endif // DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES + } return res; }