mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added a configuration option to have gf_low apply at max depth instead of at deepest ceiling.

Browse source 
Signed-off-by: Patrick Valsecchi <patrick@thus.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Patrick Valsecchi 2013-11-20 16:11:22 +01:00 • committed by Dirk Hohndel
parent 4c4a7a6d96
commit fe2eabf375
9 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/mainwindow.cpp
View file

@ -564,6 +564,13 @@ bool MainWindow::askSaveChanges()
else \
prefs.field = default_prefs.field
#define GET_TXT(name, field) \
v = s.value(QString(name)); \
if (v.isValid()) \
prefs.field = strdup(v.toString().toUtf8().constData()); \
else \
prefs.field = default_prefs.field
void MainWindow::initialUiSetup()
{
@ -623,7 +630,8 @@ void MainWindow::readSettings()
GET_BOOL("calcalltissues", calc_all_tissues);
GET_INT("gflow", gflow);
GET_INT("gfhigh", gfhigh);
set_gf(prefs.gflow, prefs.gfhigh);
GET_BOOL("gf_low_at_maxdepth", gf_low_at_maxdepth);
set_gf(prefs.gflow, prefs.gfhigh, prefs.gf_low_at_maxdepth);
GET_BOOL("show_sac", show_sac);
s.endGroup();

4
qt-ui/preferences.cpp
View file

@ -55,6 +55,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.gflow->setValue(prefs.gflow);
ui.gfhigh->setValue(prefs.gfhigh);
ui.gf_low_at_maxdepth->setChecked(prefs.gf_low_at_maxdepth);
// units
if (prefs.unit_system == METRIC)
@ -111,7 +112,7 @@ void PreferencesDialog::syncSettings()
s.setValue("pn2threshold", ui.pn2Threshold->value());
SB("ead", ui.ead_end_eadd);
SB("mod", ui.mod);
s.setValue("modppo2", ui.maxppo2->value());
s.setValue("modppO2", ui.maxppo2->value());
SB("dcceiling", ui.dc_reported_ceiling);
SB("redceiling", ui.red_ceiling);
SB("calcceiling", ui.calculated_ceiling);
@ -120,6 +121,7 @@ void PreferencesDialog::syncSettings()
SB("calcalltissues", ui.all_tissues);
s.setValue("gflow", ui.gflow->value());
s.setValue("gfhigh", ui.gfhigh->value());
SB("gf_low_at_maxdepth", ui.gf_low_at_maxdepth);
SB("show_sac", ui.show_sac);
s.endGroup();

1
qt-ui/preferences.h
View file

@ -26,7 +26,6 @@ public slots:
private:
explicit PreferencesDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
void setUiFromPrefs();
void setUIFromSettings();
Ui::PreferencesDialog ui;
struct preferences oldPrefs;
};

7
qt-ui/preferences.ui
View file

@ -763,6 +763,13 @@
<item row="1" column="1">
<widget class="QSpinBox" name="gfhigh"/>
</item>
<item row="2" 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>