From 29ee1896a4272627e52740b36b5a63e1cad50dd7 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 27 Oct 2014 21:54:59 +0100 Subject: [PATCH] Change the salinity setting for OSTC On the OSTC's the salinity is in kg/l and is stored as kg/l * 100 Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- qt-ui/configuredivecomputerdialog.cpp | 4 ++-- qt-ui/configuredivecomputerdialog.ui | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index dbd2ea110..a97d1dbde 100644 --- a/qt-ui/configuredivecomputerdialog.cpp +++ b/qt-ui/configuredivecomputerdialog.cpp @@ -349,7 +349,7 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC() deviceDetails->setDesaturation(ui.desaturationSpinBox_3->value()); deviceDetails->setLastDeco(ui.lastDecoSpinBox_3->value()); deviceDetails->setSamplingRate(ui.samplingRateSpinBox_3->value()); - deviceDetails->setSalinity(ui.salinitySpinBox_3->value()); + deviceDetails->setSalinity(ui.salinityDoubleSpinBox_3->value() * 100); deviceDetails->setDateFormat(ui.dateFormatComboBox_3->currentIndex()); deviceDetails->setSyncTime(ui.dateTimeSyncCheckBox_3->isChecked()); deviceDetails->setSafetyStop(ui.safetyStopCheckBox_3->isChecked()); @@ -707,7 +707,7 @@ setNumberOfDives ui.desaturationSpinBox_3->setValue(deviceDetails->desaturation()); ui.lastDecoSpinBox_3->setValue(deviceDetails->lastDeco()); ui.samplingRateSpinBox_3->setValue(deviceDetails->samplingRate()); - ui.salinitySpinBox_3->setValue(deviceDetails->salinity()); + ui.salinityDoubleSpinBox_3->setValue((double) deviceDetails->salinity() / 100.0); ui.dateFormatComboBox_3->setCurrentIndex(deviceDetails->dateFormat()); ui.safetyStopCheckBox_3->setChecked(deviceDetails->safetyStop()); ui.gfHighSpinBox_3->setValue(deviceDetails->gfHigh()); diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui index f39c51478..657183771 100644 --- a/qt-ui/configuredivecomputerdialog.ui +++ b/qt-ui/configuredivecomputerdialog.ui @@ -1621,7 +1621,7 @@ - Salinity (0-5%) + Salinity salinitySpinBox @@ -1692,12 +1692,15 @@ - + - % + kg/l + + + 1.000000000000000 - 5 + 1.040000000000000 0.010000000000000