From da76bc635ea2ee751006d89360006229ed4d148f Mon Sep 17 00:00:00 2001 From: Hyde Yamakawa Date: Tue, 25 Mar 2014 17:55:06 -0400 Subject: [PATCH] Canvas ND:GS pointer, LOC pointer and dme source fix from Soitenen --- Nasal/canvas/map/boeingND.svg | 2980 +++++++++++++------------------ Nasal/canvas/map/navdisplay.mfd | 31 +- 2 files changed, 1293 insertions(+), 1718 deletions(-) diff --git a/Nasal/canvas/map/boeingND.svg b/Nasal/canvas/map/boeingND.svg index da4b11bf6..13013d47b 100644 --- a/Nasal/canvas/map/boeingND.svg +++ b/Nasal/canvas/map/boeingND.svg @@ -24,15 +24,15 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1360" + inkscape:window-height="711" id="namedview102" showgrid="false" - inkscape:zoom="0.5" - inkscape:cx="432.905" - inkscape:cy="372.682" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:zoom="4" + inkscape:cx="935.56631" + inkscape:cy="485.54807" + inkscape:window-x="0" + inkscape:window-y="33" inkscape:window-maximized="1" inkscape:current-layer="layer1" inkscape:object-nodes="true" @@ -119,1772 +119,1342 @@ id="layer3" inkscape:groupmode="layer" sodipodi:insensitive="true">ABCD - - - - - - - + id="vorCrsPtr" + inkscape:label="#g3282" + inkscape:transform-center-y="-7.3565" + inkscape:transform-center-x="0.0234259">ABCD 999.9 - - - - - - - + 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" + x="844.04407" + y="126.12489" + id="wpActiveDist" + sodipodi:linespacing="125%" + inkscape:label="#text7243">999.9 999°/ 99 - - - - - - - + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="aplSymMap" + d="m 541.5,892 -59,0 29.5,-68 z" + style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:label="#path7253" />999°/ 99 999 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="gs" + y="53.306854" + x="77.874374" + 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" + xml:space="preserve">999 999 - - - - - - - + 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" + x="210.49673" + y="53.306854" + id="tas" + sodipodi:linespacing="125%" + inkscape:label="#text7243">999 GS - - - - - - - + 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" + x="38.276394" + y="53.306854" + id="gsLbl" + sodipodi:linespacing="125%" + inkscape:label="#text7243">GS TAS - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="tasLbl" + y="53.306854" + x="158.17084" + 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" + xml:space="preserve">TAS 999 - - - - - - - + id="hdgGroup" + inkscape:label="#g3141">999 HDG - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="hdgTrk" + y="67.549522" + x="373.44498" + 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" + xml:space="preserve">HDG MAG - - - - - - - + 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="578.66278" + y="67.549522" + id="truMag" + sodipodi:linespacing="125%" + inkscape:label="#text7243">MAG VOR L - - - - - - - + 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="41.732624" + y="913.5495" + id="vorL" + sodipodi:linespacing="125%" + inkscape:label="#text7243">VOR L DME - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="dmeL" + y="993.85461" + x="41.732624" + 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" + xml:space="preserve">DME 99.9 - - - - - - - + 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="101.1296" + y="993.85461" + id="dmeLDist" + sodipodi:linespacing="125%" + inkscape:label="#text7243">99.9 ABC - - - - - - - + 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="41.732624" + y="954.56171" + id="vorLId" + sodipodi:linespacing="125%" + inkscape:label="#text7243">ABC VOR R - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="vorR" + y="913.5495" + x="889.7326" + 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" + xml:space="preserve">VOR R DME - - - - - - - + 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="889.7326" + y="993.85461" + id="dmeR" + sodipodi:linespacing="125%" + inkscape:label="#text7243">DME 99.9 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="dmeRDist" + y="993.85461" + x="949.12958" + 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" + xml:space="preserve">99.9 ABC - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="vorRId" + y="954.56171" + x="889.7326" + 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" + xml:space="preserve">ABC 08 34.4z - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="eta" + y="90.062447" + x="844.04407" + 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" + xml:space="preserve">08 34.4z 0 - - - - - - - + inkscape:label="#g3124" + id="compass">0 33 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3080" + y="344.7804" + x="9.1033907" + style="font-size:35.999943px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0.866025,-0.5,0.5,0.866025,0,0)">33 30 - - - - - - - + transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)" + xml:space="preserve" + style="font-size:36.000011px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-478.97894" + y="231.34868" + id="text3084" + sodipodi:linespacing="125%" + inkscape:label="#text7243">30 27 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3088" + y="-108.93858" + x="-845.96948" + style="font-size:36.000011px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0,-1,1,0,0,0)">27 24 - - - - - - - + transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)" + xml:space="preserve" + style="font-size:35.999977px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-992.34058" + y="-584.99097" + id="text3092" + sodipodi:linespacing="125%" + inkscape:label="#text7243">24 21 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3096" + y="-1071.5541" + x="-879.19897" + style="font-size:36.000046px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(-0.866026,-0.5,0.5,-0.866026,0,0)">21 18 - - - - - - - + transform="scale(-1,-1)" + xml:space="preserve" + style="font-size:36.000027px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-533.67151" + y="-1436.3594" + id="text3100" + sodipodi:linespacing="125%" + inkscape:label="#text7243">18 15 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3104" + y="-1581.0712" + x="-51.792171" + style="font-size:36.000004px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(-0.866025,0.5,-0.5,-0.866025,0,0)">15 12 - - - - - - - + transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)" + xml:space="preserve" + style="font-size:36.000042px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="435.97983" + y="-1462.8785" + id="text3108" + sodipodi:linespacing="125%" + inkscape:label="#text7243">12 9 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3112" + y="-1123.9312" + x="812.80585" + style="font-size:36.000042px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0,1,-1,0,0,0)">9 6 - - - - - - - + transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)" + xml:space="preserve" + style="font-size:36.000019px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="958.43561" + y="-645.76654" + id="text3116" + sodipodi:linespacing="125%" + inkscape:label="#text7243">6 3 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3120" + y="-158.40652" + x="844.79596" + style="font-size:36.000095px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0.866026,0.5,-0.5,0.866026,0,0)">3 99 - - - - - - - + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc" + id="path3181" + d="m 512.162,122.464 -0.03,43.913 c 0.02,0 0.04,0 0.06,0 z m -121.834,10.683 7.445,42.355 c 0.02,0 0.04,-0.03 0.06,-0.03 l -7.506,-42.324 z m 243.668,0 -7.817,44.037 c 0.03,0 0.06,0 0.09,0 l 7.724,-44.037 z m -361.763,31.641 14.42,39.771 c 0.03,-0.01 0.06,-0.02 0.09,-0.03 z m 479.859,0 -15.666,42.948 c 0.02,0 0.04,0.02 0.06,0.03 l 15.603,-42.978 z m -590.7,51.668 20.93,36.345 c 0.02,-0.01 0.04,-0.02 0.06,-0.03 l -20.993,-36.313 z m 701.536,0 -23.41,40.703 m -778.2827,29.434 26.846,32.078 c 0.02,-0.02 0.04,-0.04 0.06,-0.06 l -26.908,-32.015 z m 901.8497,0 -31.044,36.935 m -957.2909,49.55 32.01553,26.908 c 0.0199,-0.02 0.0398,-0.04 0.0598,-0.06 L -25.2519,373.078 z m 1036.9299,31.77 c 0,0.02 0,0.05 0,0.06 l 37.87,-31.83 c -12.51,10.544 -25.26,21.2 -37.87,31.77 z m -1107.065,68.391 36.3128,20.992 c 0.01,-0.02 0.02,-0.04 0.03,-0.06 l -36.3447,-20.929 z m 1215.085,0 -43.8,25.258 c 0,0.02 0,0.04 0,0.06 l 43.77,-25.321 z m -1266.752,110.841 39.739,14.512 c 0.01,-0.03 0.02,-0.06 0.03,-0.09 l -39.771,-14.42 z m 1318.422,0 -48.55,17.628 c 0,0.03 0,0.06 0,0.09 l 48.52,-17.72 z m -1350.064,118.096 42.325,7.506 c 0,-0.02 0.03,-0.04 0.03,-0.06 l -42.356,-7.444 z m 1381.704,0 -51.94,9.125 c 0,0.03 0,0.06 0,0.09 l 51.94,-9.219 z m -43.15,121.773 c 0,0.04 0,0.08 0,0.123 l 53.84,-0.06 -53.84,-0.06 z m -1305.324,0.03 -43.912,0.03 43.912,0.03 c 0,-0.02 0,-0.04 0,-0.06 z M 1149.36,936.341 c 0,0.03 0,0.06 0,0.09 l 53.65,9.407 -53.65,-9.5 z m -1284.017,1.683 -44.037,7.817 44.037,-7.723 c 0,-0.03 0,-0.06 0,-0.09 z m 1254.357,107.046 0,0.1 51.7,18.77 -51.67,-18.87 z m -1223.804,3.21 -42.948,15.66 42.978,-15.6 c 0,0 -0.02,0 -0.03,-0.1 z m 1175.754,98.68 -0.1,0.1 48.12,27.72 -48.05,-27.82 z m -1126.393,4.3 -40.642,23.52 40.6729,-23.46 c -0.01,0 -0.02,0 -0.03,-0.1 z m 1061.593,87.76 c 0,0 0,0 -0.1,0.1 l 42.79,35.85 -42.73,-35.91 z m -995.1642,4.86 -36.9357,31.05 36.9984,-30.98 c -0.02,0 -0.04,-0.1 -0.06,-0.1 z m 915.5522,74.74 c 0,0 0,0 -0.1,0.1 l 35.917,42.72 -35.847,-42.79 z m -834.2365,4.89 -31.7662,37.9 31.829,-37.87 c -0.02,0 -0.05,0 -0.06,0 z m 742.2105,59.92 -0.1,0.1 27.816,48.04 -27.726,-48.11 z m -648.561,4.31 -25.259,43.8 25.322,-43.77 c -0.02,0 -0.04,0 -0.06,0 z m 546.661,43.77 c -0.03,0 -0.06,0 -0.09,0 l 18.874,51.68 -18.78,-51.71 z m -443.452,3.15 -17.627,48.56 17.721,-48.53 c -0.03,0 -0.06,0 -0.09,0 z m 334.729,26.54 c -0.03,0 -0.06,0 -0.09,0 l 9.499,53.63 -9.407,-53.66 z m -225.135,1.71 -9.126,51.95 9.22,-51.95 c -0.03,0 -0.06,0 -0.09,0 z m 112.646,8.78 0.06,53.85 0.06,-53.85 c -0.04,0 -0.08,0 -0.124,0 z" + style="fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + inkscape:connector-curvature="0" />99 TA ONLY - - - - - - - + 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 l 0,0" + style="fill:none;stroke:#00ff00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + inkscape:label="#path3888-1" />TA ONLY WXR - - - - - - - + id="staArrowL" + inkscape:label="#g4072" + inkscape:transform-center-y="-2.9215">WXR ARPT - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="status.arpt" + y="734.12946" + x="41.732624" + 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" + xml:space="preserve">ARPT WPT - - - - - - - + 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" + x="41.732624" + y="697.12939" + id="status.wpt" + sodipodi:linespacing="125%" + inkscape:label="#text7243">WPT STA - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="status.sta" + y="661.12933" + x="41.732624" + 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" + xml:space="preserve">STA NM - - - - - - - + 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" + d="m 541.5,627.342 -59,0 29.5,-68 z" + id="aplSymMapCtr" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" />NM ILS L - - - - + 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" + y="53.929054" + id="ilsLbl" + sodipodi:linespacing="125%" + inkscape:label="#text7243">ILS L 999.99 - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="ilsFreq" + y="53.929054" + x="888.28894" + 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" + xml:space="preserve">999.99 0 - - - - - - - + id="trkInd2" + style="fill:#ff0000;fill-opacity:1;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 484.069,824.388 55.862,0 m -27.755,84.942 -0.353,-144.493 m -27.754,-469.644 55.862,0 m -27.755,-84.942 -0.353,144.493" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" + inkscape:label="#path3998" />0 33 - - - - - - - + transform="matrix(0.866025,-0.5,0.5,0.866025,0,0)" + xml:space="preserve" + style="font-size:35.999931px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-13.265571" + y="377.83694" + id="text3924" + sodipodi:linespacing="125%" + inkscape:label="#text7243">33 30 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3928" + y="265.32059" + x="-503.69513" + style="font-size:36.000031px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0.5,-0.866026,0.866026,0.5,0,0)">30 27 - - - - - - - + transform="matrix(0,-1,1,0,0,0)" + xml:space="preserve" + style="font-size:36.000011px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-868.71942" + y="-71.969933" + id="text3932" + sodipodi:linespacing="125%" + inkscape:label="#text7243">27 24 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3936" + y="-541.37213" + x="-1019.1653" + style="font-size:35.999966px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(-0.5,-0.866025,0.866025,-0.5,0,0)">24 21 - - - - - - - + transform="matrix(-0.866026,-0.5,0.5,-0.866026,0,0)" + xml:space="preserve" + style="font-size:36.000065px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-904.95624" + y="-1033.6982" + id="text3940" + sodipodi:linespacing="125%" + inkscape:label="#text7243">21 18 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3944" + y="-1392.2814" + x="-557.84332" + style="font-size:36.000027px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="scale(-1,-1)">18 15 - - - - - - - + transform="matrix(-0.866025,0.5,-0.5,-0.866025,0,0)" + xml:space="preserve" + style="font-size:35.999992px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="-71.888855" + y="-1543.4183" + id="text3948" + sodipodi:linespacing="125%" + inkscape:label="#text7243">15 12 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3952" + y="-1431.3702" + x="409.84222" + style="font-size:36.000061px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(-0.5,0.866026,-0.866026,-0.5,0,0)">12 9 - - - - - - - + transform="matrix(0,1,-1,0,0,0)" + xml:space="preserve" + style="font-size:36.000042px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="801.43085" + y="-1088.3844" + id="text3956" + sodipodi:linespacing="125%" + inkscape:label="#text7243">9 6 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="text3960" + y="-611.09729" + x="941.70276" + style="font-size:36.000008px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + xml:space="preserve" + transform="matrix(0.5,0.866025,-0.866025,0.5,0,0)">6 3 - - - - - - - + transform="matrix(0.866026,0.5,-0.5,0.866026,0,0)" + xml:space="preserve" + style="font-size:36.000114px;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;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + x="831.16284" + y="-130.83325" + id="text3964" + sodipodi:linespacing="125%" + inkscape:label="#text7243">3 CRS - - - - + 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" + d="m 512.162,122.464 -0.03,43.913 c 0.02,0 0.04,0 0.06,0 z m -121.834,10.683 7.445,42.355 c 0.02,0 0.04,-0.03 0.06,-0.03 l -7.506,-42.324 z m 243.668,0 -7.817,44.037 c 0.03,0 0.06,0 0.09,0 l 7.724,-44.037 z m -361.763,31.641 14.42,39.771 c 0.03,-0.01 0.06,-0.02 0.09,-0.03 z m 479.859,0 -15.666,42.948 c 0.02,0 0.04,0.02 0.06,0.03 l 15.603,-42.978 z m -590.7,51.668 20.93,36.345 c 0.02,-0.01 0.04,-0.02 0.06,-0.03 l -20.993,-36.313 z m 701.536,0 -23.41,40.703 m -778.2827,29.434 26.846,32.078 c 0.02,-0.02 0.04,-0.04 0.06,-0.06 l -26.908,-32.015 z m 901.8497,0 -31.044,36.935 m -957.2909,49.55 32.01553,26.908 c 0.0199,-0.02 0.0398,-0.04 0.0598,-0.06 L -25.2519,373.078 z m 1036.9299,31.77 c 0,0.02 0,0.05 0,0.06 l 37.87,-31.83 c -12.51,10.544 -25.26,21.2 -37.87,31.77 z m -1107.065,68.391 36.3128,20.992 c 0.01,-0.02 0.02,-0.04 0.03,-0.06 l -36.3447,-20.929 z m 1215.085,0 -43.8,25.258 c 0,0.02 0,0.04 0,0.06 l 43.77,-25.321 z m -1266.752,110.841 39.739,14.512 c 0.01,-0.03 0.02,-0.06 0.03,-0.09 l -39.771,-14.42 z m 1318.422,0 -48.55,17.628 c 0,0.03 0,0.06 0,0.09 l 48.52,-17.72 z m -1350.064,118.096 42.325,7.506 c 0,-0.02 0.03,-0.04 0.03,-0.06 l -42.356,-7.444 z m 1381.704,0 -51.94,9.125 c 0,0.03 0,0.06 0,0.09 l 51.94,-9.219 z m -43.15,121.773 c 0,0.04 0,0.08 0,0.123 l 53.84,-0.06 -53.84,-0.06 z m -1305.324,0.03 -43.912,0.03 43.912,0.03 c 0,-0.02 0,-0.04 0,-0.06 z M 1149.36,936.341 c 0,0.03 0,0.06 0,0.09 l 53.65,9.407 -53.65,-9.5 z m -1284.017,1.683 -44.037,7.817 44.037,-7.723 c 0,-0.03 0,-0.06 0,-0.09 z m 1254.357,107.046 0,0.1 51.7,18.77 -51.67,-18.87 z m -1223.804,3.21 -42.948,15.66 42.978,-15.6 c 0,0 -0.02,0 -0.03,-0.1 z m 1175.754,98.68 -0.1,0.1 48.12,27.72 -48.05,-27.82 z m -1126.393,4.3 -40.642,23.52 40.6729,-23.46 c -0.01,0 -0.02,0 -0.03,-0.1 z m 1061.593,87.76 c 0,0 0,0 -0.1,0.1 l 42.79,35.85 -42.73,-35.91 z m -995.1642,4.86 -36.9357,31.05 36.9984,-30.98 c -0.02,0 -0.04,-0.1 -0.06,-0.1 z m 915.5522,74.74 c 0,0 0,0 -0.1,0.1 l 35.917,42.72 -35.847,-42.79 z m -834.2365,4.89 -31.7662,37.9 31.829,-37.87 c -0.02,0 -0.05,0 -0.06,0 z m 742.2105,59.92 -0.1,0.1 27.816,48.04 -27.726,-48.11 z m -648.561,4.31 -25.259,43.8 25.322,-43.77 c -0.02,0 -0.04,0 -0.06,0 z m 546.661,43.77 c -0.03,0 -0.06,0 -0.09,0 l 18.874,51.68 -18.78,-51.71 z m -443.452,3.15 -17.627,48.56 17.721,-48.53 c -0.03,0 -0.06,0 -0.09,0 z m 334.729,26.54 c -0.03,0 -0.06,0 -0.09,0 l 9.499,53.63 -9.407,-53.66 z m -225.135,1.71 -9.126,51.95 9.22,-51.95 c -0.03,0 -0.06,0 -0.09,0 z m 112.646,8.78 0.06,53.85 0.06,-53.85 c -0.04,0 -0.08,0 -0.124,0 z" + id="path3968" + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccc" />CRS DME - - - - + 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" + x="854.72168" + y="124.87983" + id="dmeLbl" + sodipodi:linespacing="125%" + inkscape:label="#text7243">DME 999 - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="crs" + y="90.062439" + x="913.95801" + 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" + xml:space="preserve">999 99.9 - - - - + 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" + x="913.95801" + y="126.12444" + id="dme" + sodipodi:linespacing="125%" + inkscape:label="#text7243">99.9 N - - - - - - - + style="display:inline" + id="planArcs" + inkscape:label="#g3956" + transform="matrix(1.02827,0,0,1.02827,-14.7256,-29.1838)">N W - - - - - - - + inkscape:label="#path3017" + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path3180" + d="m 522.504,63.7561 0,-24.042 m 0,0 -2.588,4.481 5.465,0 -2.877,-4.481" + style="fill:#00ff00;stroke:#00ff00;stroke-width:1.844872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />W E - - - - - - - + sodipodi:linespacing="125%" + id="text3209" + y="530.25165" + x="962.65656" + 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" + xml:space="preserve">E S - - - - - - - + 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" + x="503.03763" + y="1008.2553" + id="text3213" + sodipodi:linespacing="125%">S 99 - - - - - - - + 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" + x="511.74799" + y="320.56113" + id="rangePln2" + sodipodi:linespacing="125%" + inkscape:label="#text7243">99 99 - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="rangePln1" + y="102.56212" + x="512.06421" + 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" + xml:space="preserve">99 99 - - - - - - - + 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" + x="512.21063" + y="752.73596" + id="rangePln3" + sodipodi:linespacing="125%" + inkscape:label="#text7243">99 99 - - - - - - - - + inkscape:label="#text7243" + sodipodi:linespacing="125%" + id="rangePln4" + y="968.55823" + x="511.77499" + 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" + xml:space="preserve">99 + \ No newline at end of file diff --git a/Nasal/canvas/map/navdisplay.mfd b/Nasal/canvas/map/navdisplay.mfd index 36843e84e..a8563491b 100644 --- a/Nasal/canvas/map/navdisplay.mfd +++ b/Nasal/canvas/map/navdisplay.mfd @@ -483,7 +483,7 @@ var NDStyles = { is_true: func(nd) { nd.symbols.dme.show(); if(getprop("instrumentation/dme/in-range")) - nd.symbols.dme.setText(sprintf("%3.1f",getprop("instrumentation/nav/nav-distance")*0.000539)); + nd.symbols.dme.setText(sprintf("%3.1f",getprop("instrumentation/dme/indicated-distance-nm"))); }, is_false: func(nd) nd.symbols.dme.hide(), }, @@ -537,8 +537,13 @@ var NDStyles = { init: func(nd,symbol), predicate: func(nd) nd.in_mode('toggle_display_mode', ['APP']) and getprop("instrumentation/nav/gs-in-range"), is_true: func(nd) { - if(getprop("instrumentation/nav/gs-needle-deflection-norm") != nil) - nd.symbols.gsDiamond.setTranslation(getprop("instrumentation/nav/gs-needle-deflection-norm")*150,0); + var gs_deflection = getprop("instrumentation/nav/gs-needle-deflection-norm"); + if(gs_deflection != nil) + nd.symbols.gsDiamond.setTranslation(gs_deflection*150,0); + if(abs(gs_deflection) < 0.99) + nd.symbols.gsDiamond.setColorFill(1,0,1,1); + else + nd.symbols.gsDiamond.setColorFill(0,0,0,1); }, is_false: func(nd) nd.symbols.gsGroup.hide(), }, @@ -552,10 +557,10 @@ var NDStyles = { 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); + if(abs(deflection) < 0.99) + nd.symbols.locPtr.setColorFill(1,0,1,1); + else + nd.symbols.locPtr.setColorFill(0,0,0,1); }, is_false: func(nd) nd.symbols.locPtr.hide(), }, @@ -569,10 +574,10 @@ var NDStyles = { 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); + if(abs(deflection) < 0.99) + nd.symbols.locPtr2.setColorFill(1,0,1,1); + else + nd.symbols.locPtr2.setColorFill(0,0,0,1); }, is_false: func(nd) nd.symbols.locPtr2.hide(), }, @@ -1046,7 +1051,7 @@ var NavDisplay = { me.symbols.vorLId.setText(getprop("instrumentation/nav/frequencies/selected-mhz-fmt")); me.symbols.vorLId.setColor(0.195,0.96,0.097); if(getprop("instrumentation/dme/in-range")) - me.symbols.dmeLDist.setText(sprintf("%3.1f",getprop("instrumentation/nav/nav-distance")*0.000539)); + me.symbols.dmeLDist.setText(sprintf("%3.1f",getprop("instrumentation/dme/indicated-distance-nm"))); else me.symbols.dmeLDist.setText(" ---"); me.symbols.dmeLDist.setColor(0.195,0.96,0.097); } elsif(me.get_switch('toggle_lh_vor_adf') == -1) { @@ -1077,7 +1082,7 @@ var NavDisplay = { 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/dme[1]/in-range")) - me.symbols.dmeRDist.setText(sprintf("%3.1f",getprop("instrumentation/nav[1]/nav-distance")*0.000539)); + me.symbols.dmeRDist.setText(sprintf("%3.1f",getprop("instrumentation/dme[1]/indicated-distance-nm"))); else me.symbols.dmeRDist.setText(" ---"); me.symbols.dmeRDist.setColor(0.195,0.96,0.097); } elsif(me.get_switch('toggle_rh_vor_adf') == -1) {