1
0
Fork 0

NavDisplay fixes:

- correct VOR/ADF pointer and ILS rotation center
- display proper ETA hours
- fix DME range property
This commit is contained in:
Gijs de Rooy 2014-02-11 19:45:39 +01:00
parent b4c69e3cc8
commit c7007cd545
2 changed files with 298 additions and 244 deletions

View file

@ -7,7 +7,6 @@
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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="boeingND.svg"
@ -29,13 +28,13 @@
inkscape:window-height="716"
id="namedview102"
showgrid="false"
inkscape:zoom="2.82843"
inkscape:cx="572.938"
inkscape:cy="208.439"
inkscape:zoom="1"
inkscape:cx="240.103"
inkscape:cy="639.263"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"
inkscape:current-layer="layer3"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-object-midpoints="true"
@ -46,7 +45,7 @@
position="512,200" /><sodipodi:guide
id="guide3167"
orientation="1,0"
position="512,808.996" /><sodipodi:guide
position="512,811.5" /><sodipodi:guide
id="guide3169"
orientation="-0.866025,0.5"
position="512,200" /><sodipodi:guide
@ -118,7 +117,70 @@
style="display:inline"
inkscape:label="base"
id="layer3"
inkscape:groupmode="layer"><path
inkscape:groupmode="layer"
sodipodi:insensitive="true"><g
id="vorCrsPtr"
inkscape:label="#g3282"
inkscape:transform-center-y="-7.3565"
inkscape:transform-center-x="0.0234259"><path
sodipodi:nodetypes="ccccccccccc"
id="path4075"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 522.005,922.017 -20,0 10e-4,39.499 20,0 z m -20,-196.001 0,-28 10.341,-12 9.659,12 0,28 z"
inkscape:connector-curvature="0" /><path
inkscape:connector-curvature="0"
id="locPtr"
d="m 521.989,735.632 -19.987,-0.01 0.01,178.247 19.987,0.01 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:#ff00ff;stroke-width:5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
sodipodi:nodetypes="ccccc"
inkscape:label="#path4077"
inkscape:transform-center-y="0.742775" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path4079"
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,437.365,-62.1129)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.928,-62.1126)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path4081"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path4083"
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,663.819,-62.1131)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.671,-62.1123)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path4085"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
style="fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512,686.016 0,-562.249"
id="path4087"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ff00ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512,967.252 0,542.268"
id="path4089"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /></g><path
style="fill:none;stroke:#ff00ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:32, 16;stroke-dashoffset:0"
d="m 512,560.25 0,-327.134"
id="selHdgLine2"
@ -156,6 +218,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -173,6 +236,7 @@
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
@ -202,6 +266,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -219,6 +284,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -236,6 +302,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -254,6 +321,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -272,6 +340,7 @@
<g
id="hdgGroup"
inkscape:label="#g3141"><path
@ -297,6 +366,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -315,6 +385,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -333,6 +404,7 @@
</g><text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -351,6 +423,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -369,6 +442,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -387,6 +461,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -405,6 +480,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -423,6 +499,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -441,6 +518,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -459,6 +537,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -477,6 +556,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -495,6 +575,7 @@
<g
inkscape:label="#g3124"
id="compass"><path
@ -524,6 +605,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -543,6 +625,7 @@
<text
transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)"
xml:space="preserve"
@ -562,6 +645,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -581,6 +665,7 @@
<text
transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)"
xml:space="preserve"
@ -600,6 +685,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -619,6 +705,7 @@
<text
transform="scale(-1,-1)"
xml:space="preserve"
@ -638,6 +725,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -657,6 +745,7 @@
<text
transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)"
xml:space="preserve"
@ -676,6 +765,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -695,6 +785,7 @@
<text
transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)"
xml:space="preserve"
@ -714,6 +805,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -733,6 +825,7 @@
<path
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc"
id="path3181"
@ -803,6 +896,7 @@
<path
sodipodi:nodetypes="cscc"
inkscape:connector-curvature="0"
@ -827,37 +921,44 @@
<path
inkscape:transform-center-y="-662.357"
<g
id="staArrowL"
inkscape:label="#g4072"
inkscape:transform-center-y="-2.9215"><path
inkscape:transform-center-x="-1.011"
inkscape:transform-center-y="663.729"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccccccccccc"
inkscape:connector-curvature="0"
id="staFromR"
d="m 512.206,224.673 -10.076,-16.77 1.203,-84.883 m 17.93,0.512 -1.379,84.693 -7.678,16.448 m -22.274,-126.4175 0.53,16.5755 21.346,14.637 22.554,-15.181 0.118,-16.0315 m 0,0 -22.274,15.1005 -22.274,-15.1005"
style="fill:none;stroke:#00ff00;stroke-width:6.115005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
style="fill:none;stroke:#00ff00;stroke-width:3.671559;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 513.011,223.567 0,-111.472 0,-11.915 m 22.274,-3.2066 -22.274,15.1216 -22.274,-15.1216"
id="staFromL"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="-663.729"
inkscape:transform-center-x="-1.011" /><path
style="fill:none;stroke:#00ff00;stroke-width:6.427317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 512.5,95.501 512,225.865 m 20.25,-7.217 -20.25,-0.283 -19.75,0 M 525.024,107.259 512.5,95.501 499.976,106.824"
id="staToL"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
inkscape:label="#path3100"
id="staFromL"
d="m 512,1431.07 0,111.48 0,11.91 m 22.274,3.21 -22.274,-15.12 -22.274,15.12"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
inkscape:transform-center-x="-0.25"
inkscape:transform-center-y="-663.324"
inkscape:transform-center-x="-0.25" /><path
inkscape:transform-center-y="-1058.07"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccccccc"
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="staToL"
d="m 512.25,84.501 -0.5,130.364 m 20.25,-7.217 -20.25,-0.283 -19.75,0 M 524.774,96.259 512.25,84.501 499.726,95.824"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
id="staArrowR"
inkscape:label="#g4076"
inkscape:transform-center-y="-1.02045"><path
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 512,1433.34 -9,17.17 0,84 m 18,0 0,-84 -9,-17.17 m -22,126.17 0,-16 22,-14.96 22,14.96 0,16 m 0,0 -22,-14.85 -22,14.85"
id="staFromR"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="662.357" /><path
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 500.959,193.602 -11.459,0 0,15.301 45,0 0,-15.301 -11.459,0 -0.258,-83.647 L 512,86.4631 501.217,109.955 z"
id="staToR"
d="m 501.209,206.602 -11.459,0 0,15.301 45,0 0,-15.301 -11.459,0 -0.258,-83.647 -10.783,-23.4919 -10.783,23.4919 z"
style="fill:none;stroke:#00ff00;stroke-width:6.184731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc"
inkscape:label="#path3100"
inkscape:transform-center-y="-1058.07" /></g><g
id="rangeArcs"
inkscape:label="#g3890"><path
sodipodi:nodetypes="cscc"
@ -892,6 +993,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -910,6 +1012,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0099d9;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -928,6 +1031,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -946,6 +1050,7 @@
<path
inkscape:label="#path7253"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@ -994,73 +1099,8 @@
<g
style="display:inline"
inkscape:transform-center-y="-227.116"
inkscape:label="#g3961"
transform="matrix(0.814258,0.580503,-0.580503,0.814258,420.827,107.292)"
id="vorCrsPtr"
inkscape:transform-center-x="0.0231355"><path
sodipodi:nodetypes="ccccccccccc"
id="path4075"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 555.335,604.662 -16.285,11.61 22.93,32.162 16.286,-11.61 z m -130.064,-147.985 -16.254,-22.799 1.454,-15.774 14.831,4.164 16.254,22.799 z"
inkscape:connector-curvature="0" /><path
inkscape:connector-curvature="0"
id="locPtr"
d="M 447.125,452.906 430.844,464.5 534.325,609.633 550.606,598.039 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:#ff00ff;stroke-width:5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
sodipodi:nodetypes="ccccc"
inkscape:label="#path4077"
inkscape:transform-center-y="0.742775" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path4079"
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(1.18986,0,0,1.18986,-84.8735,-147.54)" /><path
transform="matrix(1.18986,0,0,1.18986,-23.3459,-191.404)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path4081"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
sodipodi:type="arc"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path4083"
sodipodi:cx="380.07"
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(1.18986,0,0,1.18986,99.5179,-278.997)" /><path
transform="matrix(1.18986,0,0,1.18986,161.282,-323.029)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
sodipodi:cx="380.07"
id="path4085"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /><path
style="fill:none;stroke:#ff00ff;stroke-width:5.000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 1438.97,392 0,-562.249"
id="path4087"
inkscape:connector-curvature="0"
transform="matrix(0.814258,-0.580503,0.580503,0.814258,-988.778,934.24)"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ff00ff;stroke-width:5.000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 1438.63,667.5 0,108.5"
id="path4089"
inkscape:connector-curvature="0"
transform="matrix(0.814258,-0.580503,0.580503,0.814258,-988.778,934.24)"
sodipodi:nodetypes="cc" /></g><text
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
x="803.289"
@ -1075,6 +1115,7 @@
y="53.929054">ILS L</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1090,6 +1131,7 @@
style="font-size:32px;fill:#ededed;fill-opacity:1">999.99</tspan></text>
</g><g
inkscape:groupmode="layer"
id="layer1"
@ -1109,22 +1151,20 @@
inkscape:label="#path3895"
inkscape:transform-center-y="0.309359" /><g
id="vorCrsPtr2"
transform="matrix(0.814258,0.580503,-0.580503,0.814258,420.822,-186.724)"
inkscape:label="#g3961"
inkscape:transform-center-y="4.49826"
inkscape:transform-center-x="0.0276213"><path
inkscape:label="#g3266"
inkscape:transform-center-y="4.211"><path
inkscape:connector-curvature="0"
d="m 595.97,661.66 -16.285,11.61 104.49,146.566 15.109,3.966 1.177,-15.576 z m -170.699,-204.983 -7.546,-10.585 -8.143,5.805 -9.869,-13.843 8.143,-5.805 -88.817,-124.581 1.454,-15.774 14.831,4.164 88.817,124.581 8.143,-5.805 9.868,13.843 -8.142,5.805 7.546,10.585 z"
d="m 522,698 -20,0 0,180 10,12 10,-12 z m -20,-266 0,-12.999 -10,-10e-4 0,-17 10,0 0,-153 10.341,-12 9.659,12 0,153 10,0 0,17 -10,10e-4 0,12.999 z"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3992"
sodipodi:nodetypes="cccccccccccccccccccc" /><path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:#ff00ff;stroke-width:5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="M 447.125,452.906 430.844,464.5 573.219,664.188 589.5,652.594 447.125,452.906 z"
d="m 521.984,441.616 -19.987,-0.01 0.01,245.247 19.987,0.01 -0.01,-245.246 z"
id="locPtr2"
inkscape:connector-curvature="0"
inkscape:label="#locPtr" /><path
transform="matrix(1.18986,0,0,1.18986,-68.6194,-124.741)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,437.361,-328.129)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1139,10 +1179,10 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(1.18986,0,0,1.18986,-7.09184,-168.605)" /><path
transform="matrix(1.18986,0,0,1.18986,115.772,-256.198)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.923,-328.129)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,663.814,-328.129)"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1157,14 +1197,14 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
transform="matrix(1.18986,0,0,1.18986,177.536,-300.23)" /></g><g
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.667,-328.128)" /></g><g
style="display:inline"
id="compassApp"
inkscape:label="#g3124"
transform="matrix(0.497307,0,0,0.497307,257.283,150.704)"
inkscape:transform-center-x="0.028335"
inkscape:transform-center-y="1.48975"><text
inkscape:transform-center-y="1.48975"
transform="matrix(0.497307,0,0,0.497307,257.283,150.704)"><text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
id="text3920"
@ -1182,6 +1222,7 @@
<text
transform="matrix(0.866025,-0.5,0.5,0.866025,0,0)"
xml:space="preserve"
@ -1201,6 +1242,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1220,6 +1262,7 @@
<text
transform="matrix(0,-1,1,0,0,0)"
xml:space="preserve"
@ -1239,6 +1282,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1258,6 +1302,7 @@
<text
transform="matrix(-0.866026,-0.5,0.5,-0.866026,0,0)"
xml:space="preserve"
@ -1277,6 +1322,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1296,6 +1342,7 @@
<text
transform="matrix(-0.866025,0.5,-0.5,-0.866025,0,0)"
xml:space="preserve"
@ -1315,6 +1362,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1334,6 +1382,7 @@
<text
transform="matrix(0,1,-1,0,0,0)"
xml:space="preserve"
@ -1353,6 +1402,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1372,6 +1422,7 @@
<text
transform="matrix(0.866026,0.5,-0.5,0.866026,0,0)"
xml:space="preserve"
@ -1391,6 +1442,7 @@
<path
inkscape:connector-curvature="0"
style="fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#ededed;stroke-width:10.054152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@ -1416,43 +1468,7 @@
d="m 450.789,122.474 1.851,21.331 c 0.01,0 0.02,0 0.03,0 l -1.882,-21.331 z m 122.749,0 -1.85,20.861 c 0.01,0 0.02,0 0.03,0 l 1.819,-20.861 z m 120.87,21.299 -5.301,19.669 m -359.215,-19.669 5.615,21.017 c 0,0 0.02,0 0.03,0 l -5.647,-21.017 z m 479.859,41.973 -8.438,18.068 c 0,0 5.771,-12.126 8.437,-18.069 m -595.205,0.03 9.348,20.138 c 0.01,0 0.02,-0.03 0.03,-0.03 l -9.378,-20.106 z m -106.311,61.358 12.987,18.633 c 0.02,-0.01 0.04,-0.02 0.06,-0.03 l -13.05,-18.602 z m -94.046,78.894 16.3748,16.405 c 0.01,0 -0.01,-0.03 0,-0.03 L 14.188,326.03 z m -78.8945,94.047 19.1354,13.426 c 0.01,-0.01 0.023,-0.02 0.031,-0.03 l -19.1665,-13.396 z m 1148.6865,3.513 -10.51,7.341 c 0,0 0,0.02 0,0.03 l 10.51,-7.372 z m -1210.076,102.797 21.299,9.975 c 0.01,-0.02 0.02,-0.04 0.03,-0.06 l -21.331,-9.912 z m 1269.996,3.011 -10.42,4.831 c 0,0 0,0.02 0,0.03 l 10.42,-4.862 z m -1311.97,112.335 22.869,6.147 c 0,0 0,-0.02 0,-0.03 l -22.869,-6.116 z m 1360.44,0 -17.85,4.768 c 0,0.01 0,0.02 0,0.03 l 17.82,-4.799 z m -1381.74,120.896 23.779,2.102 c 0,-0.02 0,-0.04 0,-0.06 l -23.779,-2.039 z m 1403.01,0 -18.38,1.6 c 0,0.01 0,0.02 0,0.03 l 18.38,-1.631 z m -1379.231,120.615 -23.779,2.102 23.779,-2.039 c 0,-0.02 0,-0.04 0,-0.06 z m 1360.851,0.502 c 0,0.01 0,0.02 0,0.03 l 18.44,1.6 -18.44,-1.631 z m -1340.461,116.387 -22.869,6.14 22.869,-6.11 0,0 z m 1319.721,1.34 0,0.1 17.79,4.73 -17.79,-4.8 z m -1279.285,110.2 -21.3,9.95 21.331,-9.95 -0.03,0 z m 1238.215,2.08 0,0 16.89,7.87 -16.89,-7.9 z m -1178.9897,100.72 -19.1668,13.43 19.1668,-13.4 0,0 z m 1118.9497,2.57 c 0,0 0,0 0,0.1 l 15.56,10.86 -15.53,-10.92 z m -77.01,91.23 13.71,13.7 -13.678,-13.7 -0.03,0 z M 915.552,250.85 902.069,269.164 z m -10.72,1133.86 c -0.01,0 -0.02,0 -0.03,0 l 11.262,16.03 -11.23,-16.06 z m -680.908,57.35 -9.379,20.17 9.41,-20.14 c -0.01,0 -0.02,0 -0.03,0 z m 577.452,2.04 c -0.01,0 -0.02,0 -0.03,0 l 8.439,18.04 -8.407,-18.07 z m -465.869,39.09 -5.615,21.01 5.646,-21.01 c -0.01,0 -0.02,0 -0.03,0 z m 353.597,1.31 5.301,19.7 -5.27,-19.7 c -0.01,0 -0.02,0 -0.03,0 z m -236.464,19.64 -1.851,21.4 1.882,-21.4 c -0.01,0 -0.02,0 -0.03,0 z m 119.017,0.47 1.85,20.89 -1.788,-20.89 c -0.02,0 -0.04,0 -0.06,0 z"
id="path3976"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscscccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccsccccsccccsc" /></g><use
style="display:inline"
x="0"
y="0"
xlink:href="#staToR"
inkscape:transform-center-y="-332.218"
id="staToR2"
transform="translate(-0.206735,90.9187)"
width="1024"
height="1024" /><use
style="display:inline"
x="0"
y="0"
xlink:href="#staFromR"
inkscape:transform-center-y="-332.218"
id="staFromR2"
transform="translate(0.290562,88.8207)"
width="1024"
height="1024" /><use
style="display:inline"
x="0"
y="0"
xlink:href="#staToL"
inkscape:transform-center-y="-332.218"
id="staToL2"
transform="translate(0.027267,92.9456)"
width="1024"
height="1024" /><use
style="display:inline"
x="0"
y="0"
xlink:href="#staFromL"
inkscape:transform-center-y="-332.218"
id="staFromL2"
transform="translate(-2.12902,94.067)"
width="1024"
height="1024" /><g
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscscccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccsccccsccccsc" /></g><g
id="hdgBug2"
inkscape:label="#g3185"
inkscape:transform-center-y="-346.705"><path
@ -1498,6 +1514,7 @@
style="font-size:24px">CRS</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1513,6 +1530,7 @@
y="124.87983">DME</tspan></text>
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1527,6 +1545,7 @@
sodipodi:role="line">999</tspan></text>
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1541,6 +1560,7 @@
y="126.12444">99.9</tspan></text>
<g
id="gsGroup"
transform="matrix(0,-1,1,0,746.592,1646.26)"
@ -1552,10 +1572,10 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1048.27,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1123.83,-640.211)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1570,10 +1590,10 @@
sodipodi:cy="643.93"
sodipodi:rx="6.71751"
sodipodi:ry="6.71751"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1274.73,-640.211)" /><path
transform="matrix(0.968853,0.690717,-0.690717,0.968853,1350.58,-640.21)"
d="m 386.788,643.93 c 0,3.71 -3.008,6.718 -6.718,6.718 -3.71,0 -6.718,-3.008 -6.718,-6.718 0,-3.71 3.008,-6.718 6.718,-6.718 3.71,0 6.718,3.008 6.718,6.718 z"
d="m 386.788,643.93 a 6.71751,6.71751 0 1 1 -13.436,0 6.71751,6.71751 0 1 1 13.436,0 z"
sodipodi:ry="6.71751"
sodipodi:rx="6.71751"
sodipodi:cy="643.93"
@ -1581,7 +1601,7 @@
id="path3959-1"
style="fill:none;stroke:#ededed;stroke-width:4.202175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
sodipodi:type="arc" /><path
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 1002.5,521.001 -19.001,0"
id="path4166"
inkscape:connector-curvature="0"
@ -1591,7 +1611,48 @@
id="gsDiamond"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
inkscape:label="#path4168" /></g></g><g
inkscape:label="#path4168" /></g><g
transform="translate(0,-189.841)"
style="display:inline"
inkscape:transform-center-y="5.22955"
inkscape:label="#g4076"
id="staArrowR2"><path
inkscape:transform-center-y="662.357"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccccccccccc"
inkscape:connector-curvature="0"
id="staFromR2"
d="m 512,1047.98 -9,17.17 0,24 m 18,0 0,-24 -9,-17.17 m -22,66.17 0,-16 22,-14.96 22,14.96 0,16 m 0,0 -22,-14.85 -22,14.85"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
inkscape:transform-center-y="-1058.07"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="staToR2"
d="m 500.959,440.854 -11.459,0 0,15.301 45,0 0,-15.301 -11.459,0 -0.258,-23.647 L 512,393.715 501.217,417.207 z"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
transform="translate(0.174175,-115.585)"
style="display:inline"
id="staArrowL2"
inkscape:label="#g4072"
inkscape:transform-center-y="3.80786"
inkscape:transform-center-x="-0.198874"><path
inkscape:transform-center-x="-1.011"
inkscape:transform-center-y="663.729"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccc"
inkscape:connector-curvature="0"
id="staFromL2"
d="m 512,973.468 0,51.482 0,11.91 m 22.274,3.21 -22.274,-15.12 -22.274,15.12"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
inkscape:transform-center-x="-0.25"
inkscape:transform-center-y="-663.324"
inkscape:label="#path3100"
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="staToL2"
d="m 512.25,316.675 -0.5,70.364 m 20.25,-7.217 -20.25,-0.283 -19.75,0 m 32.774,-51.106 -12.524,-11.758 -12.524,11.323"
style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="PLAN"
@ -1625,6 +1686,7 @@
<path
inkscape:label="#path3017"
sodipodi:nodetypes="cccccc"
@ -1648,6 +1710,7 @@
<text
sodipodi:linespacing="125%"
id="text3209"
@ -1665,6 +1728,7 @@
<text
xml:space="preserve"
style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#00ff00;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1682,6 +1746,7 @@
</g><text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1700,6 +1765,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1718,6 +1784,7 @@
<text
xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
@ -1736,6 +1803,7 @@
<text
inkscape:label="#text7243"
sodipodi:linespacing="125%"
@ -1754,4 +1822,5 @@
</g></svg>

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 97 KiB

View file

@ -287,7 +287,11 @@ var NDStyles = {
impl: {
init: func(nd,symbol),
predicate: func(nd) getprop("/autopilot/route-manager/wp/dist") != nil and getprop("autopilot/route-manager/active"),
is_true: func(nd) nd.symbols.wpActiveDistLbl.show(),
is_true: func(nd) {
nd.symbols.wpActiveDistLbl.show();
if(getprop("/autopilot/route-manager/wp/dist") > 1000)
nd.symbols.wpActiveDistLbl.setText(" NM");
},
is_false: func(nd) nd.symbols.wpActiveDistLbl.hide(),
},
},
@ -299,11 +303,11 @@ var NDStyles = {
is_true: func(nd) {
var etaSec = getprop("/sim/time/utc/day-seconds")+getprop("autopilot/route-manager/wp/eta-seconds");
var h = math.floor(etaSec/3600);
if (h>24) h=h-24;
etaSec=etaSec-3600*h;
var m = math.floor(etaSec/60);
etaSec=etaSec-60*m;
var s = etaSec/10;
if (h>24) h=h-24;
nd.symbols.eta.setText(sprintf("%02.0f%02.0f.%01.0fz",h,m,s));
nd.symbols.eta.show();
},
@ -470,7 +474,7 @@ var NDStyles = {
predicate: func(nd) nd.in_mode('toggle_display_mode', ['APP','VOR']),
is_true: func(nd) {
nd.symbols.dme.show();
if(getprop("instrumentation/nav/dme-in-range"))
if(getprop("instrumentation/dme/in-range"))
nd.symbols.dme.setText(sprintf("%3.1f",getprop("instrumentation/nav/nav-distance")*0.000539));
},
is_false: func(nd) nd.symbols.dme.hide(),
@ -500,6 +504,18 @@ var NDStyles = {
is_false: func(nd) nd.symbols.vorCrsPtr.hide(),
},
},
{
id:'vorCrsPtr2',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['APP','VOR']) and nd.get_switch('toggle_centered')),
is_true: func(nd) {
nd.symbols.vorCrsPtr2.show();
nd.symbols.vorCrsPtr2.setRotation((getprop("instrumentation/nav/radials/selected-deg")-nd.aircraft_source.get_hdg_tru())*D2R);
},
is_false: func(nd) nd.symbols.vorCrsPtr2.hide(),
},
},
{
id: 'gsDiamond',
impl: {
@ -516,16 +532,15 @@ var NDStyles = {
id:'locPtr',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['APP','VOR']) and !nd.get_switch('toggle_centered')),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['APP','VOR']) and !nd.get_switch('toggle_centered') and getprop("instrumentation/nav/in-range")),
is_true: func(nd) {
nd.symbols.locPtr.show();
var deflection = getprop("instrumentation/nav/heading-needle-deflection-norm");
nd.symbols.locPtr.setTranslation(deflection*150,0);
if(abs(deflection < 0.99))
nd.symbols.locPtr.setColorFill(1,0,1,1);
else
nd.symbols.locPtr.setColorFill(1,0,1,0);
nd.symbols.locPtr.setTranslation(0,-getprop("instrumentation/nav/heading-needle-deflection-norm")*150);
#if(abs(deflection) < 0.99)
# nd.symbols.locPtr.setColorFill(1,0,1,1);
#else
# nd.symbols.locPtr.setColorFill(1,0,1,0);
},
is_false: func(nd) nd.symbols.locPtr.hide(),
},
@ -534,16 +549,15 @@ var NDStyles = {
id:'locPtr2',
impl: {
init: func(nd,symbol),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['APP','VOR']) and !nd.get_switch('toggle_centered') and getprop("instrumentation/nav/in-range")),
predicate: func(nd) (nd.in_mode('toggle_display_mode', ['APP','VOR']) and nd.get_switch('toggle_centered') and getprop("instrumentation/nav/in-range")),
is_true: func(nd) {
nd.symbols.locPtr2.show();
var deflection = getprop("instrumentation/nav/heading-needle-deflection-norm");
nd.symbols.locPtr2.setTranslation(deflection*150,0);
if(abs(deflection < 0.99))
nd.symbols.locPtr2.setColorFill(1,0,1,1);
else
nd.symbols.locPtr2.setColorFill(1,0,1,0);
nd.symbols.locPtr2.setTranslation(0,-getprop("instrumentation/nav/heading-needle-deflection-norm")*150);
#if(abs(deflection) < 0.99)
# nd.symbols.locPtr2.setColorFill(1,0,1,1);
#else
# nd.symbols.locPtr2.setColorFill(1,0,1,0);
},
is_false: func(nd) nd.symbols.locPtr2.hide(),
},
@ -833,11 +847,11 @@ var NavDisplay = {
# anything that needs updatecenter called, should be added to the vector here
#
foreach(var element; ["compassApp","northUp","aplSymMap","aplSymMapCtr","aplSymVor",
"staFromL2","staToL2","staFromR2","staToR2",
"staArrowL2","staArrowR2","staFromL2","staToL2","staFromR2","staToR2",
"hdgTrk","truMag","altArc","planArcs",
"trkInd","compass","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","selHdgLine","curHdgPtr",
"HdgBugCRT2","TrkBugLCD2","HdgBugLCD2","hdgBug2","selHdgLine2","curHdgPtr2","vorCrsPtr2",
"staFromL","staToL","staFromR","staToR"] )
"trkInd","compass","hdgBug","HdgBugCRT","TrkBugLCD","HdgBugLCD","curHdgPtr",
"HdgBugCRT2","TrkBugLCD2","HdgBugLCD2","hdgBug2","selHdgLine","selHdgLine2","curHdgPtr2",
"staArrowL","staArrowR","staToL","staFromL","staToR","staFromR"] )
me.symbols[element] = me.nd.getElementById(element).updateCenter();
# this should probably be using Philosopher's new SymbolLayer ?
@ -1014,7 +1028,7 @@ var NavDisplay = {
else
me.symbols.vorLId.setText(getprop("instrumentation/nav/frequencies/selected-mhz-fmt"));
me.symbols.vorLId.setColor(0.195,0.96,0.097);
if(getprop("instrumentation/nav/dme-in-range"))
if(getprop("instrumentation/dme/in-range"))
me.symbols.dmeLDist.setText(sprintf("%3.1f",getprop("instrumentation/nav/nav-distance")*0.000539));
else me.symbols.dmeLDist.setText(" ---");
me.symbols.dmeLDist.setColor(0.195,0.96,0.097);
@ -1045,7 +1059,7 @@ var NavDisplay = {
else
me.symbols.vorRId.setText(getprop("instrumentation/nav[1]/frequencies/selected-mhz-fmt"));
me.symbols.vorRId.setColor(0.195,0.96,0.097);
if(getprop("instrumentation/nav[1]/dme-in-range"))
if(getprop("instrumentation/dme[1]/in-range"))
me.symbols.dmeRDist.setText(sprintf("%3.1f",getprop("instrumentation/nav[1]/nav-distance")*0.000539));
else me.symbols.dmeRDist.setText(" ---");
me.symbols.dmeRDist.setColor(0.195,0.96,0.097);
@ -1115,16 +1129,11 @@ var NavDisplay = {
}
me.map._node.getNode("hdg",1).setDoubleValue(userHdgTrk);
if(me.get_switch('toggle_centered')) {
if (me.in_mode('toggle_display_mode', ['APP','VOR'])) {
me.symbols.vorCrsPtr2.show();
if (me.in_mode('toggle_display_mode', ['APP','VOR']))
me.symbols.compassApp.show();
me.symbols.vorCrsPtr2.setRotation((getprop("instrumentation/nav/radials/selected-deg")-userHdgTrk)*D2R);
} else {
me.symbols.vorCrsPtr2.hide();
else
me.symbols.compassApp.setVisible(me.in_mode('toggle_display_mode', ['MAP']));
}
} else {
me.symbols.vorCrsPtr2.hide();
me.symbols.compassApp.hide();
}
@ -1151,46 +1160,34 @@ var NavDisplay = {
else
me.symbols.trkInd.show();
if((getprop("instrumentation/nav/in-range") and me.get_switch('toggle_lh_vor_adf') == 1)) {
me.symbols.staFromL.setVisible(staPtrVis);
me.symbols.staToL.setVisible(staPtrVis);
me.symbols.staFromL.setColor(0.195,0.96,0.097);
me.symbols.staArrowL.setVisible(staPtrVis);
me.symbols.staToL.setColor(0.195,0.96,0.097);
me.symbols.staFromL.setRotation((nav0hdg+180)*D2R);
me.symbols.staToL.setRotation(nav0hdg*D2R);
me.symbols.staFromL.setColor(0.195,0.96,0.097);
me.symbols.staArrowL.setRotation(nav0hdg*D2R);
}
elsif(getprop("instrumentation/adf/in-range") and (me.get_switch('toggle_lh_vor_adf') == -1)) {
me.symbols.staFromL.setVisible(staPtrVis);
me.symbols.staToL.setVisible(staPtrVis);
me.symbols.staFromL.setColor(0,0.6,0.85);
me.symbols.staArrowL.setVisible(staPtrVis);
me.symbols.staToL.setColor(0,0.6,0.85);
me.symbols.staFromL.setRotation((adf0hdg+180)*D2R);
me.symbols.staToL.setRotation(adf0hdg*D2R);
me.symbols.staFromL.setColor(0,0.6,0.85);
me.symbols.staArrowL.setRotation(adf0hdg*D2R);
} else {
me.symbols.staFromL.hide();
me.symbols.staToL.hide();
me.symbols.staArrowL.hide();
}
if((getprop("instrumentation/nav[1]/in-range") and me.get_switch('toggle_rh_vor_adf') == 1)) {
me.symbols.staFromR.setVisible(staPtrVis);
me.symbols.staToR.setVisible(staPtrVis);
me.symbols.staFromR.setColor(0.195,0.96,0.097);
me.symbols.staArrowR.setVisible(staPtrVis);
me.symbols.staToR.setColor(0.195,0.96,0.097);
me.symbols.staFromR.setRotation((nav1hdg+180)*D2R);
me.symbols.staToR.setRotation(nav1hdg*D2R);
me.symbols.staFromR.setColor(0.195,0.96,0.097);
me.symbols.staArrowR.setRotation(nav1hdg*D2R);
} elsif(getprop("instrumentation/adf[1]/in-range") and (me.get_switch('toggle_rh_vor_adf') == -1)) {
me.symbols.staFromR.setVisible(staPtrVis);
me.symbols.staToR.setVisible(staPtrVis);
me.symbols.staFromR.setColor(0,0.6,0.85);
me.symbols.staArrowR.setVisible(staPtrVis);
me.symbols.staToR.setColor(0,0.6,0.85);
me.symbols.staFromR.setRotation((adf1hdg+180)*D2R);
me.symbols.staToR.setRotation(adf1hdg*D2R);
me.symbols.staFromR.setColor(0,0.6,0.85);
me.symbols.staArrowR.setRotation(adf1hdg*D2R);
} else {
me.symbols.staFromR.hide();
me.symbols.staToR.hide();
me.symbols.staArrowR.hide();
}
me.symbols.staFromL2.hide();
me.symbols.staToL2.hide();
me.symbols.staFromR2.hide();
me.symbols.staToR2.hide();
me.symbols.staArrowL2.hide();
me.symbols.staArrowR2.hide();
me.symbols.curHdgPtr2.hide();
me.symbols.HdgBugCRT2.hide();
me.symbols.TrkBugLCD2.hide();
@ -1204,45 +1201,33 @@ var NavDisplay = {
} else {
me.symbols.trkInd.hide();
if((getprop("instrumentation/nav/in-range") and me.get_switch('toggle_lh_vor_adf') == 1)) {
me.symbols.staFromL2.setVisible(staPtrVis);
me.symbols.staToL2.setVisible(staPtrVis);
me.symbols.staArrowL2.setVisible(staPtrVis);
me.symbols.staFromL2.setColor(0.195,0.96,0.097);
me.symbols.staToL2.setColor(0.195,0.96,0.097);
me.symbols.staFromL2.setRotation((nav0hdg+180)*D2R);
me.symbols.staToL2.setRotation(nav0hdg*D2R);
me.symbols.staArrowL2.setRotation(nav0hdg*D2R);
} elsif(getprop("instrumentation/adf/in-range") and (me.get_switch('toggle_lh_vor_adf') == -1)) {
me.symbols.staFromL2.setVisible(staPtrVis);
me.symbols.staToL2.setVisible(staPtrVis);
me.symbols.staArrowL2.setVisible(staPtrVis);
me.symbols.staFromL2.setColor(0,0.6,0.85);
me.symbols.staToL2.setColor(0,0.6,0.85);
me.symbols.staFromL2.setRotation((adf0hdg+180)*D2R);
me.symbols.staToL2.setRotation(adf0hdg*D2R);
me.symbols.staArrowL2.setRotation(adf0hdg*D2R);
} else {
me.symbols.staFromL2.hide();
me.symbols.staToL2.hide();
me.symbols.staArrowL2.hide();
}
if((getprop("instrumentation/nav[1]/in-range") and me.get_switch('toggle_rh_vor_adf') == 1)) {
me.symbols.staFromR2.setVisible(staPtrVis);
me.symbols.staToR2.setVisible(staPtrVis);
me.symbols.staArrowR2.setVisible(staPtrVis);
me.symbols.staFromR2.setColor(0.195,0.96,0.097);
me.symbols.staToR2.setColor(0.195,0.96,0.097);
me.symbols.staFromR2.setRotation((nav1hdg+180)*D2R);
me.symbols.staToR2.setRotation(nav1hdg*D2R);
me.symbols.staArrowR2.setRotation(nav1hdg*D2R);
} elsif(getprop("instrumentation/adf[1]/in-range") and (me.get_switch('toggle_rh_vor_adf') == -1)) {
me.symbols.staFromR2.setVisible(staPtrVis);
me.symbols.staToR2.setVisible(staPtrVis);
me.symbols.staArrowR2.setVisible(staPtrVis);
me.symbols.staFromR2.setColor(0,0.6,0.85);
me.symbols.staToR2.setColor(0,0.6,0.85);
me.symbols.staFromR2.setRotation((adf1hdg+180)*D2R);
me.symbols.staToR2.setRotation(adf1hdg*D2R);
me.symbols.staArrowR2.setRotation(adf1hdg*D2R);
} else {
me.symbols.staFromR2.hide();
me.symbols.staToR2.hide();
me.symbols.staArrowR2.hide();
}
me.symbols.staFromL.hide();
me.symbols.staToL.hide();
me.symbols.staFromR.hide();
me.symbols.staToR.hide();
me.symbols.staArrowL.hide();
me.symbols.staArrowR.hide();
me.symbols.curHdgPtr.hide();
me.symbols.HdgBugCRT.hide();
me.symbols.TrkBugLCD.hide();