SWIG/directors dependency removal (cont'd)

* Added to python/BPy_Convert.{cpp,h} 4 utility converters below for
better introspection-based automatic type conversion.

  PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
  PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
  PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
  PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );

There are 4 corresponding converters without the "Any_" prefix.  All
calls of them in the code base were replaced with these new converters
so that the introspection-based automatic conversion would take place
universally.

* python/BPy_Convert.{cpp,h}: Those C++ to Python converters having
had a "_ptr" suffix were renamed to a name without the suffix, and
their arguments were changed so as to take a reference (e.g.,
ViewVertex&) instead of a pointer (e.g., ViewVertex *).  The changed
converters and their new function prototypes are listed below.  These
converters now return a Python wrapper object that retains the passed
reference, instead of retaining a newly created C++ object by the
converters.

  // Interface0D converters
  PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
  PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
  PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
  PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
  PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
  PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
  PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
  // Interface1D converters
  PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
  PyObject * BPy_Chain_from_Chain( Chain& c );
  PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
  PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
  PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
  PyObject * BPy_Stroke_from_Stroke( Stroke& s );
  PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
  PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
  // some other converters
  PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
  PyObject * BPy_SShape_from_SShape( SShape& ss );
  PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m );
  PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );

* Added a "borrowed" flag to the definitions of Python types being
used to wrap C++ components of Freestyle's internal data structures.
The flag indicates whether or not a Python wrapper object has a
reference to a C++ object that comprises the internal data structures.
The deallocation routines of the Python types check this flag and
release a wrapped C++ object only when it is not part of the internal
data structures.  The following files were modified:

  python/BPy_FrsMaterial.{cpp,h}
  python/BPy_Interface0D.{cpp,h}
  python/BPy_Interface1D.{cpp,h}
  python/BPy_SShape.{cpp,h}
  python/BPy_StrokeAttribute.{cpp,h}
  python/BPy_ViewShape.{cpp,h}
  python/Interface0D/BPy_CurvePoint.cpp
  python/Interface0D/BPy_SVertex.cpp
  python/Interface0D/BPy_ViewVertex.cpp
  python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
  python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
  python/Interface0D/ViewVertex/BPy_TVertex.cpp
  python/Interface1D/BPy_FEdge.cpp
  python/Interface1D/BPy_FrsCurve.cpp
  python/Interface1D/BPy_Stroke.cpp
  python/Interface1D/BPy_ViewEdge.cpp
  python/Interface1D/Curve/BPy_Chain.cpp
  python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
  python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp

* view_map/Interface[01]D.h, python/BPy_Interface[01]D.cpp: Removed
from the Interface0D and Interface1D C++ classes a back pointer to a
Python wrapper object and all "director" calls.  These classes (and
their subclasses) are used to build Freestyle's main data structures
(such as a view map and strokes) and their class hierarchy is static.
Python wrappers of these C++ classes are only used to access the data
structures from the Python layer, and not intended to extend the data
structures by subclassing the Python wrappers.  Without the necessity
of subclassing in the Python layer, the back pointer to a wrapping
Python object and "director" calls would be useless (actually they
were not used at all), so they were all removed.

* python/Director.{cpp,h}: Removed the definitions of directors that
were no longer used.

* stroke/Stroke.{cpp,h}: Removed an (unused) back pointer to a Python
wrapper object.

* python/BPy_ViewMap.cpp: Fixed a possible null pointer reference.

* python/Interface1D/BPy_FEdge.cpp: Fixed parameter checking in
FEdge___init__().

1 files changed, 25 insertions, 61 deletions

diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index c626bcbef80..17dee3973de 100755
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -38,7 +38,15 @@
 # include "../winged_edge/Nature.h"
 # include "Functions0D.h"
 
-#include "../python/Director.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <Python.h>
+
+#ifdef __cplusplus
+}
+#endif
 
 using namespace std;
 /*! \file Interface1D.h
@@ -133,11 +141,9 @@ class Interface1D
 {
 public:
 
-	PyObject *py_if1D;
-
   /*! Default constructor */
-	Interface1D() {_timeStamp=0; py_if1D = 0; }
-   virtual ~Interface1D() {}; //soc
+  Interface1D() {_timeStamp=0;}
+  virtual ~Interface1D() {}; //soc
 
   /*! Returns the string "Interface1D" .*/
   virtual string getExactTypeName() const {
@@ -150,28 +156,16 @@ public:
    *  pointing to the first vertex.
    */
   virtual Interface0DIterator verticesBegin() {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "verticesBegin") ) {
-			return Director_BPy_Interface1D_verticesBegin(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " verticesBegin() not implemented" << endl;
-			return Interface0DIterator();
-		}
+	  PyErr_SetString(PyExc_TypeError, "method verticesBegin() not properly overridden");
+	  return Interface0DIterator();
   }
 	
   /*! Returns an iterator over the Interface1D vertices,
    *  pointing after the last vertex.
    */
   virtual Interface0DIterator verticesEnd(){
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "verticesEnd") ) {
-			return Director_BPy_Interface1D_verticesEnd(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " verticesEnd() not implemented" << endl;
-			return Interface0DIterator();
-		}
+	  PyErr_SetString(PyExc_TypeError, "method verticesEnd() not properly overridden");
+	  return Interface0DIterator();
   }
 
   /*! Returns an iterator over the Interface1D points,
@@ -184,14 +178,8 @@ public:
    *    this 1D element.
    */
   virtual Interface0DIterator pointsBegin(float t=0.f) {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "pointsBegin") ) {
-			return Director_BPy_Interface1D_pointsBegin(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " pointsBegin() not implemented" << endl;
-			return Interface0DIterator();
-		}
+	  PyErr_SetString(PyExc_TypeError, "method pointsBegin() not properly overridden");
+	  return Interface0DIterator();
   }
 
   /*! Returns an iterator over the Interface1D points,
@@ -204,54 +192,30 @@ public:
    *    this 1D element.
    */
   virtual Interface0DIterator pointsEnd(float t=0.f) {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "pointsEnd") ) {
-			return Director_BPy_Interface1D_pointsEnd(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " pointsEnd() not implemented" << endl;
-			return Interface0DIterator();
-		}
+	  PyErr_SetString(PyExc_TypeError, "method pointsEnd() not properly overridden");
+	  return Interface0DIterator();
   }
 
   // Data access methods
 
   /*! Returns the 2D length of the 1D element. */
   virtual real getLength2D() const {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "getLength2D") ) {
-			return Director_BPy_Interface1D_getLength2D(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " getLength2D() not implemented" << endl;
-			return 0;
-		}
+	  PyErr_SetString(PyExc_TypeError, "method getLength2D() not properly overridden");
+	  return 0;
   }
 
   /*! Returns the Id of the 1D element .*/
   virtual Id getId() const {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "getId") ) {
-			return Director_BPy_Interface1D_getId(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " getId() not implemented" << endl;
-			return Id(0, 0);
-		}
+	  PyErr_SetString(PyExc_TypeError, "method getId() not properly overridden");
+	  return Id(0, 0);
   }	
 
 
   // FIXME: ce truc n'a rien a faire la...(c une requete complexe qui doit etre ds les Function1D)
   /*! Returns the nature of the 1D element. */
   virtual Nature::EdgeNature getNature() const {
-		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
-
-		if( py_if1D && PyObject_HasAttrString(py_if1D, "getNature") ) {
-			return Director_BPy_Interface1D_getNature(py_if1D);
-		} else {
-			cerr << "Warning: " << name << " getNature() not implemented" << endl;
-			return Nature::NO_FEATURE;
-		}
+	  PyErr_SetString(PyExc_TypeError, "method getNature() not properly overridden");
+	  return Nature::NO_FEATURE;
   }	
   
   /*! Returns the time stamp of the 1D element. Mainly used for selection. */