From af3bf453c12b8db041a589e15daef36ee4e109b7 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Mon, 11 Mar 2024 09:53:25 +0800 Subject: [PATCH] FIX:show result of plane and circle Jira: STUDIO-6439 Change-Id: I53b76913593e0b5fcce01a74bc347d3628a3646a --- src/libslic3r/Measure.cpp | 4 ++++ src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp index 804a0e7d9..e67f79b5d 100644 --- a/src/libslic3r/Measure.cpp +++ b/src/libslic3r/Measure.cpp @@ -1219,6 +1219,10 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature& }); result.distance_infinite = std::make_optional(DistAndPoints{ it->dist, it->from, it->to }); } + else { + const Eigen::Hyperplane plane(normal2, origin2); + result.distance_infinite = std::make_optional(DistAndPoints{plane.absDistance(center), center, plane.projection(center)}); + } } else { result.distance_strict = std::make_optional(DistAndPoints{0, center, origin2}); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index d05595ef0..081e95cb9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -484,7 +484,7 @@ void GLGizmoRotate3D::on_set_state() { for (GLGizmoRotate &g : m_gizmos) g.set_state(m_state); - if (get_state() == On) { + if (get_state() == On && m_object_manipulation) { m_object_manipulation->set_coordinates_type(ECoordinatesType::World); } }