summaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2013-02-04 16:21:33 +1100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-04 06:48:34 +1100
commitf507b05927fccc228951c6aa06df1f2a4a01de0a (patch)
tree52f964dd47e2e4f596e1dcdf38fc564be5bfd742 /dive.c
parent91ba78f8ac40f02d7161e5f82644557279f3c92b (diff)
downloadsubsurface-f507b05927fccc228951c6aa06df1f2a4a01de0a.tar.gz
Get rid of dive->{start,end}
We had this special logic to not show the end of a dive when a dive computer shows a series of very shallow samples (basically snorkeling back to shore after the dive ended). However, that logic ended up being global per dive, which is very annoying when you have two or more dive computers, and it decides to cut off the second one because the first one surfaces. So get rid of this per-dive state, and just use the plot-info 'maxtime' field for this (we never used the 'start' case anyway). That way we will properly cut off boring surface entries only when they are past the end of the interesting entries of *all* dive computers, and we won't be cutting things short. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index a0cb60ba6..e054be557 100644
--- a/dive.c
+++ b/dive.c
@@ -498,8 +498,7 @@ struct dive *fixup_dive(struct dive *dive)
if (sample->cns > dive->maxcns)
dive->maxcns = sample->cns;
}
- dive->start = start;
- dive->end = end;
+
/* if all the samples for a cylinder have pressure data that
* is basically equidistant throw out the sample cylinder pressure
* information but make sure we still have a valid start and end