From 71466eac13b7789af1d4cb3dbba22b1659dd3248 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 21 Jul 2019 09:00:42 +0300
Subject: [PATCH] Refactoring. In some cases, for systems with different
 precision, IsPointOnLineviaPDP must take different accuracy value.

--HG--
branch : develop
---
 src/libs/vgeometry/vgobject.cpp | 8 ++++----
 src/libs/vgeometry/vgobject.h   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp
index c943342c6..1ca2235a0 100644
--- a/src/libs/vgeometry/vgobject.cpp
+++ b/src/libs/vgeometry/vgobject.cpp
@@ -492,10 +492,10 @@ QPointF VGObject::CorrectDistortion(const QPointF &t, const QPointF &p1, const Q
  *  The pdp is zero only if the t lies on the line e1 = vector from p1 to p2.
  * @return true if point is on line
  */
-bool VGObject::IsPointOnLineviaPDP(const QPointF &t, const QPointF &p1, const QPointF &p2)
+bool VGObject::IsPointOnLineviaPDP(const QPointF &t, const QPointF &p1, const QPointF &p2, qreal accuracy)
 {
     const double p = qAbs(PerpDotProduct(p1, p2, t));
-    const double e = GetEpsilon(p1, p2);
+    const double e = GetEpsilon(p1, p2, accuracy);
     // We can't use common "<=" here because of the floating-point accuraccy problem
     return p < e || VFuzzyComparePossibleNulls(p, e);
 }
@@ -521,11 +521,11 @@ double VGObject::PerpDotProduct(const QPointF &p1, const QPointF &p2, const QPoi
  * line e1=(p1, p2), e.g. the minimal area calucalted with PerpDotProduc() if point still not on the line. This distance
  * is controled by variable accuracyPointOnLine
  */
-double VGObject::GetEpsilon(const QPointF &p1, const QPointF &p2)
+double VGObject::GetEpsilon(const QPointF &p1, const QPointF &p2, qreal accuracy)
 {
     QLineF line(p1, p2);
     line.setAngle(line.angle() + 90);
-    line.setLength(accuracyPointOnLine); // less than accuracy means the same point
+    line.setLength(accuracy); // less than accuracy means the same point
 
     return qAbs(PerpDotProduct(p1, p2, line.p2()));
 }
diff --git a/src/libs/vgeometry/vgobject.h b/src/libs/vgeometry/vgobject.h
index 89e99435c..b913d0599 100644
--- a/src/libs/vgeometry/vgobject.h
+++ b/src/libs/vgeometry/vgobject.h
@@ -98,7 +98,8 @@ public:
     static void    LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c);
     static bool    IsPointOnLineSegment (const QPointF &t, const QPointF &p1, const QPointF &p2);
     static QPointF CorrectDistortion(const QPointF &t, const QPointF &p1, const QPointF &p2);
-    static bool    IsPointOnLineviaPDP(const QPointF &t, const QPointF &p1, const QPointF &p2);
+    static bool    IsPointOnLineviaPDP(const QPointF &t, const QPointF &p1, const QPointF &p2, 
+                                       qreal accuracy = accuracyPointOnLine);
 
     template <typename T>
     static QVector<T> GetReversePoints(const QVector<T> &points);
@@ -109,7 +110,7 @@ private:
     QSharedDataPointer<VGObjectData> d;
 
     static double PerpDotProduct(const QPointF &p1, const QPointF &p2, const QPointF &t);
-    static double GetEpsilon(const QPointF &p1, const QPointF &p2);
+    static double GetEpsilon(const QPointF &p1, const QPointF &p2, qreal accuracy);
 
     static int     PointInCircle (const QPointF &p, const QPointF &center, qreal radius);
 };