From 35e60a7355e23b50fc7f48f48efe68a26b445454 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 26 Jan 2016 20:06:30 -0800 Subject: QML UI: don't combine multiple trips to the same location into one The way sectioning of the dive list works is by watching for different strings in the section.property. In order to be able to tell different trips apart we combine the address of the dive trip variable with the location (which will create a new section for a new trip, even if the location text is the same) and then strip that information out before showing the trip header. Signed-off-by: Dirk Hohndel --- subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'subsurface-core/subsurface-qt/DiveObjectHelper.cpp') diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index 78c1dfc63..e29bd3802 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp @@ -219,6 +219,16 @@ 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 +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; + return ret; +} + QString DiveObjectHelper::maxcns() const { return QString(m_dive->maxcns); -- cgit v1.2.3-70-g09d2