From 05e82b1fc569f6fe02d29784a87aa7611164d349 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 3 Nov 2022 13:20:35 +0100 Subject: [PATCH] Measuring: validation for zero distance moved from backend to frontend --- src/libslic3r/Measure.cpp | 8 -------- src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp index 6e11b853ab..ffff12bab1 100644 --- a/src/libslic3r/Measure.cpp +++ b/src/libslic3r/Measure.cpp @@ -1060,14 +1060,6 @@ MeasurementResult get_measurement(const SurfaceFeature& a, const SurfaceFeature& else result.angle = angle_plane_plane(f1.get_plane(), f2.get_plane()); } - - // validation - if (result.distance_infinite.has_value() && result.distance_infinite->dist < EPSILON) - result.distance_infinite.reset(); - if (result.distance_strict.has_value() && result.distance_strict->dist < EPSILON) - result.distance_strict.reset(); - if (result.angle.has_value() && std::abs(result.angle->angle) < EPSILON) - result.angle.reset(); return result; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 74be878f11..d296bb3c45 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -905,7 +905,7 @@ void GLGizmoMeasure::render_dimensioning() return; auto point_point = [this, shader](const Vec3d& v1, const Vec3d& v2, float distance) { - if (v1.isApprox(v2)) + if ((v2 - v2).squaredNorm() < 0.000001) return; const Camera& camera = wxGetApp().plater()->get_camera();