mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of dive->{start,end}

Browse source 
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>
This commit is contained in:
Linus Torvalds 2013-02-04 16:21:33 +11:00 committed by Dirk Hohndel
parent 91ba78f8ac
commit f507b05927
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dive.c
View file

@ -498,8 +498,7 @@ struct dive *fixup_dive(struct dive *dive)
if (sample->cns > dive->maxcns) if (sample->cns > dive->maxcns)
dive->maxcns = sample->cns; dive->maxcns = sample->cns;
} }
dive->start = start;
dive->end = end;
/* if all the samples for a cylinder have pressure data that /* if all the samples for a cylinder have pressure data that
* is basically equidistant throw out the sample cylinder pressure * is basically equidistant throw out the sample cylinder pressure
* information but make sure we still have a valid start and end * information but make sure we still have a valid start and end

1
dive.h
View file

@ -303,7 +303,6 @@ struct dive {
struct dive *next, **pprev; struct dive *next, **pprev;
int selected; int selected;
gboolean downloaded; gboolean downloaded;
int start, end;
timestamp_t when; timestamp_t when;
char *location; char *location;
char *notes; char *notes;

7
profile.c
View file

@ -1577,7 +1577,8 @@ static void calculate_max_limits(struct dive *dive, struct divecomputer *dc, str
if (depth > maxdepth) if (depth > maxdepth)
maxdepth = s->depth.mm; maxdepth = s->depth.mm;
if ((depth || lastdepth) && s->time.seconds > maxtime) if ((depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) &&
s->time.seconds > maxtime)
maxtime = s->time.seconds; maxtime = s->time.seconds;
lastdepth = depth; lastdepth = depth;
s++; s++;
@ -1601,9 +1602,7 @@ static struct plot_data *populate_plot_entries(struct dive *dive, struct divecom
int lastdepth, lasttime; int lastdepth, lasttime;
struct plot_data *plot_data; struct plot_data *plot_data;
maxtime = get_maxtime(pi); maxtime = pi->maxtime;
if (dive->end > 0)
maxtime = dive->end;
/* /*
* We want to have a plot_info event at least every 10s (so "maxtime/10+1"), * We want to have a plot_info event at least every 10s (so "maxtime/10+1"),