diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-08 13:51:57 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-11 16:25:32 -0700 |
| commit | 754160d625d374cc2b98df53511371b0ab286c7a (patch) | |
| tree | 1e9cc3363f9b7ec2598e714b34ad6f3cb3c364a0 /map-widget | |
| parent | 66c5c5f72b82bd07c6222dbf624d6389237a590b (diff) | |
| download | subsurface-754160d625d374cc2b98df53511371b0ab286c7a.tar.gz | |
Map: pass changed coordinates via signal
The coordinates of a "dragged flag" were passed out-of-bound via
the global "displayed_dive_site" object and then a signal was sent
to notify of the changed coordinates.
Instead, pass the coordinates directly via the signal. This makes
the data- and control-flow more clear.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'map-widget')
| -rw-r--r-- | map-widget/qmlmapwidgethelper.cpp | 10 | ||||
| -rw-r--r-- | map-widget/qmlmapwidgethelper.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index f5be15ba6..b4ab8efd8 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp @@ -272,9 +272,8 @@ void MapWidgetHelper::updateCurrentDiveSiteCoordinatesFromMap(quint32 uuid, QGeo MapLocation *loc = m_mapLocationModel->getMapLocationForUuid(uuid); if (loc) loc->setCoordinate(coord); - displayed_dive_site.latitude.udeg = lrint(coord.latitude() * 1000000.0); - displayed_dive_site.longitude.udeg = lrint(coord.longitude() * 1000000.0); - emit coordinatesChanged(); + emit coordinatesChanged(degrees_t { (int)lrint(coord.latitude() * 1000000.0) }, + degrees_t { (int)lrint(coord.longitude() * 1000000.0) }); } void MapWidgetHelper::updateDiveSiteCoordinates(uint32_t uuid, degrees_t latitude, degrees_t longitude) @@ -305,9 +304,8 @@ void MapWidgetHelper::setEditMode(bool editMode) } else { coord = exists->coordinate(); } - displayed_dive_site.latitude.udeg = lrint(coord.latitude() * 1000000.0); - displayed_dive_site.longitude.udeg = lrint(coord.longitude() * 1000000.0); - emit coordinatesChanged(); + emit coordinatesChanged(degrees_t { (int)lrint(coord.latitude() * 1000000.0) }, + degrees_t { (int)lrint(coord.longitude() * 1000000.0) }); } emit editModeChanged(); } diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h index 77f352965..466e8944d 100644 --- a/map-widget/qmlmapwidgethelper.h +++ b/map-widget/qmlmapwidgethelper.h @@ -55,7 +55,7 @@ signals: void modelChanged(); void editModeChanged(); void selectedDivesChanged(QList<int> list); - void coordinatesChanged(); + void coordinatesChanged(degrees_t latitude, degrees_t longitude); void pluginObjectChanged(); }; |