From 6d0c0ad5ac5fb92da5f84895c6ad4386945eaf30 Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" <helling@atdotde.de>
Date: Sat, 10 Jan 2015 23:32:36 +0100
Subject: [PATCH 5/7] Add preferences field for default set-point

Signed-off-by: Robert C. Helling <helling@atdotde.de>
---
 qt-ui/preferences.cpp |  7 ++++++-
 qt-ui/preferences.ui  | 29 ++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index 32237ae..7e71865 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -1,6 +1,7 @@
 #include "preferences.h"
 #include "mainwindow.h"
 #include <QSettings>
+#include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QShortcut>
@@ -42,6 +43,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial
 	connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
 	connect(ui.gflow, SIGNAL(valueChanged(int)), this, SLOT(gflowChanged(int)));
 	connect(ui.gfhigh, SIGNAL(valueChanged(int)), this, SLOT(gfhighChanged(int)));
+//	connect(ui.defaultSetpoint, SIGNAL(valueChanged(double)), this, SLOT(defaultSetpointChanged(double)));
 	QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
 	connect(close, SIGNAL(activated()), this, SLOT(close()));
 	QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this);
@@ -96,6 +98,7 @@ void PreferencesDialog::setUiFromPrefs()
 	ui.gfhigh->setValue(prefs.gfhigh);
 	ui.gf_low_at_maxdepth->setChecked(prefs.gf_low_at_maxdepth);
 	ui.show_ccr_setpoint->setChecked(prefs.show_ccr_setpoint);
+	ui.defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0);
 
 	// units
 	if (prefs.unit_system == METRIC)
@@ -270,6 +273,7 @@ void PreferencesDialog::syncSettings()
 	s.setValue("default_filename", ui.defaultfilename->text());
 	s.setValue("default_cylinder", ui.default_cylinder->currentText());
 	s.setValue("use_default_file", ui.btnUseDefaultFile->isChecked());
+	s.setValue("defaultsetpoint", (int) (ui.defaultSetpoint->value() * 1000.0));
 	s.endGroup();
 
 	s.beginGroup("Display");
@@ -312,7 +316,7 @@ void PreferencesDialog::syncSettings()
 
 void PreferencesDialog::loadSettings()
 {
-	// This code was on the mainwindow, it should belong nowhere, but since we dind't
+	// This code was on the mainwindow, it should belong nowhere, but since we didn't
 	// correctly fixed this code yet ( too much stuff on the code calling preferences )
 	// force this here.
 
@@ -374,6 +378,7 @@ void PreferencesDialog::loadSettings()
 	GET_TXT("default_filename", default_filename);
 	GET_TXT("default_cylinder", default_cylinder);
 	GET_BOOL("use_default_file", use_default_file);
+	GET_INT("defaultsetpoint", defaultsetpoint);
 	s.endGroup();
 
 	s.beginGroup("Display");
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index b716efa..65075b0 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -151,7 +151,7 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>5</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="page_2">
         <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -782,7 +782,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="0" colspan="2">
+            <item row="3" column="0" colspan="2">
              <widget class="QCheckBox" name="gf_low_at_maxdepth">
               <property name="text">
                <string>GFLow at max depth</string>
@@ -796,6 +796,29 @@
               </property>
              </widget>
             </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_26">
+              <property name="text">
+               <string>Default CCR set-point</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QDoubleSpinBox" name="defaultSetpoint">
+              <property name="suffix">
+               <string>bar</string>
+              </property>
+              <property name="decimals">
+               <number>2</number>
+              </property>
+              <property name="maximum">
+               <double>10.000000000000000</double>
+              </property>
+              <property name="singleStep">
+               <double>0.100000000000000</double>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
@@ -1394,7 +1417,7 @@
   <buttongroup name="buttonGroup_3"/>
   <buttongroup name="buttonGroup_4"/>
   <buttongroup name="buttonGroup_5"/>
-  <buttongroup name="buttonGroup_6"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_6"/>
  </buttongroups>
 </ui>
-- 
1.9.3 (Apple Git-50)