diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-05-28 11:21:27 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-29 12:59:46 +0900 |
commit | 4f53ad736dc3e9942b12f4240b8c391b0100206b (patch) | |
tree | d0d98322b55fd8b2aef79dde8c77289c3cacaa43 /deco.c | |
parent | 8394828806baf050fa833402c969139d52dc221d (diff) | |
download | subsurface-4f53ad736dc3e9942b12f4240b8c391b0100206b.tar.gz |
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>
Diffstat (limited to 'deco.c')
-rw-r--r-- | deco.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -136,7 +136,7 @@ double add_segment(double pressure, const struct gasmix *gasmix, int period_in_s #if GF_LOW_AT_MAXDEPTH if (pressure > gf_low_pressure_this_dive) - gf_low_pressure_this_dive = pressure; + gf_low_pressure_this_dive = pressure; #endif if (ccpo2) { /* CC */ @@ -263,10 +263,10 @@ unsigned int deco_allowed_depth(double tissues_tolerance, double surface_pressur return depth; } -void set_gf(double gflow, double gfhigh) +void set_gf(short gflow, short gfhigh) { - if (gflow != -1.0) - buehlmann_config.gf_low = gflow; - if (gfhigh != -1.0) - buehlmann_config.gf_high = gfhigh; + if (gflow != -1) + buehlmann_config.gf_low = (double)gflow / 100.0; + if (gfhigh != -1) + buehlmann_config.gf_high = (double)gfhigh / 100.0; } |