mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 19:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Distinguish internally between min pressure and end pressure

Browse source 
And don't artificially end dives on min pressure

This may be a problem for dive computers like Linus' Suunto Vyper Air
where the failure mode seems to be _high_ pressure readings (that's scary,
btw). If the transmitter fails at the end of the dive the pressure plot
ends with incorrect high pressure. But that's simply a bug with the dive
computer and not something that subsurface should hack around. Maybe we
should offer a way to edit the incorrect data points instead.

Always ending on the minimum pressure is definitely wrong as it causes
bogus plots when you do a valve shutdown during the dive (which means that
valid data gets plotted incorrectly).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-09-30 06:49:24 -07:00
parent ab3c6731be
commit c487ea055d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
profile.c
View file

@ -22,6 +22,7 @@ struct plot_info {
int maxtime; int maxtime;
int meandepth, maxdepth; int meandepth, maxdepth;
int minpressure, maxpressure; int minpressure, maxpressure;
int endpressure; /* start pressure better be max pressure */
int mintemp, maxtemp; int mintemp, maxtemp;
struct plot_data { struct plot_data {
int sec; int sec;
@ -471,6 +472,7 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi) static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
{ {
int i; int i;
int have_pressure = FALSE;
if (!get_cylinder_pressure_range(gc, pi)) if (!get_cylinder_pressure_range(gc, pi))
return; return;
@ -485,9 +487,15 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
mbar = entry->pressure; mbar = entry->pressure;
if (!mbar) if (!mbar)
continue; continue;
have_pressure = TRUE;
line_to(gc, entry->sec, mbar); line_to(gc, entry->sec, mbar);
} }
line_to(gc, pi->maxtime, pi->minpressure); /* if we have valid samples, we don't want to draw a line to the minpressure
* but just end wherever the dive ended (think valve shutdowns during dive)
* but that doesn't work so well if we have only max and min
*/
if (! have_pressure)
line_to(gc, pi->maxtime, pi->minpressure);
cairo_stroke(gc->cr); cairo_stroke(gc->cr);
} }
@ -506,24 +514,24 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
switch (output_units.pressure) { switch (output_units.pressure) {
case PASCAL: case PASCAL:
start = pi->maxpressure * 100; start = pi->maxpressure * 100;
end = pi->minpressure * 100; end = pi->endpressure * 100;
unit = "pascal"; unit = "pascal";
break; break;
case BAR: case BAR:
start = (pi->maxpressure + 500) / 1000; start = (pi->maxpressure + 500) / 1000;
end = (pi->minpressure + 500) / 1000; end = (pi->endpressure + 500) / 1000;
unit = "bar"; unit = "bar";
break; break;
case PSI: case PSI:
start = mbar_to_PSI(pi->maxpressure); start = mbar_to_PSI(pi->maxpressure);
end = mbar_to_PSI(pi->minpressure); end = mbar_to_PSI(pi->endpressure);
unit = "psi"; unit = "psi";
break; break;
} }
text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP}; text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
plot_text(gc, &tro, 0, pi->maxpressure, "%d %s", start, unit); plot_text(gc, &tro, 0, pi->maxpressure, "%d %s", start, unit);
plot_text(gc, &tro, pi->maxtime, pi->minpressure, plot_text(gc, &tro, pi->maxtime, pi->endpressure,
"%d %s", end, unit); "%d %s", end, unit);
} }
} }
@ -706,7 +714,7 @@ static struct plot_info *create_plot_info(struct dive *dive)
pi->nr = lastindex+1; pi->nr = lastindex+1;
pi->maxtime = pi->entry[lastindex].sec; pi->maxtime = pi->entry[lastindex].sec;
pi->minpressure = dive->cylinder[0].end.mbar; pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;
pi->maxpressure = dive->cylinder[0].start.mbar; pi->maxpressure = dive->cylinder[0].start.mbar;
pi->meandepth = dive->meandepth.mm; pi->meandepth = dive->meandepth.mm;