From 05552c7339d564c38d8d8aa1c4898a6736d070bf Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Sat, 16 May 2015 12:42:26 +0200 Subject: [PATCH] Show seconds in duration for free dives For free dives (corresponding to dive mode or duration shorter than 15min), the display format for duration is changed to display minutes and seconds. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index d6b425b52..69a276bfb 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1372,15 +1372,19 @@ QString DiveItem::displayDepthWithUnit() const QString DiveItem::displayDuration() const { - int hrs, mins; + 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;