heading bug lateral labels and easing on compass
This commit is contained in:
Inuyaksa
parent
f10da37fed
commit
d017a55d1c
3 changed files with 174 additions and 89 deletions
|
|
@ -32,8 +32,7 @@ canvas.NavDisplay.get_nav_path = func (type, idx) {
|
|||
return sprintf(path, name, idx);
|
||||
};
|
||||
|
||||
canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update_time=0.05)
|
||||
{
|
||||
canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update_time=0.05) {
|
||||
if (me.inited) die("MFD already was added to scene");
|
||||
me.range_dependant_layers = [];
|
||||
me.always_update_layers = {};
|
||||
|
|
@ -87,6 +86,8 @@ canvas.NavDisplay.newMFD = func(canvas_group, parent=nil, nd_options=nil, update
|
|||
.set("screen-range", 700)
|
||||
.set("z-index",-1);
|
||||
|
||||
me.lastCompassRot = 0; # last compass rotation deg
|
||||
|
||||
me.update_sub(); # init some map properties based on switches
|
||||
|
||||
var vor1_path = "/instrumentation/nav[2]";
|
||||
|
|
@ -277,20 +278,36 @@ canvas.NavDisplay.update_sub = func(){
|
|||
me.userTrk=userHdg;
|
||||
}
|
||||
|
||||
var reqHdg = 0;
|
||||
|
||||
if((me.in_mode("toggle_display_mode", ["MAP"]) and me.get_switch("toggle_display_type") == "CRT")
|
||||
or (me.get_switch("toggle_track_heading") and me.get_switch("toggle_display_type") == "LCD"))
|
||||
{
|
||||
or (me.get_switch("toggle_track_heading") and me.get_switch("toggle_display_type") == "LCD")) {
|
||||
userHdgTrk = userTrk;
|
||||
me.userHdgTrk = userTrk;
|
||||
me.lastCompassRot = userTrk;
|
||||
userHdgTrkTru = userTrkTru;
|
||||
me.symbols.hdgTrk.setText("TRK");
|
||||
} else {
|
||||
userHdgTrk = userHdg;
|
||||
me.userHdgTrk = userHdg;
|
||||
var dist = int(userHdg - me.lastCompassRot);
|
||||
if (dist>180) dist = dist - 360;
|
||||
elsif (dist<-180) dist = 360 + dist;
|
||||
if (dist>0) {
|
||||
dist = dist * 0.3;
|
||||
if (dist>20) dist = 20;
|
||||
me.lastCompassRot = (dist<1) ? userHdg : me.lastCompassRot+dist;
|
||||
}
|
||||
elsif (dist<0) {
|
||||
dist = dist * 0.3;
|
||||
if (dist<-20) dist = -20;
|
||||
me.lastCompassRot = (dist>-1) ? userHdg : me.lastCompassRot+dist;
|
||||
}
|
||||
userHdgTrk = me.lastCompassRot;
|
||||
me.userHdgTrk = me.lastCompassRot;
|
||||
userHdgTrkTru = userHdgTru;
|
||||
me.symbols.hdgTrk.setText("HDG");
|
||||
}
|
||||
|
||||
|
||||
# First, update the display position of the map
|
||||
var oldRange = me.map.getRange();
|
||||
var pos = {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
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_orig.svg"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
|
||||
sodipodi:docname="airbusND.svg"
|
||||
inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
|
||||
xml:space="preserve"
|
||||
id="svg5180"
|
||||
height="1024"
|
||||
|
|
@ -23,22 +23,22 @@
|
|||
inkscape:pageopacity="1"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1056"
|
||||
inkscape:window-height="1017"
|
||||
id="namedview102"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.9002897"
|
||||
inkscape:cx="467.92702"
|
||||
inkscape:cy="538.03817"
|
||||
inkscape:window-x="1920"
|
||||
inkscape:window-y="0"
|
||||
inkscape:zoom="0.90028968"
|
||||
inkscape:cx="475.13347"
|
||||
inkscape:cy="301.30025"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer8"
|
||||
inkscape:current-layer="layer3"
|
||||
inkscape:object-nodes="true"
|
||||
inkscape:snap-smooth-nodes="true"
|
||||
inkscape:snap-object-midpoints="true"
|
||||
inkscape:snap-grids="false"
|
||||
inkscape:snap-to-guides="false"
|
||||
showguides="true"
|
||||
showguides="false"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:document-rotation="0"><sodipodi:guide
|
||||
id="guide3167"
|
||||
|
|
@ -58,10 +58,13 @@
|
|||
id="guide3537" /><sodipodi:guide
|
||||
orientation="-0.8660254,0.5"
|
||||
position="512,200"
|
||||
id="guide3545" /></sodipodi:namedview><metadata
|
||||
id="guide3545" /><sodipodi:guide
|
||||
position="-3.9271069,171.8178"
|
||||
orientation="1,0"
|
||||
id="guide742" /></sodipodi:namedview><metadata
|
||||
id="metadata5186"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Gijs de Rooy</dc:title></cc:Agent></dc:creator><cc:license
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /><dc:creator><cc:Agent><dc:title>Gijs de Rooy</dc:title></cc:Agent></dc:creator><cc:license
|
||||
rdf:resource="" /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs5184"><marker
|
||||
style="overflow:visible"
|
||||
|
|
@ -240,26 +243,26 @@
|
|||
style="display:inline;fill:none;stroke:#f2f235;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><text
|
||||
inkscape:label="#text7243"
|
||||
id="wpActiveId"
|
||||
y="54.099972"
|
||||
x="766.04407"
|
||||
y="34.099972"
|
||||
x="788.04407"
|
||||
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:#cecdce;fill-opacity:1;stroke:none"
|
||||
xml:space="preserve"><tspan
|
||||
y="54.099972"
|
||||
x="766.04407"
|
||||
y="34.099972"
|
||||
x="788.04407"
|
||||
id="tspan7245"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25">ABCD</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"
|
||||
x="844.04407"
|
||||
y="88.124893"
|
||||
x="866.04407"
|
||||
y="68.124893"
|
||||
id="wpActiveDist"
|
||||
inkscape:label="#text7243"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan7251"
|
||||
x="844.04407"
|
||||
y="88.124893"
|
||||
x="866.04407"
|
||||
y="68.124893"
|
||||
style="font-size:36px;line-height:1.25">999.9</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="cccc"
|
||||
|
|
@ -272,8 +275,8 @@
|
|||
sodipodi:nodetypes="cccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="windArrow"
|
||||
d="m 75.2914,119.519 -2e-4,65.158 m 0,0 7.0125,-12.145 H 67.4945 l 7.7967,12.146"
|
||||
style="fill:#0dc04b;stroke:#0dc04b;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
|
||||
d="m 63.260505,77.514285 -1.88e-4,61.248515 m 0,0 6.59175,-11.4163 H 55.931419 l 7.328898,11.41724"
|
||||
style="fill:#0dc04b;stroke:#0dc04b;stroke-width:4.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
|
||||
inkscape:label="#g3124"
|
||||
id="compass"
|
||||
transform="rotate(0.34999975,516.49696,825.81379)"><path
|
||||
|
|
@ -784,60 +787,60 @@
|
|||
</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="36.862175"
|
||||
y="92.904839"
|
||||
x="12.862175"
|
||||
y="72.904839"
|
||||
id="wind"
|
||||
inkscape:label="#text7243"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan3801"
|
||||
x="36.862175"
|
||||
y="92.904839"
|
||||
x="12.862175"
|
||||
y="72.904839"
|
||||
style="font-size:36px;line-height:1.25">999°/ 99</tspan></text>
|
||||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="gs"
|
||||
y="53.306854"
|
||||
x="101.87437"
|
||||
y="33.306854"
|
||||
x="77.874367"
|
||||
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="53.306854"
|
||||
x="101.87437"
|
||||
y="33.306854"
|
||||
x="77.874367"
|
||||
id="tspan3809"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25">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"
|
||||
x="248.49673"
|
||||
y="53.306854"
|
||||
x="224.49673"
|
||||
y="33.306854"
|
||||
id="tas"
|
||||
inkscape:label="#text7243"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan3813"
|
||||
x="248.49673"
|
||||
y="53.306854"
|
||||
x="224.49673"
|
||||
y="33.306854"
|
||||
style="font-size:36px;line-height:1.25">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:#ededed;fill-opacity:1;stroke:none"
|
||||
x="38.276394"
|
||||
y="53.306854"
|
||||
x="14.276394"
|
||||
y="33.306854"
|
||||
id="gsLbl"
|
||||
inkscape:label="#text7243"><tspan
|
||||
style="font-size:36px;line-height:1.25"
|
||||
sodipodi:role="line"
|
||||
id="tspan3817"
|
||||
x="38.276394"
|
||||
y="53.306854">GS</tspan></text>
|
||||
x="14.276394"
|
||||
y="33.306854">GS</tspan></text>
|
||||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="tasLbl"
|
||||
y="53.306854"
|
||||
x="170.17084"
|
||||
y="33.306854"
|
||||
x="146.17084"
|
||||
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:#ededed;fill-opacity:1;stroke:none"
|
||||
xml:space="preserve"><tspan
|
||||
y="53.306854"
|
||||
x="170.17084"
|
||||
y="33.306854"
|
||||
x="146.17084"
|
||||
id="tspan3821"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25">TAS</tspan></text>
|
||||
|
|
@ -983,12 +986,12 @@
|
|||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="eta"
|
||||
y="126.06245"
|
||||
y="106.06245"
|
||||
x="892.04407"
|
||||
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
|
||||
style="font-size:36px;line-height:1.25"
|
||||
y="126.06245"
|
||||
y="106.06245"
|
||||
x="892.04407"
|
||||
id="tspan3092"
|
||||
sodipodi:role="line">08 34.4z</tspan></text>
|
||||
|
|
@ -1173,36 +1176,36 @@
|
|||
sodipodi:nodetypes="ccccccccc" /></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:#179ab7;fill-opacity:1;stroke:none"
|
||||
x="945.04547"
|
||||
y="87.431412"
|
||||
x="967.04547"
|
||||
y="67.431412"
|
||||
id="wpActiveDistLbl"
|
||||
inkscape:label="#text7243"><tspan
|
||||
style="font-size:24px;line-height:1.25"
|
||||
sodipodi:role="line"
|
||||
id="tspan3179"
|
||||
x="945.04547"
|
||||
y="87.431412">NM</tspan></text>
|
||||
x="967.04547"
|
||||
y="67.431412">NM</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:#cecdce;fill-opacity:1;stroke:none"
|
||||
x="785.289"
|
||||
y="53.929054"
|
||||
x="807.289"
|
||||
y="33.929054"
|
||||
id="ilsLbl"
|
||||
inkscape:label="#text7243"><tspan
|
||||
style="font-size:32px;line-height:1.25;fill:#cecdce"
|
||||
sodipodi:role="line"
|
||||
id="tspan4172"
|
||||
x="785.289"
|
||||
y="53.929054">ILS </tspan></text>
|
||||
x="807.289"
|
||||
y="33.929054">ILS </tspan></text>
|
||||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="ilsFreq"
|
||||
y="53.929054"
|
||||
x="888.28894"
|
||||
y="33.929054"
|
||||
x="910.28894"
|
||||
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:#af0063;fill-opacity:1;stroke:none"
|
||||
xml:space="preserve"><tspan
|
||||
y="53.929054"
|
||||
x="888.28894"
|
||||
y="33.929054"
|
||||
x="910.28894"
|
||||
id="tspan4176"
|
||||
sodipodi:role="line"
|
||||
style="font-size:32px;line-height:125%;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#af0063;fill-opacity:1">999.99</tspan></text>
|
||||
|
|
@ -1224,14 +1227,14 @@
|
|||
inkscape:transform-center-y="-715.12894" /><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="926.04407"
|
||||
y="54.099972"
|
||||
x="948.04407"
|
||||
y="34.099972"
|
||||
id="wpActiveCrs"
|
||||
inkscape:label="#text7243"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan4501"
|
||||
x="926.04407"
|
||||
y="54.099972"
|
||||
x="948.04407"
|
||||
y="34.099972"
|
||||
style="font-size:36px;line-height:1.25">360</tspan></text>
|
||||
<g
|
||||
id="chrono_box"
|
||||
|
|
@ -1302,7 +1305,31 @@
|
|||
x="13.282043"
|
||||
y="739.28204"
|
||||
style="font-size:40px;line-height:1.25">OFST</tspan></text>
|
||||
</g><g
|
||||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="hdgBug2ValL"
|
||||
y="174.13467"
|
||||
x="-97.01178"
|
||||
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"
|
||||
xml:space="preserve"
|
||||
transform="rotate(-35)"><tspan
|
||||
y="174.13467"
|
||||
x="-97.01178"
|
||||
id="tspan744"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25;fill:#179ab7;fill-opacity:1">999</tspan></text><text
|
||||
inkscape:label="#text7243"
|
||||
id="hdgBug2ValR"
|
||||
y="-413.09033"
|
||||
x="875.60876"
|
||||
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"
|
||||
xml:space="preserve"
|
||||
transform="rotate(35)"><tspan
|
||||
y="-413.09033"
|
||||
x="875.60876"
|
||||
id="tspan748"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25;fill:#179ab7;fill-opacity:1">999</tspan></text></g><g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
inkscape:label="CTR"
|
||||
|
|
@ -1368,20 +1395,22 @@
|
|||
id="vorCrsPtr2"
|
||||
inkscape:label="#g3266"
|
||||
inkscape:transform-center-y="5.4559828"
|
||||
transform="matrix(0.73371425,0,0,1.2956425,136.34805,-201.98371)"><path
|
||||
transform="matrix(0.73371425,0,0,1.2956425,136.34805,-201.98371)"
|
||||
style="stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="m 519.27414,698 h -14.54828 v 194.49655 l 7.27414,1.9e-4 7.27414,-1.9e-4 z M 504.72586,432 v -23.89752 l -38.65179,-0.001 V 402 h 38.65179 V 225.04414 l 7.61514,-0.48629 6.93314,0.4863 V 402 h 38.65179 v 6.10148 l -38.65179,0.001 V 432 Z"
|
||||
style="fill:#009fd6;stroke:#009fd6;stroke-width:1.02564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
style="fill:#009fd6;stroke:#009fd6;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="vorCrsPtr2_line"
|
||||
sodipodi:nodetypes="cccccccccccccccccccc" /><g
|
||||
id="locPtr2"><path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.02564;marker:none;enable-background:accumulate"
|
||||
id="locPtr2"
|
||||
style="stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none"><path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
|
||||
d="m 521.98396,447.79054 -17.26114,3.07727 0.01,235.98519 14.53528,0.01 -0.01,-235.98419 z"
|
||||
id="locPtr2_line"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:label="#locPtr"
|
||||
sodipodi:nodetypes="cccccc" /><path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.02564;marker:none;enable-background:accumulate"
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
|
||||
d="m 511.04486,437.35427 9.61501,5.69001 -35.22401,17.6614 -9.61501,-5.69001 c 0,0 29.42519,-14.6957 35.22387,-17.66133 5.79867,-2.96563 1.4e-4,-7e-5 1.4e-4,-7e-5 z"
|
||||
id="locPtr2_arr2"
|
||||
inkscape:connector-curvature="0"
|
||||
|
|
@ -1392,14 +1421,14 @@
|
|||
inkscape:connector-curvature="0"
|
||||
id="locPtr2_arr1"
|
||||
d="m 512.69442,437.35427 -9.615,5.69 35.22401,17.6614 9.615,-5.69 c 0,0 -29.42519,-14.6957 -35.22387,-17.66133 -5.79867,-2.96563 -1.4e-4,-7e-5 -1.4e-4,-7e-5 z"
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.02564;marker:none;enable-background:accumulate" /></g><circle
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;overflow:visible;visibility:visible;fill:#009fd6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" /></g><circle
|
||||
transform="matrix(0.968853,0.690717,-0.690717,0.968853,437.361,-328.129)"
|
||||
id="path3951"
|
||||
style="fill:none;stroke:#ededed;stroke-width:4.20218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
style="fill:none;stroke:#ededed;stroke-width:0.840432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
cx="380.07001"
|
||||
cy="643.92999"
|
||||
r="6.7175102" /><circle
|
||||
style="fill:none;stroke:#ededed;stroke-width:4.20218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
style="fill:none;stroke:#ededed;stroke-width:0.840432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="path3953"
|
||||
transform="matrix(0.968853,0.690717,-0.690717,0.968853,512.923,-328.129)"
|
||||
cx="380.07001"
|
||||
|
|
@ -1407,11 +1436,11 @@
|
|||
r="6.7175102" /><circle
|
||||
transform="matrix(0.968853,0.690717,-0.690717,0.968853,663.814,-328.129)"
|
||||
id="path3955"
|
||||
style="fill:none;stroke:#ededed;stroke-width:4.20218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
style="fill:none;stroke:#ededed;stroke-width:0.840432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
cx="380.07001"
|
||||
cy="643.92999"
|
||||
r="6.7175102" /><circle
|
||||
style="fill:none;stroke:#ededed;stroke-width:4.20218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
style="fill:none;stroke:#ededed;stroke-width:0.840432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="path3959"
|
||||
transform="matrix(0.968853,0.690717,-0.690717,0.968853,739.667,-328.128)"
|
||||
cx="380.07001"
|
||||
|
|
@ -1643,12 +1672,12 @@
|
|||
inkscape:transform-center-y="-363.559" /><text
|
||||
inkscape:label="#text7243"
|
||||
id="crsLbl"
|
||||
y="90.379868"
|
||||
x="812.72168"
|
||||
y="70.379868"
|
||||
x="834.72168"
|
||||
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:#cecdce;fill-opacity:1;stroke:none"
|
||||
xml:space="preserve"><tspan
|
||||
y="90.379868"
|
||||
x="812.72168"
|
||||
y="70.379868"
|
||||
x="834.72168"
|
||||
id="tspan4007"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25">CRS</tspan></text>
|
||||
|
|
@ -1656,23 +1685,23 @@
|
|||
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:#ededed;fill-opacity:1;stroke:none"
|
||||
x="854.72168"
|
||||
y="124.87983"
|
||||
y="104.87983"
|
||||
id="dmeLbl"
|
||||
inkscape:label="#text7243"><tspan
|
||||
style="font-size:24px;line-height:1.25"
|
||||
sodipodi:role="line"
|
||||
id="tspan4011"
|
||||
x="854.72168"
|
||||
y="124.87983"> </tspan></text>
|
||||
y="104.87983"> </tspan></text>
|
||||
<text
|
||||
inkscape:label="#text7243"
|
||||
id="crs"
|
||||
y="90.062439"
|
||||
x="913.95801"
|
||||
y="70.062439"
|
||||
x="935.95801"
|
||||
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"
|
||||
xml:space="preserve"><tspan
|
||||
y="90.062439"
|
||||
x="913.95801"
|
||||
y="70.062439"
|
||||
x="935.95801"
|
||||
id="tspan4046"
|
||||
sodipodi:role="line"
|
||||
style="font-size:36px;line-height:1.25">999</tspan></text>
|
||||
|
|
@ -1680,13 +1709,13 @@
|
|||
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:#ededed;fill-opacity:1;stroke:none"
|
||||
x="913.95801"
|
||||
y="126.12444"
|
||||
y="106.12444"
|
||||
id="dme"
|
||||
inkscape:label="#text7243"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan4071"
|
||||
x="913.95801"
|
||||
y="126.12444"
|
||||
y="106.12444"
|
||||
style="font-size:36px;line-height:1.25">99.9</tspan></text>
|
||||
<g
|
||||
id="gsGroup"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 136 KiB |
|
|
@ -10,6 +10,9 @@ var NOTHING = func nil;
|
|||
var att_switch = props.globals.getNode("/controls/navigation/switching/att-hdg", 1);
|
||||
var adirs_3 = props.globals.getNode("/instrumentation/efis[0]/nd/ir-3", 1);
|
||||
|
||||
var vhdg_bug = props.globals.getNode("/it-autoflight/input/hdg",0); # ND compass position deg
|
||||
|
||||
|
||||
canvas.NDStyles["Airbus"] = {
|
||||
font_mapper: func(family, weight) {
|
||||
if( family == "Liberation Sans" and weight == "normal" )
|
||||
|
|
@ -884,6 +887,42 @@ canvas.NDStyles["Airbus"] = {
|
|||
is_false: NOTHING,
|
||||
},
|
||||
},
|
||||
{
|
||||
id:"hdgBug2ValR", #"hdgBug2ValL"",
|
||||
impl: {
|
||||
init: func(nd,symbol),
|
||||
predicate: func(nd) nd.in_mode("toggle_display_mode", ["MAP"]) and !nd.get_switch("toggle_centered"),
|
||||
is_true: func(nd) {
|
||||
var bugRot = vhdg_bug.getValue();
|
||||
var diffRot = (bugRot>=nd.userHdgTrk) ? (bugRot-nd.userHdgTrk) : (360+bugRot-nd.userHdgTrk);
|
||||
if (diffRot<180 and diffRot>48) {
|
||||
nd.symbols.hdgBug2ValR.setText(sprintf("%03d", bugRot+0.5)); #CHECKME - not sure about adding +.5 as "hdg" process
|
||||
nd.symbols.hdgBug2ValR.show();
|
||||
} else {
|
||||
nd.symbols.hdgBug2ValR.hide();
|
||||
}
|
||||
},
|
||||
is_false: func(nd) nd.symbols.hdgBug2ValR.hide(),
|
||||
},
|
||||
},
|
||||
{
|
||||
id:"hdgBug2ValL",
|
||||
impl: {
|
||||
init: func(nd,symbol),
|
||||
predicate: func(nd) nd.in_mode("toggle_display_mode", ["MAP"]) and !nd.get_switch("toggle_centered"),
|
||||
is_true: func(nd) {
|
||||
var bugRot = vhdg_bug.getValue();
|
||||
var diffRot = (bugRot>nd.userHdgTrk) ? (360+nd.userHdgTrk-bugRot) : (nd.userHdgTrk-bugRot);
|
||||
if (diffRot<180 and diffRot>48) {
|
||||
nd.symbols.hdgBug2ValL.setText(sprintf("%03d", bugRot-0.5)); #CHECKME - not sure about adding +.5 as "hdg" process
|
||||
nd.symbols.hdgBug2ValL.show();
|
||||
} else {
|
||||
nd.symbols.hdgBug2ValL.hide();
|
||||
}
|
||||
},
|
||||
is_false: func(nd) nd.symbols.hdgBug2ValL.hide(),
|
||||
},
|
||||
},
|
||||
{
|
||||
id:"hdgGroup",
|
||||
impl: {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue