diff options
| -rw-r--r-- | planner.c | 48 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 5 |
2 files changed, 10 insertions, 43 deletions
@@ -24,7 +24,7 @@ int decostoplevels[] = { 0, 3000, 6000, 9000, 12000, 15000, 18000, 21000, 24000, 180000, 190000, 200000, 220000, 240000, 260000, 280000, 300000, 320000, 340000, 360000, 380000 }; double plangflow, plangfhigh; -bool plan_verbatim = false, plan_display_runtime = true, plan_display_duration = false, plan_display_transitions = false; +bool plan_verbatim, plan_display_runtime, plan_display_duration, plan_display_transitions; const char *disclaimer; @@ -66,34 +66,6 @@ bool diveplan_empty(struct diveplan *diveplan) return true; } -void set_last_stop(bool last_stop_6m) -{ - if (last_stop_6m == true) - decostoplevels[1] = 6000; - else - decostoplevels[1] = 3000; -} - -void set_verbatim(bool verbatim) -{ - plan_verbatim = verbatim; -} - -void set_display_runtime(bool display) -{ - plan_display_runtime = display; -} - -void set_display_duration(bool display) -{ - plan_display_duration = display; -} - -void set_display_transitions(bool display) -{ - plan_display_transitions = display; -} - /* get the gas at a certain time during the dive */ void get_gas_at_time(struct dive *dive, struct divecomputer *dc, duration_t time, struct gasmix *gas) { @@ -528,6 +500,11 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool bool gaschange_before; struct divedatapoint *nextdp = NULL; + plan_verbatim = prefs.verbatim_plan; + plan_display_runtime = prefs.display_runtime; + plan_display_duration = prefs.display_duration; + plan_display_transitions = prefs.display_transitions; + disclaimer = translate("gettextFromC", "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN " "ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS " "RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO " @@ -906,16 +883,11 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool diveplan->surface_pressure = SURFACE_PRESSURE; create_dive_from_plan(diveplan, is_planner); - if (prefs.verbatim_plan) - plan_verbatim = true; - if (prefs.display_runtime) - plan_display_runtime = true; - if (prefs.display_duration) - plan_display_duration = true; - if (prefs.display_transitions) - plan_display_transitions = true; - if (prefs.last_stop) + if (prefs.last_stop) { decostoplevels[1] = 6000; + } else { + decostoplevels[1] = 3000; + } /* Let's start at the last 'sample', i.e. the last manually entered waypoint. */ sample = &displayed_dive.dc.sample[displayed_dive.dc.samples - 1]; diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index e28b4d146..439e7a4de 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -416,35 +416,30 @@ int DivePlannerPointsModel::getSurfacePressure() void DivePlannerPointsModel::setLastStop6m(bool value) { - set_last_stop(value); prefs.last_stop = value; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setVerbatim(bool value) { - set_verbatim(value); prefs.verbatim_plan = value; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDisplayRuntime(bool value) { - set_display_runtime(value); prefs.display_runtime = value; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDisplayDuration(bool value) { - set_display_duration(value); prefs.display_duration = value; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDisplayTransitions(bool value) { - set_display_transitions(value); prefs.display_transitions = value; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } |