diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-11-17 18:32:35 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-19 21:13:40 -0800 |
| commit | 9ffafbc326b38bd2d0bb870fa4721b6c94280c28 (patch) | |
| tree | d4ebf99b7c0320abdf1cf17bbf3ddbf4e5fd2f8b /core | |
| parent | b76f2071589d6a7f45ec2845afa8b49110da608b (diff) | |
| download | subsurface-9ffafbc326b38bd2d0bb870fa4721b6c94280c28.tar.gz | |
Filter: move num_shown logic from model to core
Since the number of shown dives is stored in the core, let's also
keep it updated there.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/divelist.c | 19 | ||||
| -rw-r--r-- | core/divelist.h | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/core/divelist.c b/core/divelist.c index 4367b8708..6405dfd51 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -900,13 +900,19 @@ void deselect_dive(struct dive *dive) } int shown_dives = 0; -void filter_dive(struct dive *d, bool shown) +bool filter_dive(struct dive *d, bool shown) { + bool old_shown, changed; if (!d) - return; + return false; + old_shown = !d->hidden_by_filter; d->hidden_by_filter = !shown; if (!shown && d->selected) deselect_dive(d); + changed = old_shown != shown; + if (changed) + shown_dives += shown - old_shown; + return changed; } void mark_divelist_changed(bool changed) @@ -927,9 +933,13 @@ void process_loaded_dives() int i; struct dive *dive; - /* Register dive computer nick names */ - for_each_dive(i, dive) + /* Register dive computer nick names and count shown dives. */ + shown_dives = 0; + for_each_dive(i, dive) { + if (!dive->hidden_by_filter) + shown_dives++; set_dc_nickname(dive); + } sort_dive_table(&dive_table); sort_trip_table(&trip_table); @@ -1448,6 +1458,7 @@ void clear_dive_file_data() while (dive_table.nr) delete_single_dive(0); current_dive = NULL; + shown_dives = 0; while (dive_site_table.nr) delete_dive_site(get_dive_site(0, &dive_site_table), &dive_site_table); if (trip_table.nr != 0) { diff --git a/core/divelist.h b/core/divelist.h index c0f70ccb6..efab389ee 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -44,7 +44,7 @@ extern int remove_dive(const struct dive *dive, struct dive_table *table); extern bool consecutive_selected(); extern void select_dive(struct dive *dive); extern void deselect_dive(struct dive *dive); -extern void filter_dive(struct dive *d, bool shown); +extern bool filter_dive(struct dive *d, bool shown); /* returns true if status changed */ extern struct dive *first_selected_dive(); extern struct dive *last_selected_dive(); extern int get_dive_nr_at_idx(int idx); |