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

Start doing gas management using output units

Browse source 
Ok, it's an odd place to start, but this now shows the pressure curve
details and the air usage in the proper units.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-06 19:28:31 -07:00
parent 75cb94f067
commit a06d93217f
2 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main.c
View file

@ -205,11 +205,13 @@ static void quit(GtkWidget *w, gpointer data)
static void imperial(GtkWidget *w, gpointer data) static void imperial(GtkWidget *w, gpointer data)
{ {
output_units = IMPERIAL_units; output_units = IMPERIAL_units;
repaint_dive();
} }
static void metric(GtkWidget *w, gpointer data) static void metric(GtkWidget *w, gpointer data)
{ {
output_units = SI_units; output_units = SI_units;
repaint_dive();
} }
static GtkActionEntry menu_items[] = { static GtkActionEntry menu_items[] = {

49
profile.c
View file

@ -217,7 +217,7 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
pressure_t *startp, pressure_t *endp) pressure_t *startp, pressure_t *endp)
{ {
int i; int i;
int min, max, mbar; int min, max;
*scalex = round_seconds_up(dive->duration.seconds); *scalex = round_seconds_up(dive->duration.seconds);
@ -227,6 +227,7 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
startp->mbar = endp->mbar = 0; startp->mbar = endp->mbar = 0;
for (i = 0; i < dive->samples; i++) { for (i = 0; i < dive->samples; i++) {
int mbar;
struct sample *sample = dive->sample + i; struct sample *sample = dive->sample + i;
/* FIXME! We only track cylinder 0 right now */ /* FIXME! We only track cylinder 0 right now */
@ -235,15 +236,15 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
mbar = sample->cylinderpressure.mbar; mbar = sample->cylinderpressure.mbar;
if (!mbar) if (!mbar)
continue; continue;
if (mbar && startp && !startp->mbar)
startp->mbar = mbar;
if (mbar < min) if (mbar < min)
min = mbar; min = mbar;
if (mbar > max) if (mbar > max)
max = mbar; max = mbar;
} }
if (startp)
startp->mbar = max;
if (endp) if (endp)
endp->mbar = mbar; endp->mbar = min;
if (!max) if (!max)
return 0; return 0;
*scaley = max * 1.5; *scaley = max * 1.5;
@ -311,6 +312,7 @@ static void plot_info(struct dive *dive, cairo_t *cr,
{ {
text_render_options_t tro = {0.2, 1.0, 0.2, LEFT}; text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
const double liters_per_cuft = 28.317; const double liters_per_cuft = 28.317;
const char *unit;
double airuse; double airuse;
airuse = calculate_airuse(dive); airuse = calculate_airuse(dive);
@ -318,12 +320,20 @@ static void plot_info(struct dive *dive, cairo_t *cr,
return; return;
/* I really need to start addign some unit setting thing */ /* I really need to start addign some unit setting thing */
airuse /= liters_per_cuft; switch (output_units.volume) {
plot_text(cr, &tro, maxx*0.8, maxy*0.8, "cuft: %4.2f", airuse); case LITER:
unit = "l";
break;
case CUFT:
unit = "cuft";
airuse /= liters_per_cuft;
break;
}
plot_text(cr, &tro, maxx*0.8, maxy*0.8, "vol: %4.2f %s", airuse, unit);
if (dive->duration.seconds) { if (dive->duration.seconds) {
double pressure = 1 + (dive->meandepth.mm / 10000.0); double pressure = 1 + (dive->meandepth.mm / 10000.0);
double sac = airuse / pressure * 60 / dive->duration.seconds; double sac = airuse / pressure * 60 / dive->duration.seconds;
plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f", sac); plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f %s/min", sac, unit);
} }
} }
@ -337,10 +347,31 @@ static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
if (get_cylinder_pressure_range(dive, &scalex, &scaley, if (get_cylinder_pressure_range(dive, &scalex, &scaley,
&startp, &endp)) { &startp, &endp)) {
int start, end;
const char *unit = "bar";
switch (output_units.pressure) {
case PASCAL:
start = startp.mbar * 100;
end = startp.mbar * 100;
unit = "pascal";
break;
case BAR:
start = startp.mbar / 1000;
end = endp.mbar / 1000;
unit = "bar";
break;
case PSI:
start = startp.mbar / 68.95;
end = endp.mbar / 68.95;
unit = "psi";
break;
}
text_render_options_t tro = {0.2, 1.0, 0.2, LEFT}; text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
plot_text(cr, &tro, SCALE(0, startp.mbar), "%3.0f bar", startp.mbar/1000.0); plot_text(cr, &tro, SCALE(0, startp.mbar), "%d %s", start, unit);
plot_text(cr, &tro, SCALE(dive->duration.seconds, endp.mbar), plot_text(cr, &tro, SCALE(dive->duration.seconds, endp.mbar),
"%3.0f bar", endp.mbar/1000.0); "%d %s", end, unit);
} }
} }