mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-20 06:45:27 +00:00
1037c15b98
When editing a dive, a DiveObjectHelper of the unmodified dive was created to compare the edited with the old values. Since the DiveObjectHelper is used here only as a pointless wrapper around the formatting functions, call these functions directly. However, note that the code is in principle wrong since the change to the mobile-models, which do not use the DiveObjectHelper. The real fix would be to reload the data from the model to prevent going out-of-sync with respect to the formatting routines! Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
99 lines
3.1 KiB
C++
99 lines
3.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVE_QOBJECT_H
|
|
#define DIVE_QOBJECT_H
|
|
|
|
#include "core/units.h"
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QStringList>
|
|
#include <QVector>
|
|
#include <QVariant>
|
|
|
|
class DiveObjectHelper {
|
|
Q_GADGET
|
|
Q_PROPERTY(int number MEMBER number CONSTANT)
|
|
Q_PROPERTY(int id MEMBER id CONSTANT)
|
|
Q_PROPERTY(int rating MEMBER rating CONSTANT)
|
|
Q_PROPERTY(int visibility MEMBER visibility CONSTANT)
|
|
Q_PROPERTY(int wavesize MEMBER wavesize CONSTANT)
|
|
Q_PROPERTY(int current MEMBER current CONSTANT)
|
|
Q_PROPERTY(int surge MEMBER surge CONSTANT)
|
|
Q_PROPERTY(int chill MEMBER chill CONSTANT)
|
|
Q_PROPERTY(QString date READ date CONSTANT)
|
|
Q_PROPERTY(QString time READ time CONSTANT)
|
|
Q_PROPERTY(int timestamp MEMBER timestamp CONSTANT)
|
|
Q_PROPERTY(QString location MEMBER location CONSTANT)
|
|
Q_PROPERTY(QString gps MEMBER gps CONSTANT)
|
|
Q_PROPERTY(QString gps_decimal MEMBER gps_decimal CONSTANT)
|
|
Q_PROPERTY(QVariant dive_site MEMBER dive_site CONSTANT)
|
|
Q_PROPERTY(QString duration MEMBER duration CONSTANT)
|
|
Q_PROPERTY(bool noDive MEMBER noDive CONSTANT)
|
|
Q_PROPERTY(QString depth MEMBER depth CONSTANT)
|
|
Q_PROPERTY(QString divemaster MEMBER divemaster CONSTANT)
|
|
Q_PROPERTY(QString buddy MEMBER buddy CONSTANT)
|
|
Q_PROPERTY(QString airTemp MEMBER airTemp CONSTANT)
|
|
Q_PROPERTY(QString waterTemp MEMBER waterTemp CONSTANT)
|
|
Q_PROPERTY(QString notes MEMBER notes CONSTANT)
|
|
Q_PROPERTY(QString tags MEMBER tags CONSTANT)
|
|
Q_PROPERTY(QString gas MEMBER gas CONSTANT)
|
|
Q_PROPERTY(QString sac MEMBER sac CONSTANT)
|
|
Q_PROPERTY(QString weightList MEMBER weightList CONSTANT)
|
|
Q_PROPERTY(QStringList weights MEMBER weights CONSTANT)
|
|
Q_PROPERTY(bool singleWeight MEMBER singleWeight CONSTANT)
|
|
Q_PROPERTY(QString suit MEMBER suit CONSTANT)
|
|
Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT)
|
|
Q_PROPERTY(QStringList cylinders MEMBER cylinders CONSTANT)
|
|
Q_PROPERTY(int maxcns MEMBER maxcns CONSTANT)
|
|
Q_PROPERTY(int otu MEMBER otu CONSTANT)
|
|
Q_PROPERTY(QString sumWeight MEMBER sumWeight CONSTANT)
|
|
Q_PROPERTY(QStringList getCylinder MEMBER getCylinder CONSTANT)
|
|
Q_PROPERTY(QStringList startPressure MEMBER startPressure CONSTANT)
|
|
Q_PROPERTY(QStringList endPressure MEMBER endPressure CONSTANT)
|
|
Q_PROPERTY(QStringList firstGas MEMBER firstGas CONSTANT)
|
|
public:
|
|
DiveObjectHelper(); // This is only to be used by Qt's metatype system!
|
|
DiveObjectHelper(const struct dive *dive);
|
|
int number;
|
|
int id;
|
|
int rating;
|
|
int visibility;
|
|
int wavesize;
|
|
int current;
|
|
int surge;
|
|
int chill;
|
|
QString date() const;
|
|
timestamp_t timestamp;
|
|
QString time() const;
|
|
QString location;
|
|
QString gps;
|
|
QString gps_decimal;
|
|
QVariant dive_site;
|
|
QString duration;
|
|
bool noDive;
|
|
QString depth;
|
|
QString divemaster;
|
|
QString buddy;
|
|
QString airTemp;
|
|
QString waterTemp;
|
|
QString notes;
|
|
QString tags;
|
|
QString gas;
|
|
QString sac;
|
|
QString weightList;
|
|
QStringList weights;
|
|
bool singleWeight;
|
|
QString suit;
|
|
QStringList cylinderList() const;
|
|
QStringList cylinders;
|
|
int maxcns;
|
|
int otu;
|
|
QString sumWeight;
|
|
QStringList getCylinder;
|
|
QStringList startPressure;
|
|
QStringList endPressure;
|
|
QStringList firstGas;
|
|
QString salinity;
|
|
QString waterType;
|
|
};
|
|
|
|
#endif
|