From c336f0757c86d156ab135d19b3385b0fd8bb0a00 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 24 Oct 2015 15:40:24 +0200
Subject: [PATCH] + do error checking of input values and use keywords
 conforming with attributes of BSplineSurface

---
 .../App/AppReverseEngineeringPy.cpp           | 65 +++++++++++++------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
index e6ed7b429..164645ef0 100644
--- a/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
+++ b/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
@@ -32,6 +32,7 @@
 #include <Base/Console.h>
 
 #include <Mod/Part/App/BSplineSurfacePy.h>
+#include <Mod/Part/App/OCCError.h>
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshPy.h>
 #include <Mod/Points/App/PointsPy.h>
@@ -47,29 +48,54 @@ static PyObject * approxSurface(PyObject *self, PyObject *args, PyObject *kwds)
 {
     PyObject *o;
     // spline parameters
-    int orderU = 4;
-    int orderV = 4;
-    int pointsU = 6;
-    int pointsV = 6;
+    int uDegree = 3;
+    int vDegree = 3;
+    int uPoles = 6;
+    int vPoles = 6;
     // smoothing
     PyObject* smooth = Py_True;
     double weight = 0.1;
-    double first = 1.0;  //0.5
-    double second = 0.0; //0.2
-    double third = 0.0;  //0.3
+    double grad = 1.0;  //0.5
+    double bend = 0.0; //0.2
     // other parameters
     int iteration = 5;
     PyObject* correction = Py_True;
     double factor = 1.0;
 
-    static char* kwds_approx[] = {"Points", "OrderU", "OrderV", "PolesU", "PolesV",
-                                  "Smooth", "Weight", "First", "Second", "Third",
+    static char* kwds_approx[] = {"Points", "UDegree", "VDegree", "NbUPoles", "NbVPoles",
+                                  "Smooth", "Weight", "Grad", "Bend",
                                   "Iterations", "Correction", "PatchFactor", NULL};
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|iiiiO!ddddiO!d",kwds_approx,
-                                    &o,&orderU,&orderV,&pointsU,&pointsV,
-                                    &PyBool_Type,&smooth,&weight,&first,&second,&third,
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|iiiiO!dddiO!d",kwds_approx,
+                                    &o,&uDegree,&vDegree,&uPoles,&vPoles,
+                                    &PyBool_Type,&smooth,&weight,&grad,&bend,
                                     &iteration,&PyBool_Type,&correction,&factor))
-        return NULL;
+        return 0;
+
+    double curvdiv = 1.0 - (grad + bend);
+    int uOrder = uDegree + 1;
+    int vOrder = vDegree + 1;
+
+    // error checking
+    if (grad < 0.0 || grad > 1.0) {
+        PyErr_SetString(PyExc_ValueError, "Value of Grad out of range [0,1]");
+        return 0;
+    }
+    if (bend < 0.0 || bend > 1.0) {
+        PyErr_SetString(PyExc_ValueError, "Value of Bend out of range [0,1]");
+        return 0;
+    }
+    if (curvdiv < 0.0 || curvdiv > 1.0) {
+        PyErr_SetString(PyExc_ValueError, "Sum of Grad and Bend out of range [0,1]");
+        return 0;
+    }
+    if (uDegree < 1 || uOrder > uPoles) {
+        PyErr_SetString(PyExc_ValueError, "Value of uDegree out of range [1,NbUPoles-1]");
+        return 0;
+    }
+    if (vDegree < 1 || vOrder > vPoles) {
+        PyErr_SetString(PyExc_ValueError, "Value of vDegree out of range [1,NbVPoles-1]");
+        return 0;
+    }
 
     PY_TRY {
         Py::Sequence l(o);
@@ -84,11 +110,10 @@ static PyObject * approxSurface(PyObject *self, PyObject *args, PyObject *kwds)
                 (double)Py::Float(t.getItem(2)));
         }
 
-        Reen::BSplineParameterCorrection pc(orderU,orderV,pointsU,pointsV);
+        Reen::BSplineParameterCorrection pc(uOrder,vOrder,uPoles,vPoles);
         Handle_Geom_BSplineSurface hSurf;
 
-        //pc.EnableSmoothing(true, 0.1f, 0.5f, 0.2f, 0.3f);
-        pc.EnableSmoothing(PyObject_IsTrue(smooth) ? true : false, weight, first, second, third);
+        pc.EnableSmoothing(PyObject_IsTrue(smooth) ? true : false, weight, grad, bend, curvdiv);
         hSurf = pc.CreateSurface(clPoints, iteration, PyObject_IsTrue(correction) ? true : false, factor);
         if (!hSurf.IsNull()) {
             return new Part::BSplineSurfacePy(new Part::GeomBSplineSurface(hSurf));
@@ -96,7 +121,7 @@ static PyObject * approxSurface(PyObject *self, PyObject *args, PyObject *kwds)
 
         PyErr_SetString(Base::BaseExceptionFreeCADError, "Computation of B-Spline surface failed");
         return 0;
-    } PY_CATCH;
+    } PY_CATCH_OCC;
 }
 
 #if defined(HAVE_PCL_SURFACE)
@@ -108,7 +133,7 @@ triangulate(PyObject *self, PyObject *args)
     double mu=2.5;
     if (!PyArg_ParseTuple(args, "O!d|d", &(Points::PointsPy::Type), &pcObj, &searchRadius, &mu))
         return NULL;
-        
+
     Points::PointsPy* pPoints = static_cast<Points::PointsPy*>(pcObj);
     Points::PointKernel* points = pPoints->getPointKernelPtr();
     
@@ -123,8 +148,8 @@ triangulate(PyObject *self, PyObject *args)
 /* registration table  */
 struct PyMethodDef ReverseEngineering_methods[] = {
     {"approxSurface", (PyCFunction)approxSurface, METH_VARARGS|METH_KEYWORDS,
-     "approxSurface(Points=,OrderU=4,OrderV=4,PolesU=6,PolesV=6,Smooth=True)\n"
-     "Weight=0.1,First=1.0,Second=0.0,Third=0.0,\n"
+     "approxSurface(Points=,UDegree=3,VDegree=3,NbUPoles=6,NbVPoles=6,Smooth=True)\n"
+     "Weight=0.1,Grad=1.0,Bend=0.0,\n"
      "Iterations=5,Correction=True,PatchFactor=1.0"
     },
 #if defined(HAVE_PCL_SURFACE)