From 612aa6a9803ef7e2ecdb4115c2b9b09d868f7443 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 7 Jul 2015 10:07:13 +0200 Subject: [PATCH 1/4] Planner: update disclamer Update the disclamer text to reflect which algorithm where used. Signed-off-by: Joakim Bygdell --- planner.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/planner.c b/planner.c index 8569fc9..cd01849 100644 --- a/planner.c +++ b/planner.c @@ -513,10 +513,18 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool 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 " - "PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."); + if (prefs.deco_mode == BUEHLMANN){ + 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 " + "PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."); + } + else if (prefs.deco_mode == VPMB){ + disclaimer = translate("gettextFromC", "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE VPM-B " + "ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS " + "RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO " + "PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."); + } if (!dp) return; @@ -531,8 +539,14 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool } len = show_disclaimer ? snprintf(buffer, sizeof(buffer), "
%s

", disclaimer) : 0; - snprintf(temp, sizeof(temp), translate("gettextFromC", "based on GFlow = %d and GFhigh = %d"), - diveplan->gflow, diveplan->gfhigh); + if (prefs.deco_mode == BUEHLMANN){ + snprintf(temp, sizeof(temp), translate("gettextFromC", "based on Bühlmann ZHL-16b with GFlow = %d and GFhigh = %d"), + diveplan->gflow, diveplan->gfhigh); + } + else if (prefs.deco_mode == VPMB){ + snprintf(temp, sizeof(temp), translate("gettextFromC", "based on VPM-B"), + diveplan->gflow, diveplan->gfhigh); + } len += snprintf(buffer + len, sizeof(buffer) - len, "
%s
%s

", translate("gettextFromC", "Subsurface dive plan"), temp); -- 2.3.2 (Apple Git-55)