diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-07 14:01:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-07 15:17:58 -0700 |
| commit | fb82da58a28cce131ede579897bd108c820b38a0 (patch) | |
| tree | a9c42cff1c5f99e9619d6c24a3f72ee0e7984e3d | |
| parent | 2bc76beb65bacd8640170d85e40bdc844a368570 (diff) | |
| download | subsurface-fb82da58a28cce131ede579897bd108c820b38a0.tar.gz | |
Globe: assume that we are looking at the current_dive
As in commit 3870bdafee53 ("Globe: we always center on the current dive")
passing in a specific dive here makes no sense - it's always about the
current dive.
Fixes #513
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/globe.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/globe.h | 2 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index f5b60ac23..3a27e38d9 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -224,7 +224,7 @@ void GlobeGPS::centerOnCurrentDive() if ((!dive_has_gps_location(dive) || MainWindow::instance()->information()->isEditing()) && amount_selected == 1) { - prepareForGetDiveCoordinates(dive); + prepareForGetDiveCoordinates(); return; } if (!dive_has_gps_location(dive)) { @@ -270,7 +270,7 @@ void GlobeGPS::zoomOutForNoGPS() } } -void GlobeGPS::prepareForGetDiveCoordinates(struct dive *dive) +void GlobeGPS::prepareForGetDiveCoordinates() { if (!messageWidget->isVisible()) { messageWidget->setMessageType(KMessageWidget::Warning); @@ -278,7 +278,7 @@ void GlobeGPS::prepareForGetDiveCoordinates(struct dive *dive) messageWidget->setWordWrap(true); messageWidget->animatedShow(); editingDiveLocation = true; - if (!dive_has_gps_location(dive)) + if (!dive_has_gps_location(current_dive)) zoomOutForNoGPS(); } } diff --git a/qt-ui/globe.h b/qt-ui/globe.h index 7331a033f..2a631fbd1 100644 --- a/qt-ui/globe.h +++ b/qt-ui/globe.h @@ -41,7 +41,7 @@ slots: void mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit); void fixZoom(); void zoomOutForNoGPS(); - void prepareForGetDiveCoordinates(struct dive *dive); + void prepareForGetDiveCoordinates(); }; #else // NO_MARBLE diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 65eb86290..f85276d95 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -252,7 +252,7 @@ void MainTab::enableEdition(EditMode newEditMode) } MainWindow::instance()->dive_list()->setEnabled(false); if (amount_selected == 1) - MainWindow::instance()->globe()->prepareForGetDiveCoordinates(current_dive); + MainWindow::instance()->globe()->prepareForGetDiveCoordinates(); // We may be editing one or more dives here. backup everything. notesBackup.clear(); if (MainWindow::instance() && MainWindow::instance()->dive_list()->selectedTrips().count() == 1) { |