From 3e05d61eb95f5b26d0382ff87451cbe5b59fc9ec Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 29 Apr 2019 08:17:41 +0200 Subject: Map: show all dive sites when in dive-site filter mode When on the dive site tab or editing a dive site, we want to show all dive sites so that the user can related different dive sites. Therefore export a "in dive site mode" flag from the filter model and don't filter in that case in MapWidgetHelper. Signed-off-by: Berthold Stoeger --- qt-models/filtermodels.cpp | 5 +++++ qt-models/filtermodels.h | 1 + 2 files changed, 6 insertions(+) (limited to 'qt-models') diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index bc454bcc9..663037383 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -278,6 +278,11 @@ void MultiFilterSortModel::stopFilterDiveSites() myInvalidate(); } +bool MultiFilterSortModel::diveSiteMode() const +{ + return !dive_sites.isEmpty(); +} + bool MultiFilterSortModel::lessThan(const QModelIndex &i1, const QModelIndex &i2) const { // Hand sorting down to the source model. diff --git a/qt-models/filtermodels.h b/qt-models/filtermodels.h index 258b4186b..7520fbe16 100644 --- a/qt-models/filtermodels.h +++ b/qt-models/filtermodels.h @@ -63,6 +63,7 @@ public: bool updateDive(struct dive *d); // returns true if visibility status changed int divesDisplayed; bool lessThan(const QModelIndex &, const QModelIndex &) const override; + bool diveSiteMode() const; // returns true if we're filtering on dive site public slots: void myInvalidate(); -- cgit v1.2.3-70-g09d2