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

Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface

Browse source 
* 'otu-tracking-v2' of git://github.com/dirkhh/subsurface:
  Make OTU column invisible by default
  Add OTU to divelist
  Calculate OTUs for every dive

Fix up trivial conflicts in dive.h (due to dive event handling also
adding a field to the dive structure)
This commit is contained in:
Linus Torvalds 2011-09-27 10:46:42 -07:00
commit 2a8f7ab78f
3 changed files with 65 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
parse-xml.c
View file

@ -1083,7 +1083,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
return;
cuft = type->size.mliter / 28317.0;
cuft *= type->workingpressure.mbar / 1013.25;
cuft *= to_ATM(type->workingpressure);
psi = type->workingpressure.mbar / 68.95;
switch (psi) {
@ -1138,7 +1138,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
if (input_units.volume == CUFT || import_source == SUUNTO) {
volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */
atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
atm = to_ATM(type->workingpressure); /* working pressure in atm */
volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
type->size.mliter = volume + 0.5;
}