mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Implement OSTC4 specific settings
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin
Dirk Hohndel
parent
5a4e1a5586
commit
f14ad7f183
5 changed files with 142 additions and 35 deletions
|
|
@ -811,9 +811,12 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC4()
|
|||
deviceDetails->decoType = ui.decoTypeComboBox_4->currentIndex();
|
||||
deviceDetails->aGFHigh = ui.aGFHighSpinBox_4->value();
|
||||
deviceDetails->aGFLow = ui.aGFLowSpinBox_4->value();
|
||||
deviceDetails->vpmConservatism = ui.vpmConservatismSpinBox->value();
|
||||
deviceDetails->setPointFallback = ui.setPointFallbackCheckBox_4->isChecked();
|
||||
deviceDetails->buttonSensitivity = ui.buttonSensitivity_4->value();
|
||||
deviceDetails->bottomGasConsumption = ui.bottomGasConsumption_4->value();
|
||||
deviceDetails->decoGasConsumption = ui.decoGasConsumption_4->value();
|
||||
deviceDetails->travelGasConsumption = ui.travelGasConsumption_4->value();
|
||||
deviceDetails->alwaysShowppO2 = ui.alwaysShowppO2_4->isChecked();
|
||||
deviceDetails->tempSensorOffset = lrint(ui.tempSensorOffsetDoubleSpinBox_4->value() * 10);
|
||||
deviceDetails->safetyStopLength = ui.safetyStopLengthSpinBox_4->value();
|
||||
|
|
@ -1316,9 +1319,12 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC4()
|
|||
ui.decoTypeComboBox_4->setCurrentIndex(deviceDetails->decoType);
|
||||
ui.aGFHighSpinBox_4->setValue(deviceDetails->aGFHigh);
|
||||
ui.aGFLowSpinBox_4->setValue(deviceDetails->aGFLow);
|
||||
ui.vpmConservatismSpinBox->setValue(deviceDetails->vpmConservatism);
|
||||
ui.setPointFallbackCheckBox_4->setChecked(deviceDetails->setPointFallback);
|
||||
ui.buttonSensitivity_4->setValue(deviceDetails->buttonSensitivity);
|
||||
ui.bottomGasConsumption_4->setValue(deviceDetails->bottomGasConsumption);
|
||||
ui.decoGasConsumption_4->setValue(deviceDetails->decoGasConsumption);
|
||||
ui.travelGasConsumption_4->setValue(deviceDetails->travelGasConsumption);
|
||||
ui.alwaysShowppO2_4->setChecked(deviceDetails->alwaysShowppO2);
|
||||
ui.tempSensorOffsetDoubleSpinBox_4->setValue((double)deviceDetails->tempSensorOffset / 10.0);
|
||||
ui.safetyStopLengthSpinBox_4->setValue(deviceDetails->safetyStopLength);
|
||||
|
|
|
|||
|
|
@ -3261,14 +3261,37 @@
|
|||
<string>Advanced settings</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_8">
|
||||
<item row="12" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="alwaysShowppO2_4">
|
||||
<item row="12" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Always show pO₂</string>
|
||||
<string>Travel gas consumption</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<item row="11" column="4">
|
||||
<widget class="QSpinBox" name="buttonSensitivity_4">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>50</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>100</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>70</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="11" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Button sensitivity</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Future TTS</string>
|
||||
|
|
@ -3282,14 +3305,14 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<item row="2" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>GFLow</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<item row="2" column="4">
|
||||
<widget class="QSpinBox" name="gfLowSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
|
|
@ -3305,14 +3328,14 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<item row="3" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>GFHigh</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="4">
|
||||
<item row="3" column="4">
|
||||
<widget class="QSpinBox" name="gfHighSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
|
|
@ -3328,20 +3351,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="0">
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="3" column="1">
|
||||
<widget class="QSpinBox" name="lastDecoSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string> m</string>
|
||||
|
|
@ -3361,7 +3371,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="4">
|
||||
<item row="4" column="4">
|
||||
<widget class="QSpinBox" name="aGFLowSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
|
|
@ -3412,7 +3422,7 @@
|
|||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QSpinBox" name="futureTTSSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string> min</string>
|
||||
|
|
@ -3422,7 +3432,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Last deco</string>
|
||||
|
|
@ -3432,14 +3442,14 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<item row="4" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Alt GFLow</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="4">
|
||||
<item row="7" column="4">
|
||||
<widget class="QSpinBox" name="aGFHighSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string>%</string>
|
||||
|
|
@ -3455,21 +3465,21 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="3">
|
||||
<item row="7" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Alt GFHigh</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="3">
|
||||
<item row="13" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Bottom gas consumption</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="3">
|
||||
<item row="14" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Deco gas consumption</string>
|
||||
|
|
@ -3477,7 +3487,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="12" column="4">
|
||||
<widget class="QSpinBox" name="bottomGasConsumption_4">
|
||||
<widget class="QSpinBox" name="travelGasConsumption_4">
|
||||
<property name="suffix">
|
||||
<string> ℓ/min</string>
|
||||
</property>
|
||||
|
|
@ -3493,6 +3503,22 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="13" column="4">
|
||||
<widget class="QSpinBox" name="bottomGasConsumption_4">
|
||||
<property name="suffix">
|
||||
<string> ℓ/min</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="14" column="4">
|
||||
<widget class="QSpinBox" name="decoGasConsumption_4">
|
||||
<property name="suffix">
|
||||
<string> ℓ/min</string>
|
||||
|
|
@ -3508,14 +3534,54 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="3">
|
||||
<item row="16" column="0">
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QCheckBox" name="alwaysShowppO2_4">
|
||||
<property name="text">
|
||||
<string>Always show pO₂</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>VPM conservatism</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="vpmConservatismSpinBox">
|
||||
<property name="prefix">
|
||||
<string>+</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QLabel">
|
||||
<property name="text">
|
||||
<string>Temperature sensor offset</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="4">
|
||||
<item row="1" column="4">
|
||||
<widget class="QDoubleSpinBox" name="tempSensorOffsetDoubleSpinBox_4">
|
||||
<property name="suffix">
|
||||
<string>°C</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue