Connect preferences to the rest of the code

The biggest problem here was that bool has different sizes in C and C++
code. So using this in a structure shared between the two sides wasn't a
smart idea.

Instead I went with 'short', but that caused problems with Qt being to
smart for its own good and not doing the right thing when dealing with
'boolean' settings and a short value. This may be something in the way I
implemented things (as I doubt that something this fundamental would be
broken) but the workaround implemented here (explicitly using 0 or 1
depending on the value of the boolean) seems to work.

I also decided to get rid of the confusion of where gflow/gfhigh are
floating point (0..1) and when they are integers (0..100). We now use
integers anywhere outside of deco.c.

I also applied some serious spelling corrections to the preferences
dialog's ui file.

Finally, this enables the code that selects which partial pressure graph
to show.

Still to do: font size, metric/imperial logic

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 69ffdb224..7ed4f8aeb 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -372,11 +372,11 @@ void MainWindow::readSettings()
 	GET_BOOL(v, "OTU", prefs.visible_cols.otu);
 	GET_BOOL(v, "MAXCNS", prefs.visible_cols.maxcns);
 	GET_BOOL(v, "SAC", prefs.visible_cols.sac);
+	settings.endGroup();
+	settings.beginGroup("TecDetails");
 	GET_BOOL(v, "po2graph", prefs.pp_graphs.po2);
 	GET_BOOL(v, "pn2graph", prefs.pp_graphs.pn2);
 	GET_BOOL(v, "phegraph", prefs.pp_graphs.phe);
-	settings.endGroup();
-	settings.beginGroup("TecDetails");
 	v = settings.value(QString("po2threshold"));
 	if (v.isValid())
 		prefs.pp_graphs.po2_threshold = v.toDouble();
@@ -392,14 +392,15 @@ void MainWindow::readSettings()
 		prefs.mod_ppO2 = v.toDouble();
 	GET_BOOL(v, "ead", prefs.ead);
 	GET_BOOL(v, "redceiling", prefs.profile_red_ceiling);
+	GET_BOOL(v, "show_dc_reported_ceiling", prefs.profile_dc_ceiling);
 	GET_BOOL(v, "calcceiling", prefs.profile_calc_ceiling);
 	GET_BOOL(v, "calcceiling3m", prefs.calc_ceiling_3m_incr);
 	v = settings.value(QString("gflow"));
 	if (v.isValid())
-		prefs.gflow = v.toInt() / 100.0;
+		prefs.gflow = v.toInt();
 	v = settings.value(QString("gfhigh"));
 	if (v.isValid())
-		prefs.gfhigh = v.toInt() / 100.0;
+		prefs.gfhigh = v.toInt();
 	set_gf(prefs.gflow, prefs.gfhigh);
 	settings.endGroup();
 
@@ -420,7 +421,9 @@ void MainWindow::readSettings()
 
 #define SAVE_VALUE(name, field)				\
 	if (prefs.field != default_prefs.field)		\
-		settings.setValue(name, prefs.field)
+		settings.setValue(name, prefs.field);	\
+	else						\
+		settings.remove(name)
 
 void MainWindow::writeSettings()
 {