From 5b080beddef3e08b86eb53448e737b4867a50c1a Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" <helling@atdotde.de>
Date: Tue, 19 Sep 2017 14:38:38 +0200
Subject: Remove option to apply GFlow at maxdepth

This option should have never been there. This is not how
gradient factors are supposed to work. It would only trick
users to use the wrong value..

Signed-off-by: Robert C. Helling <helling@atdotde.de>
---
 desktop-widgets/preferences/preferences_graph.cpp |   3 -
 desktop-widgets/preferences/preferences_graph.ui  | 112 ++++++++++------------
 2 files changed, 52 insertions(+), 63 deletions(-)

(limited to 'desktop-widgets/preferences')

diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index 703868cb8..f0bd408e1 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -38,7 +38,6 @@ void PreferencesGraph::refreshSettings()
 	ui->gflow->setValue(prefs.gflow);
 	ui->gfhigh->setValue(prefs.gfhigh);
 	ui->vpmb_conservatism->setValue(prefs.vpmb_conservatism);
-	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);
@@ -69,7 +68,6 @@ void PreferencesGraph::syncSettings()
 	tech->setGflow(ui->gflow->value());
 	tech->setGfhigh(ui->gfhigh->value());
 	tech->setVpmbConservatism(ui->vpmb_conservatism->value());
-	tech->setGfLowAtMaxDepth(ui->gf_low_at_maxdepth->isChecked());
 	tech->setShowCCRSetpoint(ui->show_ccr_setpoint->isChecked());
 	tech->setShowCCRSensors(ui->show_ccr_sensors->isChecked());
 	tech->setDisplayUnusedTanks(ui->display_unused_tanks->isChecked());
@@ -93,7 +91,6 @@ void PreferencesGraph::on_buehlmann_toggled(bool buehlmann)
 	ui->gflow->setEnabled(buehlmann);
 	ui->label_GFhigh->setEnabled(buehlmann);
 	ui->label_GFlow->setEnabled(buehlmann);
-	ui->gf_low_at_maxdepth->setEnabled(buehlmann);
 	ui->vpmb_conservatism->setEnabled(!buehlmann);
 	ui->label_VPMB->setEnabled(!buehlmann);
 }
diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui
index c3920609f..6e037698b 100644
--- a/desktop-widgets/preferences/preferences_graph.ui
+++ b/desktop-widgets/preferences/preferences_graph.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>650</width>
+    <width>655</width>
     <height>634</height>
    </rect>
   </property>
@@ -178,23 +178,23 @@
       <string>Ceiling display setup</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="2" column="1">
-       <widget class="QLabel" name="label_VPMB">
+      <item row="3" column="3">
+       <widget class="QLabel" name="label_GFhigh">
         <property name="text">
-         <string>Conservatism level</string>
+         <string>GFHigh</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_22">
-        <property name="enabled">
-         <bool>true</bool>
+      <item row="4" column="4">
+       <widget class="QSpinBox" name="pscrfactor">
+        <property name="suffix">
+         <string/>
         </property>
-        <property name="text">
-         <string>Algorithm for calculated ceiling:</string>
+        <property name="prefix">
+         <string>1:</string>
         </property>
        </widget>
       </item>
@@ -208,46 +208,26 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QCheckBox" name="red_ceiling">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_22">
         <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="4">
-       <widget class="QSpinBox" name="pscrfactor">
-        <property name="suffix">
-         <string/>
-        </property>
-        <property name="prefix">
-         <string>1:</string>
+         <string>Algorithm for calculated ceiling:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
-       <widget class="QLabel" name="label_GFhigh">
+      <item row="4" column="3">
+       <widget class="QLabel" name="label_28">
         <property name="text">
-         <string>GFHigh</string>
+         <string>Dilution ratio</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QDoubleSpinBox" name="psro2rate">
-        <property name="suffix">
-         <string>ℓ/min</string>
-        </property>
-        <property name="decimals">
-         <number>3</number>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="2">
        <widget class="QSpinBox" name="gflow">
         <property name="suffix">
@@ -261,33 +241,16 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QLabel" name="MetabolicRate">
-        <property name="text">
-         <string>Metabolic rate O₂</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="3">
-       <widget class="QLabel" name="label_28">
+      <item row="2" column="1">
+       <widget class="QLabel" name="label_VPMB">
         <property name="text">
-         <string>Dilution ratio</string>
+         <string>Conservatism level</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" colspan="2">
-       <widget class="QCheckBox" name="gf_low_at_maxdepth">
-        <property name="text">
-         <string>GFLow at max. depth</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="2">
        <widget class="QSpinBox" name="vpmb_conservatism">
         <property name="prefix">
@@ -301,10 +264,33 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="pSCR">
+      <item row="4" column="1">
+       <widget class="QLabel" name="MetabolicRate">
         <property name="text">
-         <string>pSCR options:</string>
+         <string>Metabolic rate O₂</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" 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="4" column="2">
+       <widget class="QDoubleSpinBox" name="psro2rate">
+        <property name="suffix">
+         <string>ℓ/min</string>
+        </property>
+        <property name="decimals">
+         <number>3</number>
         </property>
        </widget>
       </item>
@@ -328,6 +314,13 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="pSCR">
+        <property name="text">
+         <string>pSCR options:</string>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="1">
        <widget class="QLabel" name="label_GFlow">
         <property name="text">
@@ -394,7 +387,6 @@
   <tabstop>buehlmann</tabstop>
   <tabstop>gflow</tabstop>
   <tabstop>gfhigh</tabstop>
-  <tabstop>gf_low_at_maxdepth</tabstop>
   <tabstop>psro2rate</tabstop>
   <tabstop>pscrfactor</tabstop>
   <tabstop>display_unused_tanks</tabstop>
-- 
cgit v1.2.3-70-g09d2