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

Move helper function to DiveObjectsHelper

Browse source 
As per Tomaz recomendation the helper functions from 19588ce and e072596
are moved from qmlmanager to DiveObjectsHelper.

[Dirk Hohndel: merged with the latest code]

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2016-01-27 18:34:34 +01:00 • committed by Dirk Hohndel
parent 4abe73ff2a
commit 9342dedb26
5 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
qt-mobile/qmlmanager.cpp
View file

@ -708,39 +708,3 @@ QString QMLManager::getDate(const QString& diveId)
datestring = get_dive_date_string(d->when);
return datestring;
}
QString QMLManager::getCylinder(const QString& diveId)
{
int dive_id = diveId.toInt();
struct dive *d = get_dive_by_uniq_id(dive_id);
QString cylinder;
if (d){
if (d->cylinder[1].type.description != NULL){
cylinder = "Multiple";
}
else {
cylinder = d->cylinder[0].type.description;
}
}
return cylinder;
}
QString QMLManager::getWeights(const QString& diveId)
{
int dive_id = diveId.toInt();
struct dive *d = get_dive_by_uniq_id(dive_id);
int weight = 0;
QString weights;
if (d){
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++)
weight += d->weightsystem[i].weight.grams;
if (informational_prefs.unit_system == IMPERIAL){
weights = QString::number(grams_to_lbs(weight), 'f', 1) + " lbs";
}
else {
weights = QString::number(weight/1000, 'f', 1) + " kg";
}
}
return weights;
}