Add read/write support for OSTC 3 SetPoint settings

Implements support for reading, writing and backup/restore of set point
settings for the OSTC 3.

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

2 files changed, 402 insertions, 236 deletions

diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index f878ec11a..81d8f0326 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -205,6 +205,28 @@ void ConfigureDiveComputerDialog::populateDeviceDetails()
 	deviceDetails->setDil3(dil3);
 	deviceDetails->setDil4(dil4);
 	deviceDetails->setDil5(dil5);
+
+	//set set point details
+	setpoint sp1;
+	setpoint sp2;
+	setpoint sp3;
+	setpoint sp4;
+	setpoint sp5;
+
+	sp1.sp = ui->ostc3SetPointTable->item(0, 1)->text().toInt();
+	sp1.depth = ui->ostc3SetPointTable->item(0, 2)->text().toInt();
+
+	sp2.sp = ui->ostc3SetPointTable->item(1, 1)->text().toInt();
+	sp2.depth = ui->ostc3SetPointTable->item(1, 2)->text().toInt();
+
+	sp3.sp = ui->ostc3SetPointTable->item(2, 1)->text().toInt();
+	sp3.depth = ui->ostc3SetPointTable->item(2, 2)->text().toInt();
+
+	sp4.sp = ui->ostc3SetPointTable->item(3, 1)->text().toInt();
+	sp4.depth = ui->ostc3SetPointTable->item(3, 2)->text().toInt();
+
+	sp5.sp = ui->ostc3SetPointTable->item(4, 1)->text().toInt();
+	sp5.depth = ui->ostc3SetPointTable->item(4, 2)->text().toInt();
 }
 
 void ConfigureDiveComputerDialog::readSettings()
@@ -338,6 +360,26 @@ void ConfigureDiveComputerDialog::reloadValues()
 	ui->ostc3DilTable->setItem(4,2, new QTableWidgetItem(QString::number(deviceDetails->dil5().helium)));
 	ui->ostc3DilTable->setItem(4,3, new QTableWidgetItem(QString::number(deviceDetails->dil5().type)));
 	ui->ostc3DilTable->setItem(4,4, new QTableWidgetItem(QString::number(deviceDetails->dil5().depth)));
+
+	//load set point 1 values
+	ui->ostc3SetPointTable->setItem(0, 1, new QTableWidgetItem(QString::number(deviceDetails->sp1().sp)));
+	ui->ostc3SetPointTable->setItem(0, 2, new QTableWidgetItem(QString::number(deviceDetails->sp1().depth)));
+
+	//load set point 2 values
+	ui->ostc3SetPointTable->setItem(1, 1, new QTableWidgetItem(QString::number(deviceDetails->sp2().sp)));
+	ui->ostc3SetPointTable->setItem(1, 2, new QTableWidgetItem(QString::number(deviceDetails->sp2().depth)));
+
+	//load set point 3 values
+	ui->ostc3SetPointTable->setItem(2, 1, new QTableWidgetItem(QString::number(deviceDetails->sp3().sp)));
+	ui->ostc3SetPointTable->setItem(2, 2, new QTableWidgetItem(QString::number(deviceDetails->sp3().depth)));
+
+	//load set point 4 values
+	ui->ostc3SetPointTable->setItem(3, 1, new QTableWidgetItem(QString::number(deviceDetails->sp4().sp)));
+	ui->ostc3SetPointTable->setItem(3, 2, new QTableWidgetItem(QString::number(deviceDetails->sp4().depth)));
+
+	//load set point 5 values
+	ui->ostc3SetPointTable->setItem(4, 1, new QTableWidgetItem(QString::number(deviceDetails->sp5().sp)));
+	ui->ostc3SetPointTable->setItem(4, 2, new QTableWidgetItem(QString::number(deviceDetails->sp5().depth)));
 }
 
 
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 0f99e597a..4274a3abe 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>699</width>
-    <height>618</height>
+    <width>787</width>
+    <height>672</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,6 +21,9 @@
        <property name="text">
         <string>Device or Mount Point</string>
        </property>
+       <property name="buddy">
+        <cstring>device</cstring>
+       </property>
       </widget>
      </item>
      <item>
@@ -98,145 +101,61 @@
        <string>HW OSTC 3</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Serial No.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="serialNoLineEdit">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Firmware Version:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="firmwareVersionLineEdit">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Custom Text:</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>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Language:</string>
-         </property>
-        </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 row="6" column="3">
+        <widget class="QComboBox" name="unitsComboBox">
          <item>
           <property name="text">
-           <string>French</string>
+           <string>m/°C</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Italian</string>
+           <string>ft/°F</string>
           </property>
          </item>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label">
+       <item row="7" column="2">
+        <widget class="QLabel" name="label_13">
          <property name="text">
-          <string>Dive Mode:</string>
+          <string>Salinity (0-5%):</string>
+         </property>
+         <property name="buddy">
+          <cstring>salinitySpinBox</cstring>
          </property>
         </widget>
        </item>
-       <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="4" column="0">
-        <widget class="QLabel" name="label_2">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Saturation:</string>
+          <string>Custom Text:</string>
+         </property>
+         <property name="buddy">
+          <cstring>customTextLlineEdit</cstring>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSpinBox" name="saturationSpinBox">
+       <item row="4" column="3">
+        <widget class="QSpinBox" name="desaturationSpinBox">
          <property name="suffix">
           <string>%</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="2">
-        <widget class="QLabel" name="label_16">
-         <property name="text">
-          <string>Desaturation:</string>
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="saturationSpinBox">
+         <property name="suffix">
+          <string>%</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
-        <widget class="QSpinBox" name="desaturationSpinBox">
+       <item row="7" column="3">
+        <widget class="QSpinBox" name="salinitySpinBox">
          <property name="suffix">
           <string>%</string>
          </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_10">
-         <property name="text">
-          <string>Last Deco:</string>
+         <property name="maximum">
+          <number>5</number>
          </property>
         </widget>
        </item>
@@ -247,10 +166,13 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QLabel" name="label_4">
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_10">
          <property name="text">
-          <string>Brightness:</string>
+          <string>Last Deco:</string>
+         </property>
+         <property name="buddy">
+          <cstring>lastDecoSpinBox</cstring>
          </property>
         </widget>
        </item>
@@ -273,118 +195,103 @@
          </item>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_9">
-         <property name="text">
-          <string>Date Format:</string>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="serialNoLineEdit">
+         <property name="readOnly">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
-        <widget class="QComboBox" name="dateFormatComboBox">
+       <item row="2" column="3">
+        <widget class="QComboBox" name="languageComboBox">
          <item>
           <property name="text">
-           <string>MMDDYY</string>
+           <string>English</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>DDMMYY</string>
+           <string>German</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>YYMMDD</string>
+           <string>French</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Italian</string>
           </property>
          </item>
         </widget>
        </item>
-       <item row="6" column="2">
-        <widget class="QLabel" name="label_11">
+       <item row="2" column="2">
+        <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Units:</string>
+          <string>Language:</string>
+         </property>
+         <property name="buddy">
+          <cstring>languageComboBox</cstring>
          </property>
         </widget>
        </item>
-       <item row="6" column="3">
-        <widget class="QComboBox" name="unitsComboBox">
+       <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>
+       <item row="8" column="3">
+        <widget class="QComboBox" name="compassGainComboBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <item>
           <property name="text">
-           <string>m/°C</string>
+           <string>230LSB/Gauss</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>ft/°F</string>
+           <string>330LSB/Gauss</string>
           </property>
          </item>
-        </widget>
-       </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="label_12">
-         <property name="text">
-          <string>Sampling Rate:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="1">
-        <widget class="QComboBox" name="samplingRateComboBox">
          <item>
           <property name="text">
-           <string>2s</string>
+           <string>390LSB/Gauss</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>10s</string>
+           <string>440LSB/Gauss</string>
           </property>
          </item>
-        </widget>
-       </item>
-       <item row="7" column="2">
-        <widget class="QLabel" name="label_13">
-         <property name="text">
-          <string>Salinity (0-5%):</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>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="label_14">
-         <property name="text">
-          <string>Dive Mode Colour:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="1">
-        <widget class="QComboBox" name="diveModeColour">
          <item>
           <property name="text">
-           <string>Standard</string>
+           <string>660LSB/Gauss</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Red</string>
+           <string>820LSB/Gauss</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Green</string>
+           <string>1090LSB/Gauss</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Blue</string>
+           <string>1370LSB/Gauss</string>
           </property>
          </item>
         </widget>
@@ -394,60 +301,188 @@
          <property name="text">
           <string>Compass Gain:</string>
          </property>
+         <property name="buddy">
+          <cstring>compassGainComboBox</cstring>
+         </property>
         </widget>
        </item>
-       <item row="8" column="3">
-        <widget class="QComboBox" name="compassGainComboBox">
+       <item row="3" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Dive Mode:</string>
+         </property>
+         <property name="buddy">
+          <cstring>diveModeComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="2" colspan="2">
+        <widget class="QTableWidget" name="ostc3DilTable">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>2</verstretch>
           </sizepolicy>
          </property>
-         <item>
+         <row>
           <property name="text">
-           <string>230LSB/Gauss</string>
+           <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/>
+          </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>Dil 1</string>
           </property>
          </item>
-         <item>
+         <item row="1" column="0">
           <property name="text">
-           <string>330LSB/Gauss</string>
+           <string>Dil 2</string>
           </property>
          </item>
-         <item>
+         <item row="2" column="0">
           <property name="text">
-           <string>390LSB/Gauss</string>
+           <string>Dil 3</string>
           </property>
          </item>
-         <item>
+         <item row="3" column="0">
           <property name="text">
-           <string>440LSB/Gauss</string>
+           <string>Dil 4</string>
           </property>
          </item>
+         <item row="4" column="0">
+          <property name="text">
+           <string>Dil 5</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="6" column="2">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Units:</string>
+         </property>
+         <property name="buddy">
+          <cstring>unitsComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QLabel" name="label_16">
+         <property name="text">
+          <string>Desaturation:</string>
+         </property>
+         <property name="buddy">
+          <cstring>desaturationSpinBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="diveModeComboBox">
          <item>
           <property name="text">
-           <string>660LSB/Gauss</string>
+           <string>OC</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>820LSB/Gauss</string>
+           <string>CC</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>1090LSB/Gauss</string>
+           <string>Gauge</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>1370LSB/Gauss</string>
+           <string>Apnea</string>
           </property>
          </item>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Serial No.</string>
+         </property>
+         <property name="buddy">
+          <cstring>serialNoLineEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="2">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Brightness:</string>
+         </property>
+         <property name="buddy">
+          <cstring>brightnessComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Saturation:</string>
+         </property>
+         <property name="buddy">
+          <cstring>saturationSpinBox</cstring>
+         </property>
+        </widget>
+       </item>
        <item row="9" column="0" colspan="2">
         <widget class="QTableWidget" name="ostc3GasTable">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
          <row>
           <property name="text">
            <string/>
@@ -525,8 +560,125 @@
          </item>
         </widget>
        </item>
-       <item row="9" column="2" colspan="2">
-        <widget class="QTableWidget" name="ostc3DilTable">
+       <item row="3" column="3">
+        <widget class="QComboBox" name="dateFormatComboBox">
+         <item>
+          <property name="text">
+           <string>MMDDYY</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>DDMMYY</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>YYMMDD</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="0" column="3">
+        <widget class="QLineEdit" name="firmwareVersionLineEdit">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Firmware Version:</string>
+         </property>
+         <property name="buddy">
+          <cstring>firmwareVersionLineEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Date Format:</string>
+         </property>
+         <property name="buddy">
+          <cstring>dateFormatComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QComboBox" name="diveModeColour">
+         <item>
+          <property name="text">
+           <string>Standard</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Red</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Green</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Blue</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Sampling Rate:</string>
+         </property>
+         <property name="buddy">
+          <cstring>samplingRateComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="2">
+        <widget class="QCheckBox" name="dateTimeSyncCheckBox">
+         <property name="text">
+          <string>Sync dive computer time with PC</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QComboBox" name="samplingRateComboBox">
+         <item>
+          <property name="text">
+           <string>2s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>10s</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>Dive Mode Colour:</string>
+         </property>
+         <property name="buddy">
+          <cstring>diveModeColour</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="0" colspan="2">
+        <widget class="QTableWidget" name="ostc3SetPointTable">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
          <row>
           <property name="text">
            <string/>
@@ -559,71 +711,41 @@
          </column>
          <column>
           <property name="text">
-           <string>%He</string>
+           <string>Set Point [cbar]</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>
+           <string>Change Depth [m]</string>
           </property>
          </column>
          <item row="0" column="0">
           <property name="text">
-           <string>Dil 1</string>
+           <string>SP 1</string>
           </property>
          </item>
          <item row="1" column="0">
           <property name="text">
-           <string>Dil 2</string>
+           <string>SP 2</string>
           </property>
          </item>
          <item row="2" column="0">
           <property name="text">
-           <string>Dil 3</string>
+           <string>SP 3</string>
           </property>
          </item>
          <item row="3" column="0">
           <property name="text">
-           <string>Dil 4</string>
+           <string>SP 4</string>
           </property>
          </item>
          <item row="4" column="0">
           <property name="text">
-           <string>Dil 5</string>
+           <string>SP 5</string>
           </property>
          </item>
         </widget>
        </item>
-       <item row="10" column="0" colspan="2">
-        <widget class="QCheckBox" name="dateTimeSyncCheckBox">
-         <property name="text">
-          <string>Sync dive computer time with PC</string>
-         </property>
-        </widget>
-       </item>
-       <item row="11" 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>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>
@@ -684,17 +806,19 @@
   <tabstop>customTextLlineEdit</tabstop>
   <tabstop>languageComboBox</tabstop>
   <tabstop>diveModeComboBox</tabstop>
+  <tabstop>dateFormatComboBox</tabstop>
   <tabstop>saturationSpinBox</tabstop>
   <tabstop>desaturationSpinBox</tabstop>
   <tabstop>lastDecoSpinBox</tabstop>
   <tabstop>brightnessComboBox</tabstop>
-  <tabstop>dateFormatComboBox</tabstop>
-  <tabstop>unitsComboBox</tabstop>
   <tabstop>samplingRateComboBox</tabstop>
-  <tabstop>salinitySpinBox</tabstop>
+  <tabstop>unitsComboBox</tabstop>
   <tabstop>diveModeColour</tabstop>
-  <tabstop>compassGainComboBox</tabstop>
+  <tabstop>salinitySpinBox</tabstop>
   <tabstop>dateTimeSyncCheckBox</tabstop>
+  <tabstop>compassGainComboBox</tabstop>
+  <tabstop>ostc3GasTable</tabstop>
+  <tabstop>ostc3DilTable</tabstop>
   <tabstop>cancel</tabstop>
  </tabstops>
  <resources/>