summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Stefan Fuchs <sfuchs@gmx.de>2018-03-03 14:29:51 +0100
committerGravatar Robert C. Helling <helling@atdotde.de>2018-03-05 16:19:49 +0100
commiteb08ec972dc134d3f926e14fda024f9405e71692 (patch)
treefc4496cdc29d8bdf491f05472d44e88e40bc3ea9
parent3eb5970becf101be6f33085d120976bc7b8b5020 (diff)
downloadsubsurface-eb08ec972dc134d3f926e14fda024f9405e71692.tar.gz
Configure DC dialog: Change order of DCs and correct names
In the configure dive computer dialog change the order of the DCs (all HW first, then Suunto) and correct the names of some HW DCs (make them the same as in the "download from DC selection list"). Plus added the OSTC Plus to the list of supported DC. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat
-rw-r--r--desktop-widgets/configuredivecomputerdialog.cpp32
-rw-r--r--desktop-widgets/configuredivecomputerdialog.ui2292
2 files changed, 1162 insertions, 1162 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index 970ffb96e..138f9763a 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -417,16 +417,16 @@ void ConfigureDiveComputerDialog::populateDeviceDetails()
{
switch (ui.dcStackedWidget->currentIndex()) {
case 0:
- populateDeviceDetailsOSTC3();
+ populateDeviceDetailsOSTC();
break;
case 1:
- populateDeviceDetailsSuuntoVyper();
+ populateDeviceDetailsOSTC3();
break;
case 2:
- populateDeviceDetailsOSTC();
+ populateDeviceDetailsOSTC4();
break;
case 3:
- populateDeviceDetailsOSTC4();
+ populateDeviceDetailsSuuntoVyper();
break;
}
}
@@ -954,16 +954,16 @@ void ConfigureDiveComputerDialog::reloadValues()
switch (ui.dcStackedWidget->currentIndex()) {
case 0:
- reloadValuesOSTC3();
+ reloadValuesOSTC();
break;
case 1:
- reloadValuesSuuntoVyper();
+ reloadValuesOSTC3();
break;
case 2:
- reloadValuesOSTC();
+ reloadValuesOSTC4();
break;
case 3:
- reloadValuesOSTC4();
+ reloadValuesSuuntoVyper();
break;
}
}
@@ -1431,23 +1431,23 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr
switch (currentRow) {
case 0:
selected_vendor = "Heinrichs Weikamp";
- selected_product = "OSTC 3";
+ selected_product = "OSTC 2N";
fw_upgrade_possible = true;
break;
case 1:
- selected_vendor = "Suunto";
- selected_product = "Vyper";
- fw_upgrade_possible = false;
- break;
- case 2:
selected_vendor = "Heinrichs Weikamp";
- selected_product = "OSTC 2N";
+ selected_product = "OSTC 3";
fw_upgrade_possible = true;
break;
- case 3:
+ case 2:
selected_vendor = "Heinrichs Weikamp";
selected_product = "OSTC 4";
fw_upgrade_possible = true;
+ break;
+ case 3:
+ selected_vendor = "Suunto";
+ selected_product = "Vyper";
+ fw_upgrade_possible = false;
default:
/* Not Supported */
return;
diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui
index e765c2e5c..e8cc84efd 100644
--- a/desktop-widgets/configuredivecomputerdialog.ui
+++ b/desktop-widgets/configuredivecomputerdialog.ui
@@ -211,38 +211,38 @@
</property>
<item>
<property name="text">
- <string>OSTC 3,Sport,Cr,2</string>
+ <string>OSTC Mk2/2N/2C</string>
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
- <normaloff>:dc-ostc-3-icon</normaloff>:dc-ostc-3-icon</iconset>
+ <normaloff>:dc-ostc-2n-icon</normaloff>:dc-ostc-2n-icon</iconset>
</property>
</item>
<item>
<property name="text">
- <string>Suunto Vyper family</string>
+ <string>OSTC 2/3/Sport/Plus/cR</string>
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
- <normaloff>:dc-suunto-vyper-icon</normaloff>:dc-suunto-vyper-icon</iconset>
+ <normaloff>:dc-ostc-3-icon</normaloff>:dc-ostc-3-icon</iconset>
</property>
</item>
<item>
<property name="text">
- <string>OSTC, Mk.2/2N/2C</string>
+ <string>OSTC 4</string>
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
- <normaloff>:dc-ostc-2n-icon</normaloff>:dc-ostc-2n-icon</iconset>
+ <normaloff>:dc-ostc-4-icon</normaloff>:dc-ostc-4-icon</iconset>
</property>
</item>
<item>
<property name="text">
- <string>OSTC 4</string>
+ <string>Suunto Vyper family</string>
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
- <normaloff>:dc-ostc-4-icon</normaloff>:dc-ostc-4-icon</iconset>
+ <normaloff>:dc-suunto-vyper-icon</normaloff>:dc-suunto-vyper-icon</iconset>
</property>
</item>
</widget>
@@ -250,97 +250,44 @@
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="page_ostc3">
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <widget class="QWidget" name="page_ostc">
+ <layout class="QVBoxLayout">
<item>
- <widget class="QTabWidget" name="tabWidget1">
+ <widget class="QTabWidget" name="tabWidget3">
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="basicSettings">
+ <widget class="QWidget" name="basicSettings3">
<attribute name="title">
<string>Basic settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout">
- <item row="5" column="4">
- <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="4">
- <widget class="QSpinBox" name="salinitySpinBox">
- <property name="suffix">
- <string>%</string>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Serial No.</string>
</property>
- <property name="maximum">
- <number>5</number>
+ <property name="buddy">
+ <cstring>serialNoLineEdit</cstring>
</property>
</widget>
</item>
- <item row="2" column="4">
- <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="6" column="4">
- <widget class="QComboBox" name="unitsComboBox">
- <item>
- <property name="text">
- <string>m/°C</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ft/°F</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="0">
+ <item row="6" column="0">
<widget class="QLabel">
<property name="text">
- <string>Serial No.</string>
+ <string>Length</string>
</property>
- <property name="buddy">
- <cstring>serialNoLineEdit</cstring>
+ </widget>
+ </item>
+ <item row="0" column="6">
+ <widget class="QLineEdit" name="firmwareVersionLineEdit_3">
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
- <widget class="QLineEdit" name="serialNoLineEdit">
+ <item row="0" column="2" colspan="2">
+ <widget class="QLineEdit" name="serialNoLineEdit_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
@@ -352,327 +299,187 @@
</property>
</widget>
</item>
- <item row="0" column="3">
+ <item row="0" column="5">
<widget class="QLabel">
<property name="text">
<string>Firmware version</string>
</property>
<property name="buddy">
- <cstring>firmwareVersionLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="4">
- <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="4">
- <widget class="QLineEdit" name="firmwareVersionLineEdit">
- <property name="readOnly">
- <bool>true</bool>
+ <cstring>firmwareVersionLineEdit_3</cstring>
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="1" column="0" colspan="2">
<widget class="QLabel">
<property name="text">
- <string>Language</string>
+ <string>Custom text</string>
</property>
<property name="buddy">
- <cstring>languageComboBox</cstring>
+ <cstring>customTextLlineEdit_3</cstring>
</property>
</widget>
</item>
- <item row="3" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Date format</string>
+ <item row="1" column="2" colspan="2">
+ <widget class="QLineEdit" name="customTextLlineEdit_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="buddy">
- <cstring>dateFormatComboBox</cstring>
+ <property name="maxLength">
+ <number>23</number>
</property>
</widget>
</item>
- <item row="5" column="3">
+ <item row="1" column="5">
<widget class="QLabel">
<property name="text">
- <string>Brightness</string>
- </property>
- <property name="buddy">
- <cstring>brightnessComboBox</cstring>
+ <string>Number of dives</string>
</property>
</widget>
</item>
- <item row="6" column="3">
- <widget class="QLabel">
+ <item row="4" column="0" rowspan="2" colspan="4">
+ <widget class="QCheckBox" name="safetyStopCheckBox_3">
<property name="text">
- <string>Units</string>
+ <string>Show safety stop</string>
</property>
- <property name="buddy">
- <cstring>unitsComboBox</cstring>
+ </widget>
+ </item>
+ <item row="1" column="6">
+ <widget class="QSpinBox" name="numberOfDivesSpinBox_3">
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="7" column="3">
+ <item row="2" column="0" colspan="2">
<widget class="QLabel">
<property name="text">
- <string>Salinity (0-5%)</string>
+ <string>Sampling rate</string>
</property>
<property name="buddy">
- <cstring>salinitySpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="14" column="3" colspan="2">
- <widget class="QPushButton" name="resetButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Reset device to default settings</string>
+ <cstring>samplingRateComboBox</cstring>
</property>
</widget>
</item>
- <item row="8" column="4">
- <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>230LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>330LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>390LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>440LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>660LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>820LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>1090LSB/Gauss</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>1370LSB/Gauss</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="12" column="2">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
+ <item row="2" column="2" colspan="2">
+ <widget class="QSpinBox" name="samplingRateSpinBox_3">
+ <property name="minimumSize">
<size>
- <width>20</width>
- <height>177</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
- </spacer>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="customTextLlineEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maxLength">
- <number>60</number>
- </property>
- </widget>
- </item>
- <item row="8" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Compass gain</string>
+ <property name="minimum">
+ <number>1</number>
</property>
- <property name="buddy">
- <cstring>compassGainComboBox</cstring>
+ <property name="maximum">
+ <number>120</number>
</property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Computer model</string>
+ <property name="value">
+ <number>10</number>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="5">
<widget class="QLabel">
<property name="text">
- <string>Custom text</string>
+ <string>Date format</string>
</property>
<property name="buddy">
- <cstring>customTextLlineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QLineEdit" name="modelLineEdit">
- <property name="readOnly">
- <bool>true</bool>
+ <cstring>dateFormatComboBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QComboBox" name="diveModeComboBox">
- <item>
- <property name="text">
- <string>OC</string>
- </property>
- </item>
+ <item row="2" column="6">
+ <widget class="QComboBox" name="dateFormatComboBox_3">
<item>
<property name="text">
- <string>CC</string>
+ <string>MM/DD/YY</string>
</property>
</item>
<item>
<property name="text">
- <string>Gauge</string>
+ <string>DD/MM/YY</string>
</property>
</item>
<item>
<property name="text">
- <string>Apnea</string>
+ <string>YY/MM/DD</string>
</property>
</item>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel">
+ <item row="3" column="0" colspan="4">
+ <widget class="QCheckBox" name="dateTimeSyncCheckBox_3">
<property name="text">
- <string>Dive mode</string>
- </property>
- <property name="buddy">
- <cstring>diveModeComboBox</cstring>
+ <string>Sync dive computer time with PC</string>
</property>
</widget>
</item>
- <item row="3" 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="3" column="0">
+ <item row="3" column="5">
<widget class="QLabel">
<property name="text">
- <string>Sampling rate</string>
+ <string>Salinity</string>
</property>
<property name="buddy">
- <cstring>samplingRateComboBox</cstring>
+ <cstring>salinitySpinBox</cstring>
</property>
</widget>
</item>
- <item row="5" 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>
+ <item row="3" column="6">
+ <widget class="QDoubleSpinBox" name="salinityDoubleSpinBox_3">
+ <property name="suffix">
+ <string>kg/ℓ</string>
+ </property>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>1.040000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.010000000000000</double>
+ </property>
</widget>
</item>
- <item row="6" column="0" colspan="3">
- <widget class="QCheckBox" name="dateTimeSyncCheckBox">
- <property name="text">
- <string>Sync dive computer time with PC</string>
+ <item row="10" column="3">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>177</height>
+ </size>
+ </property>
+ </spacer>
</item>
- <item row="5" column="0">
+ <item row="7" column="0">
<widget class="QLabel">
<property name="text">
- <string>Dive mode color</string>
- </property>
- <property name="buddy">
- <cstring>diveModeColour</cstring>
+ <string>Start Depth</string>
</property>
</widget>
</item>
- <item row="7" column="0" colspan="3">
- <widget class="QCheckBox" name="safetyStopCheckBox">
+ <item row="8" column="0">
+ <widget class="QLabel">
<property name="text">
- <string>Show safety stop</string>
+ <string>End Depth</string>
</property>
</widget>
</item>
- <item row="10" column="0">
+ <item row="9" column="0">
<widget class="QLabel">
<property name="text">
- <string>End Depth</string>
+ <string>Reset Depth</string>
</property>
</widget>
</item>
- <item row="8" column="1">
- <widget class="QSpinBox" name="safetyStopLengthSpinBox">
+ <item row="6" column="2">
+ <widget class="QSpinBox" name="safetyStopLengthSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
@@ -680,39 +487,18 @@
<string>s</string>
</property>
<property name="minimum">
- <number>60</number>
+ <number>10</number>
</property>
<property name="maximum">
- <number>240</number>
+ <number>250</number>
</property>
<property name="value">
<number>180</number>
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Length</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Start Depth</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Reset Depth</string>
- </property>
- </widget>
- </item>
- <item row="9" column="1">
- <widget class="QDoubleSpinBox" name="safetyStopStartDepthDoubleSpinBox">
+ <item row="7" column="2">
+ <widget class="QDoubleSpinBox" name="safetyStopStartDepthDoubleSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
@@ -723,10 +509,10 @@
<number>1</number>
</property>
<property name="minimum">
- <double>2.100000000000000</double>
+ <double>3.000000000000000</double>
</property>
<property name="maximum">
- <double>6.100000000000000</double>
+ <double>6.500000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
@@ -736,8 +522,8 @@
</property>
</widget>
</item>
- <item row="10" column="1">
- <widget class="QDoubleSpinBox" name="safetyStopEndDepthDoubleSpinBox">
+ <item row="8" column="2">
+ <widget class="QDoubleSpinBox" name="safetyStopEndDepthDoubleSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
@@ -748,18 +534,18 @@
<number>1</number>
</property>
<property name="minimum">
- <double>1.900000000000000</double>
+ <double>2.500000000000000</double>
</property>
<property name="maximum">
- <double>3.000000000000000</double>
+ <double>5.000000000000000</double>
</property>
<property name="value">
<double>2.900000000000000</double>
</property>
</widget>
</item>
- <item row="11" column="1">
- <widget class="QDoubleSpinBox" name="safetyStopResetDepthDoubleSpinBox">
+ <item row="9" column="2">
+ <widget class="QDoubleSpinBox" name="safetyStopResetDepthDoubleSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
@@ -770,10 +556,10 @@
<number>1</number>
</property>
<property name="minimum">
- <double>8.100000000000000</double>
+ <double>7.500000000000000</double>
</property>
<property name="maximum">
- <double>15.100000000000000</double>
+ <double>20.100000000000001</double>
</property>
<property name="value">
<double>10.100000000000000</double>
@@ -782,104 +568,37 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="advancedSettings">
+ <widget class="QWidget" name="advancedSettings_3">
<attribute name="title">
<string>Advanced settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout1">
- <item row="10" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Left button sensitivity</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0" colspan="2">
- <widget class="QCheckBox" name="alwaysShowppO2">
- <property name="text">
- <string>Always show pO₂</string>
- </property>
- </widget>
- </item>
+ <layout class="QGridLayout" name="gridLayout_5">
<item row="3" column="0" colspan="2">
- <widget class="QCheckBox" name="aGFSelectableCheckBox">
+ <widget class="QCheckBox" name="aGFSelectableCheckBox_3">
<property name="text">
<string>Alt GF can be selected underwater</string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Future TTS</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Pressure sensor offset</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>GFLow</string>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QSpinBox" name="gfLowSpinBox">
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>10</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>30</number>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
+ <item row="10" column="3">
<widget class="QLabel">
<property name="text">
- <string>GFHigh</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QSpinBox" name="gfHighSpinBox">
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>60</number>
- </property>
- <property name="maximum">
- <number>110</number>
+ <string>Desaturation</string>
</property>
- <property name="value">
- <number>85</number>
+ <property name="buddy">
+ <cstring>desaturationSpinBox</cstring>
</property>
</widget>
</item>
- <item row="9" column="3">
+ <item row="1" column="0">
<widget class="QLabel">
<property name="text">
- <string>Desaturation</string>
- </property>
- <property name="buddy">
- <cstring>desaturationSpinBox</cstring>
+ <string>Future TTS</string>
</property>
</widget>
</item>
- <item row="9" column="4">
- <widget class="QSpinBox" name="desaturationSpinBox">
+ <item row="10" column="4">
+ <widget class="QSpinBox" name="desaturationSpinBox_3">
<property name="suffix">
<string>%</string>
</property>
@@ -894,7 +613,7 @@
</property>
</widget>
</item>
- <item row="14" column="0">
+ <item row="15" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -908,7 +627,7 @@
</spacer>
</item>
<item row="2" column="1">
- <widget class="QSpinBox" name="lastDecoSpinBox">
+ <widget class="QSpinBox" name="lastDecoSpinBox_3">
<property name="suffix">
<string>m</string>
</property>
@@ -927,42 +646,10 @@
</property>
</widget>
</item>
- <item row="3" column="4">
- <widget class="QSpinBox" name="aGFLowSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>60</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>60</number>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="pressureSensorOffsetSpinBox">
- <property name="suffix">
- <string>mbar</string>
- </property>
- <property name="minimum">
- <number>-20</number>
- </property>
- <property name="maximum">
- <number>20</number>
- </property>
- </widget>
- </item>
<item row="0" column="1">
- <widget class="QComboBox" name="decoTypeComboBox">
+ <widget class="QComboBox" name="decoTypeComboBox_3">
<property name="currentIndex">
- <number>1</number>
+ <number>4</number>
</property>
<item>
<property name="text">
@@ -971,13 +658,38 @@
</item>
<item>
<property name="text">
- <string>ZH-L16+GF</string>
+ <string>Gauge</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>ZH-L16 CC</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Apnea</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>L16-GF OC</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>L16-GF CC</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>PSCR-GF</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="futureTTSSpinBox">
+ <widget class="QSpinBox" name="futureTTSSpinBox_3">
<property name="suffix">
<string>min</string>
</property>
@@ -986,6 +698,25 @@
</property>
</widget>
</item>
+ <item row="3" column="4">
+ <widget class="QSpinBox" name="aGFLowSpinBox_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>5</number>
+ </property>
+ <property name="maximum">
+ <number>255</number>
+ </property>
+ <property name="value">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0">
<widget class="QLabel">
<property name="text">
@@ -996,8 +727,8 @@
</property>
</widget>
</item>
- <item row="8" column="4">
- <widget class="QSpinBox" name="saturationSpinBox">
+ <item row="9" column="4">
+ <widget class="QSpinBox" name="saturationSpinBox_3">
<property name="suffix">
<string>%</string>
</property>
@@ -1020,7 +751,7 @@
</widget>
</item>
<item row="6" column="4">
- <widget class="QSpinBox" name="aGFHighSpinBox">
+ <widget class="QSpinBox" name="aGFHighSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
@@ -1028,13 +759,13 @@
<string>%</string>
</property>
<property name="minimum">
- <number>70</number>
+ <number>5</number>
</property>
<property name="maximum">
- <number>120</number>
+ <number>255</number>
</property>
<property name="value">
- <number>85</number>
+ <number>90</number>
</property>
</widget>
</item>
@@ -1045,7 +776,7 @@
</property>
</widget>
</item>
- <item row="8" column="3">
+ <item row="9" column="3">
<widget class="QLabel">
<property name="text">
<string>Saturation</string>
@@ -1055,89 +786,61 @@
</property>
</widget>
</item>
- <item row="6" column="0">
- <widget class="QCheckBox" name="flipScreenCheckBox">
- <property name="text">
- <string>Flip screen</string>
- </property>
- </widget>
- </item>
- <item row="11" column="3">
+ <item row="2" column="3">
<widget class="QLabel">
<property name="text">
- <string>Right button sensitivity</string>
+ <string>GFHigh</string>
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QCheckBox" name="modWarning">
- <property name="text">
- <string>MOD warning</string>
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="gfLowSpinBox_3">
+ <property name="suffix">
+ <string>%</string>
</property>
- </widget>
- </item>
- <item row="10" column="0" colspan="2">
- <widget class="QCheckBox" name="graphicalSpeedIndicator">
- <property name="text">
- <string>Graphical speed indicator</string>
+ <property name="minimum">
+ <number>10</number>
</property>
- </widget>
- </item>
- <item row="9" column="0" colspan="2">
- <widget class="QCheckBox" name="dynamicAscendRate">
- <property name="text">
- <string>Dynamic ascent rate</string>
+ <property name="maximum">
+ <number>100</number>
</property>
- </widget>
- </item>
- <item row="12" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Bottom gas consumption</string>
+ <property name="value">
+ <number>30</number>
</property>
</widget>
</item>
- <item row="13" column="3">
+ <item row="1" column="3">
<widget class="QLabel">
<property name="text">
- <string>Deco gas consumption</string>
+ <string>GFLow</string>
</property>
</widget>
</item>
- <item row="10" column="4">
- <widget class="QSpinBox" name="leftButtonSensitivity">
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="gfHighSpinBox_3">
<property name="suffix">
<string>%</string>
</property>
<property name="minimum">
- <number>20</number>
+ <number>60</number>
</property>
<property name="maximum">
- <number>100</number>
+ <number>110</number>
</property>
<property name="value">
- <number>40</number>
+ <number>85</number>
</property>
</widget>
</item>
- <item row="11" column="4">
- <widget class="QSpinBox" name="rightButtonSensitivity">
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>20</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>40</number>
+ <item row="6" column="0" colspan="2">
+ <widget class="QCheckBox" name="graphicalSpeedIndicator_3">
+ <property name="text">
+ <string>Graphical speed indicator</string>
</property>
</widget>
</item>
<item row="12" column="4">
- <widget class="QSpinBox" name="bottomGasConsumption">
+ <widget class="QSpinBox" name="decoGasConsumption_3">
<property name="suffix">
<string>ℓ/min</string>
</property>
@@ -1152,8 +855,8 @@
</property>
</widget>
</item>
- <item row="13" column="4">
- <widget class="QSpinBox" name="decoGasConsumption">
+ <item row="11" column="4">
+ <widget class="QSpinBox" name="bottomGasConsumption_3">
<property name="suffix">
<string>ℓ/min</string>
</property>
@@ -1168,41 +871,29 @@
</property>
</widget>
</item>
- <item row="14" column="3">
+ <item row="11" column="3">
<widget class="QLabel">
<property name="text">
- <string>Temperature sensor offset</string>
+ <string>Bottom gas consumption</string>
</property>
</widget>
</item>
- <item row="14" column="4">
- <widget class="QDoubleSpinBox" name="tempSensorOffsetDoubleSpinBox">
- <property name="suffix">
- <string>°C</string>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="minimum">
- <double>-2.000000000000000</double>
- </property>
- <property name="maximum">
- <double>2.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
+ <item row="12" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Deco gas consumption</string>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="gasSettings">
+ <widget class="QWidget" name="gasSettings_3">
<attribute name="title">
<string>Gas settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout_2">
+ <layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0" colspan="2">
- <widget class="QTableWidget" name="ostc3GasTable">
+ <widget class="QTableWidget" name="ostcGasTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -1287,7 +978,7 @@
</widget>
</item>
<item row="0" column="2" colspan="2">
- <widget class="QTableWidget" name="ostc3DilTable">
+ <widget class="QTableWidget" name="ostcDilTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -1371,8 +1062,8 @@
</item>
</widget>
</item>
- <item row="2" column="0" rowspan="5" colspan="2">
- <widget class="QTableWidget" name="ostc3SetPointTable">
+ <item row="2" column="0" rowspan="4" colspan="2">
+ <widget class="QTableWidget" name="ostcSetPointTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -1394,16 +1085,6 @@
<string/>
</property>
</row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
<column>
<property name="text">
<string/>
@@ -1434,66 +1115,9 @@
<string>SP 3</string>
</property>
</item>
- <item row="3" column="0">
- <property name="text">
- <string>SP 4</string>
- </property>
- </item>
- <item row="4" column="0">
- <property name="text">
- <string>SP 5</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QLabel">
- <property name="text">
- <string>O₂ in calibration gas</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QSpinBox" name="calibrationGasSpinBox">
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>21</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>21</number>
- </property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QComboBox" name="ccrModeComboBox">
- <item>
- <property name="text">
- <string>Fixed setpoint</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Sensor</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QCheckBox" name="setPointFallbackCheckBox">
- <property name="text">
- <string>Setpoint fallback</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
+ <item row="5" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -1506,8 +1130,8 @@
</property>
</spacer>
</item>
- <item row="4" column="3">
- <widget class="QSpinBox" name="ppO2MaxSpinBox">
+ <item row="3" column="3">
+ <widget class="QSpinBox" name="ppO2MaxSpinBox_3">
<property name="suffix">
<string>cbar</string>
</property>
@@ -1515,15 +1139,15 @@
<number>120</number>
</property>
<property name="maximum">
- <number>160</number>
+ <number>180</number>
</property>
<property name="value">
<number>160</number>
</property>
</widget>
</item>
- <item row="5" column="3">
- <widget class="QSpinBox" name="ppO2MinSpinBox">
+ <item row="4" column="3">
+ <widget class="QSpinBox" name="ppO2MinSpinBox_3">
<property name="suffix">
<string>cbar</string>
</property>
@@ -1531,21 +1155,21 @@
<number>16</number>
</property>
<property name="maximum">
- <number>19</number>
+ <number>21</number>
</property>
<property name="value">
<number>19</number>
</property>
</widget>
</item>
- <item row="4" column="2">
+ <item row="3" column="2">
<widget class="QLabel">
<property name="text">
<string>pO₂ max</string>
</property>
</widget>
</item>
- <item row="5" column="2">
+ <item row="4" column="2">
<widget class="QLabel">
<property name="text">
<string>pO₂ min</string>
@@ -1558,119 +1182,97 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_vyper">
- <layout class="QVBoxLayout">
+ <widget class="QWidget" name="page_ostc3">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QTabWidget" name="tabWidget2">
+ <widget class="QTabWidget" name="tabWidget1">
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="basicSettings2">
+ <widget class="QWidget" name="basicSettings">
<attribute name="title">
<string>Basic settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="1" colspan="2">
- <widget class="QDoubleSpinBox" name="maxDepthDoubleSpinBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="maximum">
- <double>200.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Safety level</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QComboBox" name="altitudeRangeComboBox">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="5" column="4">
+ <widget class="QComboBox" name="brightnessComboBox">
<item>
<property name="text">
- <string notr="true">A0 (0m - 300m)</string>
+ <string>Eco</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">A1 (300m - 1500m)</string>
+ <string>Medium</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">A2 (1500m - 3000m)</string>
+ <string>High</string>
</property>
</item>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Altitude range</string>
+ <item row="7" column="4">
+ <widget class="QSpinBox" name="salinitySpinBox">
+ <property name="suffix">
+ <string>%</string>
</property>
- </widget>
- </item>
- <item row="9" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Model</string>
+ <property name="maximum">
+ <number>5</number>
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2">
- <widget class="QLineEdit" name="customTextLlineEdit_1">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maxLength">
- <number>30</number>
- </property>
+ <item row="2" column="4">
+ <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="1" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Number of dives</string>
- </property>
+ <item row="6" column="4">
+ <widget class="QComboBox" name="unitsComboBox">
+ <item>
+ <property name="text">
+ <string>m/°C</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>ft/°F</string>
+ </property>
+ </item>
</widget>
</item>
- <item row="11" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="0" column="0">
<widget class="QLabel">
<property name="text">
<string>Serial No.</string>
</property>
<property name="buddy">
- <cstring>serialNoLineEdit_1</cstring>
+ <cstring>serialNoLineEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
- <widget class="QLineEdit" name="serialNoLineEdit_1">
+ <widget class="QLineEdit" name="serialNoLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
@@ -1688,482 +1290,321 @@
<string>Firmware version</string>
</property>
<property name="buddy">
- <cstring>firmwareVersionLineEdit_1</cstring>
+ <cstring>firmwareVersionLineEdit</cstring>
</property>
</widget>
</item>
+ <item row="3" column="4">
+ <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="4">
- <widget class="QLineEdit" name="firmwareVersionLineEdit_1">
+ <widget class="QLineEdit" name="firmwareVersionLineEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="3">
<widget class="QLabel">
<property name="text">
- <string>Max. depth</string>
+ <string>Language</string>
+ </property>
+ <property name="buddy">
+ <cstring>languageComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="4">
- <widget class="QSpinBox" name="numberOfDivesSpinBox">
- <property name="readOnly">
- <bool>true</bool>
+ <item row="3" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Date format</string>
</property>
- <property name="maximum">
- <number>5000</number>
+ <property name="buddy">
+ <cstring>dateFormatComboBox</cstring>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="5" column="3">
<widget class="QLabel">
<property name="text">
- <string>Custom text</string>
+ <string>Brightness</string>
</property>
<property name="buddy">
- <cstring>customTextLlineEdit_1</cstring>
+ <cstring>brightnessComboBox</cstring>
</property>
</widget>
</item>
- <item row="9" column="1">
- <widget class="QComboBox" name="diveModeComboBox_1">
- <item>
- <property name="text">
- <string notr="true" extracomment="Suunto computer mode">Air</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true" extracomment="Suunto computer mode">Nitrox</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true" extracomment="Suunto computer mode">Gauge</string>
- </property>
- </item>
+ <item row="6" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Units</string>
+ </property>
+ <property name="buddy">
+ <cstring>unitsComboBox</cstring>
+ </property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QComboBox" name="personalSafetyComboBox">
- <item>
- <property name="text">
- <string extracomment="Suunto safety level">P0 (none)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string extracomment="Suunto safety level">P1 (medium)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string extracomment="Suunto safety level">P2 (high)</string>
- </property>
- </item>
+ <item row="7" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Salinity (0-5%)</string>
+ </property>
+ <property name="buddy">
+ <cstring>salinitySpinBox</cstring>
+ </property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel">
+ <item row="14" column="3" colspan="2">
+ <widget class="QPushButton" name="resetButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
- <string>Sample rate</string>
+ <string>Reset device to default settings</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QComboBox" name="samplingRateComboBox_1">
+ <item row="8" column="4">
+ <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>10s</string>
+ <string>230LSB/Gauss</string>
</property>
</item>
<item>
<property name="text">
- <string>20s</string>
+ <string>330LSB/Gauss</string>
</property>
</item>
<item>
<property name="text">
- <string>30s</string>
+ <string>390LSB/Gauss</string>
</property>
</item>
<item>
<property name="text">
- <string>60s</string>
+ <string>440LSB/Gauss</string>
</property>
</item>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Total dive time</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Computer model</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QLineEdit" name="modelLineEdit_1">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2">
- <widget class="QSpinBox" name="totalTimeSpinBox">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="suffix">
- <string>min</string>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>5000000</number>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QComboBox" name="timeFormatComboBox">
<item>
<property name="text">
- <string>24h</string>
+ <string>660LSB/Gauss</string>
</property>
</item>
<item>
<property name="text">
- <string>12h</string>
+ <string>820LSB/Gauss</string>
</property>
</item>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Time format</string>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Units</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QComboBox" name="unitsComboBox_1">
<item>
<property name="text">
- <string>Imperial</string>
+ <string>1090LSB/Gauss</string>
</property>
</item>
<item>
<property name="text">
- <string>Metric</string>
+ <string>1370LSB/Gauss</string>
</property>
</item>
</widget>
</item>
- <item row="4" column="4">
- <widget class="QSpinBox" name="lightSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string>s</string>
- </property>
- </widget>
- </item>
- <item row="4" column="3">
- <widget class="QCheckBox" name="lightCheckBox">
- <property name="text">
- <string>Light</string>
- </property>
- </widget>
- </item>
- <item row="5" column="4">
- <widget class="QDoubleSpinBox" name="alarmDepthDoubleSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <double>200.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="5" column="3">
- <widget class="QCheckBox" name="alarmDepthCheckBox">
- <property name="text">
- <string>Depth alarm</string>
- </property>
- </widget>
- </item>
- <item row="6" column="4">
- <widget class="QSpinBox" name="alarmTimeSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string>min</string>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- </widget>
- </item>
- <item row="6" column="3">
- <widget class="QCheckBox" name="alarmTimeCheckBox">
- <property name="text">
- <string>Time alarm</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_ostc">
- <layout class="QVBoxLayout">
- <item>
- <widget class="QTabWidget" name="tabWidget3">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="basicSettings3">
- <attribute name="title">
- <string>Basic settings</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0" colspan="2">
- <widget class="QLabel">
- <property name="text">
- <string>Serial No.</string>
- </property>
- <property name="buddy">
- <cstring>serialNoLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Length</string>
+ <item row="12" column="2">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
- </item>
- <item row="0" column="6">
- <widget class="QLineEdit" name="firmwareVersionLineEdit_3">
- <property name="readOnly">
- <bool>true</bool>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>177</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="0" column="2" colspan="2">
- <widget class="QLineEdit" name="serialNoLineEdit_3">
+ <item row="1" column="1" colspan="2">
+ <widget class="QLineEdit" name="customTextLlineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="maxLength">
+ <number>60</number>
</property>
</widget>
</item>
- <item row="0" column="5">
+ <item row="8" column="3">
<widget class="QLabel">
<property name="text">
- <string>Firmware version</string>
+ <string>Compass gain</string>
</property>
<property name="buddy">
- <cstring>firmwareVersionLineEdit_3</cstring>
+ <cstring>compassGainComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="1" column="3">
<widget class="QLabel">
<property name="text">
- <string>Custom text</string>
- </property>
- <property name="buddy">
- <cstring>customTextLlineEdit_3</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="2" colspan="2">
- <widget class="QLineEdit" name="customTextLlineEdit_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maxLength">
- <number>23</number>
+ <string>Computer model</string>
</property>
</widget>
</item>
- <item row="1" column="5">
+ <item row="1" column="0">
<widget class="QLabel">
<property name="text">
- <string>Number of dives</string>
+ <string>Custom text</string>
</property>
- </widget>
- </item>
- <item row="4" column="0" rowspan="2" colspan="4">
- <widget class="QCheckBox" name="safetyStopCheckBox_3">
- <property name="text">
- <string>Show safety stop</string>
+ <property name="buddy">
+ <cstring>customTextLlineEdit</cstring>
</property>
</widget>
</item>
- <item row="1" column="6">
- <widget class="QSpinBox" name="numberOfDivesSpinBox_3">
+ <item row="1" column="4">
+ <widget class="QLineEdit" name="modelLineEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="2" 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">
<property name="text">
- <string>Sampling rate</string>
+ <string>Dive mode</string>
</property>
<property name="buddy">
- <cstring>samplingRateComboBox</cstring>
+ <cstring>diveModeComboBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="2" colspan="2">
- <widget class="QSpinBox" name="samplingRateSpinBox_3">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>120</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
+ <item row="3" 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="2" column="5">
+ <item row="3" column="0">
<widget class="QLabel">
<property name="text">
- <string>Date format</string>
+ <string>Sampling rate</string>
</property>
<property name="buddy">
- <cstring>dateFormatComboBox</cstring>
+ <cstring>samplingRateComboBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="6">
- <widget class="QComboBox" name="dateFormatComboBox_3">
+ <item row="5" column="1">
+ <widget class="QComboBox" name="diveModeColour">
<item>
<property name="text">
- <string>MM/DD/YY</string>
+ <string>Standard</string>
</property>
</item>
<item>
<property name="text">
- <string>DD/MM/YY</string>
+ <string>Red</string>
</property>
</item>
<item>
<property name="text">
- <string>YY/MM/DD</string>
+ <string>Green</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Blue</string>
</property>
</item>
</widget>
</item>
- <item row="3" column="0" colspan="4">
- <widget class="QCheckBox" name="dateTimeSyncCheckBox_3">
+ <item row="6" column="0" colspan="3">
+ <widget class="QCheckBox" name="dateTimeSyncCheckBox">
<property name="text">
<string>Sync dive computer time with PC</string>
</property>
</widget>
</item>
- <item row="3" column="5">
+ <item row="5" column="0">
<widget class="QLabel">
<property name="text">
- <string>Salinity</string>
+ <string>Dive mode color</string>
</property>
<property name="buddy">
- <cstring>salinitySpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="6">
- <widget class="QDoubleSpinBox" name="salinityDoubleSpinBox_3">
- <property name="suffix">
- <string>kg/ℓ</string>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>1.040000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
+ <cstring>diveModeColour</cstring>
</property>
</widget>
</item>
- <item row="10" column="3">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>177</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="0">
- <widget class="QLabel">
+ <item row="7" column="0" colspan="3">
+ <widget class="QCheckBox" name="safetyStopCheckBox">
<property name="text">
- <string>Start Depth</string>
+ <string>Show safety stop</string>
</property>
</widget>
</item>
- <item row="8" column="0">
+ <item row="10" column="0">
<widget class="QLabel">
<property name="text">
<string>End Depth</string>
</property>
</widget>
</item>
- <item row="9" column="0">
- <widget class="QLabel">
- <property name="text">
- <string>Reset Depth</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QSpinBox" name="safetyStopLengthSpinBox_3">
+ <item row="8" column="1">
+ <widget class="QSpinBox" name="safetyStopLengthSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -2171,18 +1612,39 @@
<string>s</string>
</property>
<property name="minimum">
- <number>10</number>
+ <number>60</number>
</property>
<property name="maximum">
- <number>250</number>
+ <number>240</number>
</property>
<property name="value">
<number>180</number>
</property>
</widget>
</item>
- <item row="7" column="2">
- <widget class="QDoubleSpinBox" name="safetyStopStartDepthDoubleSpinBox_3">
+ <item row="8" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Length</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Start Depth</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Reset Depth</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QDoubleSpinBox" name="safetyStopStartDepthDoubleSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -2193,10 +1655,10 @@
<number>1</number>
</property>
<property name="minimum">
- <double>3.000000000000000</double>
+ <double>2.100000000000000</double>
</property>
<property name="maximum">
- <double>6.500000000000000</double>
+ <double>6.100000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
@@ -2206,8 +1668,8 @@
</property>
</widget>
</item>
- <item row="8" column="2">
- <widget class="QDoubleSpinBox" name="safetyStopEndDepthDoubleSpinBox_3">
+ <item row="10" column="1">
+ <widget class="QDoubleSpinBox" name="safetyStopEndDepthDoubleSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -2218,18 +1680,18 @@
<number>1</number>
</property>
<property name="minimum">
- <double>2.500000000000000</double>
+ <double>1.900000000000000</double>
</property>
<property name="maximum">
- <double>5.000000000000000</double>
+ <double>3.000000000000000</double>
</property>
<property name="value">
<double>2.900000000000000</double>
</property>
</widget>
</item>
- <item row="9" column="2">
- <widget class="QDoubleSpinBox" name="safetyStopResetDepthDoubleSpinBox_3">
+ <item row="11" column="1">
+ <widget class="QDoubleSpinBox" name="safetyStopResetDepthDoubleSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -2240,10 +1702,10 @@
<number>1</number>
</property>
<property name="minimum">
- <double>7.500000000000000</double>
+ <double>8.100000000000000</double>
</property>
<property name="maximum">
- <double>20.100000000000001</double>
+ <double>15.100000000000000</double>
</property>
<property name="value">
<double>10.100000000000000</double>
@@ -2252,37 +1714,104 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="advancedSettings_3">
+ <widget class="QWidget" name="advancedSettings">
<attribute name="title">
<string>Advanced settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout_5">
+ <layout class="QGridLayout" name="gridLayout1">
+ <item row="10" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Left button sensitivity</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0" colspan="2">
+ <widget class="QCheckBox" name="alwaysShowppO2">
+ <property name="text">
+ <string>Always show pO₂</string>
+ </property>
+ </widget>
+ </item>
<item row="3" column="0" colspan="2">
- <widget class="QCheckBox" name="aGFSelectableCheckBox_3">
+ <widget class="QCheckBox" name="aGFSelectableCheckBox">
<property name="text">
<string>Alt GF can be selected underwater</string>
</property>
</widget>
</item>
- <item row="10" column="3">
+ <item row="1" column="0">
<widget class="QLabel">
<property name="text">
- <string>Desaturation</string>
+ <string>Future TTS</string>
</property>
- <property name="buddy">
- <cstring>desaturationSpinBox</cstring>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Pressure sensor offset</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="3">
<widget class="QLabel">
<property name="text">
- <string>Future TTS</string>
+ <string>GFLow</string>
</property>
</widget>
</item>
- <item row="10" column="4">
- <widget class="QSpinBox" name="desaturationSpinBox_3">
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="gfLowSpinBox">
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>10</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>GFHigh</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="gfHighSpinBox">
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>60</number>
+ </property>
+ <property name="maximum">
+ <number>110</number>
+ </property>
+ <property name="value">
+ <number>85</number>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Desaturation</string>
+ </property>
+ <property name="buddy">
+ <cstring>desaturationSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="4">
+ <widget class="QSpinBox" name="desaturationSpinBox">
<property name="suffix">
<string>%</string>
</property>
@@ -2297,7 +1826,7 @@
</property>
</widget>
</item>
- <item row="15" column="0">
+ <item row="14" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -2311,7 +1840,7 @@
</spacer>
</item>
<item row="2" column="1">
- <widget class="QSpinBox" name="lastDecoSpinBox_3">
+ <widget class="QSpinBox" name="lastDecoSpinBox">
<property name="suffix">
<string>m</string>
</property>
@@ -2330,10 +1859,42 @@
</property>
</widget>
</item>
+ <item row="3" column="4">
+ <widget class="QSpinBox" name="aGFLowSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>60</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>60</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QSpinBox" name="pressureSensorOffsetSpinBox">
+ <property name="suffix">
+ <string>mbar</string>
+ </property>
+ <property name="minimum">
+ <number>-20</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ </widget>
+ </item>
<item row="0" column="1">
- <widget class="QComboBox" name="decoTypeComboBox_3">
+ <widget class="QComboBox" name="decoTypeComboBox">
<property name="currentIndex">
- <number>4</number>
+ <number>1</number>
</property>
<item>
<property name="text">
@@ -2342,38 +1903,13 @@
</item>
<item>
<property name="text">
- <string>Gauge</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ZH-L16 CC</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Apnea</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>L16-GF OC</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>L16-GF CC</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>PSCR-GF</string>
+ <string>ZH-L16+GF</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="futureTTSSpinBox_3">
+ <widget class="QSpinBox" name="futureTTSSpinBox">
<property name="suffix">
<string>min</string>
</property>
@@ -2382,25 +1918,6 @@
</property>
</widget>
</item>
- <item row="3" column="4">
- <widget class="QSpinBox" name="aGFLowSpinBox_3">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>5</number>
- </property>
- <property name="maximum">
- <number>255</number>
- </property>
- <property name="value">
- <number>30</number>
- </property>
- </widget>
- </item>
<item row="2" column="0">
<widget class="QLabel">
<property name="text">
@@ -2411,8 +1928,8 @@
</property>
</widget>
</item>
- <item row="9" column="4">
- <widget class="QSpinBox" name="saturationSpinBox_3">
+ <item row="8" column="4">
+ <widget class="QSpinBox" name="saturationSpinBox">
<property name="suffix">
<string>%</string>
</property>
@@ -2435,7 +1952,7 @@
</widget>
</item>
<item row="6" column="4">
- <widget class="QSpinBox" name="aGFHighSpinBox_3">
+ <widget class="QSpinBox" name="aGFHighSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -2443,13 +1960,13 @@
<string>%</string>
</property>
<property name="minimum">
- <number>5</number>
+ <number>70</number>
</property>
<property name="maximum">
- <number>255</number>
+ <number>120</number>
</property>
<property name="value">
- <number>90</number>
+ <number>85</number>
</property>
</widget>
</item>
@@ -2460,7 +1977,7 @@
</property>
</widget>
</item>
- <item row="9" column="3">
+ <item row="8" column="3">
<widget class="QLabel">
<property name="text">
<string>Saturation</string>
@@ -2470,61 +1987,89 @@
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="6" column="0">
+ <widget class="QCheckBox" name="flipScreenCheckBox">
+ <property name="text">
+ <string>Flip screen</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="3">
<widget class="QLabel">
<property name="text">
- <string>GFHigh</string>
+ <string>Right button sensitivity</string>
</property>
</widget>
</item>
- <item row="1" column="4">
- <widget class="QSpinBox" name="gfLowSpinBox_3">
- <property name="suffix">
- <string>%</string>
+ <item row="8" column="0">
+ <widget class="QCheckBox" name="modWarning">
+ <property name="text">
+ <string>MOD warning</string>
</property>
- <property name="minimum">
- <number>10</number>
+ </widget>
+ </item>
+ <item row="10" column="0" colspan="2">
+ <widget class="QCheckBox" name="graphicalSpeedIndicator">
+ <property name="text">
+ <string>Graphical speed indicator</string>
</property>
- <property name="maximum">
- <number>100</number>
+ </widget>
+ </item>
+ <item row="9" column="0" colspan="2">
+ <widget class="QCheckBox" name="dynamicAscendRate">
+ <property name="text">
+ <string>Dynamic ascent rate</string>
</property>
- <property name="value">
- <number>30</number>
+ </widget>
+ </item>
+ <item row="12" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Bottom gas consumption</string>
</property>
</widget>
</item>
- <item row="1" column="3">
+ <item row="13" column="3">
<widget class="QLabel">
<property name="text">
- <string>GFLow</string>
+ <string>Deco gas consumption</string>
</property>
</widget>
</item>
- <item row="2" column="4">
- <widget class="QSpinBox" name="gfHighSpinBox_3">
+ <item row="10" column="4">
+ <widget class="QSpinBox" name="leftButtonSensitivity">
<property name="suffix">
<string>%</string>
</property>
<property name="minimum">
- <number>60</number>
+ <number>20</number>
</property>
<property name="maximum">
- <number>110</number>
+ <number>100</number>
</property>
<property name="value">
- <number>85</number>
+ <number>40</number>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2">
- <widget class="QCheckBox" name="graphicalSpeedIndicator_3">
- <property name="text">
- <string>Graphical speed indicator</string>
+ <item row="11" column="4">
+ <widget class="QSpinBox" name="rightButtonSensitivity">
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>20</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>40</number>
</property>
</widget>
</item>
<item row="12" column="4">
- <widget class="QSpinBox" name="decoGasConsumption_3">
+ <widget class="QSpinBox" name="bottomGasConsumption">
<property name="suffix">
<string>ℓ/min</string>
</property>
@@ -2539,8 +2084,8 @@
</property>
</widget>
</item>
- <item row="11" column="4">
- <widget class="QSpinBox" name="bottomGasConsumption_3">
+ <item row="13" column="4">
+ <widget class="QSpinBox" name="decoGasConsumption">
<property name="suffix">
<string>ℓ/min</string>
</property>
@@ -2555,29 +2100,41 @@
</property>
</widget>
</item>
- <item row="11" column="3">
+ <item row="14" column="3">
<widget class="QLabel">
<property name="text">
- <string>Bottom gas consumption</string>
+ <string>Temperature sensor offset</string>
</property>
</widget>
</item>
- <item row="12" column="3">
- <widget class="QLabel">
- <property name="text">
- <string>Deco gas consumption</string>
+ <item row="14" column="4">
+ <widget class="QDoubleSpinBox" name="tempSensorOffsetDoubleSpinBox">
+ <property name="suffix">
+ <string>°C</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="minimum">
+ <double>-2.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>2.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="gasSettings_3">
+ <widget class="QWidget" name="gasSettings">
<attribute name="title">
<string>Gas settings</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout_6">
+ <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
- <widget class="QTableWidget" name="ostcGasTable">
+ <widget class="QTableWidget" name="ostc3GasTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -2662,7 +2219,7 @@
</widget>
</item>
<item row="0" column="2" colspan="2">
- <widget class="QTableWidget" name="ostcDilTable">
+ <widget class="QTableWidget" name="ostc3DilTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -2746,8 +2303,8 @@
</item>
</widget>
</item>
- <item row="2" column="0" rowspan="4" colspan="2">
- <widget class="QTableWidget" name="ostcSetPointTable">
+ <item row="2" column="0" rowspan="5" colspan="2">
+ <widget class="QTableWidget" name="ostc3SetPointTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -2769,6 +2326,16 @@
<string/>
</property>
</row>
+ <row>
+ <property name="text">
+ <string/>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string/>
+ </property>
+ </row>
<column>
<property name="text">
<string/>
@@ -2799,9 +2366,66 @@
<string>SP 3</string>
</property>
</item>
+ <item row="3" column="0">
+ <property name="text">
+ <string>SP 4</string>
+ </property>
+ </item>
+ <item row="4" column="0">
+ <property name="text">
+ <string>SP 5</string>
+ </property>
+ </item>
</widget>
</item>
- <item row="5" column="2">
+ <item row="2" column="2">
+ <widget class="QLabel">
+ <property name="text">
+ <string>O₂ in calibration gas</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QSpinBox" name="calibrationGasSpinBox">
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="minimum">
+ <number>21</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>21</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QComboBox" name="ccrModeComboBox">
+ <item>
+ <property name="text">
+ <string>Fixed setpoint</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Sensor</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="3">
+ <widget class="QCheckBox" name="setPointFallbackCheckBox">
+ <property name="text">
+ <string>Setpoint fallback</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -2814,8 +2438,8 @@
</property>
</spacer>
</item>
- <item row="3" column="3">
- <widget class="QSpinBox" name="ppO2MaxSpinBox_3">
+ <item row="4" column="3">
+ <widget class="QSpinBox" name="ppO2MaxSpinBox">
<property name="suffix">
<string>cbar</string>
</property>
@@ -2823,15 +2447,15 @@
<number>120</number>
</property>
<property name="maximum">
- <number>180</number>
+ <number>160</number>
</property>
<property name="value">
<number>160</number>
</property>
</widget>
</item>
- <item row="4" column="3">
- <widget class="QSpinBox" name="ppO2MinSpinBox_3">
+ <item row="5" column="3">
+ <widget class="QSpinBox" name="ppO2MinSpinBox">
<property name="suffix">
<string>cbar</string>
</property>
@@ -2839,21 +2463,21 @@
<number>16</number>
</property>
<property name="maximum">
- <number>21</number>
+ <number>19</number>
</property>
<property name="value">
<number>19</number>
</property>
</widget>
</item>
- <item row="3" column="2">
+ <item row="4" column="2">
<widget class="QLabel">
<property name="text">
<string>pO₂ max</string>
</property>
</widget>
</item>
- <item row="4" column="2">
+ <item row="5" column="2">
<widget class="QLabel">
<property name="text">
<string>pO₂ min</string>
@@ -3941,6 +3565,382 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="page_vyper">
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QTabWidget" name="tabWidget2">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="basicSettings2">
+ <attribute name="title">
+ <string>Basic settings</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="1" colspan="2">
+ <widget class="QDoubleSpinBox" name="maxDepthDoubleSpinBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="maximum">
+ <double>200.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Safety level</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="altitudeRangeComboBox">
+ <item>
+ <property name="text">
+ <string notr="true">A0 (0m - 300m)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">A1 (300m - 1500m)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">A2 (1500m - 3000m)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Altitude range</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Model</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2">
+ <widget class="QLineEdit" name="customTextLlineEdit_1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maxLength">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Number of dives</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Serial No.</string>
+ </property>
+ <property name="buddy">
+ <cstring>serialNoLineEdit_1</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <widget class="QLineEdit" name="serialNoLineEdit_1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Firmware version</string>
+ </property>
+ <property name="buddy">
+ <cstring>firmwareVersionLineEdit_1</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QLineEdit" name="firmwareVersionLineEdit_1">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Max. depth</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="numberOfDivesSpinBox">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="maximum">
+ <number>5000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Custom text</string>
+ </property>
+ <property name="buddy">
+ <cstring>customTextLlineEdit_1</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QComboBox" name="diveModeComboBox_1">
+ <item>
+ <property name="text">
+ <string notr="true" extracomment="Suunto computer mode">Air</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true" extracomment="Suunto computer mode">Nitrox</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true" extracomment="Suunto computer mode">Gauge</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QComboBox" name="personalSafetyComboBox">
+ <item>
+ <property name="text">
+ <string extracomment="Suunto safety level">P0 (none)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string extracomment="Suunto safety level">P1 (medium)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string extracomment="Suunto safety level">P2 (high)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Sample rate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="samplingRateComboBox_1">
+ <item>
+ <property name="text">
+ <string>10s</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>20s</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>30s</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>60s</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Total dive time</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Computer model</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="QLineEdit" name="modelLineEdit_1">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QSpinBox" name="totalTimeSpinBox">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="suffix">
+ <string>min</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>5000000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QComboBox" name="timeFormatComboBox">
+ <item>
+ <property name="text">
+ <string>24h</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>12h</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Time format</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel">
+ <property name="text">
+ <string>Units</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QComboBox" name="unitsComboBox_1">
+ <item>
+ <property name="text">
+ <string>Imperial</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Metric</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="4" column="4">
+ <widget class="QSpinBox" name="lightSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="suffix">
+ <string>s</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="3">
+ <widget class="QCheckBox" name="lightCheckBox">
+ <property name="text">
+ <string>Light</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="4">
+ <widget class="QDoubleSpinBox" name="alarmDepthDoubleSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="maximum">
+ <double>200.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="3">
+ <widget class="QCheckBox" name="alarmDepthCheckBox">
+ <property name="text">
+ <string>Depth alarm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="4">
+ <widget class="QSpinBox" name="alarmTimeSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="suffix">
+ <string>min</string>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="3">
+ <widget class="QCheckBox" name="alarmTimeCheckBox">
+ <property name="text">
+ <string>Time alarm</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</widget>
</item>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 20:56:52 +0000