diff options
| -rw-r--r-- | map-widget/qmlmapwidgethelper.cpp | 15 | ||||
| -rw-r--r-- | qt-models/filtermodels.cpp | 5 | ||||
| -rw-r--r-- | qt-models/filtermodels.h | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index b4b64b4d8..da3e6963e 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp @@ -8,6 +8,9 @@ #include "core/divesite.h" #include "core/qthelper.h" #include "qt-models/maplocationmodel.h" +#ifndef SUBSURFACE_MOBILE +#include "qt-models/filtermodels.h" +#endif #define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0 #define SMALL_CIRCLE_RADIUS_PX 26.0 @@ -114,10 +117,18 @@ void MapWidgetHelper::reloadMapLocations() QVector<struct dive_site *> locations; qreal latitude, longitude; +#ifdef SUBSURFACE_MOBILE + bool diveSiteMode = false; +#else + // In dive site mode (that is when either editing a dive site or on + // the dive site tab), we want to show all dive sites, not only those + // of the non-hidden dives. + bool diveSiteMode = MultiFilterSortModel::instance()->diveSiteMode(); +#endif for_each_dive(idx, dive) { // Don't show dive sites of hidden dives, unless this is the currently - // displayed (edited) dive. - if (dive->hidden_by_filter && dive != current_dive) + // displayed (edited) dive or we're in dive site edit mode. + if (!diveSiteMode && dive->hidden_by_filter && dive != current_dive) continue; struct dive_site *ds = get_dive_site_for_dive(dive); if (!dive_site_has_gps_location(ds) || locations.contains(ds)) 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(); |