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

Fix cylinder printout information

Browse source 
The cylinder information in the printouts was wrong in many ways. As
Dirk noted, it didn't work at all for air-integrated computers that
had the pressures in the samples, but the math was also confusing and
wrong.

This should fix it.

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-01-03 12:40:25 -08:00 • committed by Dirk Hohndel
parent 6f8e9bcff3
commit 3c5ebfe036
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
print.c
View file

@ -187,13 +187,21 @@ static void print_ean_trimix (cairo_t *cr, PangoLayout *layout, int O2, int He){
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
} }
static unsigned start_pressure(cylinder_t *cyl)
{
return cyl->start.mbar ? : cyl->sample_start.mbar;
}
static unsigned end_pressure(cylinder_t *cyl)
{
return cyl->end.mbar ? : cyl->sample_end.mbar;
}
/* Print the tank data */ /* Print the tank data */
static void print_tanks (struct dive *dive, cairo_t *cr, int maxwidth, int maxheight, static void print_tanks (struct dive *dive, cairo_t *cr, int maxwidth, int maxheight,
int height, int tank_count, int first_tank, PangoFontDescription *font) int height, int tank_count, int first_tank, PangoFontDescription *font)
{ {
int curwidth, decimals, n, i, counter, cyl_press, cyl_end; int curwidth, n, i, counter;
double cyl_cap, cyl_cons_gas;
const char *unit_vol, *unit_press;
char buffer[80], dataheader1[3][80]= { N_("Cylinder"), N_("Gasmix"), N_("Gas Used")}; char buffer[80], dataheader1[3][80]= { N_("Cylinder"), N_("Gasmix"), N_("Gas Used")};
PangoLayout *layout; PangoLayout *layout;
@ -219,13 +227,26 @@ static void print_tanks (struct dive *dive, cairo_t *cr, int maxwidth, int maxhe
/* Then the cylinder stuff */ /* Then the cylinder stuff */
n = first_tank; n = first_tank;
counter = 0; counter = 0;
while ( n < tank_count && n < first_tank + 4){ while ( n < tank_count && n < first_tank + 4) {
int decimals;
const char *unit;
double gas_usage;
cylinder_t *cyl = dive->cylinder + n;
cairo_translate (cr, 0, height / (double) PANGO_SCALE); cairo_translate (cr, 0, height / (double) PANGO_SCALE);
cairo_move_to(cr, 0, 0); cairo_move_to(cr, 0, 0);
cyl_cap = get_volume_units(dive->cylinder[n].type.size.mliter, &decimals, &unit_vol);
cyl_press= get_pressure_units(dive->cylinder[n].start.mbar, &unit_press); /* Get the cylinder gas use in mbar */
cyl_end= get_pressure_units(dive->cylinder[n].end.mbar, &unit_press); gas_usage = start_pressure(cyl) - end_pressure(cyl);
cyl_cons_gas = (cyl_press - cyl_end) * cyl_cap;
/* Can we turn it into a volume? */
if (cyl->type.size.mliter) {
gas_usage = bar_to_atm(gas_usage / 1000);
gas_usage *= dive->cylinder[n].type.size.mliter;
gas_usage = get_volume_units(gas_usage, &decimals, &unit);
} else {
gas_usage = get_pressure_units(gas_usage, &unit);
}
curwidth = 0; curwidth = 0;
cairo_move_to (cr, curwidth / (double) PANGO_SCALE, 0); cairo_move_to (cr, curwidth / (double) PANGO_SCALE, 0);
@ -241,13 +262,10 @@ static void print_tanks (struct dive *dive, cairo_t *cr, int maxwidth, int maxhe
curwidth += (maxwidth/ 3); curwidth += (maxwidth/ 3);
cairo_move_to(cr, curwidth / (double) PANGO_SCALE, 0); cairo_move_to(cr, curwidth / (double) PANGO_SCALE, 0);
if (prefs.output_units.pressure == PSI) {
cyl_cons_gas = (psi_to_bar(cyl_press) - psi_to_bar(cyl_end)) * cyl_cap;
}
snprintf(buffer, sizeof(buffer), _("%.*f %s\n"), snprintf(buffer, sizeof(buffer), _("%.*f %s\n"),
decimals, decimals,
cyl_cons_gas, gas_usage,
unit_vol); unit);
pango_layout_set_text(layout, buffer, -1); pango_layout_set_text(layout, buffer, -1);
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
curwidth += (maxwidth/ 3); curwidth += (maxwidth/ 3);
@ -383,7 +401,7 @@ static void show_dive_tanks(struct dive *dive, cairo_t *cr, double w,
/* We need to know how many cylinders we used*/ /* We need to know how many cylinders we used*/
for ( tank_count = 0; tank_count < MAX_CYLINDERS; tank_count++ ){ for ( tank_count = 0; tank_count < MAX_CYLINDERS; tank_count++ ){
if (dive->cylinder[tank_count].start.mbar == 0) { if (cylinder_nodata(dive->cylinder+tank_count)) {
break; break;
} }
} }