From 40b878de4dcac36c064eab961364e88e5d58295c Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 8 Aug 2016 16:40:59 +0200
Subject: [PATCH] add method to get self-intersections of a mesh via Python

---
 src/Mod/Mesh/App/MeshPy.xml    |  7 ++++++-
 src/Mod/Mesh/App/MeshPyImp.cpp | 36 +++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Mesh/App/MeshPy.xml b/src/Mod/Mesh/App/MeshPy.xml
index 564b5743d..5be3fd178 100644
--- a/src/Mod/Mesh/App/MeshPy.xml
+++ b/src/Mod/Mesh/App/MeshPy.xml
@@ -230,7 +230,12 @@ for c in mesh.getSeparatecomponents():
 				<UserDocu>Check if the mesh intersects itself</UserDocu>
 			</Documentation>
 		</Methode>
-		<Methode Name="fixSelfIntersections">
+        <Methode Name="getSelfIntersections" Const="true">
+            <Documentation>
+                <UserDocu>Returns a tuple of indices of intersecting triangles</UserDocu>
+            </Documentation>
+        </Methode>
+        <Methode Name="fixSelfIntersections">
 			<Documentation>
 				<UserDocu>Repair self-intersections</UserDocu>
 			</Documentation>
diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp
index 9af26708c..3a799e088 100644
--- a/src/Mod/Mesh/App/MeshPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPyImp.cpp
@@ -583,7 +583,15 @@ PyObject*  MeshPy::addFacet(PyObject *args)
         Py_Return;
     }
 
-    PyErr_SetString(Base::BaseExceptionFreeCADError, "set 9 floats or three vectors");
+    PyErr_Clear();
+    PyObject *f;
+    if (PyArg_ParseTuple(args, "O!",&(Mesh::FacetPy::Type), &f)) {
+        Mesh::FacetPy* face = static_cast<Mesh::FacetPy*>(f);
+        getMeshObjectPtr()->addFacet(*face->getFacetPtr());
+        Py_Return;
+    }
+
+    PyErr_SetString(Base::BaseExceptionFreeCADError, "set 9 floats or three vectors or a facet");
     return 0;
 }
 
@@ -921,6 +929,32 @@ PyObject*  MeshPy::hasSelfIntersections(PyObject *args)
     return Py_BuildValue("O", (ok ? Py_True : Py_False)); 
 }
 
+PyObject*  MeshPy::getSelfIntersections(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+
+    std::vector<std::pair<unsigned long, unsigned long> > selfIndices;
+    std::vector<std::pair<Base::Vector3f, Base::Vector3f> > selfPoints;
+    MeshCore::MeshEvalSelfIntersection eval(getMeshObjectPtr()->getKernel());
+    eval.GetIntersections(selfIndices);
+    eval.GetIntersections(selfIndices, selfPoints);
+
+    Py::Tuple tuple(selfIndices.size());
+    if (selfIndices.size() == selfPoints.size()) {
+        for (std::size_t i=0; i<selfIndices.size(); i++) {
+            Py::Tuple item(4);
+            item.setItem(0, Py::Long(selfIndices[i].first));
+            item.setItem(1, Py::Long(selfIndices[i].second));
+            item.setItem(2, Py::Vector(selfPoints[i].first));
+            item.setItem(3, Py::Vector(selfPoints[i].second));
+            tuple.setItem(i, item);
+        }
+    }
+
+    return Py::new_reference_to(tuple);
+}
+
 PyObject*  MeshPy::fixSelfIntersections(PyObject *args)
 {
     if (!PyArg_ParseTuple(args, ""))