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: reload on selection change directly

Browse source 
When changing the dive selection, we have to reload the map to show
the correctly highlighted flags. Do this directly by hooking into
the DiveListNotifier::divesChanged signal instead of indirectly
via the MainTab.

Moreover, on reload center on the highlighted dive sites.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-05-03 12:10:19 +02:00 • committed by Dirk Hohndel
parent 48b8129137
commit d4a91a52fa
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
desktop-widgets/mapwidget.cpp
View file

@ -6,7 +6,6 @@
#include "mapwidget.h"
#include "core/divesite.h"
#include "core/subsurface-qt/DiveListNotifier.h"
#include "map-widget/qmlmapwidgethelper.h"
#include "qt-models/maplocationmodel.h"
#include "qt-models/divelocationmodel.h"
@ -31,6 +30,7 @@ MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent)
setResizeMode(QQuickWidget::SizeRootObjectToView);
connect(this, &QQuickWidget::statusChanged, this, &MapWidget::doneLoading);
connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MapWidget::diveSiteChanged);
connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &MapWidget::divesChanged);
setSource(urlMapWidget);
}
@ -85,8 +85,10 @@ void MapWidget::repopulateLabels()
void MapWidget::reload()
{
CHECK_IS_READY_RETURN_VOID();
if (!skipReload)
if (!skipReload) {
m_mapHelper->reloadMapLocations();
centerOnSelectedDiveSite();
}
}
void MapWidget::endGetDiveCoordinates()
@ -129,6 +131,12 @@ void MapWidget::diveSiteChanged(struct dive_site *ds, int field)
m_mapHelper->updateDiveSiteCoordinates(ds, ds->location);
}
void MapWidget::divesChanged(dive_trip *, const QVector<dive *> &, DiveField field)
{
if (field == DiveField::DIVESITE)
reload();
}
MapWidget::~MapWidget()
{
m_instance = NULL;