Start working on GAS and DIL tables

Start work for gas1-5 and dil1-5.

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>

1 files changed, 316 insertions, 158 deletions

diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 076b66fd1..6099535e8 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>592</width>
-    <height>507</height>
+    <width>701</width>
+    <height>620</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -98,48 +98,48 @@
        <string>HW OSTC 3</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="5" column="1">
-        <widget class="QSpinBox" name="lastDecoSpinBox">
-         <property name="suffix">
-          <string> m</string>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Serial No.</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="label_14">
-         <property name="text">
-          <string>Dive Mode Colour:</string>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="serialNoLineEdit">
+         <property name="readOnly">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="4">
-        <widget class="QCheckBox" name="dateTimeSyncCheckBox">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_8">
          <property name="text">
-          <string>Sync dive computer time with PC</string>
+          <string>Firmware Version:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="2">
-        <widget class="QLabel" name="label_11">
-         <property name="text">
-          <string>Units:</string>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="firmwareVersionLineEdit">
+         <property name="readOnly">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
-        <widget class="QLabel" name="label_13">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Salinity (0-5%):</string>
+          <string>Custom Text:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="3">
-        <widget class="QSpinBox" name="salinitySpinBox">
-         <property name="suffix">
-          <string>%</string>
-         </property>
-         <property name="maximum">
-          <number>5</number>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="customTextLlineEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
         </widget>
        </item>
@@ -150,41 +150,86 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_9">
+       <item row="2" column="3">
+        <widget class="QComboBox" name="languageComboBox">
+         <item>
+          <property name="text">
+           <string>English</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>German</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>French</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Italian</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label">
          <property name="text">
-          <string>Date Format:</string>
+          <string>Dive Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="customTextLlineEdit">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="diveModeComboBox">
+         <item>
+          <property name="text">
+           <string>OC</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>CC</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Gauge</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Apnea</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Custom Text:</string>
+          <string>Saturation:</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="2">
-        <widget class="QLabel" name="label_15">
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="saturationSpinBox">
+         <property name="suffix">
+          <string>%</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QLabel" name="label_16">
          <property name="text">
-          <string>Compass Gain:</string>
+          <string>Desaturation:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="firmwareVersionLineEdit">
-         <property name="readOnly">
-          <bool>true</bool>
+       <item row="4" column="3">
+        <widget class="QSpinBox" name="desaturationSpinBox">
+         <property name="suffix">
+          <string>%</string>
          </property>
         </widget>
        </item>
@@ -195,49 +240,45 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="serialNoLineEdit">
-         <property name="readOnly">
-          <bool>true</bool>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="lastDecoSpinBox">
+         <property name="suffix">
+          <string> m</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
-        <widget class="QComboBox" name="diveModeColour">
-         <item>
-          <property name="text">
-           <string>Standard</string>
-          </property>
-         </item>
+       <item row="5" column="2">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Brightness:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="3">
+        <widget class="QComboBox" name="brightnessComboBox">
          <item>
           <property name="text">
-           <string>Red</string>
+           <string>Eco</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Green</string>
+           <string>Medium</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Blue</string>
+           <string>High</string>
           </property>
          </item>
         </widget>
        </item>
-       <item row="10" column="0" colspan="4">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Date Format:</string>
          </property>
-        </spacer>
+        </widget>
        </item>
        <item row="6" column="1">
         <widget class="QComboBox" name="dateFormatComboBox">
@@ -258,28 +299,11 @@
          </item>
         </widget>
        </item>
-       <item row="2" column="3">
-        <widget class="QComboBox" name="languageComboBox">
-         <item>
-          <property name="text">
-           <string>English</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>German</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>French</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Italian</string>
-          </property>
-         </item>
+       <item row="6" column="2">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Units:</string>
+         </property>
         </widget>
        </item>
        <item row="6" column="3">
@@ -296,20 +320,6 @@
          </item>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>Brightness:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Serial No.</string>
-         </property>
-        </widget>
-       </item>
        <item row="7" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
@@ -317,25 +327,6 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="3">
-        <widget class="QComboBox" name="brightnessComboBox">
-         <item>
-          <property name="text">
-           <string>Eco</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Medium</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>High</string>
-          </property>
-         </item>
-        </widget>
-       </item>
        <item row="7" column="1">
         <widget class="QComboBox" name="samplingRateComboBox">
          <item>
@@ -350,44 +341,61 @@
          </item>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_8">
+       <item row="7" column="2">
+        <widget class="QLabel" name="label_13">
          <property name="text">
-          <string>Firmware Version:</string>
+          <string>Salinity (0-5%):</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label">
+       <item row="7" column="3">
+        <widget class="QSpinBox" name="salinitySpinBox">
+         <property name="suffix">
+          <string>%</string>
+         </property>
+         <property name="maximum">
+          <number>5</number>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="label_14">
          <property name="text">
-          <string>Dive Mode:</string>
+          <string>Dive Mode Colour:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QComboBox" name="diveModeComboBox">
+       <item row="8" column="1">
+        <widget class="QComboBox" name="diveModeColour">
          <item>
           <property name="text">
-           <string>OC</string>
+           <string>Standard</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>CC</string>
+           <string>Red</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Gauge</string>
+           <string>Green</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Apnea</string>
+           <string>Blue</string>
           </property>
          </item>
         </widget>
        </item>
+       <item row="8" column="2">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>Compass Gain:</string>
+         </property>
+        </widget>
+       </item>
        <item row="8" column="3">
         <widget class="QComboBox" name="compassGainComboBox">
          <property name="sizePolicy">
@@ -438,33 +446,183 @@
          </item>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Saturation:</string>
-         </property>
+       <item row="9" column="0" colspan="2">
+        <widget class="QTableWidget" name="ostc3GasTable">
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <column>
+          <property name="text">
+           <string>Gas No.</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>%He</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>%O2</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Type</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Change Depth</string>
+          </property>
+         </column>
+         <item row="0" column="0">
+          <property name="text">
+           <string>Gas 1</string>
+          </property>
+         </item>
+         <item row="1" column="0">
+          <property name="text">
+           <string>Gas 2</string>
+          </property>
+         </item>
+         <item row="2" column="0">
+          <property name="text">
+           <string>Gas 3</string>
+          </property>
+         </item>
+         <item row="3" column="0">
+          <property name="text">
+           <string>Gas 4</string>
+          </property>
+         </item>
+         <item row="4" column="0">
+          <property name="text">
+           <string>Gas 5</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSpinBox" name="saturationSpinBox">
-         <property name="suffix">
-          <string>%</string>
-         </property>
+       <item row="9" column="2" colspan="2">
+        <widget class="QTableWidget" name="ostc3DilTable">
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <row>
+          <property name="text">
+           <string/>
+          </property>
+         </row>
+         <column>
+          <property name="text">
+           <string>Gas No.</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>%He</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>%O2</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Type</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Change Depth</string>
+          </property>
+         </column>
+         <item row="0" column="0">
+          <property name="text">
+           <string>Gas 1</string>
+          </property>
+         </item>
+         <item row="1" column="0">
+          <property name="text">
+           <string>Gas 2</string>
+          </property>
+         </item>
+         <item row="2" column="0">
+          <property name="text">
+           <string>Gas 3</string>
+          </property>
+         </item>
+         <item row="3" column="0">
+          <property name="text">
+           <string>Gas 4</string>
+          </property>
+         </item>
+         <item row="4" column="0">
+          <property name="text">
+           <string>Gas 5</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="4" column="2">
-        <widget class="QLabel" name="label_16">
+       <item row="10" column="0" colspan="2">
+        <widget class="QCheckBox" name="dateTimeSyncCheckBox">
          <property name="text">
-          <string>Desaturation:</string>
+          <string>Sync dive computer time with PC</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
-        <widget class="QSpinBox" name="desaturationSpinBox">
-         <property name="suffix">
-          <string>%</string>
+       <item row="11" column="0" colspan="4">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-        </widget>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>
      </widget>