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/divelist.c | |
| 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/divelist.c')
| -rw-r--r-- | core/divelist.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/divelist.c b/core/divelist.c index 60b398539..d079b11bf 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -229,7 +229,7 @@ static int calculate_cns(struct dive *dive) if (divenr) { prev_dive = get_dive(divenr - 1); if (prev_dive) { - endtime = prev_dive->when + prev_dive->duration.seconds; + endtime = dive_endtime(prev_dive); if (dive->when < (endtime + 3600 * 12)) { cns = calculate_cns(prev_dive); cns = cns * 1 / pow(2, (dive->when - endtime) / (90.0 * 60.0)); @@ -395,13 +395,12 @@ unsigned int init_decompression(struct dive *dive) * for how far back we need to go */ if (dive->divetrip && pdive->divetrip != dive->divetrip) continue; - if (!pdive || pdive->when >= when || pdive->when + pdive->duration.seconds + 48 * 60 * 60 < when) + if (!pdive || pdive->when >= when || dive_endtime(pdive) + 48 * 60 * 60 < when) break; /* For simultaneous dives, only consider the first */ if (pdive->when == laststart) continue; - when = pdive->when; - lasttime = when + pdive->duration.seconds; + lasttime = dive_endtime(pdive); } while (++i < (divenr >= 0 ? divenr : dive_table.nr)) { struct dive *pdive = get_dive(i); @@ -421,7 +420,7 @@ unsigned int init_decompression(struct dive *dive) } if (pdive->when > lasttime) { surface_time = pdive->when - lasttime; - lasttime = pdive->when + pdive->duration.seconds; + lasttime = dive_endtime(pdive); add_segment(surface_pressure, &air, surface_time, 0, dive, prefs.decosac); #if DECO_CALC_DEBUG & 2 printf("after surface intervall of %d:%02u\n", FRACTION(surface_time, 60)); @@ -1136,7 +1135,7 @@ void process_dives(bool is_imported, bool prefer_imported) /* only try to merge overlapping dives - or if one of the dives has * zero duration (that might be a gps marker from the webservice) */ if (prev->duration.seconds && dive->duration.seconds && - prev->when + prev->duration.seconds < dive->when) + dive_endtime(prev) < dive->when) continue; merged = try_to_merge(prev, dive, prefer_imported); |