diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-05-14 09:45:01 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-14 05:33:58 -0400 |
| commit | 5868b37e6bde1eaa6da09aac5e269557d94d7641 (patch) | |
| tree | 1d4623c98cac401de44521d8b79c0dc5fe177a98 | |
| parent | f9598f062cf8684dd92ac56530c3758e3b1a6d9d (diff) | |
| download | subsurface-5868b37e6bde1eaa6da09aac5e269557d94d7641.tar.gz | |
Fix inaccurate weight and temperature display in dive list
A nonexisting temperature (mkelvin==0) was displayed as -273°C.
Weight was always displayed with an extra 500 grams/0.5 lbs.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/models.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 0b933aeb1..4c45f1489 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -540,6 +540,9 @@ QString DiveItem::displayTemperature() const { QString str; + if (!dive->watertemp.mkelvin) + return str; + if (get_units()->temperature == units::CELSIUS) str = QString::number(mkelvin_to_C(dive->watertemp.mkelvin), 'f', 1); else @@ -567,9 +570,9 @@ QString DiveItem::displayWeight() const if (get_units()->weight == units::KG) { int gr = weight() % 1000; int kg = weight() / 1000; - str = QString("%1.%2").arg(kg).arg((unsigned)(gr + 500) / 100); + str = QString("%1.%2").arg(kg).arg((unsigned)(gr) / 100); } else { - str = QString("%1").arg((unsigned)(grams_to_lbs(weight()) + 0.5)); + str = QString("%1").arg((unsigned)(grams_to_lbs(weight()))); } return str; |