mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Correctly plot dives ending below the surface
I thought we had fixed this before - but I guess it got broken again somewhere. We now make sure that the plot_info ends on an entry with depth 0. Added test14 to verify the fix. Also fixed cut'n'paste errors in a few test dive files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
4b735521e2
commit
e38eb77e30
9 changed files with 54 additions and 11 deletions
|
@ -1098,7 +1098,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
|
|||
entry->temperature = sample->temperature.mkelvin;
|
||||
|
||||
if (depth || lastdepth)
|
||||
lastindex = i+pi_idx;
|
||||
lastindex = i + pi_idx;
|
||||
|
||||
lastdepth = depth;
|
||||
if (depth > pi->maxdepth)
|
||||
|
@ -1162,9 +1162,12 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
|
|||
i = nr + 2;
|
||||
pi->entry[i].sec = sec + 20;
|
||||
pi->entry[i+1].sec = sec + 40;
|
||||
/* the number of actual entries - we may have allocated more if there
|
||||
* were gas change events, but this is how many were filled */
|
||||
/* the number of actual entries - some computers have lots of
|
||||
* depth 0 samples at the end of a dive, we want to make sure
|
||||
* we have exactly one of them at the end */
|
||||
pi->nr = lastindex+1;
|
||||
while (pi->nr <= i+2 && pi->entry[pi->nr-1].depth > 0)
|
||||
pi->nr++;
|
||||
pi->maxtime = pi->entry[lastindex].sec;
|
||||
|
||||
pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue