mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 09:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

mapwidgethelper: pass a QGeoCoordinate to the QML map

Browse source 
Rename the QML function "centerOnCoordinates" to "centerOnCoordinate"
and pass a QGeoCoordinate to it in ::centerOnDiveSite().

This will prevent the creation of a QGeoCoordinate object on the
QML side and instead it will be created in C++.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-17 23:13:31 +03:00 • committed by Dirk Hohndel
parent de90480b46
commit 476670cb8d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mobile-widgets/qml/MapWidget.qml
View file

@ -60,8 +60,8 @@ Item {
} }
} }
function centerOnCoordinates(latitude, longitude) { function centerOnCoordinate(coordinate) {
map.newCenter = QtPositioning.coordinate(latitude, longitude); map.newCenter = coordinate;
map.zoomLevel = 2; map.zoomLevel = 2;
mapAnimation.restart(); mapAnimation.restart();
} }

6
mobile-widgets/qmlmapwidgethelper.cpp
View file

@ -18,10 +18,8 @@ void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds)
qreal longitude = ds->longitude.udeg / 1000000.0; qreal longitude = ds->longitude.udeg / 1000000.0;
qreal latitude = ds->latitude.udeg / 1000000.0; qreal latitude = ds->latitude.udeg / 1000000.0;
QVariant coord = QVariant::fromValue(QGeoCoordinate(latitude, longitude));
QMetaObject::invokeMethod(m_map, "centerOnCoordinates", QMetaObject::invokeMethod(m_map, "centerOnCoordinate", Q_ARG(QVariant, coord));
Q_ARG(QVariant, latitude),
Q_ARG(QVariant, longitude));
} }
void MapWidgetHelper::reloadMapLocations() void MapWidgetHelper::reloadMapLocations()