[PATCH 2/8] Change the OSTC3 copied ui to be sane for OSTC
Anton Lundin
glance at acc.umu.se
Mon Oct 27 13:54:58 PDT 2014
The OSTC supports a bit different functionalities than the OSTC3 does.
The "unsupported" bits are
setBrightness
setCalibrationGas
setCompassGain
setDiveMode - Bult into setDecoType (OC/CCR)
setDiveModeColor - Lots of different colors
setFlipScreen
setLanguage - Controlled via flashing different firmwares
setPressureSensorOffset
setUnits
setSetPointFallback
setCcrMode - there are some ppO2 reading functionality in the fist gen
OSTC that we don't care about, and the rest is controlled
via choosing a CCR deco algorithm
Also the OSTC have a notion of number of dives it has done, so this adds
ui for that value.
There are also differences in how some values are handled. Ex the OSTC
don't have fixed samplerates that you can choose between. You can rather
just set your sample rate to X seconds.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
qt-ui/configuredivecomputerdialog.cpp | 43 ++-
qt-ui/configuredivecomputerdialog.ui | 597 ++++++++++------------------------
2 files changed, 188 insertions(+), 452 deletions(-)
diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index ed044f2..dbd2ea1 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -345,34 +345,23 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC3()
void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC()
{
deviceDetails->setCustomText(ui.customTextLlineEdit_3->text());
- deviceDetails->setDiveMode(ui.diveModeComboBox_3->currentIndex());
deviceDetails->setSaturation(ui.saturationSpinBox_3->value());
deviceDetails->setDesaturation(ui.desaturationSpinBox_3->value());
deviceDetails->setLastDeco(ui.lastDecoSpinBox_3->value());
- deviceDetails->setBrightness(ui.brightnessComboBox_3->currentIndex());
- deviceDetails->setUnits(ui.unitsComboBox_3->currentIndex());
- deviceDetails->setSamplingRate(ui.samplingRateComboBox_3->currentIndex());
+ deviceDetails->setSamplingRate(ui.samplingRateSpinBox_3->value());
deviceDetails->setSalinity(ui.salinitySpinBox_3->value());
- deviceDetails->setDiveModeColor(ui.diveModeColour_3->currentIndex());
- deviceDetails->setLanguage(ui.languageComboBox_3->currentIndex());
deviceDetails->setDateFormat(ui.dateFormatComboBox_3->currentIndex());
- deviceDetails->setCompassGain(ui.compassGainComboBox_3->currentIndex());
deviceDetails->setSyncTime(ui.dateTimeSyncCheckBox_3->isChecked());
deviceDetails->setSafetyStop(ui.safetyStopCheckBox_3->isChecked());
deviceDetails->setGfHigh(ui.gfHighSpinBox_3->value());
deviceDetails->setGfLow(ui.gfLowSpinBox_3->value());
- deviceDetails->setPressureSensorOffset(ui.pressureSensorOffsetSpinBox_3->value());
deviceDetails->setPpO2Min(ui.ppO2MinSpinBox_3->value());
deviceDetails->setPpO2Max(ui.ppO2MaxSpinBox_3->value());
deviceDetails->setFutureTTS(ui.futureTTSSpinBox_3->value());
- deviceDetails->setCcrMode(ui.ccrModeComboBox_3->currentIndex());
deviceDetails->setDecoType(ui.decoTypeComboBox_3->currentIndex());
deviceDetails->setAGFSelectable(ui.aGFSelectableCheckBox_3->isChecked());
deviceDetails->setAGFHigh(ui.aGFHighSpinBox_3->value());
deviceDetails->setAGFLow(ui.aGFLowSpinBox_3->value());
- deviceDetails->setCalibrationGas(ui.calibrationGasSpinBox_3->value());
- deviceDetails->setFlipScreen(ui.flipScreenCheckBox_3->isChecked());
- deviceDetails->setSetPointFallback(ui.setPointFallbackCheckBox_3->isChecked());
//set gas values
gas gas1;
@@ -695,36 +684,42 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC3()
void ConfigureDiveComputerDialog::reloadValuesOSTC()
{
+/*
+# Not in OSTC
+setBrightness
+setCalibrationGas
+setCompassGain
+setDiveMode - Bult into setDecoType
+setDiveModeColor - Lots of different colors
+setFlipScreen
+setLanguage
+setPressureSensorOffset
+setUnits
+setSetPointFallback
+setCcrMode
+# Not in OSTC3
+setNumberOfDives
+*/
ui.serialNoLineEdit_3->setText(deviceDetails->serialNo());
ui.firmwareVersionLineEdit_3->setText(deviceDetails->firmwareVersion());
ui.customTextLlineEdit_3->setText(deviceDetails->customText());
- ui.diveModeComboBox_3->setCurrentIndex(deviceDetails->diveMode());
ui.saturationSpinBox_3->setValue(deviceDetails->saturation());
ui.desaturationSpinBox_3->setValue(deviceDetails->desaturation());
ui.lastDecoSpinBox_3->setValue(deviceDetails->lastDeco());
- ui.brightnessComboBox_3->setCurrentIndex(deviceDetails->brightness());
- ui.unitsComboBox_3->setCurrentIndex(deviceDetails->units());
- ui.samplingRateComboBox_3->setCurrentIndex(deviceDetails->samplingRate());
+ ui.samplingRateSpinBox_3->setValue(deviceDetails->samplingRate());
ui.salinitySpinBox_3->setValue(deviceDetails->salinity());
- ui.diveModeColour_3->setCurrentIndex(deviceDetails->diveModeColor());
- ui.languageComboBox_3->setCurrentIndex(deviceDetails->language());
ui.dateFormatComboBox_3->setCurrentIndex(deviceDetails->dateFormat());
- ui.compassGainComboBox_3->setCurrentIndex(deviceDetails->compassGain());
ui.safetyStopCheckBox_3->setChecked(deviceDetails->safetyStop());
ui.gfHighSpinBox_3->setValue(deviceDetails->gfHigh());
ui.gfLowSpinBox_3->setValue(deviceDetails->gfLow());
- ui.pressureSensorOffsetSpinBox_3->setValue(deviceDetails->pressureSensorOffset());
ui.ppO2MinSpinBox_3->setValue(deviceDetails->ppO2Min());
ui.ppO2MaxSpinBox_3->setValue(deviceDetails->ppO2Max());
ui.futureTTSSpinBox_3->setValue(deviceDetails->futureTTS());
- ui.ccrModeComboBox_3->setCurrentIndex(deviceDetails->ccrMode());
ui.decoTypeComboBox_3->setCurrentIndex(deviceDetails->decoType());
ui.aGFSelectableCheckBox_3->setChecked(deviceDetails->aGFSelectable());
ui.aGFHighSpinBox_3->setValue(deviceDetails->aGFHigh());
ui.aGFLowSpinBox_3->setValue(deviceDetails->aGFLow());
- ui.calibrationGasSpinBox_3->setValue(deviceDetails->calibrationGas());
- ui.flipScreenCheckBox_3->setChecked(deviceDetails->flipScreen());
- ui.setPointFallbackCheckBox_3->setChecked(deviceDetails->setPointFallback());
+ ui.numberOfDivesSpinBox_3->setValue(deviceDetails->numberOfDives());
//load gas 1 values
ui.ostcGasTable->setItem(0,1, new QTableWidgetItem(QString::number(deviceDetails->gas1().oxygen)));
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index fc45ff9..f39c514 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -1618,6 +1618,16 @@
<string>Basic settings</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
+ <item row="5" column="3">
+ <widget class="QLabel" name="label_45">
+ <property name="text">
+ <string>Salinity (0-5%)</string>
+ </property>
+ <property name="buddy">
+ <cstring>salinitySpinBox</cstring>
+ </property>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
@@ -1676,83 +1686,48 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="maxLength">
+ <number>23</number>
+ </property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QLabel" name="label_41">
- <property name="text">
- <string>Language</string>
+ <item row="5" column="4">
+ <widget class="QSpinBox" name="salinitySpinBox_3">
+ <property name="suffix">
+ <string>%</string>
</property>
- <property name="buddy">
- <cstring>languageComboBox</cstring>
+ <property name="maximum">
+ <number>5</number>
+ </property>
+ <property name="singleStep">
+ <double>0.010000000000000</double>
</property>
</widget>
</item>
- <item row="1" column="4">
- <widget class="QComboBox" name="languageComboBox_3">
- <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>
+ <item row="7" column="2">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="buddy">
- <cstring>diveModeComboBox</cstring>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>177</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="2" column="1">
- <widget class="QComboBox" name="diveModeComboBox_3">
- <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>
+ <item row="5" column="0" colspan="3">
+ <widget class="QCheckBox" name="dateTimeSyncCheckBox_3">
+ <property name="text">
+ <string>Sync dive computer time with PC</string>
+ </property>
</widget>
</item>
- <item row="2" column="3">
- <widget class="QLabel" name="label_42">
+ <item row="6" column="0" colspan="3">
+ <widget class="QCheckBox" name="safetyStopCheckBox_3">
<property name="text">
- <string>Date format</string>
- </property>
- <property name="buddy">
- <cstring>dateFormatComboBox</cstring>
+ <string>Show safety stop</string>
</property>
</widget>
</item>
@@ -1760,168 +1735,55 @@
<widget class="QComboBox" name="dateFormatComboBox_3">
<item>
<property name="text">
- <string>MMDDYY</string>
+ <string>MM/DD/YY</string>
</property>
</item>
<item>
<property name="text">
- <string>DDMMYY</string>
+ <string>DD/MM/YY</string>
</property>
</item>
<item>
<property name="text">
- <string>YYMMDD</string>
+ <string>YY/MM/DD</string>
</property>
</item>
</widget>
</item>
- <item row="4" column="3">
- <widget class="QLabel" name="label_43">
+ <item row="1" column="3">
+ <widget class="QLabel" name="label_41">
<property name="text">
- <string>Brightness</string>
- </property>
- <property name="buddy">
- <cstring>brightnessComboBox</cstring>
+ <string>Number of dives</string>
</property>
</widget>
</item>
- <item row="4" column="4">
- <widget class="QComboBox" name="brightnessComboBox_3">
- <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="5" column="3">
- <widget class="QLabel" name="label_44">
- <property name="text">
- <string>Units</string>
- </property>
- <property name="buddy">
- <cstring>unitsComboBox</cstring>
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="numberOfDivesSpinBox_3">
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="5" column="4">
- <widget class="QComboBox" name="unitsComboBox_3">
- <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_45">
- <property name="text">
- <string>Salinity (0-5%)</string>
- </property>
- <property name="buddy">
- <cstring>salinitySpinBox</cstring>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="samplingRateSpinBox_3">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="6" column="4">
- <widget class="QSpinBox" name="salinitySpinBox_3">
- <property name="suffix">
- <string>%</string>
+ <property name="minimum">
+ <number>1</number>
</property>
<property name="maximum">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item row="7" column="3">
- <widget class="QLabel" name="label_46">
- <property name="text">
- <string>Compass gain</string>
- </property>
- <property name="buddy">
- <cstring>compassGainComboBox</cstring>
+ <number>120</number>
</property>
- </widget>
- </item>
- <item row="7" column="4">
- <widget class="QComboBox" name="compassGainComboBox_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="value">
+ <number>10</number>
</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="8" column="2">
- <spacer name="verticalSpacer">
- <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="4" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="label_47">
<property name="text">
<string>Sampling rate</string>
@@ -1931,65 +1793,13 @@
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QComboBox" name="samplingRateComboBox_3">
- <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_48">
- <property name="text">
- <string>Dive mode color</string>
- </property>
- <property name="buddy">
- <cstring>diveModeColour_3</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QComboBox" name="diveModeColour_3">
- <item>
- <property name="text">
- <string>Standard</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Red</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Green</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Blue</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="6" column="0" colspan="3">
- <widget class="QCheckBox" name="dateTimeSyncCheckBox_3">
- <property name="text">
- <string>Sync dive computer time with PC</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="3">
- <widget class="QCheckBox" name="safetyStopCheckBox_3">
+ <item row="2" column="3">
+ <widget class="QLabel" name="label_42">
<property name="text">
- <string>Show safety stop</string>
+ <string>Date format</string>
+ </property>
+ <property name="buddy">
+ <cstring>dateFormatComboBox</cstring>
</property>
</widget>
</item>
@@ -2014,59 +1824,6 @@
</property>
</widget>
</item>
- <item row="0" column="3">
- <widget class="QLabel" name="label_50">
- <property name="text">
- <string>Pressure sensor offset</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QLabel" name="label_51">
- <property name="text">
- <string>GFLow</string>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QSpinBox" name="gfLowSpinBox_3">
- <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" name="label_52">
- <property name="text">
- <string>GFHigh</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QSpinBox" name="gfHighSpinBox_3">
- <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" name="label_53">
<property name="text">
@@ -2126,6 +1883,16 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="futureTTSSpinBox_3">
+ <property name="suffix">
+ <string> min</string>
+ </property>
+ <property name="maximum">
+ <number>9</number>
+ </property>
+ </widget>
+ </item>
<item row="3" column="4">
<widget class="QSpinBox" name="aGFLowSpinBox_3">
<property name="enabled">
@@ -2135,43 +1902,20 @@
<string>%</string>
</property>
<property name="minimum">
- <number>60</number>
+ <number>5</number>
</property>
<property name="maximum">
- <number>100</number>
+ <number>255</number>
</property>
<property name="value">
- <number>60</number>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QSpinBox" name="pressureSensorOffsetSpinBox_3">
- <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="1" column="1">
- <widget class="QSpinBox" name="futureTTSSpinBox_3">
- <property name="suffix">
- <string> min</string>
- </property>
- <property name="maximum">
- <number>9</number>
+ <number>30</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="decoTypeComboBox_3">
<property name="currentIndex">
- <number>1</number>
+ <number>4</number>
</property>
<item>
<property name="text">
@@ -2180,7 +1924,32 @@
</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>Apnoe</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>
@@ -2211,6 +1980,13 @@
</property>
</widget>
</item>
+ <item row="3" column="3">
+ <widget class="QLabel" name="label_57">
+ <property name="text">
+ <string>Alt GFLow</string>
+ </property>
+ </widget>
+ </item>
<item row="6" column="4">
<widget class="QSpinBox" name="aGFHighSpinBox_3">
<property name="enabled">
@@ -2220,13 +1996,20 @@
<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>
+ <item row="6" column="3">
+ <widget class="QLabel" name="label_58">
+ <property name="text">
+ <string>Alt GFHigh</string>
</property>
</widget>
</item>
@@ -2240,24 +2023,49 @@
</property>
</widget>
</item>
- <item row="3" column="3">
- <widget class="QLabel" name="label_57">
- <property name="text">
- <string>Alt GFLow</string>
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="gfLowSpinBox_3">
+ <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="6" column="3">
- <widget class="QLabel" name="label_58">
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="gfHighSpinBox_3">
+ <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="2" column="3">
+ <widget class="QLabel" name="label_52">
<property name="text">
- <string>Alt GFHigh</string>
+ <string>GFHigh</string>
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QCheckBox" name="flipScreenCheckBox_3">
+ <item row="1" column="3">
+ <widget class="QLabel" name="label_51">
<property name="text">
- <string>Flip screen</string>
+ <string>GFLow</string>
</property>
</widget>
</item>
@@ -2438,7 +2246,7 @@
</item>
</widget>
</item>
- <item row="2" column="0" rowspan="5" colspan="2">
+ <item row="2" column="0" rowspan="4" colspan="2">
<widget class="QTableWidget" name="ostcSetPointTable">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -2461,16 +2269,6 @@
<string/>
</property>
</row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
<column>
<property name="text">
<string/>
@@ -2501,66 +2299,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" name="label_59">
- <property name="text">
- <string>O2 in calibration gas</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QSpinBox" name="calibrationGasSpinBox_3">
- <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_3">
- <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_3">
- <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 name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -2573,7 +2314,7 @@
</property>
</spacer>
</item>
- <item row="4" column="3">
+ <item row="3" column="3">
<widget class="QSpinBox" name="ppO2MaxSpinBox_3">
<property name="suffix">
<string> cbar</string>
@@ -2582,14 +2323,14 @@
<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">
+ <item row="4" column="3">
<widget class="QSpinBox" name="ppO2MinSpinBox_3">
<property name="suffix">
<string> cbar</string>
@@ -2598,21 +2339,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" name="label_60">
<property name="text">
<string>ppO2 max</string>
</property>
</widget>
</item>
- <item row="5" column="2">
+ <item row="4" column="2">
<widget class="QLabel" name="label_61">
<property name="text">
<string>ppO2 min</string>
--
1.9.1
More information about the subsurface
mailing list