[PATCH 3/8] Change the salinity setting for OSTC

[Anton Lundin]

On the OSTC's the salinity is in kg/l and is stored as kg/l * 100

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 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 dbd2ea1..a97d1db 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 f39c514..6571837 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>
-- 
1.9.1