diff options
| author |  Benjamin <nystire@gmail.com> | 2013-10-04 15:49:32 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-04 09:40:05 -0700 |
| commit | 9961cf13b13b03803b2c96ec5d2221cf18d46588 (patch) | |
| tree | a2c23d58d47a8248c12dd6f77f5e99507b91e8c5 | |
| parent | c28fe00bfe7b0ed747050afc97812a56ccc8a291 (diff) | |
| download | subsurface-9961cf13b13b03803b2c96ec5d2221cf18d46588.tar.gz | |
Use the same conversion grams->lbs in dive and equipment list
Subsurface stores weight values in grams. When displaying lbs,
the dive list was not rounding the converted weights up, but
rather truncating the value at the decimal place. The equipment
list was rounding the converted weights up. This gave two
different displayed values for the same weight value.
Signed-off-by: Benjamin Fogel <nystire@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-gui.cpp | 5 | ||||
| -rw-r--r-- | qt-ui/models.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index 64a125dcb..78138ad3a 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -217,8 +217,9 @@ QString get_depth_unit() QString get_weight_string(weight_t weight, bool showunit) { if (prefs.units.weight == units::KG) { - double kg = weight.grams / 1000.0; - return QString("%1%2").arg(kg, 0, 'f', kg >= 20.0 ? 0 : 1 ).arg(showunit ? _("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") : ""); } else { double lbs = grams_to_lbs(weight.grams); return QString("%1%2").arg(lbs, 0, 'f', lbs >= 40.0 ? 0 : 1 ).arg(showunit ? _("lbs") : ""); diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 6831b9271..752f3ddf3 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1114,7 +1114,8 @@ QString DiveItem::displayWeight() const int kg = weight() / 1000; str = QString("%1.%2").arg(kg).arg((unsigned)(gr) / 100); } else { - str = QString("%1").arg((unsigned)(grams_to_lbs(weight()))); + double lbs = grams_to_lbs(weight()); + str = QString("%1").arg(lbs, 0, 'f', lbs >= 40.0 ? 0 : 1 ); } return str; |