mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 06:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: don't combine multiple trips to the same location into one

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-26 20:06:30 -08:00
parent 6a8768ee26
commit 35e60a7355
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-mobile/qml/DiveList.qml
View file

@ -106,7 +106,19 @@ MobileComponents.Page {
MobileComponents.Heading { MobileComponents.Heading {
id: sectionText id: sectionText
text: {section == "--" ? "" : section } text: {
// if the tripMeta (which we get as "section") ends in ::-- we know
// that there's no trip -- otherwise strip the meta information before
// the :: and show the trip location
var shownText
var endsWithDoubleDash = /::--$/;
if (endsWithDoubleDash.test(section)) {
shownText = ""
} else {
shownText = section.replace(/.*::/, "")
}
shownText
}
anchors { anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left
@ -150,7 +162,7 @@ MobileComponents.Page {
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
maximumFlickVelocity: parent.height * 5 maximumFlickVelocity: parent.height * 5
cacheBuffer: 0 // seems to avoid empty rendered profiles cacheBuffer: 0 // seems to avoid empty rendered profiles
section.property: "dive.trip" section.property: "dive.tripMeta"
section.criteria: ViewSection.FullString section.criteria: ViewSection.FullString
section.delegate: tripHeading section.delegate: tripHeading
header: MobileComponents.Heading { header: MobileComponents.Heading {

10
subsurface-core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -219,6 +219,16 @@ QString DiveObjectHelper::trip() const
return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING; 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 QString DiveObjectHelper::maxcns() const
{ {
return QString(m_dive->maxcns); return QString(m_dive->maxcns);

2
subsurface-core/subsurface-qt/DiveObjectHelper.h
View file

@ -29,6 +29,7 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QString suit READ suit CONSTANT) Q_PROPERTY(QString suit READ suit CONSTANT)
Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT)
Q_PROPERTY(QString trip READ trip CONSTANT) Q_PROPERTY(QString trip READ trip CONSTANT)
Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT)
Q_PROPERTY(QString maxcns READ maxcns CONSTANT) Q_PROPERTY(QString maxcns READ maxcns CONSTANT)
Q_PROPERTY(QString otu READ otu CONSTANT) Q_PROPERTY(QString otu READ otu CONSTANT)
public: public:
@ -58,6 +59,7 @@ public:
QStringList cylinders() const; QStringList cylinders() const;
QString cylinder(int idx) const; QString cylinder(int idx) const;
QString trip() const; QString trip() const;
QString tripMeta() const;
QString maxcns() const; QString maxcns() const;
QString otu() const; QString otu() const;