soc-2008-mxcurioni: completed implementing ViewEdgeIterator and ChainingIterator. Updated UnaryPredicate{0D,1D}

12 files changed, 532 insertions, 24 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index 6a613c5f5ab..f3612b1bd52 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -8,6 +8,10 @@
 #include "Iterator/BPy_SVertexIterator.h"
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
 #include "Iterator/BPy_ViewEdgeIterator.h"
+#include "Iterator/BPy_ChainingIterator.h"
+// #include "Iterator/BPy_ChainPredicateIterator.h"
+// #include "Iterator/BPy_ChainSilhouetteIterator.h"
+
 
 	
 #ifdef __cplusplus
@@ -167,6 +171,21 @@ PyMODINIT_FUNC Iterator_Init( PyObject *module )
 	Py_INCREF( &ViewEdgeIterator_Type );
 	PyModule_AddObject(module, "ViewEdgeIterator", (PyObject *)&ViewEdgeIterator_Type);
 	
+	if( PyType_Ready( &ChainingIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &ChainingIterator_Type );
+	PyModule_AddObject(module, "ChainingIterator", (PyObject *)&ChainingIterator_Type);
+	
+	// if( PyType_Ready( &ChainPredicateIterator_Type ) < 0 )
+	// 	return;
+	// Py_INCREF( &ChainPredicateIterator_Type );
+	// PyModule_AddObject(module, "ChainPredicateIterator", (PyObject *)&ChainPredicateIterator_Type);
+	// 
+	// if( PyType_Ready( &ChainSilhouetteIterator_Type ) < 0 )
+	// 	return;
+	// Py_INCREF( &ChainSilhouetteIterator_Type );
+	// PyModule_AddObject(module, "ChainSilhouetteIterator", (PyObject *)&ChainSilhouetteIterator_Type);
+	
 	
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 29ea68c01ca..3e5168e7da1 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_UnaryPredicate0D.h"
 
 #include "BPy_Convert.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,6 +125,7 @@ PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module )
 
 int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
+	self->up0D = new UnaryPredicate0D();
 	return 0;
 }
 
@@ -147,15 +149,18 @@ PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args)
 
 PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args)
 {
-	PyObject *l;
+	PyObject *py_if0D_it;
 
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
+	if(!( PyArg_ParseTuple(args, "O", &py_if0D_it) && BPy_Interface0DIterator_Check(py_if0D_it) )) {
 		cout << "ERROR: UnaryPredicate0D___call__ " << endl;		
 		return NULL;
 	}
-	
-	//TBD
-	
+
+	Interface0DIterator *if0D_it = ((BPy_Interface0DIterator *) py_if0D_it)->if0D_it;
+
+	if( if0D_it )
+		return PyBool_from_bool( self->up0D->operator()(*if0D_it) );
+
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index b00422a0aab..54731d75d7b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_UnaryPredicate1D.h"
 
 #include "BPy_Convert.h"
+#include "BPy_Interface1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,6 +125,7 @@ PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module )
 
 int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
+	self->up1D = new UnaryPredicate1D();
 	return 0;
 }
 
@@ -147,14 +149,17 @@ PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args)
 
 PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args)
 {
-	PyObject *l;
+	PyObject *py_if1D;
 
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
+	if(!( PyArg_ParseTuple(args, "O", &py_if1D) && BPy_Interface1D_Check(py_if1D) )) {
 		cout << "ERROR: UnaryPredicate1D___call__ " << endl;		
 		return NULL;
 	}
 	
-	//TBD
+	Interface1D *if1D = ((BPy_Interface1D *) py_if1D)->if1D;
+	
+	if( if1D )
+		return PyBool_from_bool( self->up1D->operator()(*if1D) );
 	
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index cc7ce17f4cf..e40f129d3d8 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -115,22 +115,22 @@ int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args )
 	    return -1;
 
 	if( !obj1 && !obj2 && !obj3 ){
-		self->ai = new AdjacencyIterator();
+		self->a_it = new AdjacencyIterator();
 		
 	} else if( BPy_AdjacencyIterator_Check(obj1) ) {
-		self->ai = new AdjacencyIterator(*( ((BPy_AdjacencyIterator *) obj1)->ai ));
+		self->a_it = new AdjacencyIterator(*( ((BPy_AdjacencyIterator *) obj1)->a_it ));
 	
 	} else if( BPy_ViewVertex_Check(obj1) ) {
 		bool restrictToSelection = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
 		bool restrictToUnvisited = ( obj3 && PyBool_Check(obj3) ) ? bool_from_PyBool(obj3) : true;
 		
-		self->ai = new AdjacencyIterator( ((BPy_ViewVertex *) obj1)->vv, restrictToSelection, restrictToUnvisited );
+		self->a_it = new AdjacencyIterator( ((BPy_ViewVertex *) obj1)->vv, restrictToSelection, restrictToUnvisited );
 			
 	} else {
 		return -1;
 	}
 
-	self->py_it.it = self->ai;
+	self->py_it.it = self->a_it;
 	return 0;
 
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
index 91319ff9c92..de0178f7725 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
@@ -20,7 +20,7 @@ extern PyTypeObject AdjacencyIterator_Type;
 /*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	AdjacencyIterator *ai;
+	AdjacencyIterator *a_it;
 } BPy_AdjacencyIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
new file mode 100644
index 00000000000..00c77148396
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -0,0 +1,165 @@
+#include "BPy_ChainPredicateIterator.h"
+
+#include "../BPy_Convert.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainPredicateIterator instance  -----------*/
+static int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args);
+
+static PyObject * ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args );
+
+
+/*----------------------ChainPredicateIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ChainPredicateIterator_methods[] = {
+
+	{"traverse", ( PyCFunction ) ChainPredicateIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
+
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ChainPredicateIterator type definition ------------------------------*/
+
+PyTypeObject ChainPredicateIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainPredicateIterator",				/* tp_name */
+	sizeof( BPy_ChainPredicateIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	NULL,                       /* traverseproc tp_traverse; */
+
+	/* delete references to contained objects */
+	NULL,                       /* inquiry tp_clear; */
+
+  /***  Assigned meaning in release 2.1 ***/
+  /*** rich comparisons ***/
+	NULL,                       /* richcmpfunc tp_richcompare; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ChainPredicateIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ChainingIterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainPredicateIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+// ChainPredicateIterator (bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
+//  	ChainPredicateIterator (UnaryPredicate1D &upred, BinaryPredicate1D &bpred, bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
+//  	ChainPredicateIterator (const ChainPredicateIterator &brother)
+
+int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|OOOOO", &obj1, &obj2, &obj3, &obj4) ))
+	    return -1;
+
+	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
+		self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	
+	} else 	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
+			self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	
+	} else {
+		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
+		bool restrictToUnvisited = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ? ((BPy_ViewEdge *) obj3)->ve : 0;
+		bool orientation = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
+		
+		self->c_it = new ChainPredicateIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
+	}
+	
+	self->py_ve_it.ve_it = self->c_it;
+	self->py_ve_it.py_it.it = self->c_it;
+	
+	return 0;
+}
+
+//virtual ViewEdge * 	traverse (const AdjacencyIterator &it)
+PyObject *ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_a_it;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_a_it) && BPy_AdjacencyIterator_Check(py_a_it) )) {
+		cout << "ERROR: ChainPredicateIterator_traverse" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( ((BPy_AdjacencyIterator *) py_a_it)->a_it )
+		self->ve_it->traverse(*( ((BPy_AdjacencyIterator *) py_a_it)->a_it ));
+		
+	Py_RETURN_NONE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
new file mode 100644
index 00000000000..7fa0a3e2703
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
+#define FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
+
+
+#include "../../view_map/ChainingIterators.h"
+
+#include "BPy_ChainPredicateIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainPredicateIterator_Type;
+
+#define BPy_ChainPredicateIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainPredicateIterator_Type)
+
+/*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
+typedef struct {
+	ChainingIterator py_c_it;
+	ChainPredicateIterator *cp_it;
+} BPy_ChainPredicateIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
index e69de29bb2d..e69de29bb2d 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index e69de29bb2d..c695e92ec70 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -0,0 +1,182 @@
+#include "BPy_ChainingIterator.h"
+
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_ViewVertex.h"
+#include "../Interface1D/BPy_ViewEdge.h"
+#include "BPy_AdjacencyIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainingIterator instance  -----------*/
+static int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args);
+static PyObject * ChainingIterator_init( BPy_ChainingIterator *self );
+static PyObject * ChainingIterator_traverse( BPy_ChainingIterator *self, PyObject *args );
+static PyObject * ChainingIterator_getVertex( BPy_ChainingIterator *self );
+static PyObject * ChainingIterator_isIncrementing( BPy_ChainingIterator *self );
+
+/*----------------------ChainingIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ChainingIterator_methods[] = {
+	{"init", ( PyCFunction ) ChainingIterator_init, METH_NOARGS, "() Inits the iterator context. This method is called each time a new chain is started. It can be used to reset some history information that you might want to keep."},
+	{"traverse", ( PyCFunction ) ChainingIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
+	{"getVertex", ( PyCFunction ) ChainingIterator_getVertex, METH_NOARGS, "() Returns the vertex which is the next crossing "},
+	{"isIncrementing", ( PyCFunction ) ChainingIterator_isIncrementing, METH_NOARGS, "() Returns true if the current iteration is an incrementation."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ChainingIterator type definition ------------------------------*/
+
+PyTypeObject ChainingIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainingIterator",				/* tp_name */
+	sizeof( BPy_ChainingIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	NULL,                       /* traverseproc tp_traverse; */
+
+	/* delete references to contained objects */
+	NULL,                       /* inquiry tp_clear; */
+
+  /***  Assigned meaning in release 2.1 ***/
+  /*** rich comparisons ***/
+	NULL,                       /* richcmpfunc tp_richcompare; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ChainingIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ViewEdgeIterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainingIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|OOO", &obj1, &obj2, &obj3, &obj4) ))
+	    return -1;
+
+	if( obj1 && BPy_ChainingIterator_Check(obj1)  ) {
+		self->c_it = new ChainingIterator(*( ((BPy_ChainingIterator *) obj1)->c_it ));
+	
+	} else {
+		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
+		bool restrictToUnvisited = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ? ((BPy_ViewEdge *) obj3)->ve : 0;
+		bool orientation = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
+		
+		self->c_it = new ChainingIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
+	}
+	
+	self->py_ve_it.ve_it = self->c_it;
+	self->py_ve_it.py_it.it = self->c_it;
+	
+	return 0;
+}
+
+PyObject *ChainingIterator_init( BPy_ChainingIterator *self ) {
+	self->c_it->init();
+	
+	Py_RETURN_NONE;
+}
+
+PyObject *ChainingIterator_traverse( BPy_ChainingIterator *self, PyObject *args ) {
+	PyObject *py_a_it;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_a_it) && BPy_AdjacencyIterator_Check(py_a_it) )) {
+		cout << "ERROR: ChainingIterator_traverse" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( ((BPy_AdjacencyIterator *) py_a_it)->a_it )
+		self->c_it->traverse(*( ((BPy_AdjacencyIterator *) py_a_it)->a_it ));
+		
+	Py_RETURN_NONE;
+}
+
+
+PyObject *ChainingIterator_getVertex( BPy_ChainingIterator *self ) {
+	if( self->c_it->getVertex() )
+		return BPy_ViewVertex_from_ViewVertex_ptr( self->c_it->getVertex()  );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ChainingIterator_isIncrementing( BPy_ChainingIterator *self ) {
+	return PyBool_from_bool( self->c_it->isIncrementing() );
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
new file mode 100644
index 00000000000..2994f381c1d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CHAININGITERATOR_H
+#define FREESTYLE_PYTHON_CHAININGITERATOR_H
+
+
+#include "../../stroke/ChainingIterators.h"
+
+#include "BPy_ViewEdgeIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainingIterator_Type;
+
+#define BPy_ChainingIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainingIterator_Type)
+
+/*---------------------------Python BPy_ChainingIterator structure definition----------*/
+typedef struct {
+	BPy_ViewEdgeIterator py_ve_it;
+	ChainingIterator *c_it;
+} BPy_ChainingIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAININGITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp
+++ /dev/null
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 2256d374c0c..add10cd1522 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -3,6 +3,7 @@
 #include "../BPy_Convert.h"
 #include "../Interface1D/BPy_ViewEdge.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,8 +13,23 @@ extern "C" {
 /*---------------  Python API function prototypes for ViewEdgeIterator instance  -----------*/
 static int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args);
 
+static PyObject * ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setBegin( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_getOrientation( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setOrientation( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self );
+
 /*----------------------ViewEdgeIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
+	{"getCurrentEdge", ( PyCFunction ) ViewEdgeIterator_getCurrentEdge, METH_NOARGS, "() Returns the current pointed ViewEdge."},
+	{"setCurrentEdge", ( PyCFunction ) ViewEdgeIterator_setCurrentEdge, METH_VARARGS, "(ViewEdge ve) Sets the current pointed ViewEdge. "},	
+	{"getBegin", ( PyCFunction ) ViewEdgeIterator_getBegin, METH_NOARGS, "() Returns the first ViewEdge used for the iteration."},
+	{"setBegin", ( PyCFunction ) ViewEdgeIterator_setBegin, METH_VARARGS, "(ViewEdge ve) Sets the first ViewEdge used for the iteration."},
+	{"getOrientation", ( PyCFunction ) ViewEdgeIterator_getOrientation, METH_NOARGS, "() Gets the orientation of the pointed ViewEdge in the iteration. "},
+	{"setOrientation", ( PyCFunction ) ViewEdgeIterator_setOrientation, METH_VARARGS, "(bool b) Sets the orientation of the pointed ViewEdge in the iteration. "},
+	{"changeOrientation", ( PyCFunction ) ViewEdgeIterator_changeOrientation, METH_NOARGS, "() Changes the current orientation."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -102,9 +118,6 @@ PyTypeObject ViewEdgeIterator_Type = {
 	NULL
 };
 
-//-------------------MODULE INITIALIZATION--------------------------------
-
-
 //------------------------INSTANCE METHODS ----------------------------------
 
 int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
@@ -131,18 +144,71 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
 }
 
 
+PyObject *ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self ) {
+	if( self->ve_it->getCurrentEdge() )
+		return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getCurrentEdge()  ));
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_ve;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewEdgeIterator_setCurrentEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setCurrentEdge( ((BPy_ViewEdge *) py_ve)->ve );
+		
+	Py_RETURN_NONE;
+}
+
+
+PyObject *ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self ) {
+	if( self->ve_it->getBegin() )
+		return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getBegin()  ));
+		
+	Py_RETURN_NONE;
+}
 
-// ViewEdge * 	getCurrentEdge ()
-// void 	setCurrentEdge (ViewEdge *edge)
-// ViewEdge * 	getBegin ()
-// bool 	getOrientation () const
+PyObject *ViewEdgeIterator_setBegin( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_ve;
 
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewEdgeIterator_setBegin" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setBegin( ((BPy_ViewEdge *) py_ve)->ve );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_getOrientation( BPy_ViewEdgeIterator *self ) {
+	return PyBool_from_bool( self->ve_it->getOrientation() );
+}
+
+PyObject *ViewEdgeIterator_setOrientation( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_b;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_b) && PyBool_Check(py_b) )) {
+		cout << "ERROR: ViewEdgeIterator_setOrientation" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setOrientation( bool_from_PyBool(py_b) );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self ) {
+	self->ve_it->changeOrientation();
+	
+	Py_RETURN_NONE;
+}
 
 
-// void 	setCurrentEdge (ViewEdge *edge)
-// void 	setBegin (ViewEdge *begin)
-// void 	setOrientation (bool orientation)
-// void 	changeOrientation ()
 
 ///////////////////////////////////////////////////////////////////////////////////////////