diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-10-27 21:54:59 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-27 14:40:51 -0700 |
| commit | 29ee1896a4272627e52740b36b5a63e1cad50dd7 (patch) | |
| tree | faad3cb469d0542ae2b388115b4e2ea376bcdb93 /qt-ui | |
| parent | 353868e6ec729238f7195e85e60f12d6f405622b (diff) | |
| download | subsurface-29ee1896a4272627e52740b36b5a63e1cad50dd7.tar.gz | |
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 <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/configuredivecomputerdialog.cpp | 4 | ||||
| -rw-r--r-- | 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 @@ <item row="5" column="3"> <widget class="QLabel" name="label_45"> <property name="text"> - <string>Salinity (0-5%)</string> + <string>Salinity</string> </property> <property name="buddy"> <cstring>salinitySpinBox</cstring> @@ -1692,12 +1692,15 @@ </widget> </item> <item row="5" column="4"> - <widget class="QSpinBox" name="salinitySpinBox_3"> + <widget class="QDoubleSpinBox" name="salinityDoubleSpinBox_3"> <property name="suffix"> - <string>%</string> + <string>kg/l</string> + </property> + <property name="minimum"> + <double>1.000000000000000</double> </property> <property name="maximum"> - <number>5</number> + <double>1.040000000000000</double> </property> <property name="singleStep"> <double>0.010000000000000</double> |