From 44c65fec8855315d322b84b4c4207713b90328d3 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 9 May 2019 21:33:01 +0200 Subject: Map: automatically update names on the map Currently, dive site names are only updated on full reload. Instead hook directly into the corresponding signal in the MapLocationModel to set the name. Also to the coordinates directly there instead of going via the MapWidgetHelper. In the MapWidgetHelper, just center on the changed dive site. Hook into the signal directly there and remove the slot from the MapWidget. This makes the whole call-chain at least one call shorter. Signed-off-by: Berthold Stoeger --- desktop-widgets/mapwidget.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'desktop-widgets/mapwidget.cpp') diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index b28dea830..113283fc6 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -28,7 +28,6 @@ MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent) m_mapHelper = nullptr; 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); } @@ -91,13 +90,6 @@ void MapWidget::coordinatesChanged(struct dive_site *ds, const location_t &locat Command::editDiveSiteLocation(ds, location); } -void MapWidget::diveSiteChanged(struct dive_site *ds, int field) -{ - CHECK_IS_READY_RETURN_VOID(); - if (field == LocationInformationModel::LOCATION) - m_mapHelper->updateDiveSiteCoordinates(ds, ds->location); -} - void MapWidget::divesChanged(dive_trip *, const QVector &, DiveField field) { if (field == DiveField::DIVESITE) -- cgit v1.2.3-70-g09d2