diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp | 125 |
1 files changed, 51 insertions, 74 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index 9f2c52c6f44..d67c960db8e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -15,24 +15,24 @@ extern "C" { //-------------------MODULE INITIALIZATION-------------------------------- -int UnaryFunction1DVec2f_Init( PyObject *module ) { - - if( module == NULL ) +int UnaryFunction1DVec2f_Init(PyObject *module) +{ + if (module == NULL) return -1; - if( PyType_Ready( &UnaryFunction1DVec2f_Type ) < 0 ) + if (PyType_Ready(&UnaryFunction1DVec2f_Type) < 0) return -1; - Py_INCREF( &UnaryFunction1DVec2f_Type ); + Py_INCREF(&UnaryFunction1DVec2f_Type); PyModule_AddObject(module, "UnaryFunction1DVec2f", (PyObject *)&UnaryFunction1DVec2f_Type); - if( PyType_Ready( &Normal2DF1D_Type ) < 0 ) + if (PyType_Ready(&Normal2DF1D_Type) < 0) return -1; - Py_INCREF( &Normal2DF1D_Type ); + Py_INCREF(&Normal2DF1D_Type); PyModule_AddObject(module, "Normal2DF1D", (PyObject *)&Normal2DF1D_Type); - if( PyType_Ready( &Orientation2DF1D_Type ) < 0 ) + if (PyType_Ready(&Orientation2DF1D_Type) < 0) return -1; - Py_INCREF( &Orientation2DF1D_Type ); + Py_INCREF(&Orientation2DF1D_Type); PyModule_AddObject(module, "Orientation2DF1D", (PyObject *)&Orientation2DF1D_Type); return 0; @@ -50,25 +50,26 @@ static char UnaryFunction1DVec2f___doc__[] = "\n" " Default constructor.\n" "\n" -".. method:: __init__(integration)\n" +".. method:: __init__(integration_type)\n" "\n" " Builds a unary 1D function using the integration method given as\n" " argument.\n" "\n" -" :arg integration: An integration method.\n" -" :type integration: :class:`IntegrationType`\n"; +" :arg integration_type: An integration method.\n" +" :type integration_type: :class:`IntegrationType`\n"; -static int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args) +static int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args, PyObject *kwds) { + static const char *kwlist[] = {"integration", NULL}; PyObject *obj = 0; - if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) return -1; - if( !obj ) + if (!obj) self->uf1D_vec2f = new UnaryFunction1D<Vec2f>(); else { - self->uf1D_vec2f = new UnaryFunction1D<Vec2f>( IntegrationType_from_BPy_IntegrationType(obj) ); + self->uf1D_vec2f = new UnaryFunction1D<Vec2f>(IntegrationType_from_BPy_IntegrationType(obj)); } self->uf1D_vec2f->py_uf1D = (PyObject *)self; @@ -85,85 +86,61 @@ static void UnaryFunction1DVec2f___dealloc__(BPy_UnaryFunction1DVec2f* self) static PyObject * UnaryFunction1DVec2f___repr__(BPy_UnaryFunction1DVec2f* self) { - return PyUnicode_FromFormat("type: %s - address: %p", self->uf1D_vec2f->getName().c_str(), self->uf1D_vec2f ); -} - -static char UnaryFunction1DVec2f_getName___doc__[] = -".. method:: getName()\n" -"\n" -" Returns the name of the unary 1D function.\n" -"\n" -" :return: The name of the unary 1D function.\n" -" :rtype: str\n"; - -static PyObject * UnaryFunction1DVec2f_getName( BPy_UnaryFunction1DVec2f *self ) -{ - return PyUnicode_FromString( self->uf1D_vec2f->getName().c_str() ); + return PyUnicode_FromFormat("type: %s - address: %p", self->uf1D_vec2f->getName().c_str(), self->uf1D_vec2f); } -static PyObject * UnaryFunction1DVec2f___call__( BPy_UnaryFunction1DVec2f *self, PyObject *args, PyObject *kwds) +static PyObject * UnaryFunction1DVec2f___call__(BPy_UnaryFunction1DVec2f *self, PyObject *args, PyObject *kwds) { - PyObject *obj; + static const char *kwlist[] = {"inter", NULL}; + PyObject *obj = 0; - if( kwds != NULL ) { - PyErr_SetString(PyExc_TypeError, "keyword argument(s) not supported"); - return NULL; - } - if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface1D_Type, &obj)) return NULL; - - if( typeid(*(self->uf1D_vec2f)) == typeid(UnaryFunction1D<Vec2f>) ) { + + if (typeid(*(self->uf1D_vec2f)) == typeid(UnaryFunction1D<Vec2f>)) { PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden"); return NULL; } - if (self->uf1D_vec2f->operator()(*( ((BPy_Interface1D *) obj)->if1D )) < 0) { + if (self->uf1D_vec2f->operator()(*(((BPy_Interface1D *) obj)->if1D)) < 0) { if (!PyErr_Occurred()) { - string msg(self->uf1D_vec2f->getName() + " __call__ method failed"); - PyErr_SetString(PyExc_RuntimeError, msg.c_str()); + string class_name(Py_TYPE(self)->tp_name); + PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str()); } return NULL; } - return Vector_from_Vec2f( self->uf1D_vec2f->result ); + return Vector_from_Vec2f(self->uf1D_vec2f->result); } -static char UnaryFunction1DVec2f_setIntegrationType___doc__[] = -".. method:: setIntegrationType(integration)\n" -"\n" -" Sets the integration method.\n" +static PyMethodDef BPy_UnaryFunction1DVec2f_methods[] = { + {NULL, NULL, 0, NULL} +}; + +/*----------------------UnaryFunction1DVec2f get/setters ----------------------------*/ + +PyDoc_STRVAR(integration_type_doc, +"The integration method.\n" "\n" -" :arg integration: An integration method.\n" -" :type integration: :class:`IntegrationType`\n"; +":type: :class:`IntegrationType`"); -static PyObject * UnaryFunction1DVec2f_setIntegrationType(BPy_UnaryFunction1DVec2f* self, PyObject *args) +static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void *UNUSED(closure)) { - PyObject *obj; - - if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) - return NULL; - - self->uf1D_vec2f->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) ); - Py_RETURN_NONE; + return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec2f->getIntegrationType()); } -static char UnaryFunction1DVec2f_getIntegrationType___doc__[] = -".. method:: getIntegrationType(integration)\n" -"\n" -" Returns the integration method.\n" -"\n" -" :return: The integration method.\n" -" :rtype: :class:`IntegrationType`\n"; - -static PyObject * UnaryFunction1DVec2f_getIntegrationType(BPy_UnaryFunction1DVec2f* self) { - return BPy_IntegrationType_from_IntegrationType( self->uf1D_vec2f->getIntegrationType() ); +static int integration_type_set(BPy_UnaryFunction1DVec2f *self, PyObject *value, void *UNUSED(closure)) +{ + if (!BPy_IntegrationType_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); + return -1; + } + self->uf1D_vec2f->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value)); + return 0; } -/*----------------------UnaryFunction1DVec2f instance definitions ----------------------------*/ -static PyMethodDef BPy_UnaryFunction1DVec2f_methods[] = { - {"getName", ( PyCFunction ) UnaryFunction1DVec2f_getName, METH_NOARGS, UnaryFunction1DVec2f_getName___doc__}, - {"setIntegrationType", ( PyCFunction ) UnaryFunction1DVec2f_setIntegrationType, METH_VARARGS, UnaryFunction1DVec2f_setIntegrationType___doc__}, - {"getIntegrationType", ( PyCFunction ) UnaryFunction1DVec2f_getIntegrationType, METH_NOARGS, UnaryFunction1DVec2f_getIntegrationType___doc__}, - {NULL, NULL, 0, NULL} +static PyGetSetDef BPy_UnaryFunction1DVec2f_getseters[] = { + {(char *)"integration_type", (getter)integration_type_get, (setter)integration_type_set, (char *)integration_type_doc, NULL}, + {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; /*-----------------------BPy_UnaryFunction1DVec2f type definition ------------------------------*/ @@ -198,7 +175,7 @@ PyTypeObject UnaryFunction1DVec2f_Type = { 0, /* tp_iternext */ BPy_UnaryFunction1DVec2f_methods, /* tp_methods */ 0, /* tp_members */ - 0, /* tp_getset */ + BPy_UnaryFunction1DVec2f_getseters, /* tp_getset */ &UnaryFunction1D_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ |