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, 7 insertions, 7 deletions

diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index bf244e9e9..060c36b51 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -429,7 +429,7 @@ void ProfileGraphicsView::plot_pp_gas_profile()
 	setup_pp_limits(&gc);
 	QColor c;
 	QPointF from, to;
-	//if (prefs.pp_graphs.pn2) {
+	if (prefs.pp_graphs.pn2) {
 		c = profile_color[PN2].first();
 		entry = pi->entry;
 		from = QPointF(SCALEGC(entry->sec, entry->pn2));
@@ -465,9 +465,9 @@ void ProfileGraphicsView::plot_pp_gas_profile()
 				from = QPointF(SCALEGC(entry->sec, entry->pn2));
 			}
 		}
-	//}
+	}
 
-	//if (prefs.pp_graphs.phe) {
+	if (prefs.pp_graphs.phe) {
 		c = profile_color[PHE].first();
 		entry = pi->entry;
 
@@ -504,8 +504,8 @@ void ProfileGraphicsView::plot_pp_gas_profile()
 				from = QPointF(SCALEGC(entry->sec, entry->phe));
 			}
 		}
-	//}
-	//if (prefs.pp_graphs.po2) {
+	}
+	if (prefs.pp_graphs.po2) {
 		c = profile_color[PO2].first();
 		entry = pi->entry;
 		from = QPointF(SCALEGC(entry->sec, entry->po2));
@@ -539,7 +539,7 @@ void ProfileGraphicsView::plot_pp_gas_profile()
 				from = QPointF(SCALEGC(entry->sec, entry->po2));
 			}
 		}
-	//}
+	}
 }
 
 void ProfileGraphicsView::plot_deco_text()
@@ -549,7 +549,7 @@ void ProfileGraphicsView::plot_deco_text()
 		float y = gc.topy = 1.0;
 		static text_render_options_t tro = {PRESSURE_TEXT_SIZE, PRESSURE_TEXT, CENTER, -0.2};
 		gc.bottomy = 0.0;
-		plot_text(&tro, QPointF(x, y), QString("GF %1/%2").arg(prefs.gflow * 100).arg(prefs.gfhigh * 100));
+		plot_text(&tro, QPointF(x, y), QString("GF %1/%2").arg(prefs.gflow).arg(prefs.gfhigh));
 	}
 }