FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Show both the nominal and "real" size for an imperial cylinder"

Browse Source 
This reverts commit adaeb506b7a1485cab741f12450abeb76e109276.

commit a8e8d56ec016 ("Tweak cylinder equipment tooltips") does a much
better job allowing the user to know the true volume of the cylinder
(given the gas entered) and clutters the UI a lot less.
This commit is contained in:
Dirk Hohndel 2017-01-16 03:30:57 -08:00
parent a8e8d56ec0
commit 7f7c008247
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qt-models/cylindermodel.cpp
View File

@ -38,10 +38,9 @@ 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 = QString("(%1)%2").arg(real_value, 0, 'f', 0).arg(CylindersModel::tr("cuft"));
unit = CylindersModel::tr("cuft");
} else {
value = ml / 1000.0;
decimals = 1;