From 3289b12511ee0bd45f29deda792013c039a2b903 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Fri, 29 Jul 2022 14:56:24 -0700
Subject: [PATCH] Renamed python class Voronoi to VoronoiDiagram

---
 src/Mod/Path/App/AppPath.cpp              |  2 +-
 src/Mod/Path/App/VoronoiPy.xml            |  1 +
 src/Mod/Path/App/VoronoiPyImp.cpp         |  2 +-
 src/Mod/Path/PathScripts/PathVcarve.py    | 12 ++++++------
 src/Mod/Path/PathTests/TestPathVoronoi.py |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Mod/Path/App/AppPath.cpp b/src/Mod/Path/App/AppPath.cpp
index f91649f11f..a973840cef 100644
--- a/src/Mod/Path/App/AppPath.cpp
+++ b/src/Mod/Path/App/AppPath.cpp
@@ -77,7 +77,7 @@ PyMOD_INIT_FUNC(Path)
     Base::Interpreter().addType(&Path::ToolPy           ::Type, pathModule, "Tool");
     Base::Interpreter().addType(&Path::TooltablePy      ::Type, pathModule, "Tooltable");
     Base::Interpreter().addType(&Path::AreaPy           ::Type, pathModule, "Area");
-    Base::Interpreter().addType(&Path::VoronoiPy        ::Type, pathModule, "Voronoi");
+    Base::Interpreter().addType(&Path::VoronoiPy        ::Type, pathModule, "VoronoiDiagram");
     Base::Interpreter().addType(&Path::VoronoiCellPy    ::Type, pathModule, "VoronoiCell");
     Base::Interpreter().addType(&Path::VoronoiEdgePy    ::Type, pathModule, "VoronoiEdge");
     Base::Interpreter().addType(&Path::VoronoiVertexPy  ::Type, pathModule, "VoronoiVertex");
diff --git a/src/Mod/Path/App/VoronoiPy.xml b/src/Mod/Path/App/VoronoiPy.xml
index d330d6ccca..12ceedb35f 100644
--- a/src/Mod/Path/App/VoronoiPy.xml
+++ b/src/Mod/Path/App/VoronoiPy.xml
@@ -3,6 +3,7 @@
     <PythonExport 
         Father="BaseClassPy" 
         Name="VoronoiPy" 
+        PythonName="VoronoiDiagram"
         Twin="Voronoi" 
         TwinPointer="Voronoi" 
         Include="Mod/Path/App/Voronoi.h" 
diff --git a/src/Mod/Path/App/VoronoiPyImp.cpp b/src/Mod/Path/App/VoronoiPyImp.cpp
index 3fe28778c4..12ca293f24 100644
--- a/src/Mod/Path/App/VoronoiPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiPyImp.cpp
@@ -45,7 +45,7 @@ std::string VoronoiPy::representation(void) const
 {
   std::stringstream ss;
   ss.precision(5);
-  ss << "Voronoi("
+  ss << "VoronoiDiagram("
     << "{" << getVoronoiPtr()->numSegments() << ", " << getVoronoiPtr()->numPoints() << "}"
     << " -> "
     << "{" << getVoronoiPtr()->numCells() << ", " << getVoronoiPtr()->numEdges() << ", " << getVoronoiPtr()->numVertices() << "}"
diff --git a/src/Mod/Path/PathScripts/PathVcarve.py b/src/Mod/Path/PathScripts/PathVcarve.py
index 25121fcffa..463787ec94 100644
--- a/src/Mod/Path/PathScripts/PathVcarve.py
+++ b/src/Mod/Path/PathScripts/PathVcarve.py
@@ -292,7 +292,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp):
 
         voronoiWires = []
         for f in faces:
-            vd = Path.Voronoi()
+            vd = Path.VoronoiDiagram()
             insert_many_wires(vd, f.Wires)
 
             vd.construct()
@@ -354,7 +354,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp):
             )
             return
 
-        try:
+        if True:
             faces = []
 
             for base in obj.BaseShapes:
@@ -383,10 +383,10 @@ class ObjectVcarve(PathEngraveBase.ObjectOp):
                     )
                 )
 
-        except Exception as e:
-            PathLog.error(
-                "Error processing Base object. Engraving operation will produce no output."
-            )
+        #except Exception as e:
+        #    PathLog.error(
+        #        "Error processing Base object. Engraving operation will produce no output."
+        #    )
 
     def opUpdateDepths(self, obj, ignoreErrors=False):
         """updateDepths(obj) ... engraving is always done at the top most z-value"""
diff --git a/src/Mod/Path/PathTests/TestPathVoronoi.py b/src/Mod/Path/PathTests/TestPathVoronoi.py
index c75850570a..bd3d98607e 100644
--- a/src/Mod/Path/PathTests/TestPathVoronoi.py
+++ b/src/Mod/Path/PathTests/TestPathVoronoi.py
@@ -49,7 +49,7 @@ def initVD():
         ptv = [FreeCAD.Vector(p[0], p[1]) for p in pts]
         ptv.append(ptv[0])
 
-        vd = Path.Voronoi()
+        vd = Path.VoronoiDiagram()
         for i in range(len(pts)):
             vd.addSegment(ptv[i], ptv[i + 1])