archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

subtype support for properties in bpy.props.

Browse Source
This commit is contained in:
Campbell Barton
2010-02-01 22:04:33 +00:00
parent 26cfe812f8
commit 039d087171
18 changed files with 413 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
source/blender/python/intern/bpy_rna.c
View File

@@ -55,6 +55,7 @@
#include "../generic/Mathutils.h" /* so we can have mathutils callbacks */
#include "../generic/IDProp.h" /* for IDprop lookups */
static PyObject *prop_subscript_array_slice(BPy_PropertyRNA *self, PointerRNA *ptr, PropertyRNA *prop, int start, int stop, int length);
/* bpyrna vector/euler/quat callbacks */
@@ -421,6 +422,69 @@ static int pyrna_string_to_enum(PyObject *item, PointerRNA *ptr, PropertyRNA *pr
return 1;
}
int pyrna_set_to_enum_bitfield(EnumPropertyItem *items, PyObject *value, int *r_value, const char *error_prefix)
{
/* set of enum items, concatenate all values with OR */
int ret, flag= 0;
/* set looping */
Py_ssize_t pos = 0;
PyObject *key;
long hash;
*r_value= 0;
while (_PySet_NextEntry(value, &pos, &key, &hash)) {
char *param= _PyUnicode_AsString(key);
if(param==NULL) {
PyErr_Format(PyExc_TypeError, "%s expected a string. found a %.200s", error_prefix, Py_TYPE(key)->tp_name);
return -1;
}
if(RNA_enum_value(items, param, &ret) == 0) {
char *enum_str= BPy_enum_as_string(items);
PyErr_Format(PyExc_TypeError, "%s \"%.200s\" not found in (%.200s)", error_prefix, param, enum_str);
MEM_freeN(enum_str);
return -1;
}
flag |= ret;
}
*r_value= flag;
return 0;
}
static int pyrna_prop_to_enum_bitfield(PointerRNA *ptr, PropertyRNA *prop, PyObject *value, int *r_value, const char *error_prefix)
{
EnumPropertyItem *item;
int ret;
int free= FALSE;
*r_value= 0;
RNA_property_enum_items(BPy_GetContext(), ptr, prop, &item, NULL, &free);
if(item) {
ret= pyrna_set_to_enum_bitfield(item, value, r_value, error_prefix);
}
else {
if(PySet_GET_SIZE(value)) {
PyErr_Format(PyExc_TypeError, "%s: empty enum \"%.200s\" could not have any values assigned.", error_prefix, RNA_property_identifier(prop));
ret= -1;
}
else {
ret= 0;
}
}
if(free)
MEM_freeN(item);
return ret;
}
PyObject *pyrna_enum_bitfield_to_py(EnumPropertyItem *items, int value)
{
PyObject *ret= PySet_New(NULL);
@@ -738,7 +802,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, ParameterList *parms, v
}
case PROP_ENUM:
{
int val= 0, tmpval;
int val= 0;
if (PyUnicode_Check(value)) {
if (!pyrna_string_to_enum(value, ptr, prop, &val, error_prefix))
@@ -747,18 +811,8 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, ParameterList *parms, v
else if (PyAnySet_Check(value)) {
if(RNA_property_flag(prop) & PROP_ENUM_FLAG) {
/* set of enum items, concatenate all values with OR */
/* set looping */
Py_ssize_t pos = 0;
PyObject *key;
long hash;
while (_PySet_NextEntry(value, &pos, &key, &hash)) {
if (!pyrna_string_to_enum(key, ptr, prop, &tmpval, error_prefix))
return -1;
val |= tmpval;
}
if(pyrna_prop_to_enum_bitfield(ptr, prop, value, &val, error_prefix) < 0)
return -1;
}
else {
PyErr_Format(PyExc_TypeError, "%.200s, %.200s.%.200s is not a bitflag enum type", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop));
@@ -3679,7 +3733,9 @@ static int deferred_register_prop(StructRNA *srna, PyObject *item, PyObject *key
PyErr_Print();
PyErr_Clear();
// PyLineSpit();
PyErr_Format(PyExc_ValueError, "StructRNA \"%.200s\" registration error: %.200s could not register\n", RNA_struct_identifier(srna), _PyUnicode_AsString(key));
Py_DECREF(dummy_args);
return -1;
}