diff options
| author |  Benjamin <nystire@gmail.com> | 2013-10-04 21:39:33 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-04 11:57:28 -0700 |
| commit | ae713763c79afb483afec12d02730e0c5a8af309 (patch) | |
| tree | 0d1dae49cccdfa464e7675d40c3d41d522a194f6 /qt-gui.cpp | |
| parent | f63605e02e4656b60c6c095f4289dbffa293bc2d (diff) | |
| download | subsurface-ae713763c79afb483afec12d02730e0c5a8af309.tar.gz | |
Add a helper function to calculate weight display string
Add a helper function to unify the calculation of the
weight display string, instead of having the same calculation
in two places in the code.
Signed-off-by: Benjamin Fogel <nystire@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-gui.cpp')
| -rw-r--r-- | qt-gui.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index 78138ad3a..b302e341a 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -216,14 +216,13 @@ QString get_depth_unit() QString get_weight_string(weight_t weight, bool showunit) { - if (prefs.units.weight == units::KG) { - int gr = weight.grams % 1000; - int kg = weight.grams / 1000; - return QString("%1.%2%3").arg(kg).arg((unsigned)(gr) / 100).arg(showunit ? _("kg") : ""); + QString str = weight_string (weight.grams); + if (get_units()->weight == units::KG) { + str = QString ("%1%2").arg(str).arg(showunit ? _("kg") : ""); } else { - double lbs = grams_to_lbs(weight.grams); - return QString("%1%2").arg(lbs, 0, 'f', lbs >= 40.0 ? 0 : 1 ).arg(showunit ? _("lbs") : ""); + str = QString ("%1%2").arg(str).arg(showunit ? _("lbs") : ""); } + return (str); } QString get_weight_unit() |