Hook up UI elements for ascent rates to planner

That provides some UI elements that were recently introduced with function
of allowing the ascent rates of the planner to be configured by the user.

I tried to make it work both with senisble as well as with imperial units.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 65 insertions, 63 deletions

diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 82584fa0e..519f3ea7c 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -19,7 +19,7 @@
      <x>20</x>
      <y>20</y>
      <width>872</width>
-     <height>203</height>
+     <height>463</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout_2">
@@ -62,6 +62,9 @@
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QFormLayout" name="formLayout_2">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+          </property>
           <item row="1" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
@@ -69,15 +72,8 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_7">
-            <property name="text">
-             <string>deco pO₂</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
-           <widget class="QPlainTextEdit" name="ascRate75_2">
+           <widget class="QPlainTextEdit" name="bottompo2">
             <property name="maximumSize">
              <size>
               <width>16777215</width>
@@ -86,8 +82,15 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>deco pO₂</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="1">
-           <widget class="QPlainTextEdit" name="ascRate75_3">
+           <widget class="QPlainTextEdit" name="decopo2">
             <property name="maximumSize">
              <size>
               <width>16777215</width>
@@ -176,67 +179,27 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QPlainTextEdit" name="ascRate75">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>75%-50% avg. depth</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>50% avg. depth - 6m/20ft</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>6m/20ft to surface</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QPlainTextEdit" name="ascRate50">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QPlainTextEdit" name="ascRateStops">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QPlainTextEdit" name="ascRateLast6m">
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>20</height>
-          </size>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
@@ -244,21 +207,21 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="label_8">
          <property name="text">
-          <string>Decent rate</string>
+          <string>Descent rate</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="8" column="0">
         <widget class="QLabel" name="label_9">
          <property name="text">
           <string>surface to the bottom</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="8" column="1">
         <widget class="QSpinBox" name="descRate">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -272,6 +235,9 @@
            <height>20</height>
           </size>
          </property>
+         <property name="suffix">
+          <string>m/min</string>
+         </property>
          <property name="minimum">
           <number>1</number>
          </property>
@@ -280,6 +246,46 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="ascRate75">
+         <property name="suffix">
+          <string>m/min</string>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QSpinBox" name="ascRate50">
+         <property name="suffix">
+          <string>m/min</string>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="ascRateStops">
+         <property name="suffix">
+          <string>m/min</string>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="ascRateLast6m">
+         <property name="suffix">
+          <string>m/min</string>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </item>
@@ -291,14 +297,10 @@
   <tabstop>display_runtime</tabstop>
   <tabstop>display_duration</tabstop>
   <tabstop>display_transitions</tabstop>
-  <tabstop>ascRate75</tabstop>
-  <tabstop>ascRate50</tabstop>
-  <tabstop>ascRateStops</tabstop>
-  <tabstop>ascRateLast6m</tabstop>
   <tabstop>lastStop</tabstop>
   <tabstop>backgasBreaks</tabstop>
-  <tabstop>ascRate75_2</tabstop>
-  <tabstop>ascRate75_3</tabstop>
+  <tabstop>bottompo2</tabstop>
+  <tabstop>decopo2</tabstop>
   <tabstop>descRate</tabstop>
  </tabstops>
  <resources/>