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: in dive-site-edit mode, select those maps we filter for

Browse source 
When dive sites are edited, we shouldn't highlight the sites
of the current dive, but the currently edited site(s).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-05-03 23:37:42 +02:00 • committed by Dirk Hohndel
parent d29f82c52d
commit cd5489e08d
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-models/maplocationmodel.cpp
View file

@ -136,8 +136,11 @@ void MapLocationModel::reload()
#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.
// of the non-hidden dives. Moreover, the selected dive sites are those
// that we filter for.
bool diveSiteMode = MultiFilterSortModel::instance()->diveSiteMode();
if (diveSiteMode)
m_selectedDs = MultiFilterSortModel::instance()->filteredDiveSites();
#endif
for_each_dive(idx, dive) {
// Don't show dive sites of hidden dives, unless this is the currently
@ -147,7 +150,7 @@ void MapLocationModel::reload()
struct dive_site *ds = get_dive_site_for_dive(dive);
if (!dive_site_has_gps_location(ds))
continue;
if (dive->selected && !m_selectedDs.contains(ds))
if (!diveSiteMode && dive->selected && !m_selectedDs.contains(ds))
m_selectedDs.append(ds);
if (locations.contains(ds))
continue;