Merge pull request #3978 from mlampert/feature/path-voronoi-vcarve-re…

…factor Path: Feature/path voronoi vcarve refactor
FreeCAD · Oct 26, 2020 · 66d3f7b · 66d3f7b
2 parents 0fdd157 + 1e687bb
commit 66d3f7b
Show file tree

Hide file tree

Showing 12 changed files with 632 additions and 318 deletions.
diff --git a/src/Mod/Path/App/Voronoi.h b/src/Mod/Path/App/Voronoi.h
@@ -58,6 +58,7 @@ namespace Path
 
     // types
     typedef double coordinate_type;
+    typedef boost::polygon::voronoi_vertex<double> vertex_type;
     typedef boost::polygon::point_data<coordinate_type> point_type;
     typedef boost::polygon::segment_data<coordinate_type> segment_type;
     typedef boost::polygon::voronoi_diagram<double> voronoi_diagram_type;

diff --git a/src/Mod/Path/App/VoronoiCellPy.xml b/src/Mod/Path/App/VoronoiCellPy.xml
@@ -5,7 +5,7 @@
         Name="VoronoiCellPy" 
         Twin="VoronoiCell" 
         TwinPointer="VoronoiCell" 
-        Include="Mod/Path/App/Voronoi.h" 
+        Include="Mod/Path/App/VoronoiCell.h" 
         FatherInclude="Base/BaseClassPy.h" 
         Namespace="Path" 
         FatherNamespace="Base"

diff --git a/src/Mod/Path/App/VoronoiCellPyImp.cpp b/src/Mod/Path/App/VoronoiCellPyImp.cpp
@@ -27,19 +27,18 @@
 # include <boost/algorithm/string.hpp>
 #endif
 
+#include "Base/Exception.h"
+#include "Base/GeometryPyCXX.h"
+#include "Base/PlacementPy.h"
+#include "Base/Vector3D.h"
+#include "Base/VectorPy.h"
 #include "Mod/Path/App/Voronoi.h"
 #include "Mod/Path/App/VoronoiCell.h"
 #include "Mod/Path/App/VoronoiCellPy.h"
 #include "Mod/Path/App/VoronoiEdge.h"
 #include "Mod/Path/App/VoronoiEdgePy.h"
-#include <Base/Exception.h>
-#include <Base/GeometryPyCXX.h>
-#include <Base/PlacementPy.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
 
-// files generated out of VoronoiCellPy.xml
-#include "VoronoiCellPy.cpp"
+#include "Mod/Path/App/VoronoiCellPy.cpp"
 
 using namespace Path;
 
@@ -75,14 +74,14 @@ int VoronoiCellPy::PyInit(PyObject* args, PyObject* /*kwd*/)
 
 
 PyObject* VoronoiCellPy::richCompare(PyObject *lhs, PyObject *rhs, int op) {
-  PyObject *cmp = Py_False;
+  PyObject *cmp = (op == Py_EQ) ? Py_False : Py_True;
   if (   PyObject_TypeCheck(lhs, &VoronoiCellPy::Type)
       && PyObject_TypeCheck(rhs, &VoronoiCellPy::Type)
-      && op == Py_EQ) {
+      && (op == Py_EQ || op == Py_NE)) {
     const VoronoiCell *vl = static_cast<VoronoiCellPy*>(lhs)->getVoronoiCellPtr();
     const VoronoiCell *vr = static_cast<VoronoiCellPy*>(rhs)->getVoronoiCellPtr();
     if (vl->index == vr->index && vl->dia == vr->dia) {
-      cmp = Py_True;
+      cmp = (op == Py_EQ) ? Py_True : Py_False;
     }
   }
   Py_INCREF(cmp);

diff --git a/src/Mod/Path/App/VoronoiEdgePy.xml b/src/Mod/Path/App/VoronoiEdgePy.xml
@@ -5,7 +5,7 @@
         Name="VoronoiEdgePy" 
         Twin="VoronoiEdge" 
         TwinPointer="VoronoiEdge" 
-        Include="Mod/Path/App/Voronoi.h" 
+        Include="Mod/Path/App/VoronoiEdge.h" 
         FatherInclude="Base/BaseClassPy.h" 
         Namespace="Path" 
         FatherNamespace="Base"
@@ -100,9 +100,9 @@
                 <UserDocu>Returns true if edge goes through endpoint of the segment site</UserDocu>
             </Documentation>
         </Methode>
-        <Methode Name="toGeom" Const="true">
+        <Methode Name="toShape" Const="true">
             <Documentation>
-                <UserDocu>Returns a geom representation of the edge (line segment or arc of parabola)</UserDocu>
+                <UserDocu>Returns a shape for the edge</UserDocu>
             </Documentation>
         </Methode>
         <Methode Name="getDistances" Const="true">