diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-06 17:43:32 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-06 17:43:32 -0700 |
| commit | 92d24a2912d1e9302b86d74a13a9bc124e7b380c (patch) | |
| tree | 230a01f62aa4111cb7b6b459fddad66fd9c22446 /qt-models | |
| parent | 876b479d695acda652e7b6c81c6b899946d42a85 (diff) | |
| download | subsurface-92d24a2912d1e9302b86d74a13a9bc124e7b380c.tar.gz | |
Consistently show dive duration based on preferences
We now respect the settings in the preferences and also only show
the duration as minutes and seconds if the dive is a free dive.
Fixes #361
Fixes #362
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divetripmodel.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index dadf81dfd..c57541ccd 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -342,22 +342,8 @@ int DiveItem::countPhotos(dive *dive) const QString DiveItem::displayDuration() const { - int hrs, mins, fullmins, secs; struct dive *dive = get_dive_by_uniq_id(diveId); - mins = (dive->duration.seconds + 59) / 60; - fullmins = dive->duration.seconds / 60; - secs = dive->duration.seconds - 60 * fullmins; - hrs = mins / 60; - mins -= hrs * 60; - - QString displayTime; - if (hrs) - displayTime = QString("%1:%2").arg(hrs).arg(mins, 2, 10, QChar('0')); - else if (mins < 15 || dive->dc.divemode == FREEDIVE) - displayTime = QString("%1m%2s").arg(fullmins).arg(secs, 2, 10, QChar('0')); - else - displayTime = QString("%1").arg(mins); - return displayTime; + return get_dive_duration_string(dive->duration.seconds, ":", "m", "s", dive->dc.divemode == FREEDIVE); } QString DiveItem::displayTemperature() const |