diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-22 05:57:20 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-22 05:57:20 +0400 |
commit | 33f34e1a7bc08f123d76198ae0671e3da1ded401 (patch) | |
tree | 2e94232e350814cd1334cc262309fd9efd8b9ab6 /source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp | |
parent | 6cd036ab96fa50b280a6a0cfda7f09f1c1f57600 (diff) |
Freestyle Python API improvements - part 6.
Fix for PyGetSetDef and proper handling of keyword arguments were done in
Function0D and Function1D classes. Additional code clean-up was also made.
Diffstat (limited to 'source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp | 127 |
1 files changed, 52 insertions, 75 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index f18421d8754..b1dae992812 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -17,29 +17,29 @@ extern "C" { //-------------------MODULE INITIALIZATION-------------------------------- -int UnaryFunction1DVoid_Init( PyObject *module ) { - - if( module == NULL ) +int UnaryFunction1DVoid_Init(PyObject *module) +{ + if (module == NULL) return -1; - if( PyType_Ready( &UnaryFunction1DVoid_Type ) < 0 ) + if (PyType_Ready(&UnaryFunction1DVoid_Type) < 0) return -1; - Py_INCREF( &UnaryFunction1DVoid_Type ); + Py_INCREF(&UnaryFunction1DVoid_Type); PyModule_AddObject(module, "UnaryFunction1DVoid", (PyObject *)&UnaryFunction1DVoid_Type); - if( PyType_Ready( &ChainingTimeStampF1D_Type ) < 0 ) + if (PyType_Ready(&ChainingTimeStampF1D_Type) < 0) return -1; - Py_INCREF( &ChainingTimeStampF1D_Type ); + Py_INCREF(&ChainingTimeStampF1D_Type); PyModule_AddObject(module, "ChainingTimeStampF1D", (PyObject *)&ChainingTimeStampF1D_Type); - if( PyType_Ready( &IncrementChainingTimeStampF1D_Type ) < 0 ) + if (PyType_Ready(&IncrementChainingTimeStampF1D_Type) < 0) return -1; - Py_INCREF( &IncrementChainingTimeStampF1D_Type ); + Py_INCREF(&IncrementChainingTimeStampF1D_Type); PyModule_AddObject(module, "IncrementChainingTimeStampF1D", (PyObject *)&IncrementChainingTimeStampF1D_Type); - if( PyType_Ready( &TimeStampF1D_Type ) < 0 ) + if (PyType_Ready(&TimeStampF1D_Type) < 0) return -1; - Py_INCREF( &TimeStampF1D_Type ); + Py_INCREF(&TimeStampF1D_Type); PyModule_AddObject(module, "TimeStampF1D", (PyObject *)&TimeStampF1D_Type); return 0; @@ -57,25 +57,26 @@ static char UnaryFunction1DVoid___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 UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* self, PyObject *args) +static int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* 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_void = new UnaryFunction1D_void(); else { - self->uf1D_void = new UnaryFunction1D_void( IntegrationType_from_BPy_IntegrationType(obj) ); + self->uf1D_void = new UnaryFunction1D_void(IntegrationType_from_BPy_IntegrationType(obj)); } self->uf1D_void->py_uf1D = (PyObject *)self; @@ -92,84 +93,60 @@ static void UnaryFunction1DVoid___dealloc__(BPy_UnaryFunction1DVoid* self) static PyObject * UnaryFunction1DVoid___repr__(BPy_UnaryFunction1DVoid* self) { - return PyUnicode_FromFormat("type: %s - address: %p", self->uf1D_void->getName().c_str(), self->uf1D_void ); -} - -static char UnaryFunction1DVoid_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 * UnaryFunction1DVoid_getName( BPy_UnaryFunction1DVoid *self ) -{ - return PyUnicode_FromString( self->uf1D_void->getName().c_str() ); + return PyUnicode_FromFormat("type: %s - address: %p", self->uf1D_void->getName().c_str(), self->uf1D_void); } -static PyObject * UnaryFunction1DVoid___call__( BPy_UnaryFunction1DVoid *self, PyObject *args, PyObject *kwds) +static PyObject * UnaryFunction1DVoid___call__(BPy_UnaryFunction1DVoid *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_void)) == typeid(UnaryFunction1D_void) ) { + + if (typeid(*(self->uf1D_void)) == typeid(UnaryFunction1D_void)) { PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden"); return NULL; } - if (self->uf1D_void->operator()(*( ((BPy_Interface1D *) obj)->if1D )) < 0) { + if (self->uf1D_void->operator()(*(((BPy_Interface1D *) obj)->if1D)) < 0) { if (!PyErr_Occurred()) { - string msg(self->uf1D_void->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; } Py_RETURN_NONE; } -static char UnaryFunction1DVoid_setIntegrationType___doc__[] = -".. method:: setIntegrationType(integration)\n" -"\n" -" Sets the integration method.\n" +static PyMethodDef BPy_UnaryFunction1DVoid_methods[] = { + {NULL, NULL, 0, NULL} +}; + +/*----------------------UnaryFunction1DVoid 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 * UnaryFunction1DVoid_setIntegrationType(BPy_UnaryFunction1DVoid* self, PyObject *args) +static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void *UNUSED(closure)) { - PyObject *obj; - - if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) - return NULL; - - self->uf1D_void->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) ); - Py_RETURN_NONE; + return BPy_IntegrationType_from_IntegrationType(self->uf1D_void->getIntegrationType()); } -static char UnaryFunction1DVoid_getIntegrationType___doc__[] = -".. method:: getIntegrationType(integration)\n" -"\n" -" Returns the integration method.\n" -"\n" -" :return: The integration method.\n" -" :rtype: :class:`IntegrationType`\n"; - -static PyObject * UnaryFunction1DVoid_getIntegrationType(BPy_UnaryFunction1DVoid* self) { - return BPy_IntegrationType_from_IntegrationType( self->uf1D_void->getIntegrationType() ); +static int integration_type_set(BPy_UnaryFunction1DVoid *self, PyObject *value, void *UNUSED(closure)) +{ + if (!BPy_IntegrationType_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); + return -1; + } + self->uf1D_void->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value)); + return 0; } -/*----------------------UnaryFunction1DVoid instance definitions ----------------------------*/ -static PyMethodDef BPy_UnaryFunction1DVoid_methods[] = { - {"getName", ( PyCFunction ) UnaryFunction1DVoid_getName, METH_NOARGS, UnaryFunction1DVoid_getName___doc__}, - {"setIntegrationType", ( PyCFunction ) UnaryFunction1DVoid_setIntegrationType, METH_VARARGS, UnaryFunction1DVoid_setIntegrationType___doc__}, - {"getIntegrationType", ( PyCFunction ) UnaryFunction1DVoid_getIntegrationType, METH_NOARGS, UnaryFunction1DVoid_getIntegrationType___doc__}, - {NULL, NULL, 0, NULL} +static PyGetSetDef BPy_UnaryFunction1DVoid_getseters[] = { + {(char *)"integration_type", (getter)integration_type_get, (setter)integration_type_set, (char *)integration_type_doc, NULL}, + {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; /*-----------------------BPy_UnaryFunction1DVoid type definition ------------------------------*/ @@ -204,7 +181,7 @@ PyTypeObject UnaryFunction1DVoid_Type = { 0, /* tp_iternext */ BPy_UnaryFunction1DVoid_methods, /* tp_methods */ 0, /* tp_members */ - 0, /* tp_getset */ + BPy_UnaryFunction1DVoid_getseters, /* tp_getset */ &UnaryFunction1D_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ |