[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59631] trunk/blender: Last uiList patch ( for now!): filtering and reordering of shown elements.
Bastien Montagne
montagne29 at wanadoo.fr
Thu Aug 29 14:55:31 CEST 2013
Revision: 59631
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59631
Author: mont29
Date: 2013-08-29 12:55:31 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Last uiList patch (for now!): filtering and reordering of shown elements.
Thanks to Brecht for the reviews. :)
This commit adds a show/hide extension below each uiList, containing by default an option to filter and/or reorder items by name (and to reverse those filtering and reordering).
Each derived uiList class in Python can define more specific filtering by implementing callbacks: the draw_filter() function to draw options in UI, and the filter_items() function to effectively filter/reorder items.
Note: the advanced options for vgroups shown as "proof od concept" in patches do not go in trunk for now, we have to find a better way to get those vgroups info for UI code, we can't afford to loop over each vertex here!
And doc (release notes and uiList example) is still to be updated, will do this in next days.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/source/blender/blenkernel/BKE_screen.h
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesrna/intern/rna_ui.c
Modified: trunk/blender/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/__init__.py 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/release/scripts/startup/bl_ui/__init__.py 2013-08-29 12:55:31 UTC (rev 59631)
@@ -142,6 +142,61 @@
# Define a default UIList, when a list does not need any custom drawing...
# Keep in sync with its #defined name in UI_interface.h
class UI_UL_list(bpy.types.UIList):
- pass
+ # These are common filtering or ordering operations (same as the default C ones!).
+ @staticmethod
+ def filter_items_by_name(pattern, bitflag, items, propname="name", flags=None, reverse=False):
+ """
+ Set FILTER_ITEM for items which name matches filter_name one (case-insensitive).
+ pattern is the filtering pattern.
+ propname is the name of the string property to use for filtering.
+ flags must be a list of integers the same length as items, or None!
+ return a list of flags (based on given flags if not None),
+ or an empty list if no flags were given and no filtering has been done.
+ """
+ import fnmatch
+ if not pattern: # Empty pattern = no filtering!
+ return flags or []
+
+ if flags is None:
+ flags = [0] * len(items)
+ for idx, it in enumerate(items):
+ name = getattr(it, propname, None)
+ # Implicitly add heading/trailing wildcards if needed.
+ if pattern[0] != "*":
+ pattern = "*" + pattern
+ if pattern[-1] != "*":
+ pattern = pattern + "*"
+ # This is similar to a logical xor
+ if bool(name and fnmatch.fnmatch(name.lower(), pattern.lower())) is not bool(reverse):
+ flags[idx] |= bitflag
+ return flags
+
+ @staticmethod
+ def sort_items_helper(sort_data, key, reverse=False):
+ """
+ Common sorting utility. Returns a neworder list mapping org_idx -> new_idx.
+ sort_data must be an (unordered) list of tuples [(org_idx, ...), (org_idx, ...), ...].
+ key must be the same kind of callable you would use for sorted() builtin function.
+ reverse will reverse the sorting!
+ """
+ sort_data.sort(key=key, reverse=reverse)
+ neworder = [None] * len(sort_data)
+ for newidx, (orgidx, *_) in enumerate(sort_data):
+ neworder[orgidx] = newidx
+ return neworder
+
+ @classmethod
+ def sort_items_by_name(cls, items, propname="name"):
+ """
+ Re-order items using their names (case-insensitive).
+ propname is the name of the string property to use for sorting.
+ return a list mapping org_idx -> new_idx,
+ or an empty list if no sorting has been done.
+ """
+ neworder = [None] * len(items)
+ _sort = [(idx, getattr(it, propname, "")) for idx, it in enumerate(items)]
+ return cls.sort_items_helper(_sort, lambda e: e[1].lower())
+
+
bpy.utils.register_class(UI_UL_list)
Modified: trunk/blender/source/blender/blenkernel/BKE_screen.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_screen.h 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/blenkernel/BKE_screen.h 2013-08-29 12:55:31 UTC (rev 59631)
@@ -189,16 +189,24 @@
/* uilist types */
-/* draw an item in the uiList */
+/* Draw an item in the uiList */
typedef void (*uiListDrawItemFunc)(struct uiList *, struct bContext *, struct uiLayout *, struct PointerRNA *,
- struct PointerRNA *, int, struct PointerRNA *, const char *, int);
+ struct PointerRNA *, int, struct PointerRNA *, const char *, int, int);
+/* Draw the filtering part of an uiList */
+typedef void (*uiListDrawFilterFunc)(struct uiList *, struct bContext *, struct uiLayout *);
+
+/* Filter items of an uiList */
+typedef void (*uiListFilterItemsFunc)(struct uiList *, struct bContext *, struct PointerRNA *, const char *);
+
typedef struct uiListType {
struct uiListType *next, *prev;
char idname[BKE_ST_MAXNAME]; /* unique name */
uiListDrawItemFunc draw_item;
+ uiListDrawFilterFunc draw_filter;
+ uiListFilterItemsFunc filter_items;
/* RNA integration */
ExtensionRNA ext;
Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c 2013-08-29 12:55:31 UTC (rev 59631)
@@ -47,6 +47,7 @@
#include "BLI_listbase.h"
#include "BLI_utildefines.h"
+#include "BKE_idprop.h"
#include "BKE_screen.h"
/* ************ Spacetype/regiontype handling ************** */
@@ -290,8 +291,19 @@
for (uilst = ar->ui_lists.first; uilst; uilst = uilst->next) {
if (uilst->dyn_data) {
- MEM_freeN(uilst->dyn_data);
+ uiListDyn *dyn_data = uilst->dyn_data;
+ if (dyn_data->items_filter_flags) {
+ MEM_freeN(dyn_data->items_filter_flags);
+ }
+ if (dyn_data->items_filter_neworder) {
+ MEM_freeN(dyn_data->items_filter_neworder);
+ }
+ MEM_freeN(dyn_data);
}
+ if (uilst->properties) {
+ IDP_FreeProperty(uilst->properties);
+ MEM_freeN(uilst->properties);
+ }
}
BLI_freelistN(&ar->ui_lists);
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-08-29 12:55:31 UTC (rev 59631)
@@ -6128,6 +6128,9 @@
for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next) {
ui_list->type = NULL;
ui_list->dyn_data = NULL;
+ ui_list->properties = newdataadr(fd, ui_list->properties);
+ if (ui_list->properties)
+ IDP_DirectLinkProperty(ui_list->properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
}
if (spacetype == SPACE_EMPTY) {
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2013-08-29 12:55:31 UTC (rev 59631)
@@ -2394,6 +2394,15 @@
}
}
+static void write_uilist(WriteData *wd, uiList *ui_list)
+{
+ writestruct(wd, DATA, "uiList", 1, ui_list);
+
+ if (ui_list->properties) {
+ IDP_WriteProperty(ui_list->properties, wd);
+ }
+}
+
static void write_soops(WriteData *wd, SpaceOops *so, LinkNode **tmp_mem_list)
{
BLI_mempool *ts = so->treestore;
@@ -2475,7 +2484,7 @@
writestruct(wd, DATA, "Panel", 1, pa);
for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next)
- writestruct(wd, DATA, "uiList", 1, ui_list);
+ write_uilist(wd, ui_list);
}
sl= sa->spacedata.first;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-08-29 12:55:31 UTC (rev 59631)
@@ -6585,16 +6585,56 @@
((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt)))
{
const int value_orig = RNA_property_int_get(&but->rnapoin, but->rnaprop);
- int value, min, max;
+ int value, min, max, inc;
/* activate up/down the list */
value = value_orig;
+ if ((ui_list->filter_orderby_flag & UILST_FLT_ORDERBY_REVERSE) != 0) {
+ inc = ELEM(type, UPARROWKEY, WHEELUPMOUSE) ? 1 : -1;
+ }
+ else {
+ inc = ELEM(type, UPARROWKEY, WHEELUPMOUSE) ? -1 : 1;
+ }
- if (ELEM(type, UPARROWKEY, WHEELUPMOUSE))
- value--;
- else
- value++;
+ if (dyn_data->items_filter_neworder || dyn_data->items_filter_flags) {
+ /* If we have a display order different from collection order, we have some work! */
+ int *org_order = MEM_mallocN(dyn_data->items_shown * sizeof(int), AT);
+ int *new_order = dyn_data->items_filter_neworder;
+ int i, org_idx = -1, len = dyn_data->items_len;
+ int current_idx = -1;
+ int filter_exclude = ui_list->filter_flag & UILST_FLT_EXCLUDE;
+ for (i = 0; i < len; i++) {
+ if (!dyn_data->items_filter_flags ||
+ ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
+ {
+ org_order[new_order ? new_order[++org_idx] : ++org_idx] = i;
+ if (i == value) {
+ current_idx = new_order ? new_order[org_idx] : org_idx;
+ }
+ }
+ else if (i == value && org_idx >= 0) {
+ current_idx = -(new_order ? new_order[org_idx] : org_idx) - 1;
+ }
+ }
+ /* Now, org_order maps displayed indices to real indices,
+ * and current_idx either contains the displayed index of active value (positive),
+ * or its more-nearest one (negated).
+ */
+ if (current_idx < 0) {
+ current_idx = (current_idx * -1) + (inc < 0 ? inc : inc - 1);
+ }
+ else {
+ current_idx += inc;
+ }
+ CLAMP(current_idx, 0, dyn_data->items_shown - 1);
+ value = org_order[current_idx];
+ MEM_freeN(org_order);
+ }
+ else {
+ value += inc;
+ }
+
CLAMP(value, 0, dyn_data->items_len - 1);
RNA_property_int_range(&but->rnapoin, but->rnaprop, &min, &max);
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2013-08-29 12:36:02 UTC (rev 59630)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2013-08-29 12:55:31 UTC (rev 59631)
@@ -44,6 +44,7 @@
#include "BLI_rect.h"
#include "BLI_math.h"
#include "BLI_listbase.h"
+#include "BLI_fnmatch.h"
#include "BLF_api.h"
#include "BLF_translation.h"
@@ -2471,7 +2472,7 @@
static void uilist_draw_item_default(struct uiList *ui_list, struct bContext *UNUSED(C), struct uiLayout *layout,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list