mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Preferences: move graph preferences to the new dialog
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava
Dirk Hohndel
parent
57d7b59bdc
commit
cfecd1a9ab
8 changed files with 419 additions and 375 deletions
|
|
@ -64,8 +64,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial
|
||||||
#endif
|
#endif
|
||||||
connect(ui.proxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyType_changed(int)));
|
connect(ui.proxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyType_changed(int)));
|
||||||
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
|
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
|
||||||
connect(ui.gflow, SIGNAL(valueChanged(int)), this, SLOT(gflowChanged(int)));
|
|
||||||
connect(ui.gfhigh, SIGNAL(valueChanged(int)), this, SLOT(gfhighChanged(int)));
|
|
||||||
// connect(ui.defaultSetpoint, SIGNAL(valueChanged(double)), this, SLOT(defaultSetpointChanged(double)));
|
// connect(ui.defaultSetpoint, SIGNAL(valueChanged(double)), this, SLOT(defaultSetpointChanged(double)));
|
||||||
QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
|
QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
|
||||||
connect(close, SIGNAL(activated()), this, SLOT(close()));
|
connect(close, SIGNAL(activated()), this, SLOT(close()));
|
||||||
|
|
@ -120,17 +119,6 @@ void PreferencesDialog::cloudPinNeeded()
|
||||||
MainWindow::instance()->enableDisableCloudActions();
|
MainWindow::instance()->enableDisableCloudActions();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DANGER_GF (gf > 100) ? "* { color: red; }" : ""
|
|
||||||
void PreferencesDialog::gflowChanged(int gf)
|
|
||||||
{
|
|
||||||
ui.gflow->setStyleSheet(DANGER_GF);
|
|
||||||
}
|
|
||||||
void PreferencesDialog::gfhighChanged(int gf)
|
|
||||||
{
|
|
||||||
ui.gfhigh->setStyleSheet(DANGER_GF);
|
|
||||||
}
|
|
||||||
#undef DANGER_GF
|
|
||||||
|
|
||||||
void PreferencesDialog::showEvent(QShowEvent *event)
|
void PreferencesDialog::showEvent(QShowEvent *event)
|
||||||
{
|
{
|
||||||
setUiFromPrefs();
|
setUiFromPrefs();
|
||||||
|
|
@ -140,25 +128,6 @@ void PreferencesDialog::showEvent(QShowEvent *event)
|
||||||
|
|
||||||
void PreferencesDialog::setUiFromPrefs()
|
void PreferencesDialog::setUiFromPrefs()
|
||||||
{
|
{
|
||||||
// graphs
|
|
||||||
ui.pheThreshold->setValue(prefs.pp_graphs.phe_threshold);
|
|
||||||
ui.po2Threshold->setValue(prefs.pp_graphs.po2_threshold);
|
|
||||||
ui.pn2Threshold->setValue(prefs.pp_graphs.pn2_threshold);
|
|
||||||
ui.maxpo2->setValue(prefs.modpO2);
|
|
||||||
ui.red_ceiling->setChecked(prefs.redceiling);
|
|
||||||
|
|
||||||
ui.gflow->setValue(prefs.gflow);
|
|
||||||
ui.gfhigh->setValue(prefs.gfhigh);
|
|
||||||
ui.gf_low_at_maxdepth->setChecked(prefs.gf_low_at_maxdepth);
|
|
||||||
ui.show_ccr_setpoint->setChecked(prefs.show_ccr_setpoint);
|
|
||||||
ui.show_ccr_sensors->setChecked(prefs.show_ccr_sensors);
|
|
||||||
ui.defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0);
|
|
||||||
ui.psro2rate->setValue(prefs.o2consumption / 1000.0);
|
|
||||||
ui.pscrfactor->setValue(rint(1000.0 / prefs.pscr_ratio));
|
|
||||||
|
|
||||||
ui.display_unused_tanks->setChecked(prefs.display_unused_tanks);
|
|
||||||
ui.show_average_depth->setChecked(prefs.show_average_depth);
|
|
||||||
|
|
||||||
QSettings s;
|
QSettings s;
|
||||||
|
|
||||||
ui.save_uid_local->setChecked(s.value("save_uid_local").toBool());
|
ui.save_uid_local->setChecked(s.value("save_uid_local").toBool());
|
||||||
|
|
@ -197,29 +166,6 @@ void PreferencesDialog::syncSettings()
|
||||||
s.setValue("subsurface_webservice_uid", ui.default_uid->text().toUpper());
|
s.setValue("subsurface_webservice_uid", ui.default_uid->text().toUpper());
|
||||||
set_save_userid_local(ui.save_uid_local->checkState());
|
set_save_userid_local(ui.save_uid_local->checkState());
|
||||||
|
|
||||||
// Graph
|
|
||||||
s.beginGroup("TecDetails");
|
|
||||||
SAVE_OR_REMOVE("phethreshold", default_prefs.pp_graphs.phe_threshold, ui.pheThreshold->value());
|
|
||||||
SAVE_OR_REMOVE("po2threshold", default_prefs.pp_graphs.po2_threshold, ui.po2Threshold->value());
|
|
||||||
SAVE_OR_REMOVE("pn2threshold", default_prefs.pp_graphs.pn2_threshold, ui.pn2Threshold->value());
|
|
||||||
SAVE_OR_REMOVE("modpO2", default_prefs.modpO2, ui.maxpo2->value());
|
|
||||||
SAVE_OR_REMOVE("redceiling", default_prefs.redceiling, ui.red_ceiling->isChecked());
|
|
||||||
SAVE_OR_REMOVE("gflow", default_prefs.gflow, ui.gflow->value());
|
|
||||||
SAVE_OR_REMOVE("gfhigh", default_prefs.gfhigh, ui.gfhigh->value());
|
|
||||||
SAVE_OR_REMOVE("gf_low_at_maxdepth", default_prefs.gf_low_at_maxdepth, ui.gf_low_at_maxdepth->isChecked());
|
|
||||||
SAVE_OR_REMOVE("show_ccr_setpoint", default_prefs.show_ccr_setpoint, ui.show_ccr_setpoint->isChecked());
|
|
||||||
SAVE_OR_REMOVE("show_ccr_sensors", default_prefs.show_ccr_sensors, ui.show_ccr_sensors->isChecked());
|
|
||||||
SAVE_OR_REMOVE("display_unused_tanks", default_prefs.display_unused_tanks, ui.display_unused_tanks->isChecked());
|
|
||||||
SAVE_OR_REMOVE("show_average_depth", default_prefs.show_average_depth, ui.show_average_depth->isChecked());
|
|
||||||
s.endGroup();
|
|
||||||
|
|
||||||
// Defaults
|
|
||||||
s.beginGroup("GeneralSettings");
|
|
||||||
s.setValue("defaultsetpoint", rint(ui.defaultSetpoint->value() * 1000.0));
|
|
||||||
s.setValue("o2consumption", rint(ui.psro2rate->value() *1000.0));
|
|
||||||
s.setValue("pscr_ratio", rint(1000.0 / ui.pscrfactor->value()));
|
|
||||||
s.endGroup();
|
|
||||||
|
|
||||||
s.beginGroup("Network");
|
s.beginGroup("Network");
|
||||||
s.setValue("proxy_type", ui.proxyType->itemData(ui.proxyType->currentIndex()).toInt());
|
s.setValue("proxy_type", ui.proxyType->itemData(ui.proxyType->currentIndex()).toInt());
|
||||||
s.setValue("proxy_host", ui.proxyHost->text());
|
s.setValue("proxy_host", ui.proxyHost->text());
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,6 @@ slots:
|
||||||
void loadSettings();
|
void loadSettings();
|
||||||
void restorePrefs();
|
void restorePrefs();
|
||||||
void rememberPrefs();
|
void rememberPrefs();
|
||||||
void gflowChanged(int gf);
|
|
||||||
void gfhighChanged(int gf);
|
|
||||||
void proxyType_changed(int idx);
|
void proxyType_changed(int idx);
|
||||||
void facebookLoggedIn();
|
void facebookLoggedIn();
|
||||||
void facebookDisconnect();
|
void facebookDisconnect();
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>711</width>
|
<width>835</width>
|
||||||
<height>662</height>
|
<height>698</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
|
@ -19,7 +19,16 @@
|
||||||
</iconset>
|
</iconset>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
|
@ -83,16 +92,6 @@
|
||||||
<property name="currentRow">
|
<property name="currentRow">
|
||||||
<number>-1</number>
|
<number>-1</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Graph</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset>
|
|
||||||
<normalon>:/graph</normalon>
|
|
||||||
</iconset>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Network</string>
|
<string>Network</string>
|
||||||
|
|
@ -126,297 +125,6 @@
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="graph_page">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="margin">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBox_4">
|
|
||||||
<property name="title">
|
|
||||||
<string>Show</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_12">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Threshold when showing pO₂</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QDoubleSpinBox" name="po2Threshold">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.100000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_13">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Threshold when showing pN₂</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QDoubleSpinBox" name="pn2Threshold">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.100000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_17">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Threshold when showing pHe</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QDoubleSpinBox" name="pheThreshold">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.100000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_18">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Max pO₂ when showing MOD</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QDoubleSpinBox" name="maxpo2">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.100000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_10b">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="red_ceiling">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Draw dive computer reported ceiling red</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_11c">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="display_unused_tanks">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show unused cylinders in Equipment tab</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_11d">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="show_average_depth">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show average depth</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBox_5">
|
|
||||||
<property name="title">
|
|
||||||
<string>Misc</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout_3">
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="label_19">
|
|
||||||
<property name="text">
|
|
||||||
<string>GFLow</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QSpinBox" name="gflow">
|
|
||||||
<property name="minimum">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>150</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_20">
|
|
||||||
<property name="text">
|
|
||||||
<string>GFHigh</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QSpinBox" name="gfhigh">
|
|
||||||
<property name="minimum">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>150</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="gf_low_at_maxdepth">
|
|
||||||
<property name="text">
|
|
||||||
<string>GFLow at max depth</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QCheckBox" name="show_ccr_setpoint">
|
|
||||||
<property name="text">
|
|
||||||
<string>CCR: show setpoints when viewing pO₂</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QCheckBox" name="show_ccr_sensors">
|
|
||||||
<property name="text">
|
|
||||||
<string>CCR: show individual O₂ sensor values when viewing pO₂</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_26">
|
|
||||||
<property name="text">
|
|
||||||
<string>Default CCR set-point for dive planning</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<widget class="QDoubleSpinBox" name="defaultSetpoint">
|
|
||||||
<property name="suffix">
|
|
||||||
<string>bar</string>
|
|
||||||
</property>
|
|
||||||
<property name="decimals">
|
|
||||||
<number>2</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<double>10.000000000000000</double>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.100000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="pSCR">
|
|
||||||
<property name="text">
|
|
||||||
<string>pSCR O₂ metabolism rate</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0">
|
|
||||||
<widget class="QLabel" name="label_28">
|
|
||||||
<property name="text">
|
|
||||||
<string>pSCR ratio</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1">
|
|
||||||
<widget class="QDoubleSpinBox" name="psro2rate">
|
|
||||||
<property name="suffix">
|
|
||||||
<string>ℓ/min</string>
|
|
||||||
</property>
|
|
||||||
<property name="decimals">
|
|
||||||
<number>3</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="1">
|
|
||||||
<widget class="QSpinBox" name="pscrfactor">
|
|
||||||
<property name="suffix">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="prefix">
|
|
||||||
<string>1:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="verticalSpacer_5">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QWidget" name="network_page">
|
<widget class="QWidget" name="network_page">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
||||||
|
|
@ -428,7 +136,16 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
|
@ -658,7 +375,16 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
|
@ -707,7 +433,16 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
|
@ -842,15 +577,4 @@
|
||||||
</hints>
|
</hints>
|
||||||
</connection>
|
</connection>
|
||||||
</connections>
|
</connections>
|
||||||
<buttongroups>
|
|
||||||
<buttongroup name="verticalSpeed"/>
|
|
||||||
<buttongroup name="buttonGroup_2"/>
|
|
||||||
<buttongroup name="buttonGroup_3"/>
|
|
||||||
<buttongroup name="buttonGroup_4"/>
|
|
||||||
<buttongroup name="defaultFileGroup"/>
|
|
||||||
<buttongroup name="buttonGroup_5"/>
|
|
||||||
<buttongroup name="buttonGroup_6"/>
|
|
||||||
<buttongroup name="buttonGroup_7"/>
|
|
||||||
<buttongroup name="buttonGroup"/>
|
|
||||||
</buttongroups>
|
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ set(SUBSURFACE_PREFERENCES_LIB_SRCS
|
||||||
preferences_georeference.cpp
|
preferences_georeference.cpp
|
||||||
preferences_defaults.cpp
|
preferences_defaults.cpp
|
||||||
preferences_units.cpp
|
preferences_units.cpp
|
||||||
|
preferences_graph.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
source_group("Subsurface Preferences" FILES ${SUBSURFACE_PREFERENCES_LIB_SRCS})
|
source_group("Subsurface Preferences" FILES ${SUBSURFACE_PREFERENCES_LIB_SRCS})
|
||||||
|
|
|
||||||
78
desktop-widgets/preferences/preferences_graph.cpp
Normal file
78
desktop-widgets/preferences/preferences_graph.cpp
Normal file
|
|
@ -0,0 +1,78 @@
|
||||||
|
#include "preferences_graph.h"
|
||||||
|
#include "ui_preferences_graph.h"
|
||||||
|
#include "subsurface-core/prefs-macros.h"
|
||||||
|
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QMessageBox>
|
||||||
|
|
||||||
|
#include "qt-models/models.h"
|
||||||
|
|
||||||
|
PreferencesGraph::PreferencesGraph() : AbstractPreferencesWidget(tr("Graph"), QIcon(":graph"), 5)
|
||||||
|
{
|
||||||
|
ui = new Ui::PreferencesGraph();
|
||||||
|
ui->setupUi(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
PreferencesGraph::~PreferencesGraph()
|
||||||
|
{
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PreferencesGraph::refreshSettings()
|
||||||
|
{
|
||||||
|
ui->pheThreshold->setValue(prefs.pp_graphs.phe_threshold);
|
||||||
|
ui->po2Threshold->setValue(prefs.pp_graphs.po2_threshold);
|
||||||
|
ui->pn2Threshold->setValue(prefs.pp_graphs.pn2_threshold);
|
||||||
|
ui->maxpo2->setValue(prefs.modpO2);
|
||||||
|
ui->red_ceiling->setChecked(prefs.redceiling);
|
||||||
|
|
||||||
|
ui->gflow->setValue(prefs.gflow);
|
||||||
|
ui->gfhigh->setValue(prefs.gfhigh);
|
||||||
|
ui->gf_low_at_maxdepth->setChecked(prefs.gf_low_at_maxdepth);
|
||||||
|
ui->show_ccr_setpoint->setChecked(prefs.show_ccr_setpoint);
|
||||||
|
ui->show_ccr_sensors->setChecked(prefs.show_ccr_sensors);
|
||||||
|
ui->defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0);
|
||||||
|
ui->psro2rate->setValue(prefs.o2consumption / 1000.0);
|
||||||
|
ui->pscrfactor->setValue(rint(1000.0 / prefs.pscr_ratio));
|
||||||
|
|
||||||
|
ui->display_unused_tanks->setChecked(prefs.display_unused_tanks);
|
||||||
|
ui->show_average_depth->setChecked(prefs.show_average_depth);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PreferencesGraph::syncSettings()
|
||||||
|
{
|
||||||
|
QSettings s;
|
||||||
|
|
||||||
|
s.beginGroup("GeneralSettings");
|
||||||
|
s.setValue("defaultsetpoint", rint(ui->defaultSetpoint->value() * 1000.0));
|
||||||
|
s.setValue("o2consumption", rint(ui->psro2rate->value() *1000.0));
|
||||||
|
s.setValue("pscr_ratio", rint(1000.0 / ui->pscrfactor->value()));
|
||||||
|
s.endGroup();
|
||||||
|
|
||||||
|
// Graph
|
||||||
|
s.beginGroup("TecDetails");
|
||||||
|
SAVE_OR_REMOVE("phethreshold", default_prefs.pp_graphs.phe_threshold, ui->pheThreshold->value());
|
||||||
|
SAVE_OR_REMOVE("po2threshold", default_prefs.pp_graphs.po2_threshold, ui->po2Threshold->value());
|
||||||
|
SAVE_OR_REMOVE("pn2threshold", default_prefs.pp_graphs.pn2_threshold, ui->pn2Threshold->value());
|
||||||
|
SAVE_OR_REMOVE("modpO2", default_prefs.modpO2, ui->maxpo2->value());
|
||||||
|
SAVE_OR_REMOVE("redceiling", default_prefs.redceiling, ui->red_ceiling->isChecked());
|
||||||
|
SAVE_OR_REMOVE("gflow", default_prefs.gflow, ui->gflow->value());
|
||||||
|
SAVE_OR_REMOVE("gfhigh", default_prefs.gfhigh, ui->gfhigh->value());
|
||||||
|
SAVE_OR_REMOVE("gf_low_at_maxdepth", default_prefs.gf_low_at_maxdepth, ui->gf_low_at_maxdepth->isChecked());
|
||||||
|
SAVE_OR_REMOVE("show_ccr_setpoint", default_prefs.show_ccr_setpoint, ui->show_ccr_setpoint->isChecked());
|
||||||
|
SAVE_OR_REMOVE("show_ccr_sensors", default_prefs.show_ccr_sensors, ui->show_ccr_sensors->isChecked());
|
||||||
|
SAVE_OR_REMOVE("display_unused_tanks", default_prefs.display_unused_tanks, ui->display_unused_tanks->isChecked());
|
||||||
|
SAVE_OR_REMOVE("show_average_depth", default_prefs.show_average_depth, ui->show_average_depth->isChecked());
|
||||||
|
s.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
#define DANGER_GF (gf > 100) ? "* { color: red; }" : ""
|
||||||
|
void PreferencesGraph::on_gflow_valueChanged(int gf)
|
||||||
|
{
|
||||||
|
ui->gflow->setStyleSheet(DANGER_GF);
|
||||||
|
}
|
||||||
|
void PreferencesGraph::on_gfhigh_valueChanged(int gf)
|
||||||
|
{
|
||||||
|
ui->gfhigh->setStyleSheet(DANGER_GF);
|
||||||
|
}
|
||||||
|
#undef DANGER_GF
|
||||||
27
desktop-widgets/preferences/preferences_graph.h
Normal file
27
desktop-widgets/preferences/preferences_graph.h
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
#ifndef PREFERENCES_GRAPH_H
|
||||||
|
#define PREFERENCES_GRAPH_H
|
||||||
|
|
||||||
|
#include "abstractpreferenceswidget.h"
|
||||||
|
|
||||||
|
namespace Ui {
|
||||||
|
class PreferencesGraph;
|
||||||
|
}
|
||||||
|
|
||||||
|
class PreferencesGraph : public AbstractPreferencesWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
PreferencesGraph();
|
||||||
|
virtual ~PreferencesGraph();
|
||||||
|
virtual void refreshSettings();
|
||||||
|
virtual void syncSettings();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void on_gflow_valueChanged(int gf);
|
||||||
|
void on_gfhigh_valueChanged(int gf);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Ui::PreferencesGraph *ui;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
268
desktop-widgets/preferences/preferences_graph.ui
Normal file
268
desktop-widgets/preferences/preferences_graph.ui
Normal file
|
|
@ -0,0 +1,268 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>PreferencesGraph</class>
|
||||||
|
<widget class="QWidget" name="PreferencesGraph">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>505</width>
|
||||||
|
<height>623</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>Form</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupBox_4">
|
||||||
|
<property name="title">
|
||||||
|
<string>Show</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_12">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Threshold when showing pO₂</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="po2Threshold">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_13">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Threshold when showing pN₂</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="pn2Threshold">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_17">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Threshold when showing pHe</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="pheThreshold">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_18">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Max pO₂ when showing MOD</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="maxpo2">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="red_ceiling">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Draw dive computer reported ceiling red</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="display_unused_tanks">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show unused cylinders in Equipment tab</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="show_average_depth">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show average depth</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupBox_5">
|
||||||
|
<property name="title">
|
||||||
|
<string>Misc</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QSpinBox" name="gflow">
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="defaultSetpoint">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>bar</string>
|
||||||
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>2</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<double>10.000000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_26">
|
||||||
|
<property name="text">
|
||||||
|
<string>Default CCR set-point for dive planning</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="pSCR">
|
||||||
|
<property name="text">
|
||||||
|
<string>pSCR O₂ metabolism rate</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_19">
|
||||||
|
<property name="text">
|
||||||
|
<string>GFLow</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_20">
|
||||||
|
<property name="text">
|
||||||
|
<string>GFHigh</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QSpinBox" name="gfhigh">
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="psro2rate">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>ℓ/min</string>
|
||||||
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QLabel" name="label_28">
|
||||||
|
<property name="text">
|
||||||
|
<string>pSCR ratio</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QSpinBox" name="pscrfactor">
|
||||||
|
<property name="suffix">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="prefix">
|
||||||
|
<string>1:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="show_ccr_sensors">
|
||||||
|
<property name="text">
|
||||||
|
<string>CCR: show individual O₂ sensor values when viewing pO₂</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="show_ccr_setpoint">
|
||||||
|
<property name="text">
|
||||||
|
<string>CCR: show setpoints when viewing pO₂</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="gf_low_at_maxdepth">
|
||||||
|
<property name="text">
|
||||||
|
<string>GFLow at max depth</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>40</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
#include "preferences_georeference.h"
|
#include "preferences_georeference.h"
|
||||||
#include "preferences_defaults.h"
|
#include "preferences_defaults.h"
|
||||||
#include "preferences_units.h"
|
#include "preferences_units.h"
|
||||||
|
#include "preferences_graph.h"
|
||||||
|
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
|
|
@ -39,6 +40,7 @@ PreferencesDialogV2::PreferencesDialogV2()
|
||||||
addPreferencePage(new PreferencesGeoreference());
|
addPreferencePage(new PreferencesGeoreference());
|
||||||
addPreferencePage(new PreferencesDefaults());
|
addPreferencePage(new PreferencesDefaults());
|
||||||
addPreferencePage(new PreferencesUnits());
|
addPreferencePage(new PreferencesUnits());
|
||||||
|
addPreferencePage(new PreferencesGraph());
|
||||||
refreshPages();
|
refreshPages();
|
||||||
|
|
||||||
connect(pagesList, &QListWidget::currentRowChanged,
|
connect(pagesList, &QListWidget::currentRowChanged,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue