mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a helper function to calculate weight display string

Browse source 
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>
This commit is contained in:
Benjamin 2013-10-04 21:39:33 +03:00 • committed by Dirk Hohndel
parent f63605e02e
commit ae713763c7
4 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/models.cpp
View file

@ -1107,17 +1107,7 @@ QString DiveItem::displaySac() const
QString DiveItem::displayWeight() const
{
QString str;
if (get_units()->weight == units::KG) {
int gr = weight() % 1000;
int kg = weight() / 1000;
str = QString("%1.%2").arg(kg).arg((unsigned)(gr) / 100);
} else {
double lbs = grams_to_lbs(weight());
str = QString("%1").arg(lbs, 0, 'f', lbs >= 40.0 ? 0 : 1 );
}
QString str = weight_string(weight());
return str;
}