mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: activate qPrefPartialPressureGas
remove PartialPressureGas from SettingsObjectWrapper and reference qPrefPartialPressureGas update files using SettingsObjectWrapper/PartialPressureGas to use qPrefPartialPressureGas this activated qPrefPartialPressureGas and removed the similar class from SettingsObjectWrapper. Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen
Dirk Hohndel
parent
881395318c
commit
9d005888fb
8 changed files with 85 additions and 218 deletions
|
|
@ -23,6 +23,7 @@ void qPref::loadSync(bool doSync)
|
|||
qPrefGeocoding::instance()->loadSync(doSync);
|
||||
qPrefLanguage::instance()->loadSync(doSync);
|
||||
qPrefLocationService::instance()->loadSync(doSync);
|
||||
qPrefPartialPressureGas::instance()->loadSync(doSync);
|
||||
qPrefProxy::instance()->loadSync(doSync);
|
||||
qPrefTechnicalDetails::instance()->loadSync(doSync);
|
||||
qPrefUnits::instance()->loadSync(doSync);
|
||||
|
|
|
|||
|
|
@ -8,131 +8,6 @@
|
|||
#include "core/qthelper.h"
|
||||
#include "core/prefs-macros.h"
|
||||
|
||||
PartialPressureGasSettings::PartialPressureGasSettings(QObject* parent):
|
||||
QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
bool PartialPressureGasSettings::showPo2() const
|
||||
{
|
||||
return prefs.pp_graphs.po2;
|
||||
}
|
||||
|
||||
bool PartialPressureGasSettings::showPn2() const
|
||||
{
|
||||
return prefs.pp_graphs.pn2;
|
||||
}
|
||||
|
||||
bool PartialPressureGasSettings::showPhe() const
|
||||
{
|
||||
return prefs.pp_graphs.phe;
|
||||
}
|
||||
|
||||
double PartialPressureGasSettings::po2ThresholdMin() const
|
||||
{
|
||||
return prefs.pp_graphs.po2_threshold_min;
|
||||
}
|
||||
|
||||
double PartialPressureGasSettings::po2ThresholdMax() const
|
||||
{
|
||||
return prefs.pp_graphs.po2_threshold_max;
|
||||
}
|
||||
|
||||
|
||||
double PartialPressureGasSettings::pn2Threshold() const
|
||||
{
|
||||
return prefs.pp_graphs.pn2_threshold;
|
||||
}
|
||||
|
||||
double PartialPressureGasSettings::pheThreshold() const
|
||||
{
|
||||
return prefs.pp_graphs.phe_threshold;
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setShowPo2(bool value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.po2)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("po2graph", value);
|
||||
prefs.pp_graphs.po2 = value;
|
||||
emit showPo2Changed(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setShowPn2(bool value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.pn2)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("pn2graph", value);
|
||||
prefs.pp_graphs.pn2 = value;
|
||||
emit showPn2Changed(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setShowPhe(bool value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.phe)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("phegraph", value);
|
||||
prefs.pp_graphs.phe = value;
|
||||
emit showPheChanged(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setPo2ThresholdMin(double value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.po2_threshold_min)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("po2thresholdmin", value);
|
||||
prefs.pp_graphs.po2_threshold_min = value;
|
||||
emit po2ThresholdMinChanged(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setPo2ThresholdMax(double value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.po2_threshold_max)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("po2thresholdmax", value);
|
||||
prefs.pp_graphs.po2_threshold_max = value;
|
||||
emit po2ThresholdMaxChanged(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setPn2Threshold(double value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.pn2_threshold)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("pn2threshold", value);
|
||||
prefs.pp_graphs.pn2_threshold = value;
|
||||
emit pn2ThresholdChanged(value);
|
||||
}
|
||||
|
||||
void PartialPressureGasSettings::setPheThreshold(double value)
|
||||
{
|
||||
if (value == prefs.pp_graphs.phe_threshold)
|
||||
return;
|
||||
|
||||
QSettings s;
|
||||
s.beginGroup(group);
|
||||
s.setValue("phethreshold", value);
|
||||
prefs.pp_graphs.phe_threshold = value;
|
||||
emit pheThresholdChanged(value);
|
||||
}
|
||||
|
||||
GeneralSettingsObjectWrapper::GeneralSettingsObjectWrapper(QObject *parent) :
|
||||
QObject(parent)
|
||||
|
|
@ -339,7 +214,7 @@ void GeneralSettingsObjectWrapper::setFfmpegExecutable(const QString &value)
|
|||
SettingsObjectWrapper::SettingsObjectWrapper(QObject* parent):
|
||||
QObject(parent),
|
||||
techDetails(new qPrefTechnicalDetails(this)),
|
||||
pp_gas(new PartialPressureGasSettings(this)),
|
||||
pp_gas(new qPrefPartialPressureGas(this)),
|
||||
facebook(new qPrefFacebook(this)),
|
||||
geocoding(new qPrefGeocoding(this)),
|
||||
proxy(new qPrefProxy(this)),
|
||||
|
|
@ -364,7 +239,39 @@ void SettingsObjectWrapper::load()
|
|||
uiLanguage(NULL);
|
||||
|
||||
qPrefUnits::instance()->load();
|
||||
qPrefTechnicalDetails::instance()->load();
|
||||
qPrefPartialPressureGas::instance()->load();
|
||||
|
||||
s.beginGroup("TecDetails");
|
||||
GET_BOOL("mod", mod);
|
||||
GET_DOUBLE("modpO2", modpO2);
|
||||
GET_BOOL("ead", ead);
|
||||
GET_BOOL("redceiling", redceiling);
|
||||
GET_BOOL("dcceiling", dcceiling);
|
||||
GET_BOOL("calcceiling", calcceiling);
|
||||
GET_BOOL("calcceiling3m", calcceiling3m);
|
||||
GET_BOOL("calcndltts", calcndltts);
|
||||
GET_BOOL("calcalltissues", calcalltissues);
|
||||
GET_BOOL("hrgraph", hrgraph);
|
||||
GET_BOOL("tankbar", tankbar);
|
||||
GET_BOOL("RulerBar", rulergraph);
|
||||
GET_BOOL("percentagegraph", percentagegraph);
|
||||
GET_INT("gflow", gflow);
|
||||
GET_INT("gfhigh", gfhigh);
|
||||
GET_INT("vpmb_conservatism", vpmb_conservatism);
|
||||
GET_BOOL("gf_low_at_maxdepth", gf_low_at_maxdepth);
|
||||
GET_BOOL("show_ccr_setpoint",show_ccr_setpoint);
|
||||
GET_BOOL("show_ccr_sensors",show_ccr_sensors);
|
||||
GET_BOOL("show_scr_ocpo2",show_scr_ocpo2);
|
||||
GET_BOOL("zoomed_plot", zoomed_plot);
|
||||
set_gf(prefs.gflow, prefs.gfhigh);
|
||||
set_vpmb_conservatism(prefs.vpmb_conservatism);
|
||||
GET_BOOL("show_sac", show_sac);
|
||||
GET_BOOL("display_unused_tanks", display_unused_tanks);
|
||||
GET_BOOL("show_average_depth", show_average_depth);
|
||||
GET_BOOL("show_icd", show_icd);
|
||||
GET_BOOL("show_pictures_in_profile", show_pictures_in_profile);
|
||||
prefs.display_deco_mode = (deco_mode) s.value("display_deco_mode").toInt();
|
||||
s.endGroup();
|
||||
|
||||
s.beginGroup("GeneralSettings");
|
||||
GET_TXT("default_filename", default_filename);
|
||||
|
|
|
|||
|
|
@ -13,49 +13,6 @@
|
|||
* and QWidget frontends. This class will be huge, since
|
||||
* I need tons of properties, one for each option. */
|
||||
|
||||
/* Control the state of the Partial Pressure Graphs preferences */
|
||||
class PartialPressureGasSettings : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(bool show_po2 READ showPo2 WRITE setShowPo2 NOTIFY showPo2Changed)
|
||||
Q_PROPERTY(bool show_pn2 READ showPn2 WRITE setShowPn2 NOTIFY showPn2Changed)
|
||||
Q_PROPERTY(bool show_phe READ showPhe WRITE setShowPhe NOTIFY showPheChanged)
|
||||
Q_PROPERTY(double po2_threshold_min READ po2ThresholdMin WRITE setPo2ThresholdMin NOTIFY po2ThresholdMinChanged)
|
||||
Q_PROPERTY(double po2_threshold_max READ po2ThresholdMax WRITE setPo2ThresholdMax NOTIFY po2ThresholdMaxChanged)
|
||||
Q_PROPERTY(double pn2_threshold READ pn2Threshold WRITE setPn2Threshold NOTIFY pn2ThresholdChanged)
|
||||
Q_PROPERTY(double phe_threshold READ pheThreshold WRITE setPheThreshold NOTIFY pheThresholdChanged)
|
||||
|
||||
public:
|
||||
PartialPressureGasSettings(QObject *parent);
|
||||
bool showPo2() const;
|
||||
bool showPn2() const;
|
||||
bool showPhe() const;
|
||||
double po2ThresholdMin() const;
|
||||
double po2ThresholdMax() const;
|
||||
double pn2Threshold() const;
|
||||
double pheThreshold() const;
|
||||
|
||||
public slots:
|
||||
void setShowPo2(bool value);
|
||||
void setShowPn2(bool value);
|
||||
void setShowPhe(bool value);
|
||||
void setPo2ThresholdMin(double value);
|
||||
void setPo2ThresholdMax(double value);
|
||||
void setPn2Threshold(double value);
|
||||
void setPheThreshold(double value);
|
||||
|
||||
signals:
|
||||
void showPo2Changed(bool value);
|
||||
void showPn2Changed(bool value);
|
||||
void showPheChanged(bool value);
|
||||
void po2ThresholdMaxChanged(double value);
|
||||
void po2ThresholdMinChanged(double value);
|
||||
void pn2ThresholdChanged(double value);
|
||||
void pheThresholdChanged(double value);
|
||||
|
||||
private:
|
||||
const QString group = QStringLiteral("TecDetails");
|
||||
};
|
||||
|
||||
class GeneralSettingsObjectWrapper : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QString default_filename READ defaultFilename WRITE setDefaultFilename NOTIFY defaultFilenameChanged)
|
||||
|
|
@ -117,7 +74,7 @@ class SettingsObjectWrapper : public QObject {
|
|||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY(qPrefTechnicalDetails* techical_details MEMBER techDetails CONSTANT)
|
||||
Q_PROPERTY(PartialPressureGasSettings* pp_gas MEMBER pp_gas CONSTANT)
|
||||
Q_PROPERTY(qPrefPartialPressureGas* pp_gas MEMBER pp_gas CONSTANT)
|
||||
Q_PROPERTY(qPrefFacebook* facebook MEMBER facebook CONSTANT)
|
||||
Q_PROPERTY(qPrefGeocoding* geocoding MEMBER geocoding CONSTANT)
|
||||
Q_PROPERTY(qPrefProxy* proxy MEMBER proxy CONSTANT)
|
||||
|
|
@ -136,7 +93,7 @@ public:
|
|||
static SettingsObjectWrapper *instance();
|
||||
|
||||
qPrefTechnicalDetails *techDetails;
|
||||
PartialPressureGasSettings *pp_gas;
|
||||
qPrefPartialPressureGas *pp_gas;
|
||||
qPrefFacebook *facebook;
|
||||
qPrefGeocoding *geocoding;
|
||||
qPrefProxy *proxy;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue