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

Do better cylinder information management

Browse source 
Instead of just tracking gasmix, track the size and workng pressure of
the cylinder too.

And use "cylinder" instead of "tank" throughout.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-03 20:31:18 -07:00
parent c1bed52a77
commit b176daf6d6
5 changed files with 183 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

16
profile.c
View file

@ -93,7 +93,7 @@ static void plot_profile(struct dive *dive, cairo_t *cr,
cairo_stroke(cr);
}
static int get_tank_pressure_range(struct dive *dive, double *scalex, double *scaley)
static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double *scaley)
{
int i;
double min, max;
@ -106,9 +106,9 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc
struct sample *sample = dive->sample + i;
double bar;
if (!sample->tankpressure.mbar)
if (!sample->cylinderpressure.mbar)
continue;
bar = sample->tankpressure.mbar;
bar = sample->cylinderpressure.mbar;
if (bar < min)
min = bar;
if (bar > max)
@ -120,13 +120,13 @@ static int get_tank_pressure_range(struct dive *dive, double *scalex, double *sc
return 1;
}
static void plot_tank_pressure(struct dive *dive, cairo_t *cr,
static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy)
{
int i;
double scalex, scaley;
if (!get_tank_pressure_range(dive, &scalex, &scaley))
if (!get_cylinder_pressure_range(dive, &scalex, &scaley))
return;
cairo_set_source_rgba(cr, 0.2, 1.0, 0.2, 0.80);
@ -137,7 +137,7 @@ static void plot_tank_pressure(struct dive *dive, cairo_t *cr,
struct sample *sample = dive->sample + i;
sec = sample->time.seconds;
mbar = sample->tankpressure.mbar;
mbar = sample->cylinderpressure.mbar;
if (!mbar)
continue;
cairo_line_to(cr, SCALE(sec, mbar));
@ -159,8 +159,8 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
/* Depth profile */
plot_profile(dive, cr, topx, topy, maxx, maxy);
/* Tank pressure plot? */
plot_tank_pressure(dive, cr, topx, topy, maxx, maxy);
/* Cylinder pressure plot? */
plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy);
/* Bounding box last */
scalex = scaley = 1.0;