From fecabc59551cbca71a88bae59f12f85d0d190ca3 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 2 Apr 2015 10:32:14 +0200 Subject: [PATCH 1/2] Checkbox and preference for safety stop Signed-off-by: Robert C. Helling --- planner.c | 2 +- pref.h | 1 + qt-ui/diveplanner.cpp | 10 ++++++++++ qt-ui/diveplanner.h | 1 + qt-ui/plannerSettings.ui | 28 +++++++++++++++++++--------- subsurfacestartup.c | 1 + 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/planner.c b/planner.c index 7e5504a..c7bc889 100644 --- a/planner.c +++ b/planner.c @@ -905,7 +905,7 @@ int plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool s bottom_time = clock = previous_point_time = displayed_dive.dc.sample[displayed_dive.dc.samples - 1].time.seconds; gi = gaschangenr - 1; if(prefs.recreational_mode) { - bool safety_stop = true; + bool safety_stop = prefs.safetystop; // How long can we stay at the current depth and still directly ascent to the surface? while (trial_ascent(depth, 0, avg_depth, bottom_time, tissue_tolerance, &displayed_dive.cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0)) { diff --git a/pref.h b/pref.h index 56fc79b..14cc57c 100644 --- a/pref.h +++ b/pref.h @@ -79,6 +79,7 @@ struct preferences { bool display_duration; bool display_transitions; bool recreational_mode; + bool safetystop; int bottomsac; int decosac; int o2consumption; // ml per min diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 2338109..6ded50d 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -395,6 +395,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) prefs.display_runtime = s.value("display_runtime", prefs.display_runtime).toBool(); prefs.display_transitions = s.value("display_transitions", prefs.display_transitions).toBool(); prefs.recreational_mode = s.value("recreational_mode", prefs.recreational_mode).toBool(); + prefs.safetystop = s.value("safetystop", prefs.safetystop).toBool(); prefs.ascrate75 = s.value("ascrate75", prefs.ascrate75).toInt(); prefs.ascrate50 = s.value("ascrate50", prefs.ascrate50).toInt(); prefs.ascratestops = s.value("ascratestops", prefs.ascratestops).toInt(); @@ -417,6 +418,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) ui.display_runtime->setChecked(prefs.display_runtime); ui.display_transitions->setChecked(prefs.display_transitions); ui.recreational_mode->setChecked(prefs.recreational_mode); + ui.safetystop->setChecked(prefs.safetystop); ui.bottompo2->setValue(prefs.bottompo2 / 1000.0); ui.decopo2->setValue(prefs.decopo2 / 1000.0); ui.backgasBreaks->setChecked(prefs.doo2breaks); @@ -430,6 +432,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.display_duration, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayDuration(bool))); connect(ui.display_runtime, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayRuntime(bool))); connect(ui.display_transitions, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayTransitions(bool))); + connect(ui.safetystop, SIGNAL(toggled(bool)), plannerModel, SLOT(setSafetyStop(bool))); connect(ui.recreational_mode, SIGNAL(toggled(bool)), plannerModel, SLOT(setRecreationalMode(bool))); connect(ui.ascRate75, SIGNAL(valueChanged(int)), this, SLOT(setAscRate75(int))); connect(ui.ascRate75, SIGNAL(valueChanged(int)), plannerModel, SLOT(emitDataChanged())); @@ -479,6 +482,7 @@ PlannerSettingsWidget::~PlannerSettingsWidget() s.setValue("display_runtime", prefs.display_runtime); s.setValue("display_transitions", prefs.display_transitions); s.setValue("recreational_mode", prefs.recreational_mode); + s.setValue("safetystop", prefs.safetystop); s.setValue("ascrate75", prefs.ascrate75); s.setValue("ascrate50", prefs.ascrate50); s.setValue("ascratestops", prefs.ascratestops); @@ -876,6 +880,12 @@ void DivePlannerPointsModel::setRecreationalMode(bool value) emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS -1)); } +void DivePlannerPointsModel::setSafetyStop(bool value) +{ + prefs.safetystop = value; + emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS -1)); +} + void DivePlannerPointsModel::setDropStoneMode(bool value) { prefs.drop_stone_mode = value; diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index eed481c..a4752b5 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -83,6 +83,7 @@ slots: void setDisplayDuration(bool value); void setDisplayTransitions(bool value); void setRecreationalMode(bool value); + void setSafetyStop(bool value); void savePlan(); void saveDuplicatePlan(); void remove(const QModelIndex &index); diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 09f019e..961dce9 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -262,21 +262,21 @@ 2 - + GF high - + Plan backgas breaks - + % @@ -289,14 +289,14 @@ - + Last stop at 6m - + @@ -306,7 +306,7 @@ - + % @@ -319,14 +319,14 @@ - + Drop to first depth - + Qt::Vertical @@ -339,7 +339,7 @@ - + GF low @@ -353,6 +353,16 @@ + + + + Safety stop + + + false + + + diff --git a/subsurfacestartup.c b/subsurfacestartup.c index 09858f9..a5415c7 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -51,6 +51,7 @@ struct preferences default_prefs = { .display_duration = true, .display_transitions = true, .recreational_mode = false, + .safetystop = true, .bottomsac = 20000, .decosac = 17000, .o2consumption = 720, -- 1.9.5 (Apple Git-50.3)