1
0
Fork 0

Upper ECAM: flap indicator animated

This commit is contained in:
legoboyvdlp R 2020-10-08 21:21:45 +01:00
parent 2dbc526f59
commit c107d02774
4 changed files with 183 additions and 2 deletions

View file

@ -41,6 +41,10 @@ var fadecpowerup = props.globals.getNode("/systems/fadec/powerup", 1);
var thr_limit = props.globals.getNode("/controls/engines/thrust-limit", 1);
var n1_limit = props.globals.getNode("/controls/engines/n1-limit", 1);
var epr_limit = props.globals.getNode("/controls/engines/epr-limit", 1);
var flapXOffset = props.globals.getNode("/ECAM/Upper/FlapX", 1);
var flapYOffset = props.globals.getNode("/ECAM/Upper/FlapY", 1);
var slatXOffset = props.globals.getNode("/ECAM/Upper/SlatX", 1);
var slatYOffset = props.globals.getNode("/ECAM/Upper/SlatY", 1);
var ECAM_line1 = props.globals.getNode("/ECAM/msg/line1", 1);
var ECAM_line2 = props.globals.getNode("/ECAM/msg/line2", 1);
var ECAM_line3 = props.globals.getNode("/ECAM/msg/line3", 1);
@ -297,6 +301,9 @@ var canvas_upperECAM_base = {
me["SlatAlphaLock"].hide();
}
me["FlapIndicator"].setTranslation(flapXOffset.getValue(),flapYOffset.getValue());
me["SlatIndicator"].setTranslation(slatXOffset.getValue(),slatYOffset.getValue());
# FOB
if (acconfig_weight_kgs.getValue())
{
@ -345,7 +352,7 @@ var canvas_upperECAM_cfm_eis2 = {
"EGT1-XX","N21","N21-decpnt","N21-decimal","N21-XX","FF1","FF1-XX","N12-needle","N12-thr","N12-ylim","N12","N12-decpnt","N12-decimal","N12-box","N12-scale","N12-scale2","N12-scaletick","N12-scalenum","N12-XX","N12-XX2","N12-XX-box","EGT2-needle","EGT2",
"EGT2-scale","EGT2-box","EGT2-scale2","EGT2-scaletick","EGT2-XX","N22","N22-decpnt","N22-decimal","N22-XX","FF2","FF2-XX","FOB-LBS","FlapTxt","FlapDots","N1Lim-mode","N1Lim","N1Lim-decpnt","N1Lim-decimal","N1Lim-percent","N1Lim-XX","N1Lim-XX2","REV1",
"REV1-box","REV2","REV2-box","ECAM_Left","ECAML1","ECAML2","ECAML3","ECAML4","ECAML5","ECAML6","ECAML7","ECAML8","ECAMR1", "ECAMR2", "ECAMR3", "ECAMR4", "ECAMR5", "ECAMR6", "ECAMR7", "ECAMR8", "ECAM_Right",
"FOB-weight-unit","FFlow-weight-unit","SlatAlphaLock"];
"FOB-weight-unit","FFlow-weight-unit","SlatAlphaLock","SlatIndicator","FlapIndicator"];
},
update: func() {
# N1

View file

@ -42,7 +42,7 @@
id="namedview371"
showgrid="true"
inkscape:zoom="0.50000001"
inkscape:cx="419.64115"
inkscape:cx="676.98926"
inkscape:cy="1000.4352"
inkscape:window-x="-8"
inkscape:window-y="-8"
@ -1385,4 +1385,28 @@
x="650.08069"
y="575.68427"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.25px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75">A-LOCK</tspan></text>
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="m 928.84849,661.23101 -11.44541,-16.90649 38.53701,7.25587 v 15.15993 l -27.0916,-5.50931"
id="FlapIndicator"
sodipodi:nodetypes="ccccc"
inkscape:label="#path1093" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="m 530.43575,645.52404 24.69434,-5.55908 -11.10498,15.46142 -24.69434,5.56055 z"
id="SlatIndicator"
inkscape:label="#path1114" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="M 917.40308,644.32452 725.61039,596.89138"
id="FlapLine"
sodipodi:nodetypes="cc"
inkscape:label="#path1103" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="M 555.1301,639.96496 681.86618,598.43228"
id="SlatLine"
inkscape:path-effect="#path-effect1121"
inkscape:original-d="M 555.1301 "
inkscape:label="#path1119" />
</svg>

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View file

@ -1753,4 +1753,28 @@
x="650.08069"
y="575.68427"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.25px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#0dc04b;fill-opacity:1;stroke-width:0.75">A-LOCK</tspan></text>
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="m 928.84849,661.23101 -11.44541,-16.90649 38.53701,7.25587 v 15.15993 l -27.0916,-5.50931"
id="FlapIndicator"
sodipodi:nodetypes="ccccc"
inkscape:label="#path1093" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="m 530.43575,645.52404 24.69434,-5.55908 -11.10498,15.46142 -24.69434,5.56055 z"
id="SlatIndicator"
inkscape:label="#path1114" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="M 917.40308,644.32452 725.61039,596.89138"
id="FlapLine"
sodipodi:nodetypes="cc"
inkscape:label="#path1103" />
<path
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:5.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
d="M 555.1301,639.96496 681.86618,598.43228"
id="SlatLine"
inkscape:path-effect="#path-effect1121"
inkscape:original-d="M 555.1301 "
inkscape:label="#path1119" />
</svg>

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View file

@ -400,4 +400,130 @@
<output>/ECAM/Upper/N1ylim</output>
</filter>
<filter>
<name>Flap Indicator</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<equals>
<property>options/maxflap</property>
<value>35</value>
</equals>
</condition>
<expression>
<table>
<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
<entry><ind> 0.0</ind><dep>-192</dep></entry>
<entry><ind>10.0</ind><dep>-135</dep></entry>
<entry><ind>15.0</ind><dep>-89</dep></entry>
<entry><ind>20.0</ind><dep>-44</dep></entry>
<entry><ind>35.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<equals>
<property>options/maxflap</property>
<value>40</value>
</equals>
</condition>
<expression>
<table>
<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
<entry><ind> 0.0</ind><dep>-192</dep></entry>
<entry><ind>10.0</ind><dep>-135</dep></entry>
<entry><ind>15.0</ind><dep>-89</dep></entry>
<entry><ind>20.0</ind><dep>-44</dep></entry>
<entry><ind>40.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/ECAM/Upper/FlapX</output>
</filter>
<filter>
<name>Flap Indicator</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<condition>
<equals>
<property>options/maxflap</property>
<value>35</value>
</equals>
</condition>
<expression>
<table>
<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
<entry><ind> 0.0</ind><dep>-47</dep></entry>
<entry><ind>10.0</ind><dep>-30</dep></entry>
<entry><ind>15.0</ind><dep>-20</dep></entry>
<entry><ind>20.0</ind><dep>-10</dep></entry>
<entry><ind>35.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>
<condition>
<equals>
<property>options/maxflap</property>
<value>40</value>
</equals>
</condition>
<expression>
<table>
<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
<entry><ind> 0.0</ind><dep>-47</dep></entry>
<entry><ind>10.0</ind><dep>-30</dep></entry>
<entry><ind>15.0</ind><dep>-20</dep></entry>
<entry><ind>20.0</ind><dep>-10</dep></entry>
<entry><ind>40.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/ECAM/Upper/FlapY</output>
</filter>
<filter>
<name>Flap Indicator</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/fdm/jsbsim/fcs/slat-pos-deg</property>
<entry><ind> 0.0</ind><dep>131</dep></entry>
<entry><ind>18.0</ind><dep>92</dep></entry>
<entry><ind>22.0</ind><dep>46</dep></entry>
<entry><ind>27.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/ECAM/Upper/SlatX</output>
</filter>
<filter>
<name>Flap Indicator</name>
<type>gain</type>
<gain>1.0</gain>
<input>
<expression>
<table>
<property>/fdm/jsbsim/fcs/slat-pos-deg</property>
<entry><ind> 0.0</ind><dep>-42</dep></entry>
<entry><ind>18.0</ind><dep>-28</dep></entry>
<entry><ind>22.0</ind><dep>-14</dep></entry>
<entry><ind>27.0</ind><dep>0</dep></entry>
</table>
</expression>
</input>
<input>0</input>
<output>/ECAM/Upper/SlatY</output>
</filter>
</PropertyList>