subsurface/subsurface-core
Linus Torvalds 288aff9dbb Don't use "get_volume_string()" for cylinder size string
We had two totally different usage cases for "get_volume_string()": one
that did the obvious "show this volume as a string", and one that tried
to show a cylinder size.

The function used a magic third argument (the working pressure of the
cylinder) to distinguish between the two cases, but it still got it
wrong.

A metric cylinder doesn't necessarily have a working pressure at all,
and the size is a wet size in liters.  We'd pass in zero as the working
pressure, and if the volume units were set to cubic feet, the logic in
"get_volume_string()" would happily convert the metric wet size into the
wet size in cubic feet.

But that's completely wrong.  An imperial cylinder size simply isn't a
wet size.  If you don't have a working pressure, you cannot convert the
cylinder size to cubic feet.  End of story.

So instead of having "get_volume_string()" have magical behavior
depending on working pressure, and getting it wrong anyway, just make
get_volume_string do a pure volume conversion, and create a whole new
function for showing the size of a cylinder.

Now, if the cylinder doesn't have a working pressure, we just show the
metric size, even if the user had asked for cubic feet.

[Dirk Hohndel: added call to translation functions for the units]

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-25 00:58:09 +01:00
..
2016-01-26 09:51:14 -08:00
2016-01-26 09:51:14 -08:00
2015-10-30 10:36:49 -07:00
2015-10-30 10:36:49 -07:00
2015-11-15 12:10:37 -08:00
2015-11-02 19:54:34 -08:00
2016-02-25 00:45:35 +01:00
2016-02-01 18:01:05 -08:00
2016-01-11 06:14:45 -08:00
2016-02-03 06:06:23 -08:00
2016-01-31 13:06:39 -08:00
2015-10-30 10:36:49 -07:00
2015-10-30 10:36:49 -07:00
2015-11-15 12:10:37 -08:00
2016-01-31 13:06:39 -08:00
2015-11-09 18:00:56 -08:00
2016-01-24 21:26:45 -08:00
2016-02-01 18:01:05 -08:00
2015-11-14 10:43:37 -08:00
2016-01-10 14:12:23 -08:00
2015-12-27 21:31:13 -08:00
2016-01-24 21:27:05 -08:00