From 5a4e1a55866ac943eecbd32c52583142d4e8921e Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 27 Apr 2017 21:21:00 +0200 Subject: Connect up all the OSTC4 common settings Connect up all the settings that are the same, and remove those who are not, and correct those who only are minor differences. Signed-off-by: Anton Lundin --- desktop-widgets/configuredivecomputerdialog.cpp | 28 -- desktop-widgets/configuredivecomputerdialog.ui | 381 +----------------------- 2 files changed, 9 insertions(+), 400 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 551bc1f91..db7249f83 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -792,17 +792,13 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC4() { deviceDetails->customText = ui.customTextLlineEdit_4->text(); deviceDetails->diveMode = ui.diveModeComboBox_4->currentIndex(); - deviceDetails->saturation = ui.saturationSpinBox_4->value(); - deviceDetails->desaturation = ui.desaturationSpinBox_4->value(); deviceDetails->lastDeco = ui.lastDecoSpinBox_4->value(); deviceDetails->brightness = ui.brightnessComboBox_4->currentIndex(); deviceDetails->units = ui.unitsComboBox_4->currentIndex(); - deviceDetails->samplingRate = ui.samplingRateComboBox_4->currentIndex(); deviceDetails->salinity = ui.salinitySpinBox_4->value(); deviceDetails->diveModeColor = ui.diveModeColour_4->currentIndex(); deviceDetails->language = ui.languageComboBox_4->currentIndex(); deviceDetails->dateFormat = ui.dateFormatComboBox_4->currentIndex(); - deviceDetails->compassGain = ui.compassGainComboBox_4->currentIndex(); deviceDetails->syncTime = ui.dateTimeSyncCheckBox_4->isChecked(); deviceDetails->safetyStop = ui.safetyStopCheckBox_4->isChecked(); deviceDetails->gfHigh = ui.gfHighSpinBox_4->value(); @@ -813,25 +809,15 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC4() deviceDetails->futureTTS = ui.futureTTSSpinBox_4->value(); deviceDetails->ccrMode = ui.ccrModeComboBox_4->currentIndex(); deviceDetails->decoType = ui.decoTypeComboBox_4->currentIndex(); - deviceDetails->aGFSelectable = ui.aGFSelectableCheckBox_4->isChecked(); deviceDetails->aGFHigh = ui.aGFHighSpinBox_4->value(); deviceDetails->aGFLow = ui.aGFLowSpinBox_4->value(); - deviceDetails->calibrationGas = ui.calibrationGasSpinBox_4->value(); - deviceDetails->flipScreen = ui.flipScreenCheckBox_4->isChecked(); deviceDetails->setPointFallback = ui.setPointFallbackCheckBox_4->isChecked(); - deviceDetails->leftButtonSensitivity = ui.leftButtonSensitivity_4->value(); - deviceDetails->rightButtonSensitivity = ui.rightButtonSensitivity_4->value(); deviceDetails->bottomGasConsumption = ui.bottomGasConsumption_4->value(); deviceDetails->decoGasConsumption = ui.decoGasConsumption_4->value(); - deviceDetails->modWarning = ui.modWarning_4->isChecked(); - deviceDetails->dynamicAscendRate = ui.dynamicAscendRate_4->isChecked(); - deviceDetails->graphicalSpeedIndicator = ui.graphicalSpeedIndicator_4->isChecked(); deviceDetails->alwaysShowppO2 = ui.alwaysShowppO2_4->isChecked(); deviceDetails->tempSensorOffset = lrint(ui.tempSensorOffsetDoubleSpinBox_4->value() * 10); deviceDetails->safetyStopLength = ui.safetyStopLengthSpinBox_4->value(); deviceDetails->safetyStopStartDepth = lrint(ui.safetyStopStartDepthDoubleSpinBox_4->value() * 10); - deviceDetails->safetyStopEndDepth = lrint(ui.safetyStopEndDepthDoubleSpinBox_4->value() * 10); - deviceDetails->safetyStopResetDepth = lrint(ui.safetyStopResetDepthDoubleSpinBox_4->value() * 10); //set gas values gas gas1; @@ -1312,17 +1298,13 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC4() ui.customTextLlineEdit_4->setText(deviceDetails->customText); ui.modelLineEdit_4->setText(deviceDetails->model); ui.diveModeComboBox_4->setCurrentIndex(deviceDetails->diveMode); - ui.saturationSpinBox_4->setValue(deviceDetails->saturation); - ui.desaturationSpinBox_4->setValue(deviceDetails->desaturation); ui.lastDecoSpinBox_4->setValue(deviceDetails->lastDeco); ui.brightnessComboBox_4->setCurrentIndex(deviceDetails->brightness); ui.unitsComboBox_4->setCurrentIndex(deviceDetails->units); - ui.samplingRateComboBox_4->setCurrentIndex(deviceDetails->samplingRate); ui.salinitySpinBox_4->setValue(deviceDetails->salinity); ui.diveModeColour_4->setCurrentIndex(deviceDetails->diveModeColor); ui.languageComboBox_4->setCurrentIndex(deviceDetails->language); ui.dateFormatComboBox_4->setCurrentIndex(deviceDetails->dateFormat); - ui.compassGainComboBox_4->setCurrentIndex(deviceDetails->compassGain); ui.safetyStopCheckBox_4->setChecked(deviceDetails->safetyStop); ui.gfHighSpinBox_4->setValue(deviceDetails->gfHigh); ui.gfLowSpinBox_4->setValue(deviceDetails->gfLow); @@ -1332,25 +1314,15 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC4() ui.futureTTSSpinBox_4->setValue(deviceDetails->futureTTS); ui.ccrModeComboBox_4->setCurrentIndex(deviceDetails->ccrMode); ui.decoTypeComboBox_4->setCurrentIndex(deviceDetails->decoType); - ui.aGFSelectableCheckBox_4->setChecked(deviceDetails->aGFSelectable); ui.aGFHighSpinBox_4->setValue(deviceDetails->aGFHigh); ui.aGFLowSpinBox_4->setValue(deviceDetails->aGFLow); - ui.calibrationGasSpinBox_4->setValue(deviceDetails->calibrationGas); - ui.flipScreenCheckBox_4->setChecked(deviceDetails->flipScreen); ui.setPointFallbackCheckBox_4->setChecked(deviceDetails->setPointFallback); - ui.leftButtonSensitivity_4->setValue(deviceDetails->leftButtonSensitivity); - ui.rightButtonSensitivity_4->setValue(deviceDetails->rightButtonSensitivity); ui.bottomGasConsumption_4->setValue(deviceDetails->bottomGasConsumption); ui.decoGasConsumption_4->setValue(deviceDetails->decoGasConsumption); - ui.modWarning_4->setChecked(deviceDetails->modWarning); - ui.dynamicAscendRate_4->setChecked(deviceDetails->dynamicAscendRate); - ui.graphicalSpeedIndicator_4->setChecked(deviceDetails->graphicalSpeedIndicator); ui.alwaysShowppO2_4->setChecked(deviceDetails->alwaysShowppO2); ui.tempSensorOffsetDoubleSpinBox_4->setValue((double)deviceDetails->tempSensorOffset / 10.0); ui.safetyStopLengthSpinBox_4->setValue(deviceDetails->safetyStopLength); ui.safetyStopStartDepthDoubleSpinBox_4->setValue(deviceDetails->safetyStopStartDepth / 10.0); - ui.safetyStopEndDepthDoubleSpinBox_4->setValue(deviceDetails->safetyStopEndDepth / 10.0); - ui.safetyStopResetDepthDoubleSpinBox_4->setValue(deviceDetails->safetyStopResetDepth / 10.0); //load gas 1 values ui.ostc4GasTable->setItem(0, 1, new QTableWidgetItem(QString::number(deviceDetails->gas1.oxygen))); diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index 1b6beae50..8757c3639 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -3064,56 +3064,6 @@ - - - - - 1 - 0 - - - - - 230LSB/Gauss - - - - - 330LSB/Gauss - - - - - 390LSB/Gauss - - - - - 440LSB/Gauss - - - - - 660LSB/Gauss - - - - - 820LSB/Gauss - - - - - 1090LSB/Gauss - - - - - 1370LSB/Gauss - - - - @@ -3140,16 +3090,6 @@ - - - - Compass gain - - - compassGainComboBox_4 - - - @@ -3208,30 +3148,6 @@ - - - - - 2s - - - - - 10s - - - - - - - - Sampling rate - - - samplingRateComboBox_4 - - - @@ -3280,13 +3196,6 @@ - - - - End Depth - - - @@ -3299,7 +3208,7 @@ 60 - 240 + 255 180 @@ -3320,13 +3229,6 @@ - - - - Reset Depth - - - @@ -3339,10 +3241,10 @@ 1 - 2.100000000000000 + 3.000000000000000 - 6.100000000000000 + 6.000000000000000 0.100000000000000 @@ -3352,50 +3254,6 @@ - - - - false - - - m - - - 1 - - - 1.900000000000000 - - - 3.000000000000000 - - - 2.900000000000000 - - - - - - - false - - - m - - - 1 - - - 8.100000000000000 - - - 15.100000000000000 - - - 10.100000000000000 - - - @@ -3403,27 +3261,13 @@ Advanced settings - - - - Left button sensitivity - - - - + Always show pO₂ - - - - Alt GF can be selected underwater - - - @@ -3484,32 +3328,6 @@ - - - - Desaturation - - - desaturationSpinBox_4 - - - - - - - % - - - 60 - - - 100 - - - 90 - - - @@ -3545,9 +3363,6 @@ - - false - % @@ -3590,6 +3405,11 @@ ZH-L16+GF + + + VPM + + @@ -3612,22 +3432,6 @@ - - - - % - - - 100 - - - 140 - - - 110 - - - @@ -3637,9 +3441,6 @@ - - false - % @@ -3661,51 +3462,6 @@ - - - - Saturation - - - saturationSpinBox_4 - - - - - - - Flip screen - - - - - - - Right button sensitivity - - - - - - - MOD warning - - - - - - - Graphical speed indicator - - - - - - - Dynamic ascent rate - - - @@ -3720,38 +3476,6 @@ - - - - % - - - 20 - - - 100 - - - 40 - - - - - - - % - - - 20 - - - 100 - - - 40 - - - @@ -4062,29 +3786,6 @@ - - - - O₂ in calibration gas - - - - - - - % - - - 21 - - - 100 - - - 21 - - - @@ -4457,38 +4158,6 @@ - - aGFSelectableCheckBox_4 - toggled(bool) - aGFHighSpinBox_4 - setEnabled(bool) - - - 340 - 229 - - - 686 - 265 - - - - - aGFSelectableCheckBox_4 - toggled(bool) - aGFLowSpinBox_4 - setEnabled(bool) - - - 340 - 229 - - - 686 - 229 - - - safetyStopCheckBox_4 toggled(bool) @@ -4521,37 +4190,5 @@ - - safetyStopCheckBox_4 - toggled(bool) - safetyStopEndDepthDoubleSpinBox_4 - setEnabled(bool) - - - 20 - 20 - - - 20 - 20 - - - - - safetyStopCheckBox_4 - toggled(bool) - safetyStopResetDepthDoubleSpinBox_4 - setEnabled(bool) - - - 20 - 20 - - - 20 - 20 - - - -- cgit v1.2.3-70-g09d2