mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Enable the configuration of more OSTC3 settings
This enables enables you to configure a couple of new settings in the OSTC3 devices. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin
Dirk Hohndel
parent
c69d5619ce
commit
37953d163e
6 changed files with 316 additions and 108 deletions
|
|
@ -432,6 +432,14 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC3()
|
|||
deviceDetails->calibrationGas = ui.calibrationGasSpinBox->value();
|
||||
deviceDetails->flipScreen = ui.flipScreenCheckBox->isChecked();
|
||||
deviceDetails->setPointFallback = ui.setPointFallbackCheckBox->isChecked();
|
||||
deviceDetails->leftButtonSensitivity = ui.leftButtonSensitivity->value();
|
||||
deviceDetails->rightButtonSensitivity = ui.rightButtonSensitivity->value();
|
||||
deviceDetails->bottomGasConsumption = ui.bottomGasConsumption->value();
|
||||
deviceDetails->decoGasConsumption = ui.decoGasConsumption->value();
|
||||
deviceDetails->modWarning = ui.modWarning->isChecked();
|
||||
deviceDetails->dynamicAscendRate = ui.dynamicAscendRate->isChecked();
|
||||
deviceDetails->graphicalSpeedIndicator = ui.graphicalSpeedIndicator->isChecked();
|
||||
deviceDetails->alwaysShowppO2 = ui.alwaysShowppO2->isChecked();
|
||||
|
||||
//set gas values
|
||||
gas gas1;
|
||||
|
|
@ -796,6 +804,14 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC3()
|
|||
ui.calibrationGasSpinBox->setValue(deviceDetails->calibrationGas);
|
||||
ui.flipScreenCheckBox->setChecked(deviceDetails->flipScreen);
|
||||
ui.setPointFallbackCheckBox->setChecked(deviceDetails->setPointFallback);
|
||||
ui.leftButtonSensitivity->setValue(deviceDetails->leftButtonSensitivity);
|
||||
ui.rightButtonSensitivity->setValue(deviceDetails->rightButtonSensitivity);
|
||||
ui.bottomGasConsumption->setValue(deviceDetails->bottomGasConsumption);
|
||||
ui.decoGasConsumption->setValue(deviceDetails->decoGasConsumption);
|
||||
ui.modWarning->setChecked(deviceDetails->modWarning);
|
||||
ui.dynamicAscendRate->setChecked(deviceDetails->dynamicAscendRate);
|
||||
ui.graphicalSpeedIndicator->setChecked(deviceDetails->graphicalSpeedIndicator);
|
||||
ui.alwaysShowppO2->setChecked(deviceDetails->alwaysShowppO2);
|
||||
|
||||
//load gas 1 values
|
||||
ui.ostc3GasTable->setItem(0, 1, new QTableWidgetItem(QString::number(deviceDetails->gas1.oxygen)));
|
||||
|
|
|
|||
|
|
@ -224,6 +224,44 @@
|
|||
<string>Basic settings</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="1" 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="5" 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">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
|
|
@ -297,40 +335,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" 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="2" 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="2" column="1">
|
||||
<widget class="QComboBox" name="diveModeComboBox">
|
||||
<item>
|
||||
|
|
@ -355,13 +359,13 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Date format</string>
|
||||
<string>Dive mode</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>dateFormatComboBox</cstring>
|
||||
<cstring>diveModeComboBox</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -384,13 +388,13 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLabel" name="label_10">
|
||||
<item row="2" column="3">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Brightness</string>
|
||||
<string>Date format</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>brightnessComboBox</cstring>
|
||||
<cstring>dateFormatComboBox</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -413,6 +417,16 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLabel" name="label_10">
|
||||
<property name="text">
|
||||
<string>Brightness</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>brightnessComboBox</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="3">
|
||||
<widget class="QLabel" name="label_12">
|
||||
<property name="text">
|
||||
|
|
@ -423,20 +437,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" 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="6" column="3">
|
||||
<widget class="QLabel" name="label_14">
|
||||
<property name="text">
|
||||
|
|
@ -457,14 +457,18 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="3">
|
||||
<widget class="QLabel" name="label_15">
|
||||
<property name="text">
|
||||
<string>Compass gain</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>compassGainComboBox</cstring>
|
||||
</property>
|
||||
<item row="4" 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="4">
|
||||
|
|
@ -540,30 +544,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" 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="5" column="0">
|
||||
<widget class="QLabel" name="label_13">
|
||||
<property name="text">
|
||||
<string>Dive mode color</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>diveModeColour</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QComboBox" name="diveModeColour">
|
||||
<item>
|
||||
|
|
@ -595,6 +575,16 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label_13">
|
||||
<property name="text">
|
||||
<string>Dive mode color</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>diveModeColour</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0" colspan="3">
|
||||
<widget class="QCheckBox" name="safetyStopCheckBox">
|
||||
<property name="text">
|
||||
|
|
@ -612,6 +602,16 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="3">
|
||||
<widget class="QLabel" name="label_15">
|
||||
<property name="text">
|
||||
<string>Compass gain</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>compassGainComboBox</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="advancedSettings">
|
||||
|
|
@ -619,6 +619,20 @@
|
|||
<string>Advanced settings</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout1">
|
||||
<item row="10" column="3">
|
||||
<widget class="QLabel" name="label_43">
|
||||
<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 ppO2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="aGFSelectableCheckBox">
|
||||
<property name="text">
|
||||
|
|
@ -712,7 +726,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="0">
|
||||
<item row="14" column="0">
|
||||
<spacer name="verticalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
|
|
@ -777,16 +791,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="futureTTSSpinBox">
|
||||
<property name="suffix">
|
||||
<string> min</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>9</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="decoTypeComboBox">
|
||||
<property name="currentIndex">
|
||||
|
|
@ -804,6 +808,16 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="futureTTSSpinBox">
|
||||
<property name="suffix">
|
||||
<string> min</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>9</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="text">
|
||||
|
|
@ -830,6 +844,13 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QLabel" name="label_36">
|
||||
<property name="text">
|
||||
<string>Alt GFLow</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="4">
|
||||
<widget class="QSpinBox" name="aGFHighSpinBox">
|
||||
<property name="enabled">
|
||||
|
|
@ -849,6 +870,13 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="3">
|
||||
<widget class="QLabel" name="label_37">
|
||||
<property name="text">
|
||||
<string>Alt GFHigh</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="3">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
|
|
@ -859,24 +887,116 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QLabel" name="label_36">
|
||||
<item row="6" column="0">
|
||||
<widget class="QCheckBox" name="flipScreenCheckBox">
|
||||
<property name="text">
|
||||
<string>Alt GFLow</string>
|
||||
<string>Flip screen</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="3">
|
||||
<widget class="QLabel" name="label_37">
|
||||
<item row="11" column="3">
|
||||
<widget class="QLabel" name="label_44">
|
||||
<property name="text">
|
||||
<string>Alt GFHigh</string>
|
||||
<string>Right button sensitivity</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<widget class="QCheckBox" name="flipScreenCheckBox">
|
||||
<widget class="QCheckBox" name="modWarning">
|
||||
<property name="text">
|
||||
<string>Flip screen</string>
|
||||
<string>Mod warning</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>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="dynamicAscendRate">
|
||||
<property name="text">
|
||||
<string>Dynamic acend rate</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="3">
|
||||
<widget class="QLabel" name="label_46">
|
||||
<property name="text">
|
||||
<string>Bottom gas consumption</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="3">
|
||||
<widget class="QLabel" name="label_48">
|
||||
<property name="text">
|
||||
<string>Deco gas consumption</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="4">
|
||||
<widget class="QSpinBox" name="leftButtonSensitivity">
|
||||
<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="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="bottomGasConsumption">
|
||||
<property name="suffix">
|
||||
<string> l/m</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>50</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>20</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="4">
|
||||
<widget class="QSpinBox" name="decoGasConsumption">
|
||||
<property name="suffix">
|
||||
<string> l/m</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>50</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>20</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue