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.
190 lines
5.8 KiB
C++
190 lines
5.8 KiB
C++
#include "BPy_ViewMap.h"
|
|
|
|
#include "BPy_Convert.h"
|
|
#include "BPy_BBox.h"
|
|
#include "Interface1D/BPy_FEdge.h"
|
|
#include "Interface1D/BPy_ViewEdge.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
|
int ViewMap_Init(PyObject *module)
|
|
{
|
|
if (module == NULL)
|
|
return -1;
|
|
|
|
if (PyType_Ready( &ViewMap_Type ) < 0)
|
|
return -1;
|
|
Py_INCREF(&ViewMap_Type);
|
|
PyModule_AddObject(module, "ViewMap", (PyObject *)&ViewMap_Type);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*----------------------ViewMap methods----------------------------*/
|
|
|
|
PyDoc_STRVAR(ViewMap_doc,
|
|
"Class defining the ViewMap.\n"
|
|
"\n"
|
|
".. method:: __init__()\n"
|
|
"\n"
|
|
" Default constructor.");
|
|
|
|
static int ViewMap_init(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {NULL};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
|
|
return -1;
|
|
self->vm = new ViewMap();
|
|
return 0;
|
|
}
|
|
|
|
static void ViewMap_dealloc(BPy_ViewMap *self)
|
|
{
|
|
if (self->vm)
|
|
delete self->vm;
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
|
}
|
|
|
|
static PyObject * ViewMap_repr(BPy_ViewMap *self)
|
|
{
|
|
return PyUnicode_FromFormat("ViewMap - address: %p", self->vm);
|
|
}
|
|
|
|
PyDoc_STRVAR(ViewMap_get_closest_viewedge_doc,
|
|
".. method:: get_closest_viewedge(x, y)\n"
|
|
"\n"
|
|
" Gets the ViewEdge nearest to the 2D point specified as arguments.\n"
|
|
"\n"
|
|
" :arg x: X coordinate of a 2D point.\n"
|
|
" :type x: float\n"
|
|
" :arg y: Y coordinate of a 2D point.\n"
|
|
" :type y: float\n"
|
|
" :return: The ViewEdge nearest to the specified 2D point.\n"
|
|
" :rtype: :class:`ViewEdge`");
|
|
|
|
static PyObject * ViewMap_get_closest_viewedge(BPy_ViewMap *self , PyObject *args)
|
|
{
|
|
double x, y;
|
|
|
|
if (!PyArg_ParseTuple(args, "dd", &x, &y))
|
|
return NULL;
|
|
ViewEdge *ve = const_cast<ViewEdge *>(self->vm->getClosestViewEdge(x,y));
|
|
if (ve)
|
|
return BPy_ViewEdge_from_ViewEdge(*ve);
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(ViewMap_get_closest_fedge_doc,
|
|
".. method:: get_closest_fedge(x, y)\n"
|
|
"\n"
|
|
" Gets the FEdge nearest to the 2D point specified as arguments.\n"
|
|
"\n"
|
|
" :arg x: X coordinate of a 2D point.\n"
|
|
" :type x: float\n"
|
|
" :arg y: Y coordinate of a 2D point.\n"
|
|
" :type y: float\n"
|
|
" :return: The FEdge nearest to the specified 2D point.\n"
|
|
" :rtype: :class:`FEdge`");
|
|
|
|
static PyObject * ViewMap_get_closest_fedge(BPy_ViewMap *self , PyObject *args)
|
|
{
|
|
double x, y;
|
|
|
|
if (!PyArg_ParseTuple(args, "dd", &x, &y))
|
|
return NULL;
|
|
FEdge *fe = const_cast<FEdge *>(self->vm->getClosestFEdge(x,y));
|
|
if (fe)
|
|
return Any_BPy_FEdge_from_FEdge(*fe);
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
// static ViewMap *getInstance ();
|
|
|
|
static PyMethodDef BPy_ViewMap_methods[] = {
|
|
{"get_closest_viewedge", (PyCFunction)ViewMap_get_closest_viewedge, METH_VARARGS, ViewMap_get_closest_viewedge_doc},
|
|
{"get_closest_fedge", (PyCFunction)ViewMap_get_closest_fedge, METH_VARARGS, ViewMap_get_closest_fedge_doc},
|
|
{NULL, NULL, 0, NULL}
|
|
};
|
|
|
|
/*----------------------ViewMap get/setters ----------------------------*/
|
|
|
|
PyDoc_STRVAR(ViewMap_scene_bbox_doc,
|
|
"The 3D bounding box of the scene.\n"
|
|
"\n"
|
|
":type: :class:`BBox`");
|
|
|
|
static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void *UNUSED(closure))
|
|
{
|
|
return BPy_BBox_from_BBox(self->vm->getScene3dBBox());
|
|
}
|
|
|
|
static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUSED(closure))
|
|
{
|
|
if (!BPy_BBox_Check(value)) {
|
|
PyErr_SetString(PyExc_TypeError, "value must be a BBox");
|
|
return -1;
|
|
}
|
|
self->vm->setScene3dBBox(*(((BPy_BBox *)value)->bb));
|
|
return 0;
|
|
}
|
|
|
|
static PyGetSetDef BPy_ViewMap_getseters[] = {
|
|
{(char *)"scene_bbox", (getter)ViewMap_scene_bbox_get, (setter)ViewMap_scene_bbox_set, (char *)ViewMap_scene_bbox_doc, NULL},
|
|
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
/*-----------------------BPy_ViewMap type definition ------------------------------*/
|
|
|
|
PyTypeObject ViewMap_Type = {
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
"ViewMap", /* tp_name */
|
|
sizeof(BPy_ViewMap), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)ViewMap_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_reserved */
|
|
(reprfunc)ViewMap_repr, /* 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 */
|
|
ViewMap_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
BPy_ViewMap_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
BPy_ViewMap_getseters, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)ViewMap_init, /* tp_init */
|
|
0, /* tp_alloc */
|
|
PyType_GenericNew, /* tp_new */
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|