diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/dive.c | 2 | ||||
| -rw-r--r-- | core/pref.h | 2 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 12 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.h | 8 | ||||
| -rw-r--r-- | core/subsurfacestartup.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/core/dive.c b/core/dive.c index c4f5dd778..20ab2e5d6 100644 --- a/core/dive.c +++ b/core/dive.c @@ -3654,7 +3654,7 @@ fraction_t best_He(depth_t depth, struct dive *dive) { fraction_t fhe; int pnarcotic, ambient; - pnarcotic = depth_to_mbar(prefs.bestmixead, dive); + pnarcotic = depth_to_mbar(prefs.bestmixend, dive); ambient = depth_to_mbar(depth.mm, dive); fhe.permille = (100 - 100 * pnarcotic / ambient) * 10; //use integer arithmetic to round up to nearest percent if (fhe.permille < 0) diff --git a/core/pref.h b/core/pref.h index be343796a..a0f9158b8 100644 --- a/core/pref.h +++ b/core/pref.h @@ -92,7 +92,7 @@ struct preferences { int descrate; int bottompo2; int decopo2; - int bestmixead; + int bestmixend; int proxy_type; char *proxy_host; int proxy_port; diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index eeb4c96c2..b8865e256 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -915,9 +915,9 @@ int DivePlannerSettings::decopo2() const return prefs.decopo2; } -int DivePlannerSettings::bestmixead() const +int DivePlannerSettings::bestmixend() const { - return prefs.bestmixead; + return prefs.bestmixend; } int DivePlannerSettings::reserveGas() const @@ -1094,13 +1094,13 @@ void DivePlannerSettings::setDecopo2(int value) emit decopo2Changed(value); } -void DivePlannerSettings::setBestmixead(int value) +void DivePlannerSettings::setBestmixend(int value) { QSettings s; s.beginGroup(group); - s.setValue("bestmixead", value); - prefs.bestmixead = value; - emit bestmixeadChanged(value); + s.setValue("bestmixend", value); + prefs.bestmixend = value; + emit bestmixendChanged(value); } void DivePlannerSettings::setReserveGas(int value) diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index b4b898a3d..3b19c9a32 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -327,7 +327,7 @@ class DivePlannerSettings : public QObject { Q_PROPERTY(int descrate READ descrate WRITE setDescrate NOTIFY descrateChanged) Q_PROPERTY(int bottompo2 READ bottompo2 WRITE setBottompo2 NOTIFY bottompo2Changed) Q_PROPERTY(int decopo2 READ decopo2 WRITE setDecopo2 NOTIFY decopo2Changed) - Q_PROPERTY(int bestmixead READ bestmixead WRITE setBestmixead NOTIFY bestmixeadChanged) + Q_PROPERTY(int bestmixend READ bestmixend WRITE setBestmixend NOTIFY bestmixendChanged) Q_PROPERTY(int reserve_gas READ reserveGas WRITE setReserveGas NOTIFY reserveGasChanged) Q_PROPERTY(int min_switch_duration READ minSwitchDuration WRITE setMinSwitchDuration NOTIFY minSwitchDurationChanged) Q_PROPERTY(int bottomsac READ bottomSac WRITE setBottomSac NOTIFY bottomSacChanged) @@ -353,7 +353,7 @@ public: int descrate() const; int bottompo2() const; int decopo2() const; - int bestmixead() const; + int bestmixend() const; int reserveGas() const; int minSwitchDuration() const; int bottomSac() const; @@ -378,7 +378,7 @@ public slots: void setDescrate(int value); void setBottompo2(int value); void setDecopo2(int value); - void setBestmixead(int value); + void setBestmixend(int value); void setReserveGas(int value); void setMinSwitchDuration(int value); void setBottomSac(int value); @@ -403,7 +403,7 @@ signals: void descrateChanged(int value); void bottompo2Changed(int value); void decopo2Changed(int value); - void bestmixeadChanged(int value); + void bestmixendChanged(int value); void reserveGasChanged(int value); void minSwitchDurationChanged(int value); void bottomSacChanged(int value); diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c index f58efb114..1dba381de 100644 --- a/core/subsurfacestartup.c +++ b/core/subsurfacestartup.c @@ -52,7 +52,7 @@ struct preferences default_prefs = { .descrate = 18000 / 60, .bottompo2 = 1400, .decopo2 = 1600, - .bestmixead = 30000, + .bestmixend = 30000, .doo2breaks = false, .drop_stone_mode = false, .switch_at_req_stop = false, |