From adaeb506b7a1485cab741f12450abeb76e109276 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 24 Feb 2016 14:51:21 -0800 Subject: Show both the nominal and "real" size for an imperial cylinder This is questionable, but perhaps useful. When showing imperial cylinder sizes, show both the nominal value (with no compensation for compressibility of the gas) and the "actual" amount of gas the cylinder contains. So an AL80 will show as a size of "80 (77)cuft", because while 80 is the nominal size, the actual amount of gas that will fit is just 77 cuft. [Dirk Hohndel: adjusted to take translation of the unit into account] Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-models/cylindermodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qt-models') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index f5eb764db..1a587cee6 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -36,9 +36,10 @@ static QString get_cylinder_string(cylinder_t *cyl) // liters: if we don't have a working pressure, we cannot // convert the cylinder size to cuft. if (wp.mbar && prefs.units.volume == units::CUFT) { + double real_value = ml_to_cuft(gas_volume(cyl, wp)); value = ml_to_cuft(ml) * bar_to_atm(wp.mbar / 1000.0); decimals = (value > 20.0) ? 0 : (value > 2.0) ? 1 : 2; - unit = CylindersModel::tr("cuft"); + unit = QString("(%1)%2").arg(real_value, 0, 'f', 0).arg(CylindersModel::tr("cuft")); } else { value = ml / 1000.0; decimals = 1; -- cgit v1.2.3-70-g09d2