mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/core/subsurface-qt/DiveObjectHelper.h

106 lines
3.6 KiB
C
Raw Normal View History

Add SPDX header to remaining core files Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-27 18:24:53 +00:00
// SPDX-License-Identifier: GPL-2.0
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
#ifndef DIVE_QOBJECT_H
#define DIVE_QOBJECT_H
Adds Cylinder helper class for cylinder info access in grantlee templates to allow grantlee to access individual fields of the cylinder_t struct rather than a string representation of the whole cylinder info using a grantlee structure like this one: <table class="table_class"> <tr> <td>Cylinder</td> <td>Start press.</td> <td>End press.</td> <td>Gas mix</td> </tr> {% for cylinderObject in dive.cylinderObjects %} <tr> <td>{{ cylinderObject.description }}</td> <td>{{ cylinderObject.startPressure }}</td> <td>{{ cylinderObject.endPressure }}</td> <td>{{ cylinderObject.gasMix }}</td> </tr> {% endfor %} </table> Signed-off-by: Tim Wootton <tim@tee-jay.org.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-31 21:27:07 +00:00
#include "CylinderObjectHelper.h"
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
#include <QObject>
#include <QString>
Fix potential compile error This compiled just fine for me but apparently the QStringList needs to be explicitly included on Ubuntu 15.10. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:09:27 +00:00
#include <QStringList>
Cleanup: turn CylinderObjectHelper into value type CylinderObjectHelper is used for structured formatting of cylinder values in grantlee types. Instead of keeping a reference to a cylinder, turn it into a value type containing the formatted strings. This should be distinctly safer, as we don't risk having stale references flying around. Moreover, we don't have to use pointers but can use containers containing plain CylinderObjectHelper. Thus, no explicit memory management is needed, making the code distinctly easier to understand. Sadly, currently grantlee does not support Q_GADGET based Q_PROPERTY. Therefore a GRANTLEE_*_LOOKUP block has to be added. This can be removed in due course, as a patch to remedy this issue is in current grantlee master. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-08-12 16:26:42 +00:00
#include <QVector>
iOS: build fix Otherwise the moc build fails. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-13 01:21:39 +00:00
#include <QVariant>
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
class DiveObjectHelper : public QObject {
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
Q_OBJECT
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(int number READ number CONSTANT)
Q_PROPERTY(int id READ id CONSTANT)
Q_PROPERTY(int rating READ rating CONSTANT)
Adds missing visibility to DiveObjectHelper, so it too can be used in print templates. Signed-off-by: Tim Wootton <tim@tee-jay.org.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-16 08:59:05 +00:00
Q_PROPERTY(int visibility READ visibility CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QString date READ date CONSTANT)
Q_PROPERTY(QString time READ time CONSTANT)
Make the raw timestamp available in QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-14 12:38:11 +00:00
Q_PROPERTY(int timestamp READ timestamp CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QString location READ location CONSTANT)
Q_PROPERTY(QString gps READ gps CONSTANT)
Subsurface-mobile: do send decimal GPS to Google Sending nicely readable formatted coordinates to Google Maps does not result in a correctly positioned map. Google likes unreadable decimal format. Little hacky solution. Added a gps_decimal attribute, populate that with the standard function for format a coordinate to string, but reset the preferences value temporarly so that it always converts it to decimal style. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-21 16:52:29 +00:00
Q_PROPERTY(QString gps_decimal READ gps_decimal CONSTANT)
Dive site: replace UUID by pointer in mobile code Replace UUIDs by pointers to dive-site in mobile code. In both cases, the value is transported via a QVariant. The function getCoordinatesForUUID(), which was only used from mobile, can be replaced by a getCoordinatesFor() function taking a variant supposed to contain a dive-site pointer. Likewise, the variant of the centerOnDiveSite function is now supposed to wrap a pointer-to-divesite. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-10-25 18:46:12 +00:00
Q_PROPERTY(QVariant dive_site READ dive_site CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QString duration READ duration CONSTANT)
Add dive property to easily test if there isn't an actual dive Right now this just tests for zero duration, but maybe this should also return true for positive duration and max depth of 0. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-15 00:26:37 +00:00
Q_PROPERTY(bool noDive READ noDive CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QString depth READ depth CONSTANT)
Q_PROPERTY(QString divemaster READ divemaster CONSTANT)
Q_PROPERTY(QString buddy READ buddy CONSTANT)
Q_PROPERTY(QString airTemp READ airTemp CONSTANT)
Q_PROPERTY(QString waterTemp READ waterTemp CONSTANT)
Q_PROPERTY(QString notes READ notes CONSTANT)
Q_PROPERTY(QString tags READ tags CONSTANT)
Q_PROPERTY(QString gas READ gas CONSTANT)
Q_PROPERTY(QString sac READ sac CONSTANT)
DiveHelperObject: add the weightList and cylinderList properties "weights" and "cylinders" are QStringList Q_PROPERTIES, and Grantlee should be able to render them, but it doesn't. To be able to print the whole list of weights and cylinders we introduce two new QString properties "weightList" and "cylinderList". The variable replacement in the previous patch deals with the conversation of the user side HTML, e.g.: USER -> INTERNAL "{{ dive.weights }} -> {{ dive.weightList }}" "{{ dive.cylinders }} -> {{ dive.cylinderList }}" Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-29 14:42:07 +00:00
Q_PROPERTY(QString weightList READ weightList CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QStringList weights READ weights CONSTANT)
DiveObjectHelper: check if dive has only one weightsystem The mobile app should only allow editing the weight entry if there is no second weight defined. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-06 06:53:12 +00:00
Q_PROPERTY(bool singleWeight READ singleWeight CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QString suit READ suit CONSTANT)
QML UI: Enable cylinder edit This adds the option to select a cylinder when adding or editing a dive. Due to limited screen size we restrict the editing to the first cylinder only. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-30 14:24:19 +00:00
Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT)
Cleanup: turn CylinderObjectHelper into value type CylinderObjectHelper is used for structured formatting of cylinder values in grantlee types. Instead of keeping a reference to a cylinder, turn it into a value type containing the formatted strings. This should be distinctly safer, as we don't risk having stale references flying around. Moreover, we don't have to use pointers but can use containers containing plain CylinderObjectHelper. Thus, no explicit memory management is needed, making the code distinctly easier to understand. Sadly, currently grantlee does not support Q_GADGET based Q_PROPERTY. Therefore a GRANTLEE_*_LOOKUP block has to be added. This can be removed in due course, as a patch to remedy this issue is in current grantlee master. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-08-12 16:26:42 +00:00
Q_PROPERTY(QVector<CylinderObjectHelper> cylinderObjects READ cylinderObjects CONSTANT)
Mobile: don't format trip heading for all dives QML's ListView uses the "section" property to test if items belong to the same section. Apparently, this must be a string and therefore we can't pass e.g. a dive-trip object. Therefore a specially formatted string was passed in, which was guaranteed to be unique (contained the dive-trip pointer value) and the fully formatted trip-title and short-date. The disadvantage of that approach is that the formatting is performed for every dive and not every trip. Perhaps not a problem now, but it makes it for example necessary to cache the number of filtered dives. To be more flexible, pass in only the pointer value formatted as hexadecimal string and provide a function to convert that string back to a trip-pointer (in the form of a QVariant, so that it can be passed to QML). Moreover provide two functions for formatting the title and the short-date. The three new functions are members of DiveListSortModel. This might not be the perfect place, but it is easy to reach from the DiveListView. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-11-22 21:10:38 +00:00
Q_PROPERTY(QString tripId READ tripId CONSTANT)
DiveObjectHelper: expose number of dives in a trip Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-15 00:34:33 +00:00
Q_PROPERTY(int tripNrDives READ tripNrDives CONSTANT)
Let cns and otu return ints rather than QStrings This way they display correctly when accessed from grantlee template Fixes #1085 Signed-off-by: Tim Wootton <tim@tee-jay.org.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-18 22:08:27 +00:00
Q_PROPERTY(int maxcns READ maxcns CONSTANT)
Q_PROPERTY(int otu READ otu CONSTANT)
Move helper function to DiveObjectsHelper As per Tomaz recomendation the helper functions from 19588ce and e072596 are moved from qmlmanager to DiveObjectsHelper. [Dirk Hohndel: merged with the latest code] Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-27 17:34:34 +00:00
Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT)
Mobile: return all used cylinders as a list Planning ahead for full edit capabilities of dives that uses multiple cylinders. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12 09:57:21 +00:00
Q_PROPERTY(QStringList getCylinder READ getCylinder CONSTANT)
Mobile: return pressures for all used cylinders Return all pressure values for all used cylinders as a list. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-17 09:49:42 +00:00
Q_PROPERTY(QStringList startPressure READ startPressure CONSTANT)
Q_PROPERTY(QStringList endPressure READ endPressure CONSTANT)
Mobile: return all used gasmixes as a list Planning ahead for full edit capabilities of dives that uses multiple cylinders. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-16 16:25:21 +00:00
Q_PROPERTY(QStringList firstGas READ firstGas CONSTANT)
Mobile/filtering: full text filter, instead of just dive site Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-16 11:56:41 +00:00
Q_PROPERTY(QString fullText READ fullText CONSTANT)
Mobile/filtering: add fullTextNoNotes to the dive object helper This way we can filter with and without the notes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-20 01:15:56 +00:00
Q_PROPERTY(QString fullTextNoNotes READ fullTextNoNotes CONSTANT)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
public:
DiveObjectHelper: remove default argument We don't support null-dives in DiveObjectHelper. Defaulting the dive parameter to NULL seems to send the wrong message. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-08-12 21:51:44 +00:00
DiveObjectHelper(struct dive *dive);
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
int number() const;
int id() const;
core: add ability to get underlying dive to DiveObjectHelper This feels a bit like cheating, but if we need to be able to make modifications to the underlying dive and only have the helper object (for example inside of a view model), doing everything through the helper object can turn into a real performance issue. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-24 20:14:33 +00:00
struct dive *getDive() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
int rating() const;
Adds missing visibility to DiveObjectHelper, so it too can be used in print templates. Signed-off-by: Tim Wootton <tim@tee-jay.org.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-16 08:59:05 +00:00
int visibility() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QString date() const;
timestamp_t timestamp() const;
QString time() const;
QString location() const;
QString gps() const;
Subsurface-mobile: do send decimal GPS to Google Sending nicely readable formatted coordinates to Google Maps does not result in a correctly positioned map. Google likes unreadable decimal format. Little hacky solution. Added a gps_decimal attribute, populate that with the standard function for format a coordinate to string, but reset the preferences value temporarly so that it always converts it to decimal style. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-21 16:52:29 +00:00
QString gps_decimal() const;
Dive site: replace UUID by pointer in mobile code Replace UUIDs by pointers to dive-site in mobile code. In both cases, the value is transported via a QVariant. The function getCoordinatesForUUID(), which was only used from mobile, can be replaced by a getCoordinatesFor() function taking a variant supposed to contain a dive-site pointer. Likewise, the variant of the centerOnDiveSite function is now supposed to wrap a pointer-to-divesite. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-10-25 18:46:12 +00:00
QVariant dive_site() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QString duration() const;
Add dive property to easily test if there isn't an actual dive Right now this just tests for zero duration, but maybe this should also return true for positive duration and max depth of 0. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-15 00:26:37 +00:00
bool noDive() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QString depth() const;
QString divemaster() const;
QString buddy() const;
QString airTemp() const;
QString waterTemp() const;
QString notes() const;
QString tags() const;
QString gas() const;
QString sac() const;
DiveHelperObject: add the weightList and cylinderList properties "weights" and "cylinders" are QStringList Q_PROPERTIES, and Grantlee should be able to render them, but it doesn't. To be able to print the whole list of weights and cylinders we introduce two new QString properties "weightList" and "cylinderList". The variable replacement in the previous patch deals with the conversation of the user side HTML, e.g.: USER -> INTERNAL "{{ dive.weights }} -> {{ dive.weightList }}" "{{ dive.cylinders }} -> {{ dive.cylinderList }}" Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-29 14:42:07 +00:00
QString weightList() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QStringList weights() const;
QString weight(int idx) const;
DiveObjectHelper: check if dive has only one weightsystem The mobile app should only allow editing the weight entry if there is no second weight defined. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-06 06:53:12 +00:00
bool singleWeight() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QString suit() const;
QML UI: Enable cylinder edit This adds the option to select a cylinder when adding or editing a dive. Due to limited screen size we restrict the editing to the first cylinder only. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-30 14:24:19 +00:00
QStringList cylinderList() const;
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
QStringList cylinders() const;
QString cylinder(int idx) const;
Cleanup: turn CylinderObjectHelper into value type CylinderObjectHelper is used for structured formatting of cylinder values in grantlee types. Instead of keeping a reference to a cylinder, turn it into a value type containing the formatted strings. This should be distinctly safer, as we don't risk having stale references flying around. Moreover, we don't have to use pointers but can use containers containing plain CylinderObjectHelper. Thus, no explicit memory management is needed, making the code distinctly easier to understand. Sadly, currently grantlee does not support Q_GADGET based Q_PROPERTY. Therefore a GRANTLEE_*_LOOKUP block has to be added. This can be removed in due course, as a patch to remedy this issue is in current grantlee master. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-08-12 16:26:42 +00:00
QVector<CylinderObjectHelper> cylinderObjects() const;
Mobile: don't format trip heading for all dives QML's ListView uses the "section" property to test if items belong to the same section. Apparently, this must be a string and therefore we can't pass e.g. a dive-trip object. Therefore a specially formatted string was passed in, which was guaranteed to be unique (contained the dive-trip pointer value) and the fully formatted trip-title and short-date. The disadvantage of that approach is that the formatting is performed for every dive and not every trip. Perhaps not a problem now, but it makes it for example necessary to cache the number of filtered dives. To be more flexible, pass in only the pointer value formatted as hexadecimal string and provide a function to convert that string back to a trip-pointer (in the form of a QVariant, so that it can be passed to QML). Moreover provide two functions for formatting the title and the short-date. The three new functions are members of DiveListSortModel. This might not be the perfect place, but it is easy to reach from the DiveListView. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-11-22 21:10:38 +00:00
QString tripId() const;
DiveObjectHelper: expose number of dives in a trip Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-15 00:34:33 +00:00
int tripNrDives() const;
Let cns and otu return ints rather than QStrings This way they display correctly when accessed from grantlee template Fixes #1085 Signed-off-by: Tim Wootton <tim@tee-jay.org.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-07-18 22:08:27 +00:00
int maxcns() const;
int otu() const;
Move helper function to DiveObjectsHelper As per Tomaz recomendation the helper functions from 19588ce and e072596 are moved from qmlmanager to DiveObjectsHelper. [Dirk Hohndel: merged with the latest code] Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-27 17:34:34 +00:00
QString sumWeight() const;
Mobile: return all used cylinders as a list Planning ahead for full edit capabilities of dives that uses multiple cylinders. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12 09:57:21 +00:00
QStringList getCylinder() const;
Mobile: return pressures for all used cylinders Return all pressure values for all used cylinders as a list. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-17 09:49:42 +00:00
QStringList startPressure() const;
QStringList endPressure() const;
Mobile: return all used gasmixes as a list Planning ahead for full edit capabilities of dives that uses multiple cylinders. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-16 16:25:21 +00:00
QStringList firstGas() const;
Mobile/filtering: full text filter, instead of just dive site Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-16 11:56:41 +00:00
QString fullText() const;
Mobile/filtering: add fullTextNoNotes to the dive object helper This way we can filter with and without the notes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-20 01:15:56 +00:00
QString fullTextNoNotes() const;
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
private:
struct dive *m_dive;
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
};
Random whitespace cleanup Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:14:45 +00:00
Q_DECLARE_METATYPE(DiveObjectHelper *)
Move Dive class from qthelper.h/cpp to it's own file and rename it to DiveObjectHelper, since it should be an QObject based class to make it easier on the QML, grantlee and widgets side to display the dive's internal data. each Q_PROPERTY defined in the DiveObjectHelper.h file can be acessed directly via it's name. So, if you are on a model that returns a dive, acess it's name by dive.name Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07 18:01:24 +00:00
Fix potential compile error This compiled just fine for me but apparently the QStringList needs to be explicitly included on Ubuntu 15.10. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 14:09:27 +00:00
#endif
Reference in a new issue Copy permalink