From 6d6ba8b54aad2ebcd7fc4259f6c9976022362ee5 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 5 Apr 2016 12:27:51 -0700
Subject: [PATCH] QML UI: better trip header
This tries to give the best information about the trip that we have.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
core/subsurface-qt/DiveObjectHelper.cpp | 33 ++++++++++++++++++++++---
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp
index ab88d2f3c..9a3f2386d 100644
--- a/core/subsurface-qt/DiveObjectHelper.cpp
+++ b/core/subsurface-qt/DiveObjectHelper.cpp
@@ -272,13 +272,38 @@ QString DiveObjectHelper::trip() const
return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING;
}
-// combine the pointer address with the trip location so that
-// we detect multiple, destinct trips to the same location
+// combine the pointer address with the trip title so that
+// we detect multiple, destinct trips with the same title
+// the trip title is designed to be
+// location (# dives)
+// or, if there is no location name
+// date range (# dives)
+// where the date range is given as "month year" or "month-month year" or "month year - month year"
QString DiveObjectHelper::tripMeta() const
{
QString ret = EMPTY_DIVE_STRING;
- if (m_dive->divetrip)
- ret = QString::number((quint64)m_dive->divetrip, 16) + QLatin1Literal("::") + m_dive->divetrip->location;
+ struct dive_trip *dt = m_dive->divetrip;
+ if (dt) {
+ QString numDives = tr("%1 dive(s)").arg(dt->nrdives);
+ QString title(dt->location);
+ if (title.isEmpty()) {
+ // so use the date range
+ timestamp_t firstTime = dt->when - gettimezoneoffset(dt->when);
+ QString firstMonth = QDateTime::fromTime_t(firstTime).toString("MMM");
+ QString firstYear = QDateTime::fromTime_t(firstTime).toString("yyyy");
+ struct dive *lastDive = dt->dives;
+ timestamp_t lastTime = lastDive->when - gettimezoneoffset(lastDive->when);
+ QString lastMonth = QDateTime::fromTime_t(lastTime).toString("MMM");
+ QString lastYear = QDateTime::fromTime_t(lastTime).toString("yyyy");
+ if (lastMonth == firstMonth && lastYear == firstYear)
+ title = firstMonth + " " + firstYear;
+ else if (lastMonth != firstMonth && lastYear == firstYear)
+ title = firstMonth + "-" + lastMonth + " " + firstYear;
+ else
+ title = firstMonth + " " + firstYear + " - " + lastMonth + " " + lastYear;
+ }
+ ret = QString::number((quint64)m_dive->divetrip, 16) + QLatin1Literal("::") + QStringLiteral("%1 (%2)").arg(title, numDives);
+ }
return ret;
}