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

Show dive coordinates on map based on dive site

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-12 01:19:07 -08:00
parent 9ef81d3ed3
commit d488c37cc1
2 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dive.h
View file

@ -505,6 +505,13 @@ static inline struct dive *get_dive_from_table(int nr, struct dive_table *dt)
return dt->dives[nr]; return dt->dives[nr];
} }
static inline struct dive_site *get_dive_site_for_dive(struct dive *dive)
{
if (dive)
return get_dive_site_by_uuid(dive->dive_site_uuid);
return NULL;
}
static inline unsigned int number_of_computers(struct dive *dive) static inline unsigned int number_of_computers(struct dive *dive)
{ {
unsigned int total_number = 0; unsigned int total_number = 0;

42
qt-ui/globe.cpp
View file

@ -164,10 +164,11 @@ void GlobeGPS::mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit unit)
QList<int> selectedDiveIds; QList<int> selectedDiveIds;
for_each_dive (idx, dive) { for_each_dive (idx, dive) {
long lat_diff, lon_diff; long lat_diff, lon_diff;
if (!dive_has_gps_location(dive)) struct dive_site *ds = get_dive_site_for_dive(dive);
if (!dive_site_has_gps_location(ds))
continue; continue;
lat_diff = labs(dive->latitude.udeg - lat_udeg); lat_diff = labs(ds->latitude.udeg - lat_udeg);
lon_diff = labs(dive->longitude.udeg - lon_udeg); lon_diff = labs(ds->longitude.udeg - lon_udeg);
if (lat_diff > 180000000) if (lat_diff > 180000000)
lat_diff = 360000000 - lat_diff; lat_diff = 360000000 - lat_diff;
if (lon_diff > 180000000) if (lon_diff > 180000000)
@ -186,6 +187,7 @@ void GlobeGPS::mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit unit)
void GlobeGPS::repopulateLabels() void GlobeGPS::repopulateLabels()
{ {
struct dive_site *ds;
if (loadedDives) { if (loadedDives) {
model()->treeModel()->removeDocument(loadedDives); model()->treeModel()->removeDocument(loadedDives);
delete loadedDives; delete loadedDives;
@ -204,12 +206,13 @@ void GlobeGPS::repopulateLabels()
// don't show that flag, it's either already shown as displayed_dive // don't show that flag, it's either already shown as displayed_dive
// or it's the one that we are moving right now... // or it's the one that we are moving right now...
continue; continue;
if (dive_has_gps_location(dive)) { ds = get_dive_site_for_dive(dive);
GeoDataPlacemark *place = new GeoDataPlacemark(dive->location); if (dive_site_has_gps_location(ds)) {
place->setCoordinate(dive->longitude.udeg / 1000000.0, dive->latitude.udeg / 1000000.0, 0, GeoDataCoordinates::Degree); GeoDataPlacemark *place = new GeoDataPlacemark(ds->name);
place->setCoordinate(ds->longitude.udeg / 1000000.0, ds->latitude.udeg / 1000000.0, 0, GeoDataCoordinates::Degree);
// don't add dive locations twice, unless they are at least 50m apart // don't add dive locations twice, unless they are at least 50m apart
if (locationMap[QString(dive->location)]) { if (locationMap[QString(ds->name)]) {
GeoDataCoordinates existingLocation = locationMap[QString(dive->location)]->coordinate(); GeoDataCoordinates existingLocation = locationMap[QString(ds->name)]->coordinate();
GeoDataLineString segment = GeoDataLineString(); GeoDataLineString segment = GeoDataLineString();
segment.append(existingLocation); segment.append(existingLocation);
GeoDataCoordinates newLocation = place->coordinate(); GeoDataCoordinates newLocation = place->coordinate();
@ -220,7 +223,7 @@ void GlobeGPS::repopulateLabels()
if (dist < 0.05) if (dist < 0.05)
continue; continue;
} }
locationMap[QString(dive->location)] = place; locationMap[QString(ds->name)] = place;
loadedDives->append(place); loadedDives->append(place);
} }
} }
@ -236,23 +239,23 @@ void GlobeGPS::reload()
void GlobeGPS::centerOnCurrentDive() void GlobeGPS::centerOnCurrentDive()
{ {
struct dive *dive = current_dive; struct dive_site *ds = get_dive_site_for_dive(current_dive);
// dive has changed, if we had the 'editingDive', hide it. // dive has changed, if we had the 'editingDive', hide it.
if (messageWidget->isVisible() && (!dive || dive_has_gps_location(dive) || amount_selected != 1)) if (messageWidget->isVisible() && (!ds || dive_site_has_gps_location(ds) || amount_selected != 1))
messageWidget->hide(); messageWidget->hide();
editingDiveLocation = false; editingDiveLocation = false;
if (!dive) if (!ds)
return; return;
qreal longitude = dive->longitude.udeg / 1000000.0; qreal longitude = ds->longitude.udeg / 1000000.0;
qreal latitude = dive->latitude.udeg / 1000000.0; qreal latitude = ds->latitude.udeg / 1000000.0;
if ((!dive_has_gps_location(dive) || MainWindow::instance()->information()->isEditing()) && amount_selected == 1) { if ((!dive_site_has_gps_location(ds) || MainWindow::instance()->information()->isEditing()) && amount_selected == 1) {
prepareForGetDiveCoordinates(); prepareForGetDiveCoordinates();
return; return;
} }
if (!dive_has_gps_location(dive)) { if (!dive_site_has_gps_location(ds)) {
zoomOutForNoGPS(); zoomOutForNoGPS();
return; return;
} }
@ -309,8 +312,10 @@ void GlobeGPS::prepareForGetDiveCoordinates()
} }
} }
// This needs to update the dive site, not just this dive
void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::Unit unit) void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::Unit unit)
{ {
struct dive_site *ds;
messageWidget->hide(); messageWidget->hide();
if (MainWindow::instance()->dive_list()->selectionModel()->selection().isEmpty()) if (MainWindow::instance()->dive_list()->selectionModel()->selection().isEmpty())
@ -324,8 +329,9 @@ void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::U
centerOn(lon, lat, true); centerOn(lon, lat, true);
// change the location of the displayed_dive and put the UI in edit mode // change the location of the displayed_dive and put the UI in edit mode
displayed_dive.latitude.udeg = lrint(lat * 1000000.0); ds = get_dive_site_for_dive(&displayed_dive);
displayed_dive.longitude.udeg = lrint(lon * 1000000.0); ds->latitude.udeg = lrint(lat * 1000000.0);
ds->longitude.udeg = lrint(lon * 1000000.0);
emit(coordinatesChanged()); emit(coordinatesChanged());
repopulateLabels(); repopulateLabels();
editingDiveLocation = false; editingDiveLocation = false;