A3XX: PFD, FMGC, FADEC bugfixes
This commit is contained in:
Joshua Davidson
parent
42fa4f19c2
commit
2414a1dc15
7 changed files with 232 additions and 238 deletions
|
|
@ -497,22 +497,56 @@ var canvas_PFD_base = {
|
|||
me.middleAltText = roundaboutAlt(me.altitude / 100);
|
||||
me.middleAltOffset = nil;
|
||||
if (me.altOffset > 0.5) {
|
||||
me.middleAltOffset = -(me.altOffset - 1) * 486.6856;
|
||||
me.middleAltOffset = -(me.altOffset - 1) * 243.3424;
|
||||
} else {
|
||||
me.middleAltOffset = -me.altOffset * 486.6856;
|
||||
me.middleAltOffset = -me.altOffset * 243.3424;
|
||||
}
|
||||
me["ALT_scale"].setTranslation(0, -me.middleAltOffset);
|
||||
me["ALT_scale"].update();
|
||||
me["ALT_five"].setText(sprintf("%03d",me.middleAltText+10));
|
||||
me["ALT_four"].setText(sprintf("%03d",me.middleAltText+5));
|
||||
me["ALT_three"].setText(sprintf("%03d",me.middleAltText));
|
||||
me["ALT_two"].setText(sprintf("%03d",me.middleAltText-5));
|
||||
me["ALT_one"].setText(sprintf("%03d",me.middleAltText-10));
|
||||
me["ALT_five"].setText(sprintf("%03d", me.middleAltText+10));
|
||||
me["ALT_four"].setText(sprintf("%03d", me.middleAltText+5));
|
||||
me["ALT_three"].setText(sprintf("%03d", me.middleAltText));
|
||||
me["ALT_two"].setText(sprintf("%03d", me.middleAltText-5));
|
||||
me["ALT_one"].setText(sprintf("%03d", me.middleAltText-10));
|
||||
|
||||
me["ALT_digits"].setText(sprintf("%s", getprop("/instrumentation/altimeter/indicated-altitude-ft-pfd")));
|
||||
altTens = num(right(sprintf("%02d", getprop("/instrumentation/altimeter/indicated-altitude-ft")), 2));
|
||||
me["ALT_tens"].setTranslation(0, altTens * 1.392);
|
||||
|
||||
if (getprop("/instrumentation/pfd/alt-diff") >= -565 and getprop("/instrumentation/pfd/alt-diff") <= 565) {
|
||||
me["ALT_target"].setTranslation(0, (getprop("/instrumentation/pfd/alt-diff") / 100) * -48.66856);
|
||||
me["ALT_target_digit"].setText(sprintf("%03d", math.round(getprop("/it-autoflight/internal/alt") / 100)));
|
||||
me["ALT_digit_UP"].hide();
|
||||
me["ALT_digit_DN"].hide();
|
||||
me["ALT_target"].show();
|
||||
} else if (getprop("/instrumentation/pfd/alt-diff") < -565) {
|
||||
if (getprop("/modes/altimeter/std") == 1) {
|
||||
if (getprop("/it-autoflight/internal/alt") < 10000) {
|
||||
me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100));
|
||||
} else {
|
||||
me["ALT_digit_DN"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100));
|
||||
}
|
||||
} else {
|
||||
me["ALT_digit_DN"].setText(sprintf("%5.0f", getprop("/it-autoflight/internal/alt")));
|
||||
}
|
||||
me["ALT_digit_DN"].show();
|
||||
me["ALT_digit_UP"].hide();
|
||||
me["ALT_target"].hide();
|
||||
} else if (getprop("/instrumentation/pfd/alt-diff") > 565) {
|
||||
if (getprop("/modes/altimeter/std") == 1) {
|
||||
if (getprop("/it-autoflight/internal/alt") < 10000) {
|
||||
me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100));
|
||||
} else {
|
||||
me["ALT_digit_UP"].setText(sprintf("%s", "FL " ~ getprop("/it-autoflight/internal/alt") / 100));
|
||||
}
|
||||
} else {
|
||||
me["ALT_digit_UP"].setText(sprintf("%5.0f", getprop("/it-autoflight/internal/alt")));
|
||||
}
|
||||
me["ALT_digit_UP"].show();
|
||||
me["ALT_digit_DN"].hide();
|
||||
me["ALT_target"].hide();
|
||||
}
|
||||
|
||||
# QNH
|
||||
if (getprop("/modes/altimeter/std") == 1) {
|
||||
me["QNH"].hide();
|
||||
|
|
@ -545,9 +579,9 @@ var canvas_PFD_base = {
|
|||
}
|
||||
|
||||
if (getprop("/it-autoflight/internal/vert-speed-fpm-pfd") < 10) {
|
||||
me["VS_digit"].setText(sprintf("%2.0f", "0" ~ getprop("/it-autoflight/internal/vert-speed-fpm-pfd")));
|
||||
me["VS_digit"].setText(sprintf("%02d", "0" ~ getprop("/it-autoflight/internal/vert-speed-fpm-pfd")));
|
||||
} else {
|
||||
me["VS_digit"].setText(sprintf("%2.0f", getprop("/it-autoflight/internal/vert-speed-fpm-pfd")));
|
||||
me["VS_digit"].setText(sprintf("%02d", getprop("/it-autoflight/internal/vert-speed-fpm-pfd")));
|
||||
}
|
||||
|
||||
# ILS
|
||||
|
|
@ -635,8 +669,9 @@ var canvas_PFD_1 = {
|
|||
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_ctr_msg","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd",
|
||||
"FMA_athr","FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box",
|
||||
"FMA_Middle1","FMA_Middle2","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","AI_center","AI_bank","AI_bank_lim","AI_slipskid","AI_horizon","AI_horizon_ground",
|
||||
"AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","FD_roll","FD_pitch","ALT_scale","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","VS_pointer","VS_box","VS_digit","QNH","QNH_setting","QNH_std",
|
||||
"QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale","HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","TRK_pointer"];
|
||||
"AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","FD_roll","FD_pitch","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP","ALT_digit_DN",
|
||||
"VS_pointer","VS_box","VS_digit","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale","HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L",
|
||||
"HDG_digit_R","TRK_pointer"];
|
||||
},
|
||||
update: func() {
|
||||
fd1 = getprop("/it-autoflight/output/fd1");
|
||||
|
|
@ -669,6 +704,7 @@ var canvas_PFD_1 = {
|
|||
me["LOC_scale"].hide();
|
||||
me["GS_scale"].hide();
|
||||
}
|
||||
|
||||
if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
|
||||
me["LOC_pointer"].show();
|
||||
} else {
|
||||
|
|
@ -695,8 +731,9 @@ var canvas_PFD_2 = {
|
|||
return ["FMA_man","FMA_manmode","FMA_flxtemp","FMA_thrust","FMA_lvrclb","FMA_pitch","FMA_pitcharm","FMA_pitcharm2","FMA_roll","FMA_rollarm","FMA_combined","FMA_ctr_msg","FMA_catmode","FMA_cattype","FMA_nodh","FMA_dh","FMA_dhn","FMA_ap","FMA_fd",
|
||||
"FMA_athr","FMA_man_box","FMA_flx_box","FMA_thrust_box","FMA_pitch_box","FMA_pitcharm_box","FMA_roll_box","FMA_rollarm_box","FMA_combined_box","FMA_catmode_box","FMA_cattype_box","FMA_cat_box","FMA_dh_box","FMA_ap_box","FMA_fd_box","FMA_athr_box",
|
||||
"FMA_Middle1","FMA_Middle2","ASI_scale","ASI_target","ASI_mach","ASI_mach_decimal","ASI_ten_sec","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP","ASI_decimal_DN","AI_center","AI_bank","AI_bank_lim","AI_slipskid","AI_horizon","AI_horizon_ground",
|
||||
"AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","FD_roll","FD_pitch","ALT_scale","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","VS_pointer","VS_box","VS_digit","QNH","QNH_setting","QNH_std",
|
||||
"QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale","HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L","HDG_digit_R","TRK_pointer"];
|
||||
"AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading","AI_agl_g","AI_agl","FD_roll","FD_pitch","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_digits","ALT_tens","ALT_digit_UP","ALT_digit_DN",
|
||||
"VS_pointer","VS_box","VS_digit","QNH","QNH_setting","QNH_std","QNH_box","LOC_pointer","LOC_scale","GS_scale","GS_pointer","CRS_pointer","HDG_target","HDG_scale","HDG_one","HDG_two","HDG_three","HDG_four","HDG_five","HDG_six","HDG_seven","HDG_digit_L",
|
||||
"HDG_digit_R","TRK_pointer"];
|
||||
},
|
||||
update: func() {
|
||||
fd1 = getprop("/it-autoflight/output/fd1");
|
||||
|
|
@ -729,6 +766,7 @@ var canvas_PFD_2 = {
|
|||
me["LOC_scale"].hide();
|
||||
me["GS_scale"].hide();
|
||||
}
|
||||
|
||||
if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
|
||||
me["LOC_pointer"].show();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@ Heading Tape:
|
|||
61.5885
|
||||
|
||||
98.5416 is 123.177 in 1024
|
||||
49.2708 is 61.5885 in 1024
|
||||
|
||||
Altitude Tape:
|
||||
608.357
|
||||
304.178
|
||||
60.8357
|
||||
|
||||
486.6856 is 608.357 in 1024
|
||||
243.3424 is 304.178 in 1024
|
||||
48.66856 is 60.8357 in 1024
|
||||
|
|
@ -41,9 +41,9 @@
|
|||
inkscape:window-height="1030"
|
||||
id="namedview371"
|
||||
showgrid="false"
|
||||
inkscape:zoom="8.0000002"
|
||||
inkscape:cx="277.58791"
|
||||
inkscape:cy="751.03677"
|
||||
inkscape:zoom="0.70710678"
|
||||
inkscape:cx="1034.8491"
|
||||
inkscape:cy="734.42739"
|
||||
inkscape:window-x="1592"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
|
|
@ -1048,6 +1048,14 @@
|
|||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<rect
|
||||
inkscape:label="#rect9211"
|
||||
y="237.03366"
|
||||
x="752.0592"
|
||||
height="552.00073"
|
||||
width="104.39759"
|
||||
id="ALT_target_clip"
|
||||
style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<g
|
||||
id="AI_horizon_ground"
|
||||
transform="translate(0,-97.082454)"
|
||||
|
|
@ -2042,115 +2050,36 @@
|
|||
inkscape:label="#rect9211" />
|
||||
<g
|
||||
id="ALT_scale"
|
||||
inkscape:label="#g5093"
|
||||
transform="translate(-683.2,486.68708)">
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,999.43812 -11.3041,0"
|
||||
id="path4903"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<text
|
||||
inkscape:label="#text975"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
id="ALT_one"
|
||||
y="965.3197"
|
||||
x="1562.5935"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75"
|
||||
y="965.3197"
|
||||
x="1562.5935"
|
||||
id="tspan4907"
|
||||
sodipodi:role="line">000</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="ccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4909"
|
||||
d="m 1439.2996,1007.4044 9.3792,-7.97458 -9.3788,-7.9742"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
inkscape:label="#g5036"
|
||||
transform="translate(-723.20023,0)">
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4911"
|
||||
d="m 1539.3052,512.75274 -11.3041,0"
|
||||
d="m 1579.3052,999.43982 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="1562.5935"
|
||||
y="501.1033"
|
||||
id="ALT_two"
|
||||
x="1604.5295"
|
||||
y="965.32141"
|
||||
id="ALT_one"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan4915"
|
||||
x="1562.5935"
|
||||
y="501.1033"
|
||||
x="1604.5295"
|
||||
y="965.32141"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000</tspan></text>
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1439.2996,520.71865 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
d="m 1479.2996,1007.4057 9.3792,-7.97457 -9.3788,-7.9742"
|
||||
id="path4917"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4919"
|
||||
d="m 1539.3052,950.76948 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,902.10092 -11.3041,0"
|
||||
id="path4921"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4923"
|
||||
d="m 1539.3052,853.43236 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,804.7638 -11.3041,0"
|
||||
id="path4925"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4927"
|
||||
d="m 1539.3052,756.09524 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,707.42668 -11.3041,0"
|
||||
id="path4929"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4931"
|
||||
d="m 1539.3052,658.75812 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,610.08956 -11.3041,0"
|
||||
id="path4933"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4935"
|
||||
d="m 1539.3052,561.421 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,26.067443 -11.3041,0"
|
||||
d="m 1579.3052,512.65602 -11.3041,0"
|
||||
id="path4937"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2158,24 +2087,24 @@
|
|||
inkscape:label="#text975"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
id="ALT_three"
|
||||
y="36.886917"
|
||||
x="1562.5935"
|
||||
y="501.10501"
|
||||
x="1604.5295"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75"
|
||||
y="36.886917"
|
||||
x="1562.5935"
|
||||
y="501.10501"
|
||||
x="1604.5295"
|
||||
id="tspan4941"
|
||||
sodipodi:role="line">000</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="ccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4943"
|
||||
d="m 1439.2996,34.033353 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
d="m 1479.2996,520.72043 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,464.08418 -11.3041,0"
|
||||
d="m 1579.3052,950.77126 -11.3041,0"
|
||||
id="path4945"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2183,11 +2112,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4947"
|
||||
d="m 1539.3052,415.41562 -11.3041,0"
|
||||
d="m 1579.3052,902.1027 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,366.74706 -11.3041,0"
|
||||
d="m 1579.3052,853.43414 -11.3041,0"
|
||||
id="path4949"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2195,11 +2124,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4951"
|
||||
d="m 1539.3052,318.0785 -11.3041,0"
|
||||
d="m 1579.3052,804.76558 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,269.40994 -11.3041,0"
|
||||
d="m 1579.3052,756.09702 -11.3041,0"
|
||||
id="path4953"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2207,11 +2136,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4955"
|
||||
d="m 1539.3052,220.74138 -11.3041,0"
|
||||
d="m 1579.3052,707.42846 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,172.07282 -11.3041,0"
|
||||
d="m 1579.3052,658.7599 -11.3041,0"
|
||||
id="path4957"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2219,11 +2148,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4959"
|
||||
d="m 1539.3052,123.40426 -11.3041,0"
|
||||
d="m 1579.3052,610.09134 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,74.735703 -11.3041,0"
|
||||
d="m 1579.3052,561.42278 -11.3041,0"
|
||||
id="path4961"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2231,24 +2160,24 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5031"
|
||||
d="m 1539.3052,-460.61777 -11.3041,0"
|
||||
d="m 1579.3052,26.06931 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="1562.5935"
|
||||
y="-427.32938"
|
||||
id="ALT_four"
|
||||
x="1604.5295"
|
||||
y="36.888714"
|
||||
id="ALT_five"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan5035"
|
||||
x="1562.5935"
|
||||
y="-427.32938"
|
||||
x="1604.5295"
|
||||
y="36.888714"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000</tspan></text>
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1439.2996,-452.65186 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
d="m 1479.2996,34.03522 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
id="path5037"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccc" />
|
||||
|
|
@ -2256,11 +2185,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5039"
|
||||
d="m 1539.3052,-22.601032 -11.3041,0"
|
||||
d="m 1579.3052,464.08605 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-71.269592 -11.3041,0"
|
||||
d="m 1579.3052,415.41749 -11.3041,0"
|
||||
id="path5041"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2268,11 +2197,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5043"
|
||||
d="m 1539.3052,-119.93815 -11.3041,0"
|
||||
d="m 1579.3052,366.74893 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-168.60671 -11.3041,0"
|
||||
d="m 1579.3052,318.08037 -11.3041,0"
|
||||
id="path5045"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2280,11 +2209,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5047"
|
||||
d="m 1539.3052,-217.27527 -11.3041,0"
|
||||
d="m 1579.3052,269.41181 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-265.94383 -11.3041,0"
|
||||
d="m 1579.3052,220.74325 -11.3041,0"
|
||||
id="path5049"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2292,11 +2221,11 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5051"
|
||||
d="m 1539.3052,-314.61239 -11.3041,0"
|
||||
d="m 1579.3052,172.07469 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-363.28095 -11.3041,0"
|
||||
d="m 1579.3052,123.40613 -11.3041,0"
|
||||
id="path5053"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2304,96 +2233,47 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5055"
|
||||
d="m 1539.3052,-411.94951 -11.3041,0"
|
||||
d="m 1579.3052,74.73757 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="1604.5295"
|
||||
y="268.99725"
|
||||
id="ALT_four"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan5014"
|
||||
x="1604.5295"
|
||||
y="268.99725"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000</tspan></text>
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-947.30329 -11.3041,0"
|
||||
id="path5065"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1479.2996,277.37822 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
id="path5016"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
sodipodi:nodetypes="ccc" />
|
||||
<text
|
||||
inkscape:label="#text975"
|
||||
transform="scale(0.95383278,1.0484018)"
|
||||
id="ALT_five"
|
||||
y="-891.54596"
|
||||
x="1562.5935"
|
||||
id="ALT_two"
|
||||
y="733.21313"
|
||||
x="1604.5295"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75"
|
||||
y="-891.54596"
|
||||
x="1562.5935"
|
||||
id="tspan5069"
|
||||
y="733.21313"
|
||||
x="1604.5295"
|
||||
id="tspan5026"
|
||||
sodipodi:role="line">000</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="ccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5072"
|
||||
d="m 1439.2996,-939.33738 9.3792,-7.9746 -9.3788,-7.9742"
|
||||
id="path5028"
|
||||
d="m 1479.2996,764.06299 9.3792,-7.97457 -9.3788,-7.9742"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-509.28655 -11.3041,0"
|
||||
id="path5074"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5076"
|
||||
d="m 1539.3052,-557.95511 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-606.62367 -11.3041,0"
|
||||
id="path5078"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5080"
|
||||
d="m 1539.3052,-655.29223 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-703.96079 -11.3041,0"
|
||||
id="path5082"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5084"
|
||||
d="m 1539.3052,-752.62935 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-801.29791 -11.3041,0"
|
||||
id="path5086"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5088"
|
||||
d="m 1539.3052,-849.96647 -11.3041,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 1539.3052,-898.63503 -11.3041,0"
|
||||
id="path5090"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="ALT_mask"
|
||||
width="89.289597"
|
||||
height="64.328094"
|
||||
x="768.71039"
|
||||
y="480.85416"
|
||||
inkscape:label="#rect4671" />
|
||||
<rect
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.39996576;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="FMA_man_box"
|
||||
|
|
@ -2877,10 +2757,58 @@
|
|||
id="path922"
|
||||
d="m 13.167811,790.62913 141.300719,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<g
|
||||
id="ALT_target"
|
||||
inkscape:label="#g4832">
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="rect4802"
|
||||
width="84.638374"
|
||||
height="58.155445"
|
||||
x="753.69922"
|
||||
y="483.91519"
|
||||
inkscape:label="#rect4671" />
|
||||
<path
|
||||
inkscape:label="#path4943-1"
|
||||
style="fill:none;fill-opacity:1;stroke:#1684a5;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 806.4248,453.9808 0,117.4912 -50.3256,0 0,-50.7712 9.37937,-7.97477 -9.37857,-7.97403 0,-50.7712 50.3248,0"
|
||||
id="ALT_target_box"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccccccc" />
|
||||
<rect
|
||||
inkscape:label="#rect4671"
|
||||
y="483.91519"
|
||||
x="771.4729"
|
||||
height="58.155445"
|
||||
width="83.838371"
|
||||
id="rect4796"
|
||||
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#1684a5;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="890.99316"
|
||||
y="506.26898"
|
||||
id="ALT_target_digit"
|
||||
transform="scale(0.95383277,1.0484018)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan4800"
|
||||
x="890.99316"
|
||||
y="506.26898"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83483124px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#1684a5;fill-opacity:1;stroke-width:0.75">000</tspan></text>
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="ALT_mask"
|
||||
width="89.289597"
|
||||
height="64.328094"
|
||||
x="768.71039"
|
||||
y="480.85416"
|
||||
inkscape:label="#rect4671" />
|
||||
<g
|
||||
id="ALT_box"
|
||||
inkscape:label="#g963"
|
||||
transform="matrix(1.0666667,0,0,1.066636,2.2828427,-0.50381959)">
|
||||
transform="matrix(1.0666667,0,0,1.066636,2.2828427,-0.60381959)">
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 720.02617,452.36852 80.7091,-2.9e-4"
|
||||
|
|
@ -2906,11 +2834,11 @@
|
|||
width="48.851151"
|
||||
height="90.122147"
|
||||
x="858.00543"
|
||||
y="467.69009"
|
||||
y="467.59009"
|
||||
inkscape:label="#rect9211" />
|
||||
<text
|
||||
id="ALT_tens"
|
||||
y="289.76563"
|
||||
y="289.66925"
|
||||
x="898.703"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"
|
||||
|
|
@ -2918,63 +2846,63 @@
|
|||
inkscape:label="#text913"
|
||||
transform="scale(0.96366556,1.0377044)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:94.99999881%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="289.76563"
|
||||
y="289.66925"
|
||||
x="898.703"
|
||||
id="tspan911"
|
||||
sodipodi:role="line" /><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="317.1181"
|
||||
y="317.02173"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan919">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="343.9458"
|
||||
y="343.84943"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4300">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="370.77347"
|
||||
y="370.67709"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan931">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="397.60114"
|
||||
y="397.50476"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan927">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="424.42883"
|
||||
y="424.33246"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan925">60</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="451.2565"
|
||||
y="451.16013"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan923">40</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="478.08417"
|
||||
y="477.98779"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan921">20</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="504.91187"
|
||||
y="504.81549"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan917">00</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="531.7395"
|
||||
y="531.64313"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan915">80</tspan><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.83641052px;line-height:87.00000048%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75"
|
||||
y="558.5672"
|
||||
y="558.47083"
|
||||
x="898.703"
|
||||
sodipodi:role="line"
|
||||
id="tspan4302">60</tspan></text>
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 765.76075,790.62913 136.156,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.16267705;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
d="m 768.94214,790.64777 132.99332,0"
|
||||
id="path965"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -2982,20 +2910,20 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path967"
|
||||
d="m 765.76075,235.4451 136.156,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995403;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
d="m 768.94214,235.42646 132.99332,0"
|
||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.16267705;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="893.05707"
|
||||
y="506.24783"
|
||||
x="890.99316"
|
||||
y="506.23941"
|
||||
id="ALT_digits"
|
||||
transform="scale(0.95383277,1.0484018)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan973"
|
||||
x="893.05707"
|
||||
y="506.24783"
|
||||
x="890.99316"
|
||||
y="506.23941"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83483124px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">00</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
|
|
@ -3893,4 +3821,30 @@
|
|||
x="80.506668"
|
||||
id="tspan4696"
|
||||
sodipodi:role="line">.</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
x="801.06317"
|
||||
y="787.28491"
|
||||
id="ALT_digit_DN"
|
||||
transform="scale(0.95382558,1.0484097)"
|
||||
inkscape:label="#text975"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan5112"
|
||||
x="801.06317"
|
||||
y="787.28491"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke-width:0.75">FL 000</tspan></text>
|
||||
<text
|
||||
inkscape:label="#text975"
|
||||
transform="scale(0.95382558,1.0484097)"
|
||||
id="ALT_digit_UP"
|
||||
y="220.32645"
|
||||
x="801.06317"
|
||||
style="font-style:normal;font-weight:normal;font-size:30.52176857px;line-height:1.25;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke:none;stroke-width:0.75"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#1684a5;fill-opacity:1;stroke-width:0.75"
|
||||
y="220.32645"
|
||||
x="801.06317"
|
||||
id="tspan5116"
|
||||
sodipodi:role="line">FL 000</tspan></text>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 221 KiB After Width: | Height: | Size: 218 KiB |
|
|
@ -723,7 +723,7 @@ var altcapt = func {
|
|||
setprop("/it-autoflight/internal/captvs", 1500);
|
||||
setprop("/it-autoflight/internal/captvsneg", -1500);
|
||||
}
|
||||
if (getprop("/it-autoflight/output/fd1") == 1 or getprop("/it-autoflight/output/fd2") == 1 or getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) {
|
||||
if ((getprop("/it-autoflight/output/fd1") == 1 or getprop("/it-autoflight/output/fd2") == 1 or getprop("/it-autoflight/output/ap1") == 1 or getprop("/it-autoflight/output/ap2") == 1) and getprop("/it-autoflight/output/vert") != 9) {
|
||||
var calt = getprop("/instrumentation/altimeter/indicated-altitude-ft");
|
||||
var alt = getprop("/it-autoflight/internal/alt");
|
||||
var dif = calt - alt;
|
||||
|
|
|
|||
|
|
@ -286,8 +286,8 @@ var phasecheck = maketimer(0.2, func {
|
|||
setprop("/FMGC/internal/alpha-prot-speed", 138);
|
||||
} else if (flap == 5) {
|
||||
setprop("/FMGC/internal/overspeed", 163);
|
||||
setprop("/FMGC/internal/minspeed", 134);
|
||||
setprop("/FMGC/internal/alpha-prot-speed", 123);
|
||||
setprop("/FMGC/internal/minspeed", 131);
|
||||
setprop("/FMGC/internal/alpha-prot-speed", 122);
|
||||
}
|
||||
|
||||
if (gear0 == 1 and (state1 == "MCT" or state1 == "MAN THR" or state1 == "TOGA") and (state2 == "MCT" or state2 == "MAN THR" or state2 == "TOGA") and flaps < 5) {
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ var thrust_loop = func {
|
|||
} else {
|
||||
var status = getprop("/systems/thrust/lvrclb");
|
||||
if (status == 0) {
|
||||
if (getprop("/gear/gear[0]/wow") == 0) {
|
||||
if (getprop("/gear/gear[0]/wow") == 0 and getprop("/MCDUC/thracc-set") == 1) {
|
||||
if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") {
|
||||
setprop("/systems/thrust/lvrclb", "1");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4008
|
||||
4009
|
||||
Reference in a new issue