[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52606] trunk/blender/source/blender/ python/bmesh/bmesh_py_ops_call.c: split py->slot & slot-> py into their own functions & fixed some mistakes with conversion.
Campbell Barton
ideasman42 at gmail.com
Tue Nov 27 15:25:39 CET 2012
Revision: 52606
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52606
Author: campbellbarton
Date: 2012-11-27 14:25:38 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
split py->slot & slot->py into their own functions & fixed some mistakes with conversion.
Modified Paths:
--------------
trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c 2012-11-27 13:54:34 UTC (rev 52605)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c 2012-11-27 14:25:38 UTC (rev 52606)
@@ -60,443 +60,617 @@
}
/**
- * This is the __call__ for bmesh.ops.xxx()
+ * Use for giving py args to an operator.
*/
-PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw)
+static int bpy_slot_from_py(BMesh *bm, BMOperator *bmop, BMOpSlot *slot, PyObject *value,
+ /* the are just for exception messages */
+ const char *opname, const char *slot_name)
{
- PyObject *ret;
- BPy_BMesh *py_bm;
- BMesh *bm;
+ switch (slot->slot_type) {
+ case BMO_OP_SLOT_BOOL:
+ {
+ int param;
- BMOperator bmop;
+ param = PyLong_AsLong(value);
- if ((PyTuple_GET_SIZE(args) == 1) &&
- (py_bm = (BPy_BMesh *)PyTuple_GET_ITEM(args, 0)) &&
- (BPy_BMesh_Check(py_bm))
- )
- {
- BPY_BM_CHECK_OBJ(py_bm);
- bm = py_bm->bm;
- }
- else {
- PyErr_SetString(PyExc_TypeError,
- "calling a bmesh operator expects a single BMesh (non keyword) "
- "as the first argument");
- return NULL;
- }
+ if (param < 0) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected True/False or 0/1, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ else {
+ BMO_SLOT_AS_BOOL(slot) = param;
+ }
- /* TODO - error check this!, though we do the error check on attribute access */
- /* TODO - make flags optional */
- BMO_op_init(bm, &bmop, BMO_FLAG_DEFAULTS, self->opname);
-
- if (kw && PyDict_Size(kw) > 0) {
- /* setup properties, see bpy_rna.c: pyrna_py_to_prop()
- * which shares this logic for parsing properties */
-
- PyObject *key, *value;
- Py_ssize_t pos = 0;
- while (PyDict_Next(kw, &pos, &key, &value)) {
- const char *slot_name = _PyUnicode_AsString(key);
- BMOpSlot *slot = BMO_slot_get(bmop.slots_in, slot_name);
-
- if (slot == NULL) {
+ break;
+ }
+ case BMO_OP_SLOT_INT:
+ {
+ int overflow;
+ long param = PyLong_AsLongAndOverflow(value, &overflow);
+ if (overflow || (param > INT_MAX) || (param < INT_MIN)) {
+ PyErr_Format(PyExc_ValueError,
+ "%.200s: keyword \"%.200s\" value not in 'int' range "
+ "(" STRINGIFY(INT_MIN) ", " STRINGIFY(INT_MAX) ")",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ else if (param == -1 && PyErr_Occurred()) {
PyErr_Format(PyExc_TypeError,
- "%.200s: keyword \"%.200s\" is invalid for this operator",
- self->opname, slot_name);
- return NULL;
+ "%.200s: keyword \"%.200s\" expected an int, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
}
+ else {
+ BMO_SLOT_AS_INT(slot) = (int)param;
+ }
+ break;
+ }
+ case BMO_OP_SLOT_FLT:
+ {
+ float param = PyFloat_AsDouble(value);
+ if (param == -1 && PyErr_Occurred()) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected a float, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ else {
+ BMO_SLOT_AS_FLOAT(slot) = param;
+ }
+ break;
+ }
+ case BMO_OP_SLOT_MAT:
+ {
+ /* XXX - BMesh operator design is crappy here, operator slot should define matrix size,
+ * not the caller! */
+ unsigned short size;
+ if (!MatrixObject_Check(value)) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected a Matrix, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ else if (BaseMath_ReadCallback((MatrixObject *)value) == -1) {
+ return -1;
+ }
+ else if (((size = ((MatrixObject *)value)->num_col) != ((MatrixObject *)value)->num_row) ||
+ (ELEM(size, 3, 4) == FALSE))
+ {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected a 3x3 or 4x4 matrix Matrix",
+ opname, slot_name);
+ return -1;
+ }
- /* now assign the value */
- switch (slot->slot_type) {
- case BMO_OP_SLOT_BOOL:
+ BMO_slot_mat_set(bmop, bmop->slots_in, slot_name, ((MatrixObject *)value)->matrix, size);
+ break;
+ }
+ case BMO_OP_SLOT_VEC:
+ {
+ /* passing slot name here is a bit non-descriptive */
+ if (mathutils_array_parse(BMO_SLOT_AS_VECTOR(slot), 3, 3, value, slot_name) == -1) {
+ return -1;
+ }
+ break;
+ }
+ case BMO_OP_SLOT_ELEMENT_BUF:
+ {
+ if (slot->slot_subtype.elem & BMO_OP_SLOT_SUBTYPE_ELEM_IS_SINGLE) {
+ if (!BPy_BMElem_Check(value) ||
+ !(((BPy_BMElem *)value)->ele->head.htype & slot->slot_subtype.elem))
{
- int param;
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected a %.200s not *.200s",
+ opname, slot_name,
+ BPy_BMElem_StringFromHType(slot->slot_subtype.elem & BM_ALL_NOLOOP),
+ Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ else if (((BPy_BMElem *)value)->bm == NULL) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" invalidated element",
+ opname, slot_name);
+ return -1;
+ }
- param = PyLong_AsLong(value);
+ BMO_slot_buffer_from_single(bmop, slot, &((BPy_BMElem *)value)->ele->head);
+ }
+ else {
+ /* there are many ways we could interpret arguments, for now...
+ * - verts/edges/faces from the mesh direct,
+ * this way the operator takes every item.
+ * - `TODO` a plain python sequence (list) of elements.
+ * - `TODO` an iterator. eg.
+ * face.verts
+ * - `TODO` (type, flag) pair, eg.
+ * ('VERT', {'TAG'})
+ */
- if (param < 0) {
- PyErr_Format(PyExc_TypeError,
- "%.200s: keyword \"%.200s\" expected True/False or 0/1, not %.200s",
- self->opname, slot_name, Py_TYPE(value)->tp_name);
- return NULL;
+#define BPY_BM_GENERIC_MESH_TEST(type_string) \
+if (((BPy_BMGeneric *)value)->bm != bm) { \
+ PyErr_Format(PyExc_NotImplementedError, \
+ "%.200s: keyword \"%.200s\" " type_string " are from another bmesh", \
+ opname, slot_name, slot->slot_type); \
+ return -1; \
+ } (void)0
+
+#define BPY_BM_ELEM_TYPE_TEST(type_string) \
+ if ((slot->slot_subtype.elem & BM_VERT) == 0) { \
+ PyErr_Format(PyExc_TypeError, \
+ "%.200s: keyword \"%.200s\" expected " \
+ "a list of %.200s not " type_string, \
+ opname, slot_name, \
+ BPy_BMElem_StringFromHType(slot->slot_subtype.elem & BM_ALL_NOLOOP)); \
+ return -1; \
+ } (void)0
+
+ if (BPy_BMVertSeq_Check(value)) {
+ BPY_BM_GENERIC_MESH_TEST("verts");
+ BPY_BM_ELEM_TYPE_TEST("verts");
+
+ BMO_slot_buffer_from_all(bm, bmop, bmop->slots_in, slot_name, BM_VERT);
+ }
+ else if (BPy_BMEdgeSeq_Check(value)) {
+ BPY_BM_GENERIC_MESH_TEST("edges");
+ BPY_BM_ELEM_TYPE_TEST("edges");
+ BMO_slot_buffer_from_all(bm, bmop, bmop->slots_in, slot_name, BM_EDGE);
+ }
+ else if (BPy_BMFaceSeq_Check(value)) {
+ BPY_BM_GENERIC_MESH_TEST("faces");
+ BPY_BM_ELEM_TYPE_TEST("faces");
+ BMO_slot_buffer_from_all(bm, bmop, bmop->slots_in, slot_name, BM_FACE);
+ }
+
+#undef BPY_BM_ELEM_TYPE_TEST
+
+ else if (BPy_BMElemSeq_Check(value)) {
+ BMIter iter;
+ BMHeader *ele;
+ int tot;
+ unsigned int i;
+
+ BPY_BM_GENERIC_MESH_TEST("elements");
+
+ /* this will loop over all elements which is a shame but
+ * we need to know this before alloc */
+ /* calls bpy_bmelemseq_length() */
+ tot = Py_TYPE(value)->tp_as_sequence->sq_length((PyObject *)value);
+
+ BMO_slot_buffer_alloc(bmop, bmop->slots_in, slot_name, tot);
+
+ i = 0;
+ BM_ITER_BPY_BM_SEQ (ele, &iter, ((BPy_BMElemSeq *)value)) {
+ slot->data.buf[i] = ele;
+ i++;
}
- else {
- BMO_SLOT_AS_BOOL(slot) = param;
+ }
+ /* keep this last */
+ else if (PySequence_Check(value)) {
+ BMElem **elem_array = NULL;
+ Py_ssize_t elem_array_len;
+
+ elem_array = BPy_BMElem_PySeq_As_Array(&bm, value, 0, PY_SSIZE_T_MAX,
+ &elem_array_len, (slot->slot_subtype.elem & BM_ALL_NOLOOP),
+ TRUE, TRUE, slot_name);
+
+ /* error is set above */
+ if (elem_array == NULL) {
+ return -1;
}
- break;
+ BMO_slot_buffer_alloc(bmop, bmop->slots_in, slot_name, elem_array_len);
+ memcpy(slot->data.buf, elem_array, sizeof(void *) * elem_array_len);
+ PyMem_FREE(elem_array);
}
- case BMO_OP_SLOT_INT:
+ else {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected "
+ "a bmesh sequence, list, (htype, flag) pair, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ }
+#undef BPY_BM_GENERIC_MESH_TEST
+
+ break;
+ }
+ case BMO_OP_SLOT_MAPPING:
+ {
+ /* first check types */
+ if (slot->slot_subtype.map != BMO_OP_SLOT_SUBTYPE_MAP_EMPTY) {
+ if (!PyDict_Check(value)) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected "
+ "a dict, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ }
+ else {
+ if (!PySet_Check(value)) {
+ PyErr_Format(PyExc_TypeError,
+ "%.200s: keyword \"%.200s\" expected "
+ "a set, not %.200s",
+ opname, slot_name, Py_TYPE(value)->tp_name);
+ return -1;
+ }
+ }
+
+ switch (slot->slot_subtype.map) {
+
+ /* this could be a static function */
+#define BPY_BM_MAPPING_KEY_CHECK(arg_key) \
+ if (!BPy_BMElem_Check(arg_key)) { \
+ PyErr_Format(PyExc_TypeError, \
+ "%.200s: keyword \"%.200s\" expected " \
+ "a dict with bmesh element keys, not %.200s", \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list