diff options
author | Martin Měřinský <mermar@centrum.cz> | 2017-03-13 07:09:06 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-03-13 10:28:06 -0700 |
commit | 3d89914633574efd379cf6c5ce007e664ca636d5 (patch) | |
tree | b07734df378076f93bd0be06915cb63f0e9a58a2 | |
parent | 71d48142acde8ecb1c9d2b742e6bd3dfa0672ef5 (diff) | |
download | subsurface-3d89914633574efd379cf6c5ce007e664ca636d5.tar.gz |
Use GFLow, GFHigh (not GFlow, GF Low, GF low).
-rw-r--r-- | Documentation/user-manual.txt | 4 | ||||
-rw-r--r-- | Documentation/user-manual_fr.txt | 4 | ||||
-rw-r--r-- | Documentation/user-manual_ru.txt | 4 | ||||
-rw-r--r-- | core/planner.c | 4 | ||||
-rw-r--r-- | desktop-widgets/plannerSettings.ui | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 66d23b124..63887a0d5 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3310,7 +3310,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page",align="center"] [[GradientFactors_Ref]] -*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating the deco ceiling following +*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating the deco ceiling following the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a @@ -3573,7 +3573,7 @@ These dives are planned in three stages: *a) Nitrogen management*: This is done by specifying the rates for descent and ascent, as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_ to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B -model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFhigh and GFlow +model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFHigh and GFLow need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_ panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within the planner), the new values are diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 14adde3f0..0579483d4 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -3489,7 +3489,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"] [[GradientFactors_Ref]] -*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating the deco ceiling following +*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating the deco ceiling following the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a @@ -3777,7 +3777,7 @@ using multiple breathing gases. These dives are planned in three stages: *a) Nitrogen management*: This is done by specifying the rates for descent and ascent, as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_ to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B -model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFhigh and GFlow +model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFHigh and GFLow need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_ panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within the planner), the new values are diff --git a/Documentation/user-manual_ru.txt b/Documentation/user-manual_ru.txt index 8645bfeea..5161314a8 100644 --- a/Documentation/user-manual_ru.txt +++ b/Documentation/user-manual_ru.txt @@ -3312,9 +3312,9 @@ image::images/Pref3_f23.jpg["Рисунок: настройки профиля", же, как вы настраиваете консерватизм вашего дайв-компьютера. Меньше значения градиент-фактора, тем консервативнее вычисления относительно азотного насыщения и тем глубже потолок всплытия. Установки 20/60 считаются достаточно - консервативными, а значения 70/90 достаточно суровы. Если в поле *GF Low на + консервативными, а значения 70/90 достаточно суровы. Если в поле *GFLow на макс. глубине* стоит галочка, значение нижнего градиент-фактора будет - использоваться на максимальной глубине. В противном случае GF Low будет + использоваться на максимальной глубине. В противном случае GFLow будет использоваться на всех глубинах ниже первой деко-остановки. Больше информации вы можете найти по ссылкам: diff --git a/core/planner.c b/core/planner.c index 90fe6294a..1564643d9 100644 --- a/core/planner.c +++ b/core/planner.c @@ -815,7 +815,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool /* Print the settings for the diveplan next. */ if (decoMode() == BUEHLMANN){ - snprintf(temp, sz_temp, translate("gettextFromC", "Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d"), + snprintf(temp, sz_temp, translate("gettextFromC", "Deco model: Bühlmann ZHL-16C with GFLow = %d and GFHigh = %d"), diveplan->gflow, diveplan->gfhigh); } else if (decoMode() == VPMB){ int temp_len; @@ -828,7 +828,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool , diveplan->eff_gfhigh); } else if (decoMode() == RECREATIONAL){ - snprintf(temp, sz_temp, translate("gettextFromC", "Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"), + snprintf(temp, sz_temp, translate("gettextFromC", "Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d and GFHigh = %d"), diveplan->gflow, diveplan->gfhigh); } len += snprintf(buffer + len, sz_buffer - len, "<div>%s<br>",temp); diff --git a/desktop-widgets/plannerSettings.ui b/desktop-widgets/plannerSettings.ui index 90331bdf6..f1eddb70a 100644 --- a/desktop-widgets/plannerSettings.ui +++ b/desktop-widgets/plannerSettings.ui @@ -340,7 +340,7 @@ <item row="8" column="1"> <widget class="QLabel" name="label_15"> <property name="text"> - <string>GF low</string> + <string>GFLow</string> </property> <property name="indent"> <number>26</number> @@ -357,7 +357,7 @@ <item row="9" column="1"> <widget class="QLabel" name="label_16"> <property name="text"> - <string>GF high</string> + <string>GFHigh</string> </property> <property name="indent"> <number>25</number> |