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: zoom on dive sites when flipping through dive site list

Browse source 
The dive site list was connected to centerOnDiveSite(). Apparently,
the currently selected dive site should have been shown in the map.
Yet, this never worked, because the actual dive site of the selected
dive had precedence in centerOnDiveSite().

It seems that centerOnDiveSite() had actually to purposes:
1) center on the passed in dive site
2) center on the dive sites of the selected dives

Therefore, split this function in two separate functions for
each of these use-cases. This allows us to remove some pre-processor
magic (mobile vs. desktop) and to remove a parameter from the
MainTab::diveSiteChanged() signal.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-08 21:16:40 +02:00 • committed by Dirk Hohndel
parent 1c8b73b36f
commit 0aef04352a
8 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
desktop-widgets/mapwidget.cpp
View file

@ -50,6 +50,13 @@ void MapWidget::doneLoading(QQuickWidget::Status status)
this, SLOT(coordinatesChangedLocal()));
}
void MapWidget::centerOnSelectedDiveSite()
{
CHECK_IS_READY_RETURN_VOID();
if (!skipReload)
m_mapHelper->centerOnSelectedDiveSite();
}
void MapWidget::centerOnDiveSite(struct dive_site *ds)
{
CHECK_IS_READY_RETURN_VOID();
@ -60,9 +67,9 @@ void MapWidget::centerOnDiveSite(struct dive_site *ds)
void MapWidget::centerOnIndex(const QModelIndex& idx)
{
CHECK_IS_READY_RETURN_VOID();
struct dive_site *ds = get_dive_site_by_uuid(idx.model()->index(idx.row(), 0).data().toInt());
struct dive_site *ds = get_dive_site_by_uuid(idx.model()->index(idx.row(), 0).data().toUInt());
if (!ds || !dive_site_has_gps_location(ds))
centerOnDiveSite(&displayed_dive_site);
centerOnSelectedDiveSite();
else
centerOnDiveSite(ds);
}