1
0
Fork 0

Add a small M to the ND to show that the VOR has been manually tuned

This commit is contained in:
Jonathan Redpath 2021-12-27 15:43:45 +00:00
parent 7833a3a5f2
commit 183f6e888f
4 changed files with 314 additions and 255 deletions

View file

@ -212,7 +212,8 @@ canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update
# because things are much better configurable that way
# now look up all required SVG elements and initialize member fields using the same name to have a convenient handle
foreach(var element; ["dmeL","dmeR","vorL","vorR","vorLId","vorRId",
"status.wxr","status.wpt","status.sta","status.arpt","terrHI","terrLO","TerrLabel","terrAhead","terrAltGroup"])
"status.wxr","status.wpt","status.sta","status.arpt","terrHI","terrLO","TerrLabel","terrAhead","terrAltGroup",
"vorLIdtuneMode","vorRIdtuneMode"])
me.symbols[element] = me.nd.getElementById(element);
foreach(var element; ["dmeLDist","dmeRDist"])
@ -572,7 +573,31 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
var dme1_path = "/instrumentation/dme[2]";
var dme2_path = "/instrumentation/dme[3]";
if(me.get_switch("toggle_lh_vor_adf") == 1) {
if (fmgc.FMGCInternal.VOR1.freqSet) {
me.symbols.vorLIdtuneMode.show();
} else {
me.symbols.vorLIdtuneMode.hide();
}
} else if(me.get_switch("toggle_lh_vor_adf") == -1) {
if (fmgc.FMGCInternal.ADF1.freqSet) {
me.symbols.vorLIdtuneMode.show();
} else {
me.symbols.vorLIdtuneMode.hide();
}
} else {
me.symbols.vorLIdtuneMode.hide();
}
if(me.get_switch("toggle_rh_vor_adf") == 1) {
if (fmgc.FMGCInternal.VOR2.freqSet) {
me.symbols.vorRIdtuneMode.show();
} else {
me.symbols.vorRIdtuneMode.hide();
}
me.symbols.vorR.setText("VOR R");
me.symbols.vorR.setColor(0.195,0.96,0.097);
me.symbols.dmeR.setText("DME");
@ -587,6 +612,13 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
else me.symbols.dmeRDist.setText(" ---");
me.symbols.dmeRDist.setColor(0.195,0.96,0.097);
} elsif(me.get_switch("toggle_rh_vor_adf") == -1) {
if (fmgc.FMGCInternal.ADF2.freqSet) {
me.symbols.vorRIdtuneMode.show();
} else {
me.symbols.vorRIdtuneMode.hide();
}
me.symbols.vorR.setText("ADF R");
me.symbols.vorR.setColor(0,0.6,0.85);
me.symbols.dmeR.setText("");
@ -598,6 +630,7 @@ canvas.NavDisplay.update = func() # FIXME: This stuff is still too aircraft spec
me.symbols.dmeRDist.setText("");
me.symbols.dmeRDist.setColor(0,0.6,0.85);
} else {
me.symbols.vorRIdtuneMode.hide();
me.symbols.vorR.setText("");
me.symbols.dmeR.setText("");
me.symbols.vorRId.setText("");

View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="airbusND.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
xml:space="preserve"
id="svg5180"
height="1024"
width="1024"
version="1.1"><sodipodi:namedview
version="1.1"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1"
@ -22,17 +22,17 @@
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="705"
inkscape:window-width="1920"
inkscape:window-height="986"
id="namedview102"
showgrid="false"
inkscape:zoom="1.5540552"
inkscape:cx="474.64782"
inkscape:cy="152.79363"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:zoom="4.3955319"
inkscape:cx="75.872501"
inkscape:cy="938.90799"
inkscape:window-x="-11"
inkscape:window-y="-11"
inkscape:window-maximized="1"
inkscape:current-layer="g415"
inkscape:current-layer="layer3"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-object-midpoints="true"
@ -292,71 +292,71 @@
sodipodi:nodetypes="cc" /><g
id="terrGroup"
transform="translate(-9.356522,-6.2275037)"><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#179ab7;fill-opacity:1;stroke:none"
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#179ab7;fill-opacity:1;stroke:none"
x="1018.2351"
y="796.34009"
id="terrAhead"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;text-align:end;text-anchor:end"
sodipodi:role="line"
id="tspan1244"
x="1018.2351"
y="796.34009">TERR</tspan><tspan
style="font-size:24px;line-height:1.25;text-align:end;text-anchor:end"
sodipodi:role="line"
x="1018.2351"
y="796.34009"
id="terrAhead"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;text-align:end;text-anchor:end"
sodipodi:role="line"
id="tspan1244"
x="1018.2351"
y="796.34009">TERR</tspan><tspan
style="font-size:24px;line-height:1.25;text-align:end;text-anchor:end"
sodipodi:role="line"
x="1018.2351"
y="826.34009"
id="tspan1248">AHEAD</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#179ab7;fill-opacity:1;stroke:none"
x="952.74292"
y="826.34009"
id="TerrLabel"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25"
sodipodi:role="line"
id="tspan1994"
x="952.74292"
y="826.34009">TERR</tspan></text>
<g
id="terrAltGroup"><text
inkscape:label="#text7243"
id="terrHI"
y="858.63959"
x="965.73273"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="858.63959"
x="965.73273"
id="tspan2002"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">000</tspan></text>
id="tspan1248">AHEAD</tspan></text>
<text
inkscape:label="#text7243"
id="terrLO"
y="888.00446"
x="965.73273"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="888.00446"
x="965.73273"
id="tspan2006"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">000</tspan></text>
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#179ab7;fill-opacity:1;stroke:none"
x="952.74292"
y="826.34009"
id="TerrLabel"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25"
sodipodi:role="line"
id="tspan1994"
x="952.74292"
y="826.34009">TERR</tspan></text>
<g
id="terrAltGroup"><text
inkscape:label="#text7243"
id="terrHI"
y="858.63959"
x="965.73273"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="858.63959"
x="965.73273"
id="tspan2002"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">000</tspan></text>
<text
inkscape:label="#text7243"
id="terrLO"
y="888.00446"
x="965.73273"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="888.00446"
x="965.73273"
id="tspan2006"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">000</tspan></text>
<rect
style="fill:none;stroke:#f2f235;stroke-width:3.15591;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect2018"
width="67.30439"
height="58.673889"
x="958.45599"
y="833.17212"
ry="0" /><path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#f2f235;stroke-width:3.15591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.9941;stop-color:#000000;stop-opacity:1"
d="m 958.38792,861.87476 67.46618,0.61588"
id="path2033"
sodipodi:nodetypes="cc" /></g></g><path
style="fill:none;stroke:#f2f235;stroke-width:3.15591;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect2018"
width="67.30439"
height="58.673889"
x="958.45599"
y="833.17212"
ry="0" /><path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#f2f235;stroke-width:3.15591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.9941;stop-color:#000000;stop-opacity:1"
d="m 958.38792,861.87476 67.46618,0.61588"
id="path2033"
sodipodi:nodetypes="cc" /></g></g><path
sodipodi:nodetypes="cc"
inkscape:label="#path3843"
inkscape:transform-center-y="-340.574"
@ -1076,15 +1076,15 @@
</g><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="39.859375"
x="41.859375"
y="919.5495"
id="vorL"
inkscape:label="#text7243"><tspan
style="font-size:32px;line-height:1.25;fill:#0dc04b;fill-opacity:1"
sodipodi:role="line"
id="tspan3056"
x="39.859375"
y="919.5495">VOR 1</tspan></text>
x="41.859375"
y="919.5495">VOR1</tspan></text>
<text
inkscape:label="#text7243"
@ -1102,16 +1102,38 @@
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="39.9375"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="126.51562"
y="956.56171"
id="vorLId"
inkscape:label="#text7243"><tspan
style="font-size:32px;line-height:1.25;fill:#0dc04b"
style="font-size:32px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b"
sodipodi:role="line"
id="tspan3072"
x="39.9375"
y="956.56171">ABC</tspan></text>
x="126.51562"
y="956.56171">ABC</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="134.0838"
y="956.56171"
id="vorLIdtuneMode"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;fill:#0dc04b;fill-opacity:0.6"
sodipodi:role="line"
id="tspan3072-6"
x="134.0838"
y="956.56171">M</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="856.42511"
y="955.98981"
id="vorRIdtuneMode"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;fill:#0dc04b;fill-opacity:0.6"
sodipodi:role="line"
id="tspan3072-6-0"
x="856.42511"
y="955.98981">M</tspan></text>
<text
inkscape:label="#text7243"
@ -1124,7 +1146,7 @@
x="883.85938"
id="tspan3076"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">VOR 2</tspan></text>
style="font-size:32px;line-height:1.25;fill:#0dc04b"> VOR2</tspan></text>
<text
xml:space="preserve"
@ -1151,7 +1173,7 @@
x="883.9375"
id="tspan3088"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;fill:#0dc04b">ABC</tspan></text>
style="font-size:32px;line-height:1.25;fill:#0dc04b"> ABC</tspan></text>
<text
inkscape:label="#text7243"
@ -1196,16 +1218,16 @@
inkscape:connector-curvature="0"
id="trkline"
d="M 512,179.04645 V 777.94594"
style="fill:none;stroke:#66b266;stroke-width:5.12175989;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;stroke:#66b266;stroke-width:5.12176;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:transform-center-y="-345.50518"
inkscape:label="#path6714"
inkscape:transform-center-x="-0.001953124" /><path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="altArc"
d="m 351.124,888.591 c 0,0 72.1,-39.455 161.041,-39.455 88.941,0 161.041,39.455 161.041,39.455 v 0"
style="fill:none;stroke:#00ff00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
inkscape:label="#path3888-1" />
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="altArc"
d="m 351.124,888.591 c 0,0 72.1,-39.455 161.041,-39.455 88.941,0 161.041,39.455 161.041,39.455 v 0"
style="fill:none;stroke:#00ff00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
inkscape:label="#path3888-1" />
<g
inkscape:transform-center-x="-0.198874"
inkscape:transform-center-y="4.4952743"
@ -1490,55 +1512,55 @@
sodipodi:nodetypes="ccccccccc" /><g
id="dmeLDist"
transform="translate(2)"><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="56.791557"
y="993.85461"
id="dmeLDist1"
inkscape:label="#text7243"><tspan
style="font-size:32px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b"
sodipodi:role="line"
id="tspan3068"
x="56.791557"
y="993.85461"
id="dmeLDist1"
inkscape:label="#text7243"><tspan
style="font-size:32px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b"
sodipodi:role="line"
id="tspan3068"
x="56.791557"
y="993.85461">999</tspan></text>
y="993.85461">999</tspan></text>
<text
inkscape:label="#text7243"
id="dmeLDist2"
inkscape:label="#text7243"
id="dmeLDist2"
y="993.85461"
x="55.73262"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="993.85461"
x="55.73262"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="993.85461"
x="55.73262"
id="tspan1329"
sodipodi:role="line"
style="font-size:24px;line-height:1.25;fill:#0dc04b">.9</tspan></text>
id="tspan1329"
sodipodi:role="line"
style="font-size:24px;line-height:1.25;fill:#0dc04b">.9</tspan></text>
</g><g
id="dmeRDist"
transform="translate(-0.90081787)"><text
inkscape:label="#text7243"
id="dmeRDist1"
inkscape:label="#text7243"
id="dmeRDist1"
y="993.85461"
x="936.79144"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="993.85461"
x="936.79144"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="993.85461"
x="936.79144"
id="tspan3084"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b">999</tspan></text>
id="tspan3084"
sodipodi:role="line"
style="font-size:32px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b">999</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="935.7326"
y="993.85461"
id="dmeRDist2"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;fill:#0dc04b"
sodipodi:role="line"
id="tspan1346"
x="935.7326"
y="993.85461"
id="dmeRDist2"
inkscape:label="#text7243"><tspan
style="font-size:24px;line-height:1.25;fill:#0dc04b"
sodipodi:role="line"
id="tspan1346"
x="935.7326"
y="993.85461">.9</tspan></text>
y="993.85461">.9</tspan></text>
</g><g
id="rangeRingMap"
style="display:inline"
@ -2330,90 +2352,90 @@
id="layer9"
inkscape:label="ND_BOTTOM_MEMO"
style="display:inline"><rect
style="opacity:0.99;fill:none;stroke:#ffffff;stroke-width:3.15591;stroke-miterlimit:4;stroke-dasharray:none"
id="nd_warn_msgbox"
width="563.05048"
height="46.844471"
x="230.3676"
y="919.6969" /><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:42.6667px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none"
x="511.39594"
y="958.03772"
id="nd_warn_memo"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan2199-5"
x="511.39594"
y="958.03772"
style="font-size:42.6667px;line-height:1.25;fill:#ff6600">GPS PRIMARY LOST</tspan></text>
style="opacity:0.99;fill:none;stroke:#ffffff;stroke-width:3.15591;stroke-miterlimit:4;stroke-dasharray:none"
id="nd_warn_msgbox"
width="563.05048"
height="46.844471"
x="230.3676"
y="919.6969" /><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:42.6667px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none"
x="511.39594"
y="958.03772"
id="nd_warn_memo"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan2199-5"
x="511.39594"
y="958.03772"
style="font-size:42.6667px;line-height:1.25;fill:#ff6600">GPS PRIMARY LOST</tspan></text>
</g><g
inkscape:groupmode="layer"
id="g415"
inkscape:label="ND_TCAS_MEMO"
style="display:inline"><rect
style="opacity:0.98999999;fill:none;stroke:#ffffff;stroke-width:3.15591002;stroke-miterlimit:4;stroke-dasharray:none"
id="taOnlyBox"
width="563.05048"
height="46.844471"
x="230.3676"
y="871.6969" /><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:42.66669846px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none"
x="511.39594"
y="910.03772"
id="taOnly"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="taOnlyText"
x="511.39594"
y="910.03772"
style="font-size:42.66669846px;line-height:1.25;fill:#ffffff">TA ONLY</tspan></text>
style="opacity:0.99;fill:none;stroke:#ffffff;stroke-width:3.15591;stroke-miterlimit:4;stroke-dasharray:none"
id="taOnlyBox"
width="563.05048"
height="46.844471"
x="230.3676"
y="871.6969" /><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:42.6667px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none"
x="511.39594"
y="910.03772"
id="taOnly"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="taOnlyText"
x="511.39594"
y="910.03772"
style="font-size:42.6667px;line-height:1.25;fill:#ffffff">TA ONLY</tspan></text>
</g><g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="UNAVAIL_ARC"
style="display:inline"><text
inkscape:label="#text7243"
id="text3549-7"
y="-258.81296"
x="-364.83682"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none"
xml:space="preserve"
transform="rotate(0.34999975)" />
inkscape:label="#text7243"
id="text3549-7"
y="-258.81296"
x="-364.83682"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none"
xml:space="preserve"
transform="rotate(0.34999975)" />
<g
id="unavailARC"><g
id="rangeArcs-3"
inkscape:label="#g3890"
style="display:inline;stroke:#ff0000"
transform="translate(0.16248,0.757949)"><path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="path3103-6"
d="m 168.665,820.476 c 0,-189.321 153.474,-342.796 342.795,-342.796 189.319,0 342.794,153.473 342.794,342.796 0,0 0,0 0,0"
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1" /><path
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1"
d="m -4.01174,820.476 c 0,-284.688 230.78374,-515.473 515.47174,-515.473 284.685,0 515.47,230.782 515.47,515.473 0,0 0,0 0,0"
id="path3886-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc" /><path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="path3888-5"
d="m 340.958,820.476 c 0,-94.166 76.335,-170.502 170.501,-170.502 94.166,0 170.501,76.335 170.501,170.502 0,0 0,0 0,0"
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1" /></g><circle
style="fill:none;stroke:#ff0000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4079-1"
transform="rotate(35.485921)"
cx="895.22479"
cy="373.73712"
r="15" /><ellipse
style="opacity:0.99;fill:none;stroke:#ff0000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none"
id="path2436"
cx="512.13513"
cy="823.758"
rx="701.56787"
ry="701.51489" /></g></g><g
id="unavailARC"><g
id="rangeArcs-3"
inkscape:label="#g3890"
style="display:inline;stroke:#ff0000"
transform="translate(0.16248,0.757949)"><path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="path3103-6"
d="m 168.665,820.476 c 0,-189.321 153.474,-342.796 342.795,-342.796 189.319,0 342.794,153.473 342.794,342.796 0,0 0,0 0,0"
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1" /><path
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1"
d="m -4.01174,820.476 c 0,-284.688 230.78374,-515.473 515.47174,-515.473 284.685,0 515.47,230.782 515.47,515.473 0,0 0,0 0,0"
id="path3886-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc" /><path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
id="path3888-5"
d="m 340.958,820.476 c 0,-94.166 76.335,-170.502 170.501,-170.502 94.166,0 170.501,76.335 170.501,170.502 0,0 0,0 0,0"
style="fill:none;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:32, 16;stroke-dashoffset:0;stroke-opacity:1" /></g><circle
style="fill:none;stroke:#ff0000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4079-1"
transform="rotate(35.485921)"
cx="895.22479"
cy="373.73712"
r="15" /><ellipse
style="opacity:0.99;fill:none;stroke:#ff0000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none"
id="path2436"
cx="512.13513"
cy="823.758"
rx="701.56787"
ry="701.51489" /></g></g><g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="UNAVAIL_NAV"
@ -2435,43 +2457,43 @@
id="layer8"
inkscape:label="UNAVAIL_WARN"
style="display:inline"><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff0000;fill-opacity:1;stroke:none"
x="511.82605"
y="292.91833"
id="nd_warn_hdg"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan3241-5"
x="511.82605"
y="292.91833"
style="font-size:53.3333px;line-height:1.25;fill:#ff0000">HDG</tspan></text>
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff0000;fill-opacity:1;stroke:none"
x="511.82605"
y="292.91833"
id="nd_warn_hdg"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan3241-5"
x="511.82605"
y="292.91833"
style="font-size:53.3333px;line-height:1.25;fill:#ff0000">HDG</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff0000;fill-opacity:1;stroke:none"
x="510.7153"
y="399.58936"
id="nd_warn_map"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan2199"
x="510.7153"
y="399.58936"
style="font-size:53.3333px;line-height:1.25;fill:#ff0000">MAP NOT AVAIL</tspan></text>
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff0000;fill-opacity:1;stroke:none"
x="510.7153"
y="399.58936"
id="nd_warn_map"
inkscape:label="#text3239"><tspan
sodipodi:role="line"
id="tspan2199"
x="510.7153"
y="399.58936"
style="font-size:53.3333px;line-height:1.25;fill:#ff0000">MAP NOT AVAIL</tspan></text>
</g><g
inkscape:groupmode="layer"
id="layer7"
inkscape:label="ND_MAIN_MSG"
style="display:inline"><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="510.7153"
y="537.58936"
id="nd_msg_change"
inkscape:label="#text3401"><tspan
sodipodi:role="line"
id="tspan3544"
x="510.7153"
y="537.58936"
style="font-size:53.3333px;line-height:1.25;fill:#0dc04b">RANGE CHANGE</tspan></text>
</g></svg>
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:53.3333px;line-height:0%;font-family:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#0dc04b;fill-opacity:1;stroke:none"
x="510.7153"
y="537.58936"
id="nd_msg_change"
inkscape:label="#text3401"><tspan
sodipodi:role="line"
id="tspan3544"
x="510.7153"
y="537.58936"
style="font-size:53.3333px;line-height:1.25;fill:#0dc04b">RANGE CHANGE</tspan></text>
</g></svg>

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 150 KiB

View file

@ -798,7 +798,7 @@ canvas.NDStyles["Airbus"] = {
if(nd.get_switch("toggle_display_mode") == "APP")
nd.symbols.ilsLbl.setText("ILS");
else
nd.symbols.ilsLbl.setText("VOR 1");
nd.symbols.ilsLbl.setText("VOR1");
},
is_false: func(nd) nd.symbols.ilsLbl.hide(),
},
@ -1660,13 +1660,13 @@ canvas.NDStyles["Airbus"] = {
is_true: func(nd) {
nd.symbols.dmeL.show();
if(nd.get_switch("toggle_lh_vor_adf") < 0){
nd.symbols.vorL.setText("ADF 1");
nd.symbols.vorL.setText("ADF1");
nd.symbols.vorL.setColor(0.195,0.96,0.097);
nd.symbols.vorLId.setColor(0.195,0.96,0.097);
#nd.symbols.dmeLDist.setColor(0.195,0.96,0.097);
nd.symbols.dmeL.setText("");
} else {
nd.symbols.vorL.setText("VOR 1");
nd.symbols.vorL.setText("VOR1");
nd.symbols.vorL.setColor(1,1,1);
nd.symbols.vorLId.setColor(1,1,1);
#nd.symbols.dmeLDist.setColor(1,1,1);
@ -1687,12 +1687,12 @@ canvas.NDStyles["Airbus"] = {
is_true: func(nd) {
nd.symbols.dmeR.show();
if(nd.get_switch("toggle_rh_vor_adf") < 0){
nd.symbols.vorR.setText("ADF 2");
nd.symbols.vorR.setText("ADF2");
nd.symbols.vorR.setColor(0.195,0.96,0.097);
nd.symbols.vorRId.setColor(0.195,0.96,0.097);
nd.symbols.dmeR.setText("");
} else {
nd.symbols.vorR.setText("VOR 2");
nd.symbols.vorR.setText("VOR2");
nd.symbols.vorR.setColor(1,1,1);
nd.symbols.vorRId.setColor(1,1,1);
#nd.symbols.dmeRDist.setColor(1,1,1);
@ -1718,10 +1718,11 @@ canvas.NDStyles["Airbus"] = {
var adf = "instrumentation/adf/";
var navident = getprop(adf~ "ident");
var frq = getprop(adf~ "frequencies/selected-khz");
if(navident != "")
if(navident != "") {
nd.symbols.vorLId.setText(navident);
else
} else {
nd.symbols.vorLId.setText(sprintf("%3d", frq));
}
nd.symbols.dmeLDist.setText("");
} else {
var nav = nd.get_nav_path("vor", 0);
@ -1730,10 +1731,11 @@ canvas.NDStyles["Airbus"] = {
var dme = nd.get_nav_path("dme", 0);
var dst = getprop(dme~ "indicated-distance-nm");
#print(dme~ "indicated-distance-nm");
if(getprop(nav~ "in-range"))
if(getprop(nav~ "in-range")) {
nd.symbols.vorLId.setText(navID);
else
} else {
nd.symbols.vorLId.setText(frq);
}
if(getprop(dme~ "in-range"))
nd.symbols.dmeLDist.setText(sprintf("%3.1f",
dst));
@ -1775,10 +1777,11 @@ canvas.NDStyles["Airbus"] = {
var adf = "instrumentation/adf[1]/";
var navident = getprop(adf~ "ident");
var frq = getprop(adf~ "frequencies/selected-khz");
if(navident != "")
if(navident != "") {
nd.symbols.vorRId.setText(navident);
else
} else {
nd.symbols.vorRId.setText(sprintf("%3d", frq));
}
nd.symbols.dmeRDist.setText("");
} else {
var nav = nd.get_nav_path("vor", 1);
@ -1787,10 +1790,11 @@ canvas.NDStyles["Airbus"] = {
var dme = nd.get_nav_path("dme", 1);
var dst = getprop(dme~ "indicated-distance-nm");
#print(dme~ "indicated-distance-nm");
if(getprop(nav~ "in-range"))
if(getprop(nav~ "in-range")) {
nd.symbols.vorRId.setText(navID);
else
} else {
nd.symbols.vorRId.setText(frq);
}
if(getprop(dme~ "in-range"))
nd.symbols.dmeRDist.setText(sprintf("%3.1f",
dst));

View file

@ -278,7 +278,7 @@ var radnavInput = func(key, i) {
}
} else if (key == "R1") {
if (radNavScratchpad == "CLR") {
fmgc.FMGCInternal.VOR1.freqSet = 0;
fmgc.FMGCInternal.VOR2.freqSet = 0;
mcdu_scratchpad.scratchpads[i].empty();
} else {
if (size(split("/", radNavScratchpad)) == 2) {