core: create qPrefPartialPressureGas from SettingsObjectWrapper

Update set/get functions to follow common name scheme:
- get function have same name as in struct diveComputer
- set function have set_<name>
- signal function have <name>_changed

one class one .h/.cpp is the C++ idiom. Having load/sync of each
variable in 1 functions (in contrast to the distributed way
SettingsObjectWrapper handles it) secures the same storage name
is used. Having the set/get/load/sync functions grouped together
makes it easier to get an overview.

REMARK: this commit only defines the class, it is not active in production

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-10 21:18:40 +02:00 committed by Dirk Hohndel
parent c912ac053e
commit 881395318c
6 changed files with 109 additions and 0 deletions

View file

@ -112,6 +112,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
settings/qPrefGeocoding.cpp
settings/qPrefLanguage.cpp
settings/qPrefLocationService.cpp
settings/qPrefPartialPressureGas.cpp
settings/qPrefPrivate.cpp
settings/qPrefProxy.cpp
settings/qPrefTechnicalDetails.cpp

View file

@ -14,6 +14,7 @@
#include "qPrefGeocoding.h"
#include "qPrefLanguage.h"
#include "qPrefLocationService.h"
#include "qPrefPartialPressureGas.h"
#include "qPrefProxy.h"
#include "qPrefTechnicalDetails.h"
#include "qPrefUnit.h"

View file

@ -0,0 +1,40 @@
// SPDX-License-Identifier: GPL-2.0
#include "qPref.h"
#include "qPrefPrivate.h"
static const QString group = QStringLiteral("TecDetails");
qPrefPartialPressureGas::qPrefPartialPressureGas(QObject *parent) : QObject(parent)
{
}
qPrefPartialPressureGas *qPrefPartialPressureGas::instance()
{
static qPrefPartialPressureGas *self = new qPrefPartialPressureGas;
return self;
}
void qPrefPartialPressureGas::loadSync(bool doSync)
{
disk_phe(doSync);
disk_phe_threshold(doSync);
disk_pn2(doSync);
disk_pn2_threshold(doSync);
disk_po2(doSync);
disk_po2_threshold_min(doSync);
disk_po2_threshold_max(doSync);
}
HANDLE_PREFERENCE_BOOL_EXT(PartialPressureGas, "/phegraph", phe, pp_graphs.);
HANDLE_PREFERENCE_DOUBLE_EXT(PartialPressureGas, "/phethreshold", phe_threshold, pp_graphs.);
HANDLE_PREFERENCE_BOOL_EXT(PartialPressureGas, "/pn2graph", pn2, pp_graphs.);
HANDLE_PREFERENCE_DOUBLE_EXT(PartialPressureGas, "/pn2threshold", pn2_threshold, pp_graphs.);
HANDLE_PREFERENCE_BOOL_EXT(PartialPressureGas, "/po2graph", po2, pp_graphs.);
HANDLE_PREFERENCE_DOUBLE_EXT(PartialPressureGas, "/po2thresholdmax", po2_threshold_max, pp_graphs.);
HANDLE_PREFERENCE_DOUBLE_EXT(PartialPressureGas, "/po2thresholdmin", po2_threshold_min, pp_graphs.);

View file

@ -0,0 +1,64 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef QPREFPARTICULARPRESSUREGAS_H
#define QPREFPARTICULARPRESSUREGAS_H
#include "core/pref.h"
#include <QObject>
class qPrefPartialPressureGas : public QObject {
Q_OBJECT
Q_PROPERTY(bool phe READ phe WRITE set_phe NOTIFY phe_changed);
Q_PROPERTY(double phe_threshold READ phe_threshold WRITE set_phe_threshold NOTIFY phe_threshold_changed);
Q_PROPERTY(bool pn2 READ pn2 WRITE set_pn2 NOTIFY pn2_changed);
Q_PROPERTY(double pn2_threshold READ pn2_threshold WRITE set_pn2_threshold NOTIFY pn2_threshold_changed);
Q_PROPERTY(bool po2 READ po2 WRITE set_po2 NOTIFY po2_changed);
Q_PROPERTY(double po2_threshold_max READ po2_threshold_max WRITE set_po2_threshold_max NOTIFY po2_threshold_max_changed);
Q_PROPERTY(double po2_threshold_min READ po2_threshold_min WRITE set_po2_threshold_min NOTIFY po2_threshold_min_changed);
public:
qPrefPartialPressureGas(QObject *parent = NULL);
static qPrefPartialPressureGas *instance();
// Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync);
void load() { loadSync(false); }
void sync() { loadSync(true); }
public:
bool phe() { return prefs.pp_graphs.phe; }
double phe_threshold() { return prefs.pp_graphs.phe_threshold; }
bool pn2() { return prefs.pp_graphs.pn2; }
double pn2_threshold() { return prefs.pp_graphs.pn2_threshold; }
bool po2() { return prefs.pp_graphs.po2; }
double po2_threshold_max() { return prefs.pp_graphs.po2_threshold_max; }
double po2_threshold_min() { return prefs.pp_graphs.po2_threshold_min; }
public slots:
void set_phe(bool value);
void set_phe_threshold(double value);
void set_pn2(bool value);
void set_pn2_threshold(double value);
void set_po2(bool value);
void set_po2_threshold_min(double value);
void set_po2_threshold_max(double value);
signals:
void phe_changed(bool value);
void phe_threshold_changed(double value);
void pn2_changed(bool value);
void pn2_threshold_changed(double value);
void po2_changed(bool value);
void po2_threshold_max_changed(double value);
void po2_threshold_min_changed(double value);
private:
void disk_phe(bool doSync);
void disk_phe_threshold(bool doSync);
void disk_pn2(bool doSync);
void disk_pn2_threshold(bool doSync);
void disk_po2(bool doSync);
void disk_po2_threshold_min(bool doSync);
void disk_po2_threshold_max(bool doSync);
};
#endif

View file

@ -23,6 +23,7 @@ public:
friend class qPrefGeocoding;
friend class qPrefLanguage;
friend class qPrefLocationService;
friend class qPrefPartialPressureGas;
friend class qPrefProxy;
friend class qPrefTechnicalDetails;
friend class qPrefUnits;

View file

@ -87,6 +87,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/settings/qPrefGeocoding.cpp \
../../core/settings/qPrefLanguage.cpp \
../../core/settings/qPrefLocationService.cpp \
../../core/settings/qPrefPartialPressureGas.cpp \
../../core/settings/qPrefPrivate.cpp \
../../core/settings/qPrefProxy.cpp \
../../core/settings/qPrefTechnicalDetails.cpp \
@ -208,6 +209,7 @@ HEADERS += \
../../core/settings/qPrefGeocoding.h \
../../core/settings/qPrefLanguage.h \
../../core/settings/qPrefLocationService.h \
../../core/settings/qPrefPartialPressureGas.h \
../../core/settings/qPrefPrivate.h \
../../core/settings/qPrefProxy.h \
../../core/settings/qPrefTechnicalDetails.h \