generate minumum number of points from an edge

FreeCAD · May 19, 2019 · b17a784 · b17a784
1 parent 51c317d
commit b17a784
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp
@@ -30,6 +30,7 @@
 # include <BndLib_Add3dCurve.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <GCPnts_UniformDeflection.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
 # include <gp_Pln.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
@@ -688,7 +689,7 @@ MeshProjection::~MeshProjection()
 {
 }
 
-void MeshProjection::discretize(const TopoDS_Edge& aEdge, std::vector<Base::Vector3f>& polyline) const
+void MeshProjection::discretize(const TopoDS_Edge& aEdge, std::vector<Base::Vector3f>& polyline, std::size_t minPoints) const
 {
     BRepAdaptor_Curve clCurve(aEdge);
 
@@ -703,6 +704,18 @@ void MeshProjection::discretize(const TopoDS_Edge& aEdge, std::vector<Base::Vect
             polyline.push_back( Base::Vector3f( (float)gpPt.X(), (float)gpPt.Y(), (float)gpPt.Z() ) );
         }
     }
+
+    if (polyline.size() < minPoints) {
+        GCPnts_UniformAbscissa clAbsc(clCurve, static_cast<Standard_Integer>(minPoints), fFirst, fLast);
+        if (clAbsc.IsDone() == Standard_True) {
+            polyline.clear();
+            Standard_Integer nNbPoints = clAbsc.NbPoints();
+            for (Standard_Integer i = 1; i <= nNbPoints; i++) {
+                gp_Pnt gpPt = clCurve.Value(clAbsc.Parameter(i));
+                polyline.push_back( Base::Vector3f( (float)gpPt.X(), (float)gpPt.Y(), (float)gpPt.Z() ) );
+            }
+        }
+    }
 }
 
 void MeshProjection::splitMeshByShape ( const TopoDS_Shape &aShape, float fMaxDist ) const
@@ -765,7 +778,7 @@ void MeshProjection::projectParallelToMesh (const TopoDS_Shape &aShape, const Ba
     for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
         const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current());
         std::vector<Base::Vector3f> points;
-        discretize(aEdge, points);
+        discretize(aEdge, points, 5);
 
         typedef std::pair<Base::Vector3f, unsigned long> HitPoint;
         std::vector<HitPoint> hitPoints;

diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h
@@ -180,7 +180,7 @@ class MeshPartExport MeshProjection
     /// Destruction
     ~MeshProjection();
 
-    void discretize(const TopoDS_Edge& aEdge, std::vector<Base::Vector3f>& polyline) const;
+    void discretize(const TopoDS_Edge& aEdge, std::vector<Base::Vector3f>& polyline, std::size_t minPoints=2) const;
     /**
      * Searches all edges that intersect with the projected curve \a aShape. Therefore \a aShape must
      * contain shapes of type TopoDS_Edge, other shape types are ignored. A possible solution is

diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
@@ -147,6 +147,7 @@
 #include <GCE2d_MakeSegment.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <GCPnts_UniformDeflection.hxx>
+#include <GCPnts_UniformAbscissa.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Line.hxx>