mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Map: show all dive sites when in dive-site filter mode

Browse source 
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 <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-29 08:17:41 +02:00 • committed by Dirk Hohndel
parent 23cf85e89c
commit 3e05d61eb9
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
map-widget/qmlmapwidgethelper.cpp
View file

@ -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))