diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-10-02 11:17:10 +0200 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2017-10-18 23:19:13 +0200 |
| commit | 4158a4c7de3701f9e03cd226ab26b6437a47f33e (patch) | |
| tree | b289320d08d3eeef4c4fc9fdadb848876d8a3660 /core/planner.c | |
| parent | 59845c13438f1d72f500eeebed90f6929b822fa5 (diff) | |
| download | subsurface-4158a4c7de3701f9e03cd226ab26b6437a47f33e.tar.gz | |
init_deco correctly identify previous dives and report overlapping dives
When changing the date/time of a dive in the planner the dive may end
up in a totaly new position in respect to date/time of other dives in
dive list table. It can be moved to the past or the future before or after
other existing dives. It also could overlap with an existing dive.
This change enables identification of a new "virtual" dive list position
and based on this starts looking for previous dives.
Then it (as before the change) does init the deco calculation with any
applicable previous dive and surface interval.
If some of these applicable dives overlap it returns a neg. surface time
which is then used in the planner notes to prohibit display of results.
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'core/planner.c')
| -rw-r--r-- | core/planner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/planner.c b/core/planner.c index 8010979d9..18f3c8701 100644 --- a/core/planner.c +++ b/core/planner.c @@ -127,7 +127,7 @@ void interpolate_transition(struct dive *dive, duration_t t0, duration_t t1, dep } /* returns the tissue tolerance at the end of this (partial) dive */ -unsigned int tissue_at_end(struct dive *dive, struct deco_state **cached_datap) +int tissue_at_end(struct dive *dive, struct deco_state **cached_datap) { struct divecomputer *dc; struct sample *sample, *psample; @@ -135,7 +135,7 @@ unsigned int tissue_at_end(struct dive *dive, struct deco_state **cached_datap) depth_t lastdepth = {}; duration_t t0 = {}, t1 = {}; struct gasmix gas; - unsigned int surface_interval = 0; + int surface_interval = 0; if (!dive) return 0; |