mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always updated the coordinates from the displayed_dive

Browse source 
That's why it's called the displayed dive...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-01-19 17:17:01 +12:00
parent ecf4d18b41
commit 83018619d6
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/maintab.cpp
View file

@ -428,7 +428,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.DiveType->setCurrentIndex(displayed_dive.dc.divemode); ui.DiveType->setCurrentIndex(displayed_dive.dc.divemode);
if (!clear) { if (!clear) {
updateGpsCoordinates(&displayed_dive); updateGpsCoordinates();
// Subsurface always uses "local time" as in "whatever was the local time at the location" // Subsurface always uses "local time" as in "whatever was the local time at the location"
// so all time stamps have no time zone information and are in UTC // so all time stamps have no time zone information and are in UTC
QDateTime localTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when)); QDateTime localTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when));
@ -750,7 +750,7 @@ void MainTab::acceptChanges()
} }
struct dive *cd = current_dive; struct dive *cd = current_dive;
//Reset coordinates field, in case it contains garbage. //Reset coordinates field, in case it contains garbage.
updateGpsCoordinates(&displayed_dive); updateGpsCoordinates();
// now check if something has changed and if yes, edit the selected dives that // now check if something has changed and if yes, edit the selected dives that
// were identical with the master dive shown (and mark the divelist as changed) // were identical with the master dive shown (and mark the divelist as changed)
if (!same_string(displayed_dive.buddy, cd->buddy)) if (!same_string(displayed_dive.buddy, cd->buddy))
@ -1137,7 +1137,7 @@ void MainTab::on_location_editingFinished()
displayed_dive.latitude = dive->latitude; displayed_dive.latitude = dive->latitude;
displayed_dive.longitude = dive->longitude; displayed_dive.longitude = dive->longitude;
MainWindow::instance()->globe()->reload(); MainWindow::instance()->globe()->reload();
updateGpsCoordinates(&displayed_dive); updateGpsCoordinates();
break; break;
} }
} }
@ -1244,14 +1244,10 @@ void MainTab::updateCoordinatesText(qreal lat, qreal lon)
ui.coordinates->setText(printGPSCoords(ulat, ulon)); ui.coordinates->setText(printGPSCoords(ulat, ulon));
} }
void MainTab::updateGpsCoordinates(const struct dive *dive) void MainTab::updateGpsCoordinates()
{ {
if (dive) { ui.coordinates->setText(printGPSCoords(displayed_dive.latitude.udeg, displayed_dive.longitude.udeg));
ui.coordinates->setText(printGPSCoords(dive->latitude.udeg, dive->longitude.udeg)); ui.coordinates->setModified(displayed_dive.latitude.udeg || displayed_dive.longitude.udeg);
ui.coordinates->setModified(dive->latitude.udeg || dive->longitude.udeg);
} else {
ui.coordinates->clear();
}
} }
void MainTab::escDetected() void MainTab::escDetected()
@ -1300,7 +1296,7 @@ void MainTab::showAndTriggerEditSelective(struct dive_components what)
if (what.visibility) if (what.visibility)
ui.visibility->setCurrentStars(displayed_dive.visibility); ui.visibility->setCurrentStars(displayed_dive.visibility);
if (what.gps) if (what.gps)
updateGpsCoordinates(&displayed_dive); updateGpsCoordinates();
if (what.tags) { if (what.tags) {
char buf[1024]; char buf[1024];
taglist_get_tagstring(displayed_dive.tag_list, buf, 1024); taglist_get_tagstring(displayed_dive.tag_list, buf, 1024);

3
qt-ui/maintab.h
View file

@ -92,6 +92,8 @@ slots:
void escDetected(void); void escDetected(void);
void photoDoubleClicked(const QString filePath); void photoDoubleClicked(const QString filePath);
void removeSelectedPhotos(); void removeSelectedPhotos();
void updateGpsCoordinates();
private: private:
Ui::MainTab ui; Ui::MainTab ui;
WeightModel *weightModel; WeightModel *weightModel;
@ -109,7 +111,6 @@ private:
bool copyPaste; bool copyPaste;
void resetPallete(); void resetPallete();
void saveTags(); void saveTags();
void updateGpsCoordinates(const struct dive *dive);
void markChangedWidget(QWidget *w); void markChangedWidget(QWidget *w);
dive_trip_t *currentTrip; dive_trip_t *currentTrip;
dive_trip_t displayedTrip; dive_trip_t displayedTrip;