diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-11-17 18:13:55 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-19 21:13:40 -0800 |
| commit | b76f2071589d6a7f45ec2845afa8b49110da608b (patch) | |
| tree | 1b7176f4bf706803160c9dc007a7c524dbc59bd2 /desktop-widgets/divelistview.cpp | |
| parent | 6d6d10f03a92a9bac5394fc226c398af61f29d66 (diff) | |
| download | subsurface-b76f2071589d6a7f45ec2845afa8b49110da608b.tar.gz | |
Filter: split out filter from model
Split out the actual filtering from the MultiFilterSortModel.
Create a DiveFilter class that does the actual filtering.
Currently, mobile and desktop have their own version of this
class, though ultimately we may want to merge them.
The idea here is that the trip-model and undo-commands have
direct access to the filter-function and thus can take care
of keeping track of the number of shown dives, etc.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/divelistview.cpp')
| -rw-r--r-- | desktop-widgets/divelistview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index aa2195434..d6a4d507e 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -10,6 +10,7 @@ #include "desktop-widgets/mainwindow.h" #include "desktop-widgets/divepicturewidget.h" #include "core/display.h" +#include "core/divefilter.h" #include <unistd.h> #include <QSettings> #include <QKeyEvent> @@ -463,7 +464,7 @@ void DiveListView::selectDives(const QList<int> &newDiveSelection) // But don't do this if we are in divesite mode, because then // the dive-site selection is controlled by the filter not // by the selected dives. - if (!MultiFilterSortModel::instance()->diveSiteMode()) { + if (!DiveFilter::instance()->diveSiteMode()) { QVector<dive_site *> selectedSites; for (int idx: newDiveSelection) { dive *d = get_dive(idx); @@ -698,7 +699,7 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS // But don't do this if we are in divesite mode, because then // the dive-site selection is controlled by the filter not // by the selected dives. - if (!MultiFilterSortModel::instance()->diveSiteMode()) { + if (!DiveFilter::instance()->diveSiteMode()) { QVector<dive_site *> selectedSites; for (QModelIndex index: selectionModel()->selection().indexes()) { const QAbstractItemModel *model = index.model(); |