diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index 592fb29f..95e34dd4 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -18,7 +18,8 @@ var aoa_2 = props.globals.getNode("/systems/navigation/adr/output/aoa-2", 1);
var aoa_3 = props.globals.getNode("/systems/navigation/adr/output/aoa-3", 1);
var hundredAbove = props.globals.getNode("/instrumentation/pfd/hundred-above", 1);
var minimum = props.globals.getNode("/instrumentation/pfd/minimums", 1);
-
+setprop("test", 0);
+setprop("test2", 0);
# Create Nodes:
var altFlash = [0,0];
var amberFlash = [0, 0];
@@ -976,20 +977,21 @@ var canvas_pfd = {
obj["ALT_three"].setText(sprintf("%03d", abs(obj.middleAltText)));
obj["ALT_two"].setText(sprintf("%03d", abs(obj.middleAltText - 5)));
obj["ALT_one"].setText(sprintf("%03d", abs(obj.middleAltText - 10)));
-
- if (val.altitudePFD < 0) {
- obj["ALT_neg"].show();
- } else {
- obj["ALT_neg"].hide();
- }
- } else {
- obj["ALT_neg"].hide();
}
}),
props.UpdateManager.FromHashList(["altitudePFD","altError"], 0.1, func(val) {
if (!val.altError) {
obj.altOffset = val.altitudePFD / 500 - int(val.altitudePFD / 500);
obj.middleAltOffset = nil;
+ obj["ALT_tapes"].show();
+
+ if (val.altitudePFD < 0) {
+ obj["ALT_neg"].show();
+ obj["ALT_tenthousands"].hide();
+ } else {
+ obj["ALT_neg"].hide();
+ obj["ALT_tenthousands"].show();
+ }
if (obj.altOffset > 0.5) {
obj.middleAltOffset = -(obj.altOffset - 1) * 243.3424;
@@ -999,12 +1001,29 @@ var canvas_pfd = {
obj["ALT_scale"].setTranslation(0, -obj.middleAltOffset);
obj["ALT_scale"].update();
- obj["ALT_tens"].setTranslation(0, num(right(sprintf("%02d", abs(val.altitudePFD)), 2)) * 1.498);
+
+ obj.altAbs = abs(val.altitudePFD);
+
+ if (obj.altAbs < 9900) { # Prepare to show the zero at 10000
+ obj["ALT_thousands_zero"].hide();
+ } else {
+ obj["ALT_thousands_zero"].show();
+ }
+
+ obj.altTenThousands = num(right(sprintf("%05d", obj.altAbs), 5)) / 100; # Unlikely it would be above 99999 but lets account for it anyways
+ obj["ALT_tenthousands"].setTranslation(0, genevaAltTenThousands(obj.altTenThousands) * 51.61);
+
+ obj.altThousands = num(right(sprintf("%04d", obj.altAbs), 4)) / 100;
+ obj["ALT_thousands"].setTranslation(0, genevaAltThousands(obj.altThousands) * 51.61);
+
+ obj.altHundreds = num(right(sprintf("%03d", obj.altAbs), 3)) / 100;
+ obj["ALT_hundreds"].setTranslation(0, genevaAltHundreds(obj.altHundreds) * 51.61);
+
+ obj["ALT_tens"].setTranslation(0, num(right(sprintf("%02d", obj.altAbs), 2)) * 1.498);
+ } else {
+ obj["ALT_tapes"].hide();
}
}),
- props.UpdateManager.FromHashValue("altitudeDigits", 1, func(val) {
- obj["ALT_digits"].setText(sprintf("%d", val));
- }),
props.UpdateManager.FromHashValue("altitudeDifference", 0.1, func(val) {
obj["ALT_target"].setTranslation(0, (val / 100) * -48.66856);
}),
@@ -1061,11 +1080,11 @@ var canvas_pfd = {
"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","ALPHA_MAX","ALPHA_PROT","ALPHA_SW","ALPHA_bars","VLS_min","ASI_max","ASI_scale","ASI_target","ASI_mach","ASI_trend_up","ASI_trend_down","ASI_digit_UP","ASI_digit_DN","ASI_decimal_UP",
"ASI_decimal_DN","ASI_index","ASI_error","ASI_group","ASI_frame","AI_center","AI_bank","AI_bank_lim","AI_bank_lim_X","AI_pitch_lim","AI_pitch_lim_X","AI_slipskid","AI_horizon","AI_horizon_ground","AI_horizon_sky","AI_stick","AI_stick_pos","AI_heading",
- "AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","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","ALT_digit_UP_metric","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","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","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError","ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend",
- "ILS_HDG_R","ILS_HDG_L","ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground","ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd",
- "Metric_box","Metric_letter","Metric_cur_alt","ASI_buss","ASI_buss_ref","ASI_buss_ref_blue"];
+ "AI_agl_g","AI_agl","AI_error","AI_group","FD_roll","FD_pitch","ALT_box_flash","ALT_box","ALT_box_amber","ALT_scale","ALT_target","ALT_target_digit","ALT_one","ALT_two","ALT_three","ALT_four","ALT_five","ALT_tens","ALT_digit_UP","ALT_tapes","ALT_hundreds",
+ "ALT_thousands","ALT_thousands_zero","ALT_tenthousands","ALT_digit_DN","ALT_digit_UP_metric","ALT_error","ALT_neg","ALT_group","ALT_group2","ALT_frame","VS_pointer","VS_box","VS_digit","VS_error","VS_group","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","HDG_error","HDG_group","HDG_frame","TRK_pointer","machError",
+ "ilsError","ils_code","ils_freq","dme_dist","dme_dist_legend","ILS_HDG_R","ILS_HDG_L","ILS_right","ILS_left","outerMarker","middleMarker","innerMarker","v1_group","v1_text","vr_speed","F_target","S_target","FS_targets","flap_max","clean_speed","ground",
+ "ground_ref","FPV","spdLimError","vsFMArate","tailstrikeInd","Metric_box","Metric_letter","Metric_cur_alt","ASI_buss","ASI_buss_ref","ASI_buss_ref_blue"];
},
getKeysTest: func() {
return ["Test_white","Test_text"];
@@ -1422,7 +1441,6 @@ var canvas_pfd = {
if (dmc.DMController.DMCs[me.number].outputs[1] != nil) {
notification.altError = 0;
notification.altitudePFD = dmc.DMController.DMCs[me.number].outputs[1].getValue();
- notification.altitudeDigits = dmc.DMController.DMCs[me.number].outputs[3].getValue();
notification.altitudeDifference = dmc.DMController.DMCs[me.number].outputs[7].getValue();
if (!ecam.altAlertFlash and !ecam.altAlertSteady) {
@@ -1507,7 +1525,6 @@ var canvas_pfd = {
} else {
notification.altError = 1;
notification.altitudePFD = -9999;
- notification.altitudeDigits = -9999;
notification.altitudeDifference = -9999;
}
@@ -2262,7 +2279,6 @@ foreach (var name; keys(input)) {
# Power
-
setlistener("/systems/electrical/bus/ac-ess", func() {
if (A320PFD1.MainScreen != nil) { A320PFD1.MainScreen.powerTransient() }
}, 0, 0);
@@ -2280,6 +2296,26 @@ var roundaboutAlt = func(x) {
return (x * 0.2 - int(x * 0.2)) < 0.5 ? 5 * int(x * 0.2) : 5 + 5 * int(x * 0.2);
};
+var genevaAltTenThousands = func(input) {
+ var m = math.floor(input / 100);
+ var s = math.max(0, (math.mod(input, 1) - 0.8) * 5);
+ if (math.mod(input / 10, 1) < 0.9 or math.mod(input / 100, 1) < 0.9) s = 0;
+ return m + s;
+}
+
+var genevaAltThousands = func(input) {
+ var m = math.floor(input / 10);
+ var s = math.max(0, (math.mod(input, 1) - 0.8) * 5);
+ if (math.mod(input / 10, 1) < 0.9) s = 0;
+ return m + s;
+}
+
+var genevaAltHundreds = func(input) {
+ var m = math.floor(input);
+ var s = math.max(0, (math.mod(input, 1) - 0.8) * 5);
+ return m + s;
+}
+
var _fontSizeHDGTempVar = nil;
var fontSizeHDG = func(input) {
diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg
index 1c1c865c..a45a84d4 100644
--- a/Models/Instruments/PFD/res/pfd.svg
+++ b/Models/Instruments/PFD/res/pfd.svg
@@ -41,9 +41,9 @@
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="1592"
- inkscape:cy="275.40444"
- inkscape:cx="771.82374"
- inkscape:zoom="0.70710685"
+ inkscape:cy="639.31164"
+ inkscape:cx="1047.0778"
+ inkscape:zoom="2.8284272"
showgrid="false"
id="namedview371"
inkscape:window-height="1017"
@@ -239,7 +239,7 @@
id="tspan4720"
x="388.37762"
y="480.29984"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:-4px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">10
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">10
10
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;letter-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.75">10
0000
+ x="484.21155"
+ y="723.58716"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:47.83309937px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">0000
+ ATT
00
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.36203766px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">00
000
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:-0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000
000
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:-0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000
FL 000
+ y="795.27063"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.15568161px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;letter-spacing:0px;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">FL 000
FL 000
@@ -2357,11 +2371,11 @@
id="QNH_setting"
y="885.26117"
x="907.61713"
- style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:-2.4px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1;"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1;"
xml:space="preserve"
transform="scale(1.0000144,0.9999856)"
inkscape:label="#text979">
+ 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"
+ id="ALT_tenthousands_clip"
+ width="30.594685"
+ height="59.52"
+ x="768.74731"
+ y="483.258"
+ inkscape:label="#rect9211" />
+
+
+
+
+
+
+ ALT
+
+ NEG
+
+ 0
+ 1
+ 9
+ 8
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 0
+ 1
+ 2
+
+
+ 0
+ 1
+ 9
+ 8
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 0
+ 1
+ 2
+
+
+ 1
+ 9
+ 8
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 1
+ 2
+
+
+ 4208642086
+ 0000000000
+
+
@@ -2482,8 +3314,8 @@
sodipodi:nodetypes="cccccc"
inkscape:connector-curvature="0"
id="path1283"
- d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583"
- style="fill:#000000;fill-opacity:1;stroke:#ffff00;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 856.4002,481.90842 2.2e-4,-15.92813 54.07458,0 0,93.34657 -54.07451,0 0,-15.26583"
+ style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
- 00
+
+
+
+
+
00
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:-0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00
00
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:-0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00
00
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:-0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00
000
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:39.90000153px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;letter-spacing:0px;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000
+ id="ASI_group">
+ inkscape:label="#g5380"
+ transform="translate(-2000.1001,0)">
140
160
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">160
120
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">120
100
080
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">080
060
040
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">040
180
200
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">200
220
240
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">240
260
280
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">280
300
320
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">320
340
360
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">360
380
400
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">400
420
@@ -5424,17 +6263,17 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4440"
- d="m 105.17928,615.79362 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,615.79362 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5442,11 +6281,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4448"
- d="m 105.17928,813.80802 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,813.80802 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5454,11 +6293,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4452"
- d="m 105.17928,945.81762 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,945.81762 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5466,11 +6305,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4456"
- d="m 105.17928,1077.8272 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,1077.8272 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5478,11 +6317,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4460"
- d="m 105.17928,1209.8368 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,1209.8368 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5490,11 +6329,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4506"
- d="m 105.17928,483.78402 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,483.78402 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5502,11 +6341,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4510"
- d="m 105.17928,351.77442 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,351.77442 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5514,11 +6353,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4514"
- d="m 105.17928,219.76482 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,219.76482 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5526,11 +6365,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4518"
- d="m 105.17928,87.755223 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,87.755223 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5538,11 +6377,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4522"
- d="m 105.17928,-44.254377 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-44.254377 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5550,11 +6389,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4526"
- d="m 105.17928,-176.26398 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-176.26398 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5562,11 +6401,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4530"
- d="m 105.17928,-308.27358 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-308.27358 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5574,11 +6413,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4534"
- d="m 105.17928,-440.28318 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-440.28318 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5586,11 +6425,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4538"
- d="m 105.17928,-572.29278 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-572.29278 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5598,11 +6437,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4542"
- d="m 105.17928,-704.30238 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-704.30238 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5610,11 +6449,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4546"
- d="m 105.17928,-836.31198 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-836.31198 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5622,11 +6461,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4550"
- d="m 105.17928,-968.32158 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-968.32158 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5634,11 +6473,11 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4554"
- d="m 105.17928,-1100.3312 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-1100.3312 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5646,18 +6485,18 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4558"
- d="m 105.17928,-1232.3408 h 17.06206"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 105.17928,-1232.3408 17.06206,0"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5677,18 +6516,18 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path930"
- d="M 92.069682,481.26097 H 134.83566"
+ d="m 92.069682,481.26097 42.765978,0"
style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
@@ -5697,14 +6536,14 @@
inkscape:label="#g4874"
id="ASI_trend_up">
+ style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 102.47083,892.24236 0,-377.61127"
+ style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
000
000
000
+ y="218.41843"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;letter-spacing:0px;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000
+ FLX
@@ -5936,20 +6790,6 @@
d="M 13.167811,790.62913 H 121.24725"
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
- ALT
MACH
@@ -6029,9 +6869,9 @@
id="ils_freq"
y="974.72784"
x="34.684372"
- style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:-2.4px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75;"
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75;"
xml:space="preserve">000
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:39.89999771px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;letter-spacing:0px;text-anchor:middle;fill:#b055be;fill-opacity:1;stroke-width:0.75">000
IM
- 40200080604020008060
-
-
-
-
-
000
+ d="m 856.4002,481.90842 2.2e-4,-15.92813 54.07458,0 0,93.34657 -54.07451,0 0,-15.26583"
+ style="fill:none;fill-opacity:1;stroke:#bb6100;stroke-width:3.20030999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
- FLX
LIM
- ATT
- NEG
11070
M