Tamito Kajiyama
39f8c6e189
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.
203 lines
6.3 KiB
C++
203 lines
6.3 KiB
C++
#include "BPy_FrsCurve.h"
|
|
|
|
#include "../BPy_Convert.h"
|
|
#include "../BPy_Id.h"
|
|
#include "../Interface0D/BPy_CurvePoint.h"
|
|
#include "../Interface0D/BPy_SVertex.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
/*----------------------CurvePoint methods ----------------------------*/
|
|
|
|
PyDoc_STRVAR(FrsCurve_doc,
|
|
"Class hierarchy: :class:`Interface1D` > :class:`Curve`\n"
|
|
"\n"
|
|
"Base class for curves made of CurvePoints. :class:`SVertex` is the\n"
|
|
"type of the initial curve vertices. A :class:`Chain` is a\n"
|
|
"specialization of a Curve.\n"
|
|
"\n"
|
|
".. method:: __init__()\n"
|
|
"\n"
|
|
" Default Constructor.\n"
|
|
"\n"
|
|
".. method:: __init__(brother)\n"
|
|
"\n"
|
|
" Copy Constructor.\n"
|
|
"\n"
|
|
" :arg brother: A Curve object.\n"
|
|
" :type brother: :class:`Curve`\n"
|
|
"\n"
|
|
".. method:: __init__(id)\n"
|
|
"\n"
|
|
" Builds a Curve from its Id.\n"
|
|
"\n"
|
|
" :arg id: An Id object.\n"
|
|
" :type id: :class:`Id`");
|
|
|
|
static int FrsCurve_init(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist_1[] = {"brother", NULL};
|
|
static const char *kwlist_2[] = {"id", NULL};
|
|
PyObject *obj = 0;
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &FrsCurve_Type, &obj)) {
|
|
if (!obj)
|
|
self->c = new Curve();
|
|
else
|
|
self->c = new Curve(*(((BPy_FrsCurve *)obj)->c));
|
|
}
|
|
else if (PyErr_Clear(),
|
|
PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_2, &Id_Type, &obj))
|
|
{
|
|
self->c = new Curve(*(((BPy_Id *)obj)->id));
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
|
return -1;
|
|
}
|
|
self->py_if1D.if1D = self->c;
|
|
self->py_if1D.borrowed = 0;
|
|
return 0;
|
|
}
|
|
|
|
PyDoc_STRVAR(FrsCurve_push_vertex_back_doc,
|
|
".. method:: push_vertex_back(iVertex)\n"
|
|
"\n"
|
|
" Adds a single vertex at the end of the Curve.\n"
|
|
"\n"
|
|
" :arg iVertex: A vertex object.\n"
|
|
" :type iVertex: :class:`SVertex` or :class:`CurvePoint`");
|
|
|
|
static PyObject * FrsCurve_push_vertex_back( BPy_FrsCurve *self, PyObject *args )
|
|
{
|
|
PyObject *obj;
|
|
|
|
if (!PyArg_ParseTuple(args, "O", &obj))
|
|
return NULL;
|
|
|
|
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);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument");
|
|
return NULL;
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(FrsCurve_push_vertex_front_doc,
|
|
".. method:: push_vertex_front(iVertex)\n"
|
|
"\n"
|
|
" Adds a single vertex at the front of the Curve.\n"
|
|
"\n"
|
|
" :arg iVertex: A vertex object.\n"
|
|
" :type iVertex: :class:`SVertex` or :class:`CurvePoint`");
|
|
|
|
static PyObject * FrsCurve_push_vertex_front( BPy_FrsCurve *self, PyObject *args )
|
|
{
|
|
PyObject *obj;
|
|
|
|
if (!PyArg_ParseTuple(args, "O", &obj))
|
|
return NULL;
|
|
|
|
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);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument");
|
|
return NULL;
|
|
}
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyMethodDef BPy_FrsCurve_methods[] = {
|
|
{"push_vertex_back", (PyCFunction)FrsCurve_push_vertex_back, METH_VARARGS, FrsCurve_push_vertex_back_doc},
|
|
{"push_vertex_front", (PyCFunction)FrsCurve_push_vertex_front, METH_VARARGS, FrsCurve_push_vertex_front_doc},
|
|
{NULL, NULL, 0, NULL}
|
|
};
|
|
|
|
/*----------------------CurvePoint get/setters ----------------------------*/
|
|
|
|
PyDoc_STRVAR(FrsCurve_is_empty_doc,
|
|
"True if the Curve doesn't have any Vertex yet.\n"
|
|
"\n"
|
|
":type: bool");
|
|
|
|
static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void *UNUSED(closure))
|
|
{
|
|
return PyBool_from_bool(self->c->empty());
|
|
}
|
|
|
|
PyDoc_STRVAR(FrsCurve_segments_size_doc,
|
|
"The number of segments in the polyline constituing the Curve.\n"
|
|
"\n"
|
|
":type: int");
|
|
|
|
static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(closure))
|
|
{
|
|
return PyLong_FromLong(self->c->nSegments());
|
|
}
|
|
|
|
static PyGetSetDef BPy_FrsCurve_getseters[] = {
|
|
{(char *)"is_empty", (getter)FrsCurve_is_empty_get, (setter)NULL, (char *)FrsCurve_is_empty_doc, NULL},
|
|
{(char *)"segments_size", (getter)FrsCurve_segments_size_get, (setter)NULL, (char *)FrsCurve_segments_size_doc, NULL},
|
|
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
/*-----------------------BPy_FrsCurve type definition ------------------------------*/
|
|
|
|
PyTypeObject FrsCurve_Type = {
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
"Curve", /* tp_name */
|
|
sizeof(BPy_FrsCurve), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
0, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_reserved */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
FrsCurve_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
BPy_FrsCurve_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
BPy_FrsCurve_getseters, /* tp_getset */
|
|
&Interface1D_Type, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)FrsCurve_init, /* tp_init */
|
|
0, /* tp_alloc */
|
|
0, /* tp_new */
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|