diff options
author | Hans Goudey <h.goudey@me.com> | 2021-06-19 00:33:02 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-06-19 00:33:02 +0300 |
commit | f9aea19d98908be450f228a35bb6098e7e3e4b03 (patch) | |
tree | 87e91bc56f4235a86bcd44706b0f76064131e3df /source/blender/blenkernel/intern | |
parent | d52b7dbe2695c673b3bad091b55893413e7b022b (diff) |
Spreadsheet Editor: Row Filters
This patch adds support for filtering rows based on rules and values.
Filters will work for any attribute data source, they are a property
of the spreadsheet rather than of the attribute system. The properties
displayed in the row filter can depend on data type of the currently
visible column with that name. If the name is no longer visible, the
row filter filter is grayed out, but it will remember the value until
a column with its name is visible again.
Note: The comments in `screen.c` combined with tagging the sidebar
for redraw after the main region point to a lack of understanding
or technical debt, that is a point to improve in the future.
**Future Improvements**
* T89272: A search menu for visible columns when adding a new filter.
* T89273: Possibly a "Range" operation.
Differential Revision: https://developer.blender.org/D10959
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 2d59e978a81..269aeaebe82 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -1357,12 +1357,21 @@ static void write_area(BlendWriter *writer, ScrArea *area) } else if (sl->spacetype == SPACE_SPREADSHEET) { BLO_write_struct(writer, SpaceSpreadsheet, sl); - SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl; + + LISTBASE_FOREACH (SpreadsheetRowFilter *, row_filter, &sspreadsheet->row_filters) { + BLO_write_struct(writer, SpreadsheetRowFilter, row_filter); + BLO_write_string(writer, row_filter->value_string); + } + LISTBASE_FOREACH (SpreadsheetColumn *, column, &sspreadsheet->columns) { BLO_write_struct(writer, SpreadsheetColumn, column); BLO_write_struct(writer, SpreadsheetColumnID, column->id); BLO_write_string(writer, column->id->name); + /* While the display name is technically runtime data, we write it here, otherwise the row + * filters might not now their type if their region draws before the main region. + * This would ideally be cleared here. */ + BLO_write_string(writer, column->display_name); } LISTBASE_FOREACH (SpreadsheetContext *, context, &sspreadsheet->context_path) { switch (context->type) { @@ -1743,11 +1752,18 @@ static void direct_link_area(BlendDataReader *reader, ScrArea *area) SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl; sspreadsheet->runtime = NULL; - + BLO_read_list(reader, &sspreadsheet->row_filters); + LISTBASE_FOREACH (SpreadsheetRowFilter *, row_filter, &sspreadsheet->row_filters) { + BLO_read_data_address(reader, &row_filter->value_string); + } BLO_read_list(reader, &sspreadsheet->columns); LISTBASE_FOREACH (SpreadsheetColumn *, column, &sspreadsheet->columns) { BLO_read_data_address(reader, &column->id); BLO_read_data_address(reader, &column->id->name); + /* While the display name is technically runtime data, it is loaded here, otherwise the row + * filters might not now their type if their region draws before the main region. + * This would ideally be cleared here. */ + BLO_read_data_address(reader, &column->display_name); } BLO_read_list(reader, &sspreadsheet->context_path); |