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

Don't ask for globe-coordinates for a dive

Browse source 
Only ask that for dive_site_management.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-05-31 19:53:35 -03:00 • committed by Dirk Hohndel
parent ad9d1a81a2
commit f28cec7b9e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/globe.cpp
View file

@ -255,10 +255,6 @@ void GlobeGPS::centerOnCurrentDive()
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;
if ((!dive_site_has_gps_location(ds) || MainWindow::instance()->information()->isEditing()) && amount_selected == 1) {
prepareForGetDiveCoordinates();
return;
}
if (!dive_site_has_gps_location(ds)) { if (!dive_site_has_gps_location(ds)) {
zoomOutForNoGPS(); zoomOutForNoGPS();
return; return;
@ -319,9 +315,9 @@ void GlobeGPS::prepareForGetDiveCoordinates()
// This needs to update the dive site, not just this dive // 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();
// TODO: Check if this is still necessary.
if (MainWindow::instance()->dive_list()->selectionModel()->selection().isEmpty()) if (MainWindow::instance()->dive_list()->selectionModel()->selection().isEmpty())
return; return;
@ -335,7 +331,7 @@ void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::U
// 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_site.latitude.udeg = lrint(lat * 1000000.0); displayed_dive_site.latitude.udeg = lrint(lat * 1000000.0);
displayed_dive_site.longitude.udeg = lrint(lon * 1000000.0); displayed_dive_site.longitude.udeg = lrint(lon * 1000000.0);
emit(coordinatesChanged()); emit coordinatesChanged();
repopulateLabels(); repopulateLabels();
editingDiveLocation = false; editingDiveLocation = false;
} }