diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-30 21:28:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-29 08:34:09 -0800 |
| commit | e80c0d2c60e53071632095322845c32c80767f6f (patch) | |
| tree | eb46dadc370569190b2b14a362678c5307f8ded4 /core | |
| parent | dea1ef84d50620d8030566d058c39d9d50f7c5df (diff) | |
| download | subsurface-e80c0d2c60e53071632095322845c32c80767f6f.tar.gz | |
filter: reset shown_dives in filter
The shown_dives variable was reset by the dive_list code. Arguably,
the filter should keep track of the number of shown dives, so move
the resetting there. This means adding a new "reset()" member function
to the filter and call that instead of "updateAll()" when the core
data is reset.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/divefilter.cpp | 10 | ||||
| -rw-r--r-- | core/divefilter.h | 1 | ||||
| -rw-r--r-- | core/divelist.c | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/core/divefilter.cpp b/core/divefilter.cpp index 0aa78e53b..4c40869f5 100644 --- a/core/divefilter.cpp +++ b/core/divefilter.cpp @@ -52,6 +52,16 @@ ShownChange DiveFilter::update(const QVector<dive *> &dives) const return res; } +void DiveFilter::reset() +{ + int i; + dive *d; + shown_dives = dive_table.nr; + for_each_dive(i, d) + d->hidden_by_filter = false; + updateAll(); +} + ShownChange DiveFilter::updateAll() const { dive *old_current = current_dive; diff --git a/core/divefilter.h b/core/divefilter.h index d8d28ab04..608cf4843 100644 --- a/core/divefilter.h +++ b/core/divefilter.h @@ -39,6 +39,7 @@ class DiveFilter { public: static DiveFilter *instance(); + void reset(); QString shownText() const; bool diveSiteMode() const; // returns true if we're filtering on dive site (on mobile always returns false) #ifndef SUBSURFACE_MOBILE diff --git a/core/divelist.c b/core/divelist.c index a15c40d83..9e67e55c2 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -807,13 +807,9 @@ void process_loaded_dives() int i; struct dive *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++; + /* Register dive computer nick names. */ + for_each_dive(i, dive) add_devices_of_dive(dive, &device_table); - } sort_dive_table(&dive_table); sort_trip_table(&trip_table); |