From 746874a78e2abb53655e422abe66aa4f61fe47d1 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 9 Nov 2017 18:43:21 +0200 Subject: map-widget: allow real-time updates of edited markers This patch allows updating the location of map markers while editing a dive site and updating the text in the LocationInformationWidget in real-time. Currently it is only possible to see the marker changes by clicking 'Apply'. The modification required the following changes: - add the MapWidget::updateCurrentDiveSiteCoordinatesToMap() slot and call it each time the GPS text updates - separate the updateCurrentDiveSiteCoordinates(FromMap/ToMap) logic by having the FromMap/ToMap suffix to method names - make MapWidgetHelper::updateCurrentDiveSiteCoordinatesToMap() call a new MapLocationModel::updateMapLocationCoordinates() method, which updates selected location coordinates and the model - add MapLocation::setCoordinateNoEmit() that does not emit a signal when updating a coordinate Signed-off-by: Lubomir I. Ivanov --- qt-models/maplocationmodel.cpp | 22 ++++++++++++++++++++++ qt-models/maplocationmodel.h | 2 ++ 2 files changed, 24 insertions(+) (limited to 'qt-models') diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index 9666ca009..d8070862e 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include "maplocationmodel.h" const char *MapLocation::PROPERTY_NAME_COORDINATE = "coordinate"; @@ -39,6 +40,11 @@ void MapLocation::setCoordinate(QGeoCoordinate coord) emit coordinateChanged(); } +void MapLocation::setCoordinateNoEmit(QGeoCoordinate coord) +{ + m_coordinate = coord; +} + quint32 MapLocation::uuid() { return m_uuid; @@ -136,3 +142,19 @@ MapLocation *MapLocationModel::getMapLocationForUuid(quint32 uuid) } return NULL; } + +void MapLocationModel::updateMapLocationCoordinates(quint32 uuid, QGeoCoordinate coord) +{ + MapLocation *location; + int row = 0; + foreach(location, m_mapLocations) { + if (uuid == location->uuid()) { + location->setCoordinateNoEmit(coord); + emit dataChanged(createIndex(0, row), createIndex(0, row)); + return; + } + row++; + } + // should not happen, as this should be called only when editing an existing marker + qWarning() << "MapLocationModel::updateMapLocationCoordinates(): cannot find MapLocation for uuid:" << uuid; +} diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h index 114de4c92..e198773a5 100644 --- a/qt-models/maplocationmodel.h +++ b/qt-models/maplocationmodel.h @@ -27,6 +27,7 @@ public: QVariant getRole(int role) const; QGeoCoordinate coordinate(); void setCoordinate(QGeoCoordinate coord); + void setCoordinateNoEmit(QGeoCoordinate coord); quint32 uuid(); enum Roles { @@ -62,6 +63,7 @@ public: void addList(QVector); void clear(); MapLocation *getMapLocationForUuid(quint32 uuid); + void updateMapLocationCoordinates(quint32 uuid, QGeoCoordinate coord); Q_INVOKABLE void setSelectedUuid(QVariant uuid, QVariant fromClick = true); quint32 selectedUuid(); -- cgit v1.2.3-70-g09d2