[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19131] branches/blender2.5/blender/source /blender: added defAutoButR() and blockSetFlag() and some flags for the experimental python UI, which just wraps C the functions.
Diego B
bdiego at gmail.com
Fri Feb 27 14:47:23 CET 2009
On Fri, Feb 27, 2009 at 8:23 AM, Campbell Barton <ideasman42 at gmail.com> wrote:
> Revision: 19131
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19131
> Author: campbellbarton
> Date: 2009-02-27 11:22:40 +0100 (Fri, 27 Feb 2009)
>
> Log Message:
> -----------
> added defAutoButR() and blockSetFlag() and some flags for the experimental python UI, which just wraps C the functions.
>
> Modified Paths:
> --------------
> branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
> branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
>
> Modified: branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
> ===================================================================
> --- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2009-02-27 00:12:11 UTC (rev 19130)
> +++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2009-02-27 10:22:40 UTC (rev 19131)
> @@ -70,7 +70,7 @@
> #define UI_CENTER 16
> #define UI_SHIFT_FLIPPED 32
>
> -/* uiBlock->autofill */
> +/* uiBlock->autofill (not yet used) */
> #define UI_BLOCK_COLLUMNS 1
> #define UI_BLOCK_ROWS 2
>
>
> Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
> ===================================================================
> --- branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c 2009-02-27 00:12:11 UTC (rev 19130)
> +++ branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c 2009-02-27 10:22:40 UTC (rev 19131)
> @@ -23,6 +23,7 @@
> */
>
> #include "bpy_ui.h"
> +#include "bpy_rna.h" /* for rna buttons */
> #include "bpy_compat.h"
>
> #include "BLI_dynstr.h"
> @@ -83,6 +84,29 @@
> return PyCObject_FromVoidPtr(uiDefButO(PyCObject_AsVoidPtr(py_block), BUT, opname, exec, butname, xco, yco, width, height, tip), NULL );
> }
>
> +static PyObject *Method_defAutoButR( PyObject * self, PyObject * args )
> +{
> + PyObject *py_block;
> + BPy_StructRNA *py_rna;
> + char *propname, *butname;
> + int index, xco, yco, width, height;
> + PropertyRNA *prop;
> +
> + if( !PyArg_ParseTuple( args, "O!O!sisiiii:defAutoButR", &PyCObject_Type, &py_block, &pyrna_struct_Type, &py_rna, &propname, &index, &butname, &xco, &yco, &width, &height))
> + return NULL;
> +
> + // XXX This isnt that nice api, but we dont always have the rna property from python since its converted immediately into a PyObject
> + prop = RNA_struct_find_property(&py_rna->ptr, propname);
> + if (prop==NULL) {
> + PyErr_SetString(PyExc_ValueError, "rna property not found");
> + return NULL;
> + }
> +
> + return PyCObject_FromVoidPtr( uiDefAutoButR(PyCObject_AsVoidPtr(py_block), &py_rna->ptr, prop, index, butname, xco, yco, width, height), NULL);
> +}
> +
> +
> +
> static uiBlock *py_internal_uiBlockCreateFunc(struct bContext *C, struct ARegion *ar, void *arg1)
> {
> PyObject *ret, *args;
> @@ -175,6 +199,18 @@
> Py_RETURN_NONE;
> }
>
> +static PyObject *Method_blockSetFlag( PyObject * self, PyObject * args )
> +{
> + PyObject *py_block;
> + int flag; /* Note new py api should not use flags, but for this low level UI api its ok. */
> +
> + if( !PyArg_ParseTuple( args, "O!i:blockSetFlag", &PyCObject_Type, &py_block, &flag))
> + return NULL;
> +
> + uiBlockSetFlag(PyCObject_AsVoidPtr(py_block), flag);
> + Py_RETURN_NONE;
> +}
> +
> static PyObject *Method_newPanel( PyObject * self, PyObject * args )
> {
> PyObject *py_context, *py_area, *py_block;
> @@ -232,12 +268,14 @@
> {"pupMenuEnd", (PyCFunction)Method_pupMenuEnd, METH_VARARGS, ""},
> {"menuItemO", (PyCFunction)Method_menuItemO, METH_VARARGS, ""},
> {"defButO", (PyCFunction)Method_defButO, METH_VARARGS, ""},
> + {"defAutoButR", (PyCFunction)Method_defAutoButR, METH_VARARGS, ""},
> {"pupBlock", (PyCFunction)Method_pupBlock, METH_VARARGS, ""},
> {"beginBlock", (PyCFunction)Method_beginBlock, METH_VARARGS, ""},
> {"endBlock", (PyCFunction)Method_endBlock, METH_VARARGS, ""},
> {"popupBoundsBlock", (PyCFunction)Method_popupBoundsBlock, METH_VARARGS, ""},
> {"blockBeginAlign", (PyCFunction)Method_blockBeginAlign, METH_VARARGS, ""},
> {"blockEndAlign", (PyCFunction)Method_blockEndAlign, METH_VARARGS, ""},
> + {"blockSetFlag", (PyCFunction)Method_blockSetFlag, METH_VARARGS, ""},
> {"newPanel", (PyCFunction)Method_newPanel, METH_VARARGS, ""},
>
> {"getRegonPtr", (PyCFunction)Method_getRegonPtr, METH_NOARGS, ""}, // XXX Nasty, we really need to improve dealing with context!
> @@ -247,7 +285,6 @@
> {NULL, NULL, 0, NULL}
> };
>
I am getting compiled error since this change, if ui_module (only?) is
used with python3, why remove the #if ? anyway, I have python 2.5
and the error:
bpy_ui.c:288: error: variable ‘ui_module’ has initializer but incomplete type
bpy_ui.c:289: error: ‘PyModuleDef_HEAD_INIT’ undeclared here (not in a function)
bpy_ui.c:289: warning: excess elements in struct initializer
bpy_ui.c:289: warning: (near initialization for ‘ui_module’)
I just restore the #if and work fine, but I don't know what is the
real fix for this.
> -#if PY_VERSION_HEX >= 0x03000000
> static struct PyModuleDef ui_module = {
> PyModuleDef_HEAD_INIT,
> "bpyui",
> @@ -259,11 +296,25 @@
>
> PyObject *BPY_ui_module( void )
> {
> - return PyModule_Create(&ui_module);
> -}
> + PyObject *submodule, *dict;
> +#if PY_VERSION_HEX >= 0x03000000
> + submodule= PyModule_Create(&ui_module);
> #else /* Py2.x */
> -PyObject *BPY_ui_module( void )
> -{
> - return Py_InitModule3( "bpyui", ui_methods, "" );
> + submodule= Py_InitModule3( "bpyui", ui_methods, "" );
> +#endif
> +
> + /* uiBlock->flag (controls) */
> + PyModule_AddObject( submodule, "UI_BLOCK_LOOP", PyLong_FromSize_t(UI_BLOCK_LOOP) );
> + PyModule_AddObject( submodule, "UI_BLOCK_RET_1", PyLong_FromSize_t(UI_BLOCK_RET_1) );
> + PyModule_AddObject( submodule, "UI_BLOCK_NUMSELECT", PyLong_FromSize_t(UI_BLOCK_NUMSELECT) );
> + PyModule_AddObject( submodule, "UI_BLOCK_ENTER_OK", PyLong_FromSize_t(UI_BLOCK_ENTER_OK) );
> + PyModule_AddObject( submodule, "UI_BLOCK_NOSHADOW", PyLong_FromSize_t(UI_BLOCK_NOSHADOW) );
> + PyModule_AddObject( submodule, "UI_BLOCK_NO_HILITE", PyLong_FromSize_t(UI_BLOCK_NO_HILITE) );
> + PyModule_AddObject( submodule, "UI_BLOCK_MOVEMOUSE_QUIT", PyLong_FromSize_t(UI_BLOCK_MOVEMOUSE_QUIT) );
> + PyModule_AddObject( submodule, "UI_BLOCK_KEEP_OPEN", PyLong_FromSize_t(UI_BLOCK_KEEP_OPEN) );
> + PyModule_AddObject( submodule, "UI_BLOCK_POPUP", PyLong_FromSize_t(UI_BLOCK_POPUP) );
> +
> + return submodule;
> }
> -#endif
> +
> +
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
More information about the Bf-committers
mailing list