Revision: 41867
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41867
Author: campbellbarton
Date: 2011-11-15 10:19:44 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
de-duplicate some idproperty py api code, also improve some exception messages.
Modified Paths:
--------------
trunk/blender/source/blender/python/generic/idprop_py_api.c
trunk/blender/source/blender/python/generic/idprop_py_api.h
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/python/generic/idprop_py_api.c
===================================================================
--- trunk/blender/source/blender/python/generic/idprop_py_api.c 2011-11-15
10:01:18 UTC (rev 41866)
+++ trunk/blender/source/blender/python/generic/idprop_py_api.c 2011-11-15
10:19:44 UTC (rev 41867)
@@ -21,7 +21,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/python/generic/IDProp.c
+/** \file blender/python/generic/idprop_py_api.c
* \ingroup pygen
*/
@@ -49,81 +49,116 @@
/*********************** ID Property Main Wrapper Stuff ***************/
-/* use for both array and group */
-static long BPy_IDGroup_hash(BPy_IDProperty *self)
+/* ----------------------------------------------------------------------------
+ * static conversion functions to avoid duplicate code, no type checking.
+ */
+
+static PyObject *idprop_py_from_idp_string(IDProperty *prop)
{
- return _Py_HashPointer(self->prop);
+ if (prop->subtype == IDP_STRING_SUB_BYTE) {
+ return PyBytes_FromStringAndSize(IDP_Array(prop), prop->len);
+ }
+ else {
+#ifdef USE_STRING_COERCE
+ return PyC_UnicodeFromByteAndSize(IDP_Array(prop), prop->len -
1);
+#else
+ return PyUnicode_FromStringAndSize(IDP_Array(prop), prop->len -
1);
+#endif
+ }
}
-static PyObject *BPy_IDGroup_repr(BPy_IDProperty *self)
+static PyObject *idprop_py_from_idp_int(IDProperty *prop)
{
- return PyUnicode_FromFormat( "<bpy id property from \"%s\">",
self->id->name);
+ return PyLong_FromLong((long)prop->data.val);
}
-PyObject *BPy_IDGroup_WrapData( ID *id, IDProperty *prop )
+static PyObject *idprop_py_from_idp_float(IDProperty *prop)
{
- switch ( prop->type ) {
- case IDP_STRING:
+ return PyFloat_FromDouble((double)(*(float*)(&prop->data.val)));
+}
- if (prop->subtype == IDP_STRING_SUB_BYTE) {
- return PyBytes_FromStringAndSize(IDP_Array(prop),
prop->len);
- }
- else {
-#ifdef USE_STRING_COERCE
- return PyC_UnicodeFromByteAndSize(IDP_Array(prop),
prop->len - 1);
-#else
- return PyUnicode_FromStringAndSize(IDP_Array(prop),
prop->len - 1);
-#endif
- }
+static PyObject *idprop_py_from_idp_double(IDProperty *prop)
+{
+ return PyFloat_FromDouble((*(double*)(&prop->data.val)));
+}
- case IDP_INT:
- return PyLong_FromLong( (long)prop->data.val );
- case IDP_FLOAT:
- return PyFloat_FromDouble(
(double)(*(float*)(&prop->data.val)) );
- case IDP_DOUBLE:
- return PyFloat_FromDouble(
(*(double*)(&prop->data.val)) );
- case IDP_GROUP:
- /*blegh*/
- {
- BPy_IDProperty *group =
PyObject_New(BPy_IDProperty, &BPy_IDGroup_Type);
- group->id = id;
- group->prop = prop;
- return (PyObject*) group;
- }
- case IDP_ARRAY:
- {
- BPy_IDProperty *array =
PyObject_New(BPy_IDProperty, &BPy_IDArray_Type);
- array->id = id;
- array->prop = prop;
- return (PyObject*) array;
- }
- case IDP_IDPARRAY: /* this could be better a internal type */
- {
- PyObject *seq = PyList_New(prop->len), *wrap;
- IDProperty *array= IDP_IDPArray(prop);
- int i;
+static PyObject *idprop_py_from_idp_group(ID *id, IDProperty *prop, IDProperty
*parent)
+{
+ BPy_IDProperty *group= PyObject_New(BPy_IDProperty, &BPy_IDGroup_Type);
+ group->id = id;
+ group->prop = prop;
+ group->parent = parent; /* can be NULL */
+ return (PyObject*) group;
+}
- if (!seq) {
- PyErr_Format(PyExc_RuntimeError,
"BPy_IDGroup_MapDataToPy, IDP_IDPARRAY: PyList_New(%d) failed", prop->len);
- return NULL;
- }
+static PyObject *idprop_py_from_idp_array(ID *id, IDProperty *prop)
+{
+ BPy_IDProperty *array = PyObject_New(BPy_IDProperty, &BPy_IDArray_Type);
+ array->id = id;
+ array->prop = prop;
+ return (PyObject*) array;
+}
- for (i=0; i<prop->len; i++) {
- wrap= BPy_IDGroup_WrapData(id, array++);
+static PyObject *idprop_py_from_idp_idparray(ID *id, IDProperty *prop)
+{
+ PyObject *seq = PyList_New(prop->len), *wrap;
+ IDProperty *array= IDP_IDPArray(prop);
+ int i;
- if (!wrap) /* BPy_IDGroup_MapDataToPy
sets the error */
- return NULL;
+ if (!seq) {
+ PyErr_Format(PyExc_RuntimeError,
+ "%s: IDP_IDPARRAY: PyList_New(%d) failed",
+ __func__, prop->len);
+ return NULL;
+ }
- PyList_SET_ITEM(seq, i, wrap);
- }
+ for (i=0; i<prop->len; i++) {
+ wrap= BPy_IDGroup_WrapData(id, array++, prop);
- return seq;
- }
- /* case IDP_IDPARRAY: TODO */
+ if (!wrap) /* BPy_IDGroup_MapDataToPy sets the error */
+ return NULL;
+
+ PyList_SET_ITEM(seq, i, wrap);
}
- Py_RETURN_NONE;
+
+ return seq;
}
+/* --------------------------------------------------------------------------
*/
+
+/* use for both array and group */
+static long BPy_IDGroup_hash(BPy_IDProperty *self)
+{
+ return _Py_HashPointer(self->prop);
+}
+
+static PyObject *BPy_IDGroup_repr(BPy_IDProperty *self)
+{
+ return PyUnicode_FromFormat( "<bpy id property from \"%s\">",
self->id->name);
+}
+
+PyObject *BPy_IDGroup_WrapData(ID *id, IDProperty *prop, IDProperty *parent)
+{
+ switch (prop->type) {
+ case IDP_STRING:
+ return idprop_py_from_idp_string(prop);
+ case IDP_INT:
+ return idprop_py_from_idp_int(prop);
+ case IDP_FLOAT:
+ return idprop_py_from_idp_float(prop);
+ case IDP_DOUBLE:
+ return idprop_py_from_idp_double(prop);
+ case IDP_GROUP:
+ return idprop_py_from_idp_group(id, prop, parent);
+ case IDP_ARRAY:
+ return idprop_py_from_idp_idparray(id, prop);
+ case IDP_IDPARRAY: /* this could be better a internal type */
+ idprop_py_from_idp_array(id, prop);
+ default:
+ Py_RETURN_NONE;
+ }
+}
+
#if 0 /* UNUSED, currenly assignment overwrites into new properties, rather
than setting in-place */
static int BPy_IDGroup_SetData(BPy_IDProperty *self, IDProperty *prop,
PyObject *value)
{
@@ -135,6 +170,7 @@
PyErr_SetString(PyExc_TypeError, "expected a
string!");
return -1;
}
+ /* NOTE: if this code is enabled, bytes support needs
to be added */
#ifdef USE_STRING_COERCE
{
int alloc_len;
@@ -267,8 +303,7 @@
return NULL;
}
- return BPy_IDGroup_WrapData(self->id, idprop);
-
+ return BPy_IDGroup_WrapData(self->id, idprop, self->prop);
}
/*returns NULL on success, error string on failure*/
@@ -506,113 +541,109 @@
return (PyObject*) iter;
}
+/* for simple, non nested types this is the same as BPy_IDGroup_WrapData */
static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop)
{
switch (prop->type) {
- case IDP_STRING:
- if (prop->subtype == IDP_STRING_SUB_BYTE) {
- return
PyBytes_FromStringAndSize(IDP_Array(prop), prop->len);
+ case IDP_STRING:
+ return idprop_py_from_idp_string(prop);
+ case IDP_INT:
+ return idprop_py_from_idp_int(prop);
+ case IDP_FLOAT:
+ return idprop_py_from_idp_float(prop);
+ case IDP_DOUBLE:
+ return idprop_py_from_idp_double(prop);
+ case IDP_ARRAY:
+ {
+ PyObject *seq = PyList_New(prop->len);
+ int i;
+
+ if (!seq) {
+ PyErr_Format(PyExc_RuntimeError,
+ "%s: IDP_ARRAY: PyList_New(%d) failed",
+ __func__, prop->len);
+ return NULL;
+ }
+
+ switch(prop->subtype) {
+ case IDP_FLOAT:
+ {
+ float *array= (float*)IDP_Array(prop);
+ for (i=0; i<prop->len; i++) {
+ PyList_SET_ITEM(seq, i,
PyFloat_FromDouble(array[i]));
}
- else {
-#ifdef USE_STRING_COERCE
- return
PyC_UnicodeFromByteAndSize(IDP_Array(prop), prop->len - 1);
-#else
- return
PyUnicode_FromStringAndSize(IDP_Array(prop), prop->len - 1);
-#endif
- }
break;
- case IDP_FLOAT:
- return PyFloat_FromDouble(*((float*)&prop->data.val));
- break;
+ }
case IDP_DOUBLE:
- return PyFloat_FromDouble(*((double*)&prop->data.val));
+ {
+ double *array= (double*)IDP_Array(prop);
+ for (i=0; i<prop->len; i++) {
+ PyList_SET_ITEM(seq, i,
PyFloat_FromDouble(array[i]));
+ }
break;
+ }
case IDP_INT:
- return PyLong_FromSsize_t( prop->data.val );
- break;
- case IDP_ARRAY:
{
- PyObject *seq = PyList_New(prop->len);
- int i;
-
- if (!seq) {
- PyErr_Format(PyExc_RuntimeError,
"BPy_IDGroup_MapDataToPy, IDP_ARRAY: PyList_New(%d) failed", prop->len);
- return NULL;
+ int *array= (int*)IDP_Array(prop);
+ for (i=0; i<prop->len; i++) {
+ PyList_SET_ITEM(seq, i,
PyLong_FromLong(array[i]));
}
+ break;
+ }
+ default:
+ PyErr_Format(PyExc_RuntimeError,
+ "%s: invalid/corrupt array type '%d'!",
+ __func__, prop->subtype);
+ Py_DECREF(seq);
+ return NULL;
+ }
- switch(prop->subtype) {
- case IDP_FLOAT:
- {
- float *array= (float*)IDP_Array(prop);
- for (i=0; i<prop->len; i++) {
- PyList_SET_ITEM(seq, i,
PyFloat_FromDouble(array[i]));
- }
- break;
- }
- case IDP_DOUBLE:
- {
- double *array= (double*)IDP_Array(prop);
- for (i=0; i<prop->len; i++) {
- PyList_SET_ITEM(seq, i,
PyFloat_FromDouble(array[i]));
- }
- break;
- }
- case IDP_INT:
- {
- int *array= (int*)IDP_Array(prop);
- for (i=0; i<prop->len; i++) {
- PyList_SET_ITEM(seq, i,
PyLong_FromLong(array[i]));
- }
- break;
- }
- default:
- PyErr_SetString(PyExc_RuntimeError,
"invalid/corrupt array type!");
- Py_DECREF(seq);
- return NULL;
- }
+ return seq;
+ }
+ case IDP_IDPARRAY:
+ {
+ PyObject *seq = PyList_New(prop->len), *wrap;
+ IDProperty *array= IDP_IDPArray(prop);
+ int i;
- return seq;
+ if (!seq) {
+ PyErr_Format(PyExc_RuntimeError,
+ "%s: IDP_IDPARRAY: PyList_New(%d) failed",
+ __func__, prop->len);
+ return NULL;
}
- case IDP_IDPARRAY:
- {
- PyObject *seq = PyList_New(prop->len), *wrap;
- IDProperty *array= IDP_IDPArray(prop);
- int i;
- if (!seq) {
- PyErr_Format(PyExc_RuntimeError,
"BPy_IDGroup_MapDataToPy, IDP_IDPARRAY: PyList_New(%d) failed", prop->len);
+ for (i=0; i<prop->len; i++) {
+ wrap= BPy_IDGroup_MapDataToPy(array++);
+
+ if (!wrap) /* BPy_IDGroup_MapDataToPy sets the error */
return NULL;
- }
- for (i=0; i<prop->len; i++) {
- wrap= BPy_IDGroup_MapDataToPy(array++);
-
- if (!wrap) /* BPy_IDGroup_MapDataToPy sets the
error */
- return NULL;
-
- PyList_SET_ITEM(seq, i, wrap);
- }
- return seq;
+ PyList_SET_ITEM(seq, i, wrap);
}
- case IDP_GROUP:
- {
- PyObject *dict = PyDict_New(), *wrap;
- IDProperty *loop;
+ return seq;
+ }
+ case IDP_GROUP:
+ {
+ PyObject *dict = PyDict_New(), *wrap;
+ IDProperty *loop;
- for (loop=prop->data.group.first; loop;
loop=loop->next) {
- wrap = BPy_IDGroup_MapDataToPy(loop);
+ for (loop=prop->data.group.first; loop; loop=loop->next) {
+ wrap = BPy_IDGroup_MapDataToPy(loop);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
