Merge branch 'master' into bugfix/path-invalid-base-geometry-robustness

FreeCAD · Feb 14, 2021 · f7a467c · f7a467c
2 parents d7c4612 + 008e97b
commit f7a467c
Show file tree

Hide file tree

Showing 14 changed files with 332 additions and 142 deletions.
diff --git a/src/Mod/Draft/draftguitools/gui_orthoarray.py b/src/Mod/Draft/draftguitools/gui_orthoarray.py
@@ -73,7 +73,7 @@ def Activated(self):
         We add callbacks that connect the 3D view with
         the widgets of the task panel.
         """
-        _log("GuiCommand: {}".format(_self.command_name))
+        _log("GuiCommand: {}".format(self.command_name))
         #_msg("{}".format(16*"-"))
         #_msg("GuiCommand: {}".format(self.command_name))
 

diff --git a/src/Mod/Draft/drafttaskpanels/task_circulararray.py b/src/Mod/Draft/drafttaskpanels/task_circulararray.py
@@ -297,7 +297,7 @@ def create_object(self):
                      "App.ActiveDocument.recompute()"]
 
         # We commit the command list through the parent command
-        self.source_command.commit(translate("draft","Circular array", _cmd_list))
+        self.source_command.commit(translate("draft","Circular array"), _cmd_list)
 
     def get_distances(self):
         """Get the distance parameters from the widgets."""

diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp
@@ -1497,6 +1497,30 @@ void MeshObject::validateIndices()
         this->_segments.clear();
 }
 
+bool MeshObject::hasInvalidNeighbourhood() const
+{
+    MeshCore::MeshEvalNeighbourhood eval(_kernel);
+    return !eval.Evaluate();
+}
+
+bool MeshObject::hasPointsOutOfRange() const
+{
+    MeshCore::MeshEvalRangePoint eval(_kernel);
+    return !eval.Evaluate();
+}
+
+bool MeshObject::hasFacetsOutOfRange() const
+{
+    MeshCore::MeshEvalRangeFacet eval(_kernel);
+    return !eval.Evaluate();
+}
+
+bool MeshObject::hasCorruptedFacets() const
+{
+    MeshCore::MeshEvalCorruptedFacets eval(_kernel);
+    return !eval.Evaluate();
+}
+
 void MeshObject::validateDeformations(float fMaxAngle, float fEps)
 {
     unsigned long count = _kernel.CountFacets();

diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h
@@ -283,6 +283,10 @@ class MeshExport MeshObject : public Data::ComplexGeoData
     void removeDuplicatedPoints();
     void removeDuplicatedFacets();
     bool hasNonManifolds() const;
+    bool hasInvalidNeighbourhood() const;
+    bool hasPointsOutOfRange() const;
+    bool hasFacetsOutOfRange() const;
+    bool hasCorruptedFacets() const;
     void removeNonManifolds();
     void removeNonManifoldPoints();
     bool hasSelfIntersections() const;

diff --git a/src/Mod/Mesh/App/MeshPy.xml b/src/Mod/Mesh/App/MeshPy.xml
@@ -229,7 +229,7 @@ for c in mesh.getSeparatecomponents():
 				<UserDocu>Check if the mesh has non-manifolds</UserDocu>
 			</Documentation>
 		</Methode>
-		<Methode Name="removeNonManifolds">
+        <Methode Name="removeNonManifolds">
 			<Documentation>
 				<UserDocu>Remove non-manifolds</UserDocu>
 			</Documentation>
@@ -284,7 +284,27 @@ for c in mesh.getSeparatecomponents():
 				<UserDocu>Remove points with invalid coordinates (NaN)</UserDocu>
 			</Documentation>
 		</Methode>
-		<Methode Name="countComponents" Const="true">
+        <Methode Name="hasInvalidNeighbourhood" Const="true">
+            <Documentation>
+                <UserDocu>Check if the mesh has invalid neighbourhood indices</UserDocu>
+            </Documentation>
+        </Methode>
+        <Methode Name="hasPointsOutOfRange" Const="true">
+            <Documentation>
+                <UserDocu>Check if the mesh has point indices that are out of range</UserDocu>
+            </Documentation>
+        </Methode>
+        <Methode Name="hasFacetsOutOfRange" Const="true">
+            <Documentation>
+                <UserDocu>Check if the mesh has facet indices that are out of range</UserDocu>
+            </Documentation>
+        </Methode>
+        <Methode Name="hasCorruptedFacets" Const="true">
+            <Documentation>
+                <UserDocu>Check if the mesh has corrupted facets</UserDocu>
+            </Documentation>
+        </Methode>
+        <Methode Name="countComponents" Const="true">
 			<Documentation>
 				<UserDocu>Get the number of topologic independent areas</UserDocu>
 			</Documentation>

diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp
@@ -972,6 +972,38 @@ PyObject*  MeshPy::hasNonManifolds(PyObject *args)
     return Py_BuildValue("O", (ok ? Py_True : Py_False)); 
 }
 
+PyObject*  MeshPy::hasInvalidNeighbourhood(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    bool ok = getMeshObjectPtr()->hasInvalidNeighbourhood();
+    return Py_BuildValue("O", (ok ? Py_True : Py_False));
+}
+
+PyObject*  MeshPy::hasPointsOutOfRange(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    bool ok = getMeshObjectPtr()->hasPointsOutOfRange();
+    return Py_BuildValue("O", (ok ? Py_True : Py_False));
+}
+
+PyObject*  MeshPy::hasFacetsOutOfRange(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    bool ok = getMeshObjectPtr()->hasFacetsOutOfRange();
+    return Py_BuildValue("O", (ok ? Py_True : Py_False));
+}
+
+PyObject*  MeshPy::hasCorruptedFacets(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    bool ok = getMeshObjectPtr()->hasFacetsOutOfRange();
+    return Py_BuildValue("O", (ok ? Py_True : Py_False));
+}
+
 PyObject*  MeshPy::removeNonManifolds(PyObject *args)
 {
     if (!PyArg_ParseTuple(args, ""))