diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-21 06:57:44 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-21 06:57:44 +0400 |
commit | 39f8c6e189c89f4097f5d979612cb71bd8773030 (patch) | |
tree | d9a4ace57a1dc75f9e968ac0c1cae92ef995c145 /source/blender/freestyle/intern/python/BPy_Id.cpp | |
parent | 92436c94d3adbbfc285bd7b3041db36e66dae5d5 (diff) |
Freestyle Python API improvements - part 5.
Handling of keyword arguments in Python wrapper class constructors was revised.
This revision is mainly focused on Interface0D, Interface1D, Iterator, and
their subclasses, as well as a few additional view map component classes.
Implementation notes: Because of the extensive use of constructor overloading
in the underlying C++ classes, the corresponding Python wrappers try to parse
arguments through multiple calls of PyArg_ParseTupleAndKeywords() if needed.
The downside of this implementation is that most argument errors result in the
same error message ("invalid argument(s)") without indicating what is wrong.
For now this issue is left for future work.
* Now the instantiation of ViewVertex is prohibited since the underlying
C++ class is an abstract class.
* Removed the .cast_to_interface0diterator() method from CurvePointIterator
and StrokeVertexIterator. Instead the constructor of Interface0DIterator now
accepts the instances of these two iterator classes to construct a nested
Interface0DIterator instance that can be passed to Function0D functor objects.
Specifically, an iterator 'it' is passed to a functor 'func' as follows:
func(Interface0DIterator(it))
instead of:
func(it.cast_to_interface0diterator())
* Boolean arguments of class constructors only accept values of boolean type.
Input values of other types are considered as error.
* Additional code clean-up was made.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Id.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_Id.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index da9c2b9ca15..5d56903d854 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -25,43 +25,43 @@ int Id_Init(PyObject *module) //------------------------INSTANCE METHODS ---------------------------------- PyDoc_STRVAR(Id_doc, -".. method:: __init__()\n" +"Class for representing an object Id.\n" "\n" -" Default constructor.\n" +".. method:: __init__(first=0, second=0)\n" "\n" -".. method:: __init__(iBrother)\n" +" Build the Id from two numbers.\n" "\n" -" Copy constructor.\n" -"\n" -" :arg iBrother: An Id object.\n" -" :type iBrother: :class:`Id`\n" -"\n" -".. method:: __init__(iFirst)\n" +" :arg first: The first number.\n" +" :type first: int\n" +" :arg iSecond: The second number.\n" +" :type iSecond: int\n" "\n" -" Builds an Id from an integer. The second number is set to 0.\n" +".. method:: __init__(brother)\n" "\n" -" :arg iFirst: The first Id number.\n" -" :type iFirst: int\n" -"\n" -".. method:: __init__(iFirst, iSecond)\n" -"\n" -" Builds the Id from the two numbers.\n" +" Copy constructor.\n" "\n" -" :arg iFirst: The first Id number.\n" -" :type iFirst: int\n" -" :arg iSecond: The second Id number.\n" -" :type iSecond: int\n"); +" :arg brother: An Id object.\n" +" :type brother: :class:`Id`"); static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds) { + static const char *kwlist_1[] = {"brother", NULL}; + static const char *kwlist_2[] = {"first", "second", NULL}; + PyObject *brother; int first = 0, second = 0; - static const char *kwlist[] = {"first", "second", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char**)kwlist, &first, &second)) + if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &Id_Type, &brother)) { + self->id = new Id(*(((BPy_Id *)brother)->id)); + } + else if (PyErr_Clear(), + PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char**)kwlist_2, &first, &second)) + { + self->id = new Id(first, second); + } + else { + PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); return -1; - - self->id = new Id(first, second); - + } return 0; } |