diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 12:39:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 12:39:55 -0700 |
| commit | 55352a051cfa7ac519e397cd3d18851e5050517b (patch) | |
| tree | 8d42a09d66212b84f992c8d3ce6b8e341cdac94a /parse-xml.c | |
| parent | e4bfb6597279ca3d9aa3678a617f5f0aef298278 (diff) | |
| parent | 619ab9e828d4db7b0c4089018b09892c9d04ece9 (diff) | |
| download | subsurface-55352a051cfa7ac519e397cd3d18851e5050517b.tar.gz | |
Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface
* 'add-info-stats-page' of git://github.com/dirkhh/subsurface:
Add Info & Stats page to the notebook
Even more places with pressure and volume conversions
Further cleanup of pressure and volume conversions
Use unit functions to get column headers, add unit function for pressure
More consistency improvements
Add new helper function to get temperature and unit
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/parse-xml.c b/parse-xml.c index c44b6f6ae..5eabc353c 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -425,7 +425,7 @@ static void water_pressure(char *buffer, void *_depth) if (!val.fp) break; /* cbar to atm */ - atm = (val.fp / 100) / 1.01325; + atm = bar_to_atm(val.fp * 10); /* * atm to cm. Why not mm? The precision just isn't * there. @@ -1122,9 +1122,9 @@ static void match_standard_cylinder(cylinder_type_t *type) if (type->description) return; - cuft = type->size.mliter / 28317.0; + cuft = ml_to_cuft(type->size.mliter); cuft *= to_ATM(type->workingpressure); - psi = type->workingpressure.mbar / 68.95; + psi = to_PSI(type->workingpressure); switch (psi) { case 2300 ... 2500: /* 2400 psi: LP tank */ @@ -1177,7 +1177,8 @@ static void sanitize_cylinder_type(cylinder_type_t *type) return; if (input_units.volume == CUFT || import_source == SUUNTO) { - volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */ + /* confusing - we don't really start from ml but millicuft !*/ + volume_of_air = cuft_to_l(type->size.mliter); 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; |