mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use GFLow, GFHigh (not GFlow, GF Low, GF low).

Browse source
This commit is contained in:
Martin Měřinský 2017-03-13 07:09:06 +01:00 • committed by Dirk Hohndel
parent 71d48142ac
commit 3d89914633
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/user-manual.txt
View file

@ -3310,7 +3310,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page",align="center"]
[[GradientFactors_Ref]] [[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. 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. 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 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, *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_ 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 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_ 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 panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within
the planner), the new values are the planner), the new values are

4
Documentation/user-manual_fr.txt
View file

@ -3489,7 +3489,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"]
[[GradientFactors_Ref]] [[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. 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. 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 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, *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_ 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 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_ 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 panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within
the planner), the new values are the planner), the new values are

4
Documentation/user-manual_ru.txt
View file

@ -3312,9 +3312,9 @@ image::images/Pref3_f23.jpg["Рисунок: настройки профиля",
же, как вы настраиваете консерватизм вашего дайв-компьютера. Меньше значения же, как вы настраиваете консерватизм вашего дайв-компьютера. Меньше значения
градиент-фактора, тем консервативнее вычисления относительно азотного градиент-фактора, тем консервативнее вычисления относительно азотного
насыщения и тем глубже потолок всплытия. Установки 20/60 считаются достаточно насыщения и тем глубже потолок всплытия. Установки 20/60 считаются достаточно
консервативными, а значения 70/90 достаточно суровы. Если в поле *GF Low на консервативными, а значения 70/90 достаточно суровы. Если в поле *GFLow на
макс. глубине* стоит галочка, значение нижнего градиент-фактора будет макс. глубине* стоит галочка, значение нижнего градиент-фактора будет
использоваться на максимальной глубине. В противном случае GF Low будет использоваться на максимальной глубине. В противном случае GFLow будет
использоваться на всех глубинах ниже первой деко-остановки. Больше информации использоваться на всех глубинах ниже первой деко-остановки. Больше информации
вы можете найти по ссылкам: вы можете найти по ссылкам:

4
core/planner.c
View file

@ -815,7 +815,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
/* Print the settings for the diveplan next. */ /* Print the settings for the diveplan next. */
if (decoMode() == BUEHLMANN){ 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); diveplan->gflow, diveplan->gfhigh);
} else if (decoMode() == VPMB){ } else if (decoMode() == VPMB){
int temp_len; int temp_len;
@ -828,7 +828,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
, diveplan->eff_gfhigh); , diveplan->eff_gfhigh);
} else if (decoMode() == RECREATIONAL){ } 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); diveplan->gflow, diveplan->gfhigh);
} }
len += snprintf(buffer + len, sz_buffer - len, "<div>%s<br>",temp); len += snprintf(buffer + len, sz_buffer - len, "<div>%s<br>",temp);

4
desktop-widgets/plannerSettings.ui
View file

@ -340,7 +340,7 @@
<item row="8" column="1"> <item row="8" column="1">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>GF low</string> <string>GFLow</string>
</property> </property>
<property name="indent"> <property name="indent">
<number>26</number> <number>26</number>
@ -357,7 +357,7 @@
<item row="9" column="1"> <item row="9" column="1">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="text"> <property name="text">
<string>GF high</string> <string>GFHigh</string>
</property> </property>
<property name="indent"> <property name="indent">
<number>25</number> <number>25</number>