mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change the salinity setting for OSTC

Browse source 
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>
This commit is contained in:
Anton Lundin 2014-10-27 21:54:59 +01:00 • committed by Dirk Hohndel
parent 353868e6ec
commit 29ee1896a4
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/configuredivecomputerdialog.cpp
View file

@ -349,7 +349,7 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC()
deviceDetails->setDesaturation(ui.desaturationSpinBox_3->value()); deviceDetails->setDesaturation(ui.desaturationSpinBox_3->value());
deviceDetails->setLastDeco(ui.lastDecoSpinBox_3->value()); deviceDetails->setLastDeco(ui.lastDecoSpinBox_3->value());
deviceDetails->setSamplingRate(ui.samplingRateSpinBox_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->setDateFormat(ui.dateFormatComboBox_3->currentIndex());
deviceDetails->setSyncTime(ui.dateTimeSyncCheckBox_3->isChecked()); deviceDetails->setSyncTime(ui.dateTimeSyncCheckBox_3->isChecked());
deviceDetails->setSafetyStop(ui.safetyStopCheckBox_3->isChecked()); deviceDetails->setSafetyStop(ui.safetyStopCheckBox_3->isChecked());
@ -707,7 +707,7 @@ setNumberOfDives
ui.desaturationSpinBox_3->setValue(deviceDetails->desaturation()); ui.desaturationSpinBox_3->setValue(deviceDetails->desaturation());
ui.lastDecoSpinBox_3->setValue(deviceDetails->lastDeco()); ui.lastDecoSpinBox_3->setValue(deviceDetails->lastDeco());
ui.samplingRateSpinBox_3->setValue(deviceDetails->samplingRate()); 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.dateFormatComboBox_3->setCurrentIndex(deviceDetails->dateFormat());
ui.safetyStopCheckBox_3->setChecked(deviceDetails->safetyStop()); ui.safetyStopCheckBox_3->setChecked(deviceDetails->safetyStop());
ui.gfHighSpinBox_3->setValue(deviceDetails->gfHigh()); ui.gfHighSpinBox_3->setValue(deviceDetails->gfHigh());

11
qt-ui/configuredivecomputerdialog.ui
View file

@ -1621,7 +1621,7 @@
<item row="5" column="3"> <item row="5" column="3">
<widget class="QLabel" name="label_45"> <widget class="QLabel" name="label_45">
<property name="text"> <property name="text">
<string>Salinity (0-5%)</string> <string>Salinity</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>salinitySpinBox</cstring> <cstring>salinitySpinBox</cstring>
@ -1692,12 +1692,15 @@
</widget> </widget>
</item> </item>
<item row="5" column="4"> <item row="5" column="4">
<widget class="QSpinBox" name="salinitySpinBox_3"> <widget class="QDoubleSpinBox" name="salinityDoubleSpinBox_3">
<property name="suffix"> <property name="suffix">
<string>%</string> <string>kg/l</string>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>5</number> <double>1.040000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.010000000000000</double> <double>0.010000000000000</double>