mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
288aff9dbb
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> |
||
|---|---|---|
| .. | ||
| cleanertablemodel.cpp | ||
| cleanertablemodel.h | ||
| CMakeLists.txt | ||
| completionmodels.cpp | ||
| completionmodels.h | ||
| cylindermodel.cpp | ||
| cylindermodel.h | ||
| divecomputerextradatamodel.cpp | ||
| divecomputerextradatamodel.h | ||
| divecomputermodel.cpp | ||
| divecomputermodel.h | ||
| divelistmodel.cpp | ||
| divelistmodel.h | ||
| divelocationmodel.cpp | ||
| divelocationmodel.h | ||
| divepicturemodel.cpp | ||
| divepicturemodel.h | ||
| diveplannermodel.cpp | ||
| diveplannermodel.h | ||
| diveplotdatamodel.cpp | ||
| diveplotdatamodel.h | ||
| divesitepicturesmodel.cpp | ||
| divesitepicturesmodel.h | ||
| divetripmodel.cpp | ||
| divetripmodel.h | ||
| filtermodels.cpp | ||
| filtermodels.h | ||
| gpslistmodel.cpp | ||
| gpslistmodel.h | ||
| models.cpp | ||
| models.h | ||
| ssrfsortfilterproxymodel.cpp | ||
| ssrfsortfilterproxymodel.h | ||
| tankinfomodel.cpp | ||
| tankinfomodel.h | ||
| treemodel.cpp | ||
| treemodel.h | ||
| weightmodel.cpp | ||
| weightmodel.h | ||
| weigthsysteminfomodel.cpp | ||
| weigthsysteminfomodel.h | ||
| yearlystatisticsmodel.cpp | ||
| yearlystatisticsmodel.h | ||