soc-2008-mxcurioni: fully implemented (but did not test) Curve class.

4 files changed, 252 insertions, 77 deletions

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index ed6beefd337..3b7d503ed43 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -73,6 +73,7 @@ python_sources = [
 						prefix + '/Interface0D/BPy_SVertex.cpp',
 						prefix + '/Interface0D/BPy_ViewVertex.cpp',
 					prefix + '/BPy_Interface1D.cpp',
+						prefix + '/Interface1D/BPy_Curve.cpp',
 						prefix + '/Interface1D/BPy_FEdge.cpp',
 						prefix + '/Interface1D/BPy_Stroke.cpp',
 						prefix + '/Interface1D/BPy_ViewEdge.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index ec881b010ee..5166fca4aef 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_Interface1D.h"
 
 #include "BPy_Convert.h"
+#include "Interface1D/BPy_Curve.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
@@ -137,6 +138,11 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 	Py_INCREF( &Interface1D_Type );
 	PyModule_AddObject(module, "Interface1D", (PyObject *)&Interface1D_Type);
 	
+	if( PyType_Ready( &Curve_Type ) < 0 )
+		return;
+	Py_INCREF( &Curve_Type );
+	PyModule_AddObject(module, "Curve", (PyObject *)&Curve_Type);
+	
 	if( PyType_Ready( &FEdge_Type ) < 0 )
 		return;
 	Py_INCREF( &FEdge_Type );
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
index 4fac75b3f0d..b0f043a6525 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
@@ -1,112 +1,249 @@
- PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *self , PyObject *args) {
-}
+#include "BPy_Curve.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Id.h"
+#include "../Interface0D/BPy_CurvePoint.h"
+#include "../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Curve instance  -----------*/
+static int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds);
+static PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_empty( BPy_Curve *self );
+static PyObject * Curve_nSegments( BPy_Curve *self );
+// point_iterator 	points_begin (float step=0)
+static PyObject * Curve_verticesBegin( BPy_Curve *self );
+static PyObject * Curve_verticesEnd( BPy_Curve *self );
+static PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args );
+
+/*----------------------Curve instance definitions ----------------------------*/
+static PyMethodDef BPy_Curve_methods[] = {	
+	{"push_vertex_back", ( PyCFunction ) Curve_push_vertex_back, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the front of the Curve."},
+	{"push_vertex_front", ( PyCFunction ) Curve_push_vertex_front, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the end of the Curve."},
+	{"empty", ( PyCFunction ) Curve_empty, METH_NOARGS, "() Returns true is the Curve doesn't have any Vertex yet."},
+	{"nSegments", ( PyCFunction ) Curve_nSegments, METH_NOARGS, "() Returns the number of segments in the oplyline constituing the Curve."},
+	{"verticesBegin", ( PyCFunction ) Curve_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator pointing onto the first vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"verticesEnd", ( PyCFunction ) Curve_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator pointing after the last vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"pointsBegin", ( PyCFunction ) Curve_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing onto the first point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+	{"pointsEnd", ( PyCFunction ) Curve_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing after the last point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Curve type definition ------------------------------*/
+
+PyTypeObject Curve_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Curve",				/* tp_name */
+	sizeof( BPy_Curve ),	/* 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_Curve_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface1D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Curve___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
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+	
+int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj = 0;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ){
+		self->c = new Curve();
+		
+	} else if( BPy_Curve_Check(obj) ) {
+		if( ((BPy_Curve *) obj)->c )
+			self->c = new Curve(*( ((BPy_Curve *) obj)->c ));
+		else
+			return -1;
+		
+	} else if( BPy_Id_Check(obj) ) {
+		if( ((BPy_Id *) obj)->id )
+			self->c = new Curve(*( ((BPy_Id *) obj)->id ));
+		else
+			return -1;
+			
+	} else {
+		return -1;
+	}
 
+	self->py_if1D.if1D = self->c;
 
- PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *self , PyObject *args) {
+	return 0;
 }
 
 
- PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *self , PyObject *args) {
-}
-
+PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args ) {
+	PyObject *obj;
 
- PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
-}
+	if(!( PyArg_ParseTuple(args, "O", &obj) )) {
+		cout << "ERROR: Curve_push_vertex_back" << endl;
+		Py_RETURN_NONE;
+	}
 
+	if( BPy_CurvePoint_Check(obj) ) {
+		self->c->push_vertex_back( ((BPy_CurvePoint *) obj)->cp );
+	} else if( BPy_SVertex_Check(obj) ) {
+		self->c->push_vertex_back( ((BPy_SVertex *) obj)->sv );
+	}
 
- PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args ) {
+		PyObject *obj;
 
- PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *self , PyObject *args) {
-}
-
+		if(!( PyArg_ParseTuple(args, "O", &obj) )) {
+			cout << "ERROR: Curve_push_vertex_front" << endl;
+			Py_RETURN_NONE;
+		}
 
- PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
-}
+		if( BPy_CurvePoint_Check(obj) ) {
+			self->c->push_vertex_front( ((BPy_CurvePoint *) obj)->cp );
+		} else if( BPy_SVertex_Check(obj) ) {
+			self->c->push_vertex_front( ((BPy_SVertex *) obj)->sv );
+		}
 
+		Py_RETURN_NONE;
+	}
 
- PyObject *_wrap_Curve_empty(PyObject *self , PyObject *args) {
+PyObject * Curve_empty( BPy_Curve *self ) {
+	return PyBool_from_bool( self->c->empty() );
 }
 
-
- PyObject *_wrap_Curve_getLength2D(PyObject *self , PyObject *args) {
+PyObject * Curve_nSegments( BPy_Curve *self ) {
+	return PyInt_FromLong( self->c->nSegments() );
 }
 
-
- PyObject *_wrap_Curve_getId(PyObject *self , PyObject *args) {
-}
+// point_iterator 	points_begin (float step=0)
+// not implemented
 
 
- PyObject *_wrap_Curve_nSegments(PyObject *self , PyObject *args) {
+PyObject * Curve_verticesBegin( BPy_Curve *self ) {
+	Interface0DIterator if0D_it( self->c->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
-
- PyObject *_wrap_Curve_setId(PyObject *self , PyObject *args) {
+PyObject * Curve_verticesEnd( BPy_Curve *self ) {
+	Interface0DIterator if0D_it( self->c->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
 
- PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
+PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args ) {
+	float f = 0;
 
- PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsBegin" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->c->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
+PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args ) {
+	float f = 0;
 
- PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsEnd" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->c->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
 
- PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curveVerticesBegin(PyObject *self , PyObject *args) {
-}
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_Curve_curveVerticesEnd(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_Curve_verticesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_verticesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
new file mode 100644
index 00000000000..fd19612261a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CURVE_H
+#define FREESTYLE_PYTHON_CURVE_H
+
+#include "../BPy_Interface1D.h"
+#include "../../stroke/Curve.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Curve_Type;
+
+#define BPy_Curve_Check(v)	(( (PyObject *) v)->ob_type == &Curve_Type)
+
+/*---------------------------Python BPy_Curve structure definition----------*/
+typedef struct {
+	BPy_Interface1D py_if1D;
+	Curve *c;
+} BPy_Curve;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVE_H */