From 353868e6ec729238f7195e85e60f12d6f405622b Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 27 Oct 2014 21:54:58 +0100 Subject: [PATCH] Change the OSTC3 copied ui to be sane for OSTC 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 Signed-off-by: Dirk Hohndel --- qt-ui/configuredivecomputerdialog.cpp | 43 +- qt-ui/configuredivecomputerdialog.ui | 645 ++++++++------------------ 2 files changed, 212 insertions(+), 476 deletions(-) diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index ed044f29f..dbd2ea110 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 fc45ff99b..f39c51478 100644 --- a/qt-ui/configuredivecomputerdialog.ui +++ b/qt-ui/configuredivecomputerdialog.ui @@ -1618,6 +1618,16 @@ Basic settings + + + + Salinity (0-5%) + + + salinitySpinBox + + + @@ -1676,169 +1686,12 @@ 0 - - - - - - Language - - - languageComboBox - - - - - - - - English - - - - - German - - - - - French - - - - - Italian - - - - - - - - Dive mode - - - diveModeComboBox - - - - - - - - OC - - - - - CC - - - - - Gauge - - - - - Apnea - - - - - - - - Date format - - - dateFormatComboBox - - - - - - - - MMDDYY - - - - - DDMMYY - - - - - YYMMDD - - - - - - - - Brightness - - - brightnessComboBox - - - - - - - - Eco - - - - - Medium - - - - - High - - - - - - - - Units - - - unitsComboBox + + 23 - - - - m/°C - - - - - ft/°F - - - - - - - - Salinity (0-5%) - - - salinitySpinBox - - - - % @@ -1846,69 +1699,12 @@ 5 - - - - - - Compass gain - - - compassGainComboBox + + 0.010000000000000 - - - - - 1 - 0 - - - - - 230LSB/Gauss - - - - - 330LSB/Gauss - - - - - 390LSB/Gauss - - - - - 440LSB/Gauss - - - - - 660LSB/Gauss - - - - - 820LSB/Gauss - - - - - 1090LSB/Gauss - - - - - 1370LSB/Gauss - - - - - + Qt::Vertical @@ -1921,7 +1717,73 @@ - + + + + Sync dive computer time with PC + + + + + + + Show safety stop + + + + + + + + MM/DD/YY + + + + + DD/MM/YY + + + + + YY/MM/DD + + + + + + + + Number of dives + + + + + + + true + + + + + + + + 0 + 0 + + + + 1 + + + 120 + + + 10 + + + + Sampling rate @@ -1931,65 +1793,13 @@ - - - - - 2s - - - - - 10s - - - - - - + + - Dive mode color + Date format - diveModeColour_3 - - - - - - - - Standard - - - - - Red - - - - - Green - - - - - Blue - - - - - - - - Sync dive computer time with PC - - - - - - - Show safety stop + dateFormatComboBox @@ -2014,59 +1824,6 @@ - - - - Pressure sensor offset - - - - - - - GFLow - - - - - - - % - - - 10 - - - 100 - - - 30 - - - - - - - GFHigh - - - - - - - % - - - 60 - - - 110 - - - 85 - - - @@ -2126,38 +1883,6 @@ - - - - false - - - % - - - 60 - - - 100 - - - 60 - - - - - - - mbar - - - -20 - - - 20 - - - @@ -2168,10 +1893,29 @@ + + + + false + + + % + + + 5 + + + 255 + + + 30 + + + - 1 + 4 @@ -2180,7 +1924,32 @@ - ZH-L16+GF + Gauge + + + + + ZH-L16 CC + + + + + Apnoe + + + + + L16-GF OC + + + + + L16-GF CC + + + + + PSCR-GF @@ -2211,6 +1980,13 @@ + + + + Alt GFLow + + + @@ -2220,13 +1996,20 @@ % - 70 + 5 - 120 + 255 - 85 + 90 + + + + + + + Alt GFHigh @@ -2240,24 +2023,49 @@ - - - - Alt GFLow + + + + % + + + 10 + + + 100 + + + 30 - - - - Alt GFHigh + + + + % + + + 60 + + + 110 + + + 85 - - + + - Flip screen + GFHigh + + + + + + + GFLow @@ -2438,7 +2246,7 @@ - + @@ -2461,16 +2269,6 @@ - - - - - - - - - - @@ -2501,66 +2299,9 @@ SP 3 - - - SP 4 - - - - - SP 5 - - - - - - O2 in calibration gas - - - - - - - % - - - 21 - - - 100 - - - 21 - - - - - - - - Fixed setpoint - - - - - Sensor - - - - - - - - Setpoint fallback - - - true - - - - + Qt::Vertical @@ -2573,7 +2314,7 @@ - + cbar @@ -2582,14 +2323,14 @@ 120 - 160 + 180 160 - + cbar @@ -2598,21 +2339,21 @@ 16 - 19 + 21 19 - + ppO2 max - + ppO2 min