add tolerance to getSelfIntersectionPoints

qcad · Jun 17, 2021 · 930cfe5 · 930cfe5
1 parent f574361
commit 930cfe5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/core/math/RPolyline.cpp b/src/core/math/RPolyline.cpp
@@ -783,7 +783,7 @@ bool RPolyline::toLogicallyOpen() {
     return true;
 }
 
-QList<RVector> RPolyline::getSelfIntersectionPoints() const {
+QList<RVector> RPolyline::getSelfIntersectionPoints(double tolerance) const {
     QList<RVector> ret;
 
     bool cl = isGeometricallyClosed();
@@ -798,13 +798,13 @@ QList<RVector> RPolyline::getSelfIntersectionPoints() const {
             QList<RVector> ips = segment->getIntersectionPoints(*otherSegment);
             for (int n=0; n<ips.length(); n++) {
                 RVector ip = ips[n];
-                if (k==i+1 && ip.equalsFuzzy(segment->getEndPoint())) {
+                if (k==i+1 && ip.equalsFuzzy(segment->getEndPoint(), tolerance)) {
                     // ignore intersection at vertex between two consecutive segments:
                     continue;
                 }
 
                 if (cl) {
-                    if (i==0 && k==segments.length()-1 && ip.equalsFuzzy(segment->getStartPoint())) {
+                    if (i==0 && k==segments.length()-1 && ip.equalsFuzzy(segment->getStartPoint(), tolerance)) {
                         continue;
                     }
                 }

diff --git a/src/core/math/RPolyline.h b/src/core/math/RPolyline.h
@@ -134,7 +134,7 @@ class QCADCORE_EXPORT RPolyline: public RShape, public RExplodable {
     bool toLogicallyClosed(double tolerance=RS::PointTolerance);
     bool toLogicallyOpen();
 
-    QList<RVector> getSelfIntersectionPoints() const;
+    QList<RVector> getSelfIntersectionPoints(double tolerance=RS::PointTolerance) const;
 
     RS::Orientation getOrientation(bool implicitelyClosed = false) const;
     bool setOrientation(RS::Orientation orientation);

diff --git a/src/entity/RPolylineEntity.h b/src/entity/RPolylineEntity.h
@@ -293,8 +293,8 @@ class QCADENTITY_EXPORT RPolylineEntity: public REntity {
         return data.toLogicallyOpen();
     }
 
-    QList<RVector> getSelfIntersectionPoints() const {
-        return data.getSelfIntersectionPoints();
+    QList<RVector> getSelfIntersectionPoints(double tolerance=RS::PointTolerance) const {
+        return data.getSelfIntersectionPoints(tolerance);
     }
 
     RS::Orientation getOrientation(bool implicitelyClosed = false) const {