diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-09-30 18:00:34 +0200 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-10-01 23:55:37 +0300 |
| commit | 7713c7e607b11c0828decdbf35d910280153f880 (patch) | |
| tree | 8e08d80032ba7cdcaa344042da7e220f217b75c5 /core/gpslocation.cpp | |
| parent | 325c4459ade70f626d6a39fecfb9e0c27f0c5cee (diff) | |
| download | subsurface-7713c7e607b11c0828decdbf35d910280153f880.tar.gz | |
Use helper function dive_endtime() where apropriate
Calculating dive.when + dive.duration doesn't always give the correct
endtime of a dive especially when a dive has surface interval(s) in
the middle.
Using the helper function dive_endtime() fixes this issue.
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'core/gpslocation.cpp')
| -rw-r--r-- | core/gpslocation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp index a823a9124..22525ca3d 100644 --- a/core/gpslocation.cpp +++ b/core/gpslocation.cpp @@ -275,7 +275,7 @@ bool GpsLocation::applyLocations() qDebug() << "processing gpsFix @" << get_dive_date_string(gpsTable[j].when) << "which is withing six hours of dive from" << get_dive_date_string(d->when) << "until" << - get_dive_date_string(d->when + d->duration.seconds); + get_dive_date_string(dive_endtime(d)); /* * If position is fixed during dive. This is the good one. * Asign and mark position, and end gps_location loop @@ -310,7 +310,7 @@ bool GpsLocation::applyLocations() if (verbose) qDebug() << "which is closer to the start of the dive, do continue with that"; continue; - } else if (gpsTable[j].when > d->when + d->duration.seconds) { + } else if (gpsTable[j].when > dive_endtime(d)) { if (verbose) qDebug() << "which is even later after the end of the dive, so pick the previous one"; copy_gps_location(gpsTable[j], d); @@ -319,7 +319,7 @@ bool GpsLocation::applyLocations() break; } else { /* ok, gpsFix is before, nextgpsFix is after */ - if (d->when - gpsTable[j].when <= gpsTable[j+1].when - (d->when + d->duration.seconds)) { + if (d->when - gpsTable[j].when <= gpsTable[j+1].when - dive_endtime(d)) { if (verbose) qDebug() << "pick the one before as it's closer to the start"; copy_gps_location(gpsTable[j], d); @@ -351,7 +351,7 @@ bool GpsLocation::applyLocations() /* If position is out of SAME_GROUP range and in the future, mark position for * next dive iteration and end the gps_location loop */ - if (gpsTable[j].when >= d->when + d->duration.seconds + SAME_GROUP) { + if (gpsTable[j].when >= dive_endtime(d) + SAME_GROUP) { last = j; break; } |