Merge branch 'dev' into 3D
This commit is contained in:
Jonathan Redpath
commit
6fec5d8f3b
5 changed files with 98 additions and 64 deletions
|
|
@ -1475,11 +1475,12 @@
|
|||
<!-- Cocktpit Door Switch -->
|
||||
|
||||
<animation>
|
||||
<type>slider</type>
|
||||
<type>knob</type>
|
||||
<object-name>CockpitDoorSwitch</object-name>
|
||||
<object-name>CockpitDoorSwitch.mark</object-name>
|
||||
<property>controls/doors/doorc-switch</property>
|
||||
<drag-direction>vertical</drag-direction>
|
||||
<drag-scale-px>14</drag-scale-px>
|
||||
<action>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
id="svg2"
|
||||
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
|
||||
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
|
||||
sodipodi:docname="iesi.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
|
|
@ -38,16 +38,16 @@
|
|||
inkscape:pageopacity="1"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="986"
|
||||
inkscape:window-height="974"
|
||||
id="namedview371"
|
||||
showgrid="true"
|
||||
inkscape:zoom="0.93517029"
|
||||
inkscape:cx="815.35952"
|
||||
inkscape:cy="762.42799"
|
||||
inkscape:zoom="0.66126526"
|
||||
inkscape:cx="369.74572"
|
||||
inkscape:cy="772.76099"
|
||||
inkscape:window-x="-11"
|
||||
inkscape:window-y="-11"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="ATTflag"
|
||||
inkscape:current-layer="MsgBox"
|
||||
showguides="true"
|
||||
inkscape:snap-global="false"
|
||||
units="pt"
|
||||
|
|
@ -72,11 +72,11 @@
|
|||
inkscape:label="MsgBox">
|
||||
<rect
|
||||
y="720.3349"
|
||||
x="304.32764"
|
||||
x="260.241"
|
||||
height="91.330338"
|
||||
width="406.27161"
|
||||
width="490.202"
|
||||
id="rect4448"
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.48539;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
inkscape:label="#text979"
|
||||
transform="scale(1.0000144,0.9999856)"
|
||||
|
|
@ -142,11 +142,11 @@
|
|||
<g
|
||||
id="ATTwarn">
|
||||
<rect
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.23675;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="rect4484"
|
||||
width="243.81277"
|
||||
width="283.81299"
|
||||
height="91.330353"
|
||||
x="390.0936"
|
||||
x="360.09399"
|
||||
y="287.07605" />
|
||||
<text
|
||||
id="text4486"
|
||||
|
|
@ -164,14 +164,15 @@
|
|||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="ATTflag">
|
||||
id="ATTflag"
|
||||
style="display:inline">
|
||||
<rect
|
||||
y="720.3349"
|
||||
x="304.32764"
|
||||
x="260.241"
|
||||
height="91.330338"
|
||||
width="406.27161"
|
||||
width="490.202"
|
||||
id="attRstRect"
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
style="fill:#c9d121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.48538;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
|
||||
<text
|
||||
inkscape:label="#text979"
|
||||
transform="scale(1.0000144,0.9999856)"
|
||||
|
|
@ -186,12 +187,12 @@
|
|||
y="796.4032"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:86px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.75">ATT : RST</tspan></text>
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.21458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="ATTflag_rect"
|
||||
width="243.81277"
|
||||
height="91.330353"
|
||||
x="390.0936"
|
||||
y="287.07605" />
|
||||
width="280.59842"
|
||||
height="91.115768"
|
||||
x="361.70129"
|
||||
y="287.18335" />
|
||||
<text
|
||||
id="ATTflag_text"
|
||||
y="363.13785"
|
||||
|
|
@ -212,7 +213,8 @@
|
|||
inkscape:label="IESI">
|
||||
<g
|
||||
id="AI_horizon"
|
||||
inkscape:label="#g4573">
|
||||
inkscape:label="#g4573"
|
||||
style="display:inline">
|
||||
<g
|
||||
transform="translate(824.0447,-40.79798)"
|
||||
inkscape:label="#g4312"
|
||||
|
|
@ -618,7 +620,7 @@
|
|||
</g>
|
||||
</g>
|
||||
<rect
|
||||
style="opacity:1;fill:#1fa7f8;fill-opacity:1;stroke:none;stroke-width:2.58922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
style="display:inline;opacity:1;fill:#1fa7f8;fill-opacity:1;stroke:none;stroke-width:2.58922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="AI_sky_bank"
|
||||
width="663.18652"
|
||||
height="124.96"
|
||||
|
|
@ -626,7 +628,7 @@
|
|||
y="138.78481"
|
||||
inkscape:label="#rect5809" />
|
||||
<rect
|
||||
style="opacity:0.5;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:10.0653;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
style="display:inline;opacity:0.5;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:10.0653;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="AI_bank_scale_clip"
|
||||
width="663.21997"
|
||||
height="229.7616"
|
||||
|
|
@ -634,7 +636,7 @@
|
|||
y="138.67441"
|
||||
inkscape:label="#rect1094" />
|
||||
<rect
|
||||
style="opacity:0.46;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
style="display:inline;opacity:0.46;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="AI_horizon_clip"
|
||||
width="663.21997"
|
||||
height="608.67889"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
|
|
@ -1685,7 +1685,7 @@
|
|||
<object-name>overfly</object-name>
|
||||
<action>
|
||||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("OVFY", 0);</script>
|
||||
|
|
@ -1710,11 +1710,23 @@
|
|||
<action>
|
||||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>/MCDU[0]/clrbtn-timeout</property>
|
||||
<step>1</step>
|
||||
<min>0</min>
|
||||
<max>6</max>
|
||||
<wrap>false</wrap>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("CLR", 0, "down");</script>
|
||||
<script>mcdu.button("LONGCLR", 0);</script>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>/MCDU[0]/clrbtn-timeout</property>
|
||||
<value>5</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac-1</property>
|
||||
<value>110</value>
|
||||
|
|
@ -1725,17 +1737,21 @@
|
|||
</greater-than>
|
||||
</and>
|
||||
</condition>
|
||||
</binding>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("CLR", 0, "up");</script>
|
||||
<script>mcdu.button("CLR", 0);</script>
|
||||
<condition>
|
||||
<and>
|
||||
<less-than>
|
||||
<property>/MCDU[0]/clrbtn-timeout</property>
|
||||
<value>5</value>
|
||||
</less-than>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac-1</property>
|
||||
<value>110</value>
|
||||
</greater-than-equals>
|
||||
</greater-than-equals>
|
||||
<greater-than>
|
||||
<property>controls/lighting/DU/mcdu1</property>
|
||||
<value>0.01</value>
|
||||
|
|
@ -1743,6 +1759,11 @@
|
|||
</and>
|
||||
</condition>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/MCDU[0]/clrbtn-timeout</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</action>
|
||||
</animation>
|
||||
|
|
|
|||
|
|
@ -1685,7 +1685,7 @@
|
|||
<object-name>overfly</object-name>
|
||||
<action>
|
||||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("OVFY", 1);</script>
|
||||
|
|
@ -1710,32 +1710,48 @@
|
|||
<action>
|
||||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<binding>
|
||||
<command>property-adjust</command>
|
||||
<property>/MCDU[1]/clrbtn-timeout</property>
|
||||
<step>1</step>
|
||||
<min>0</min>
|
||||
<max>6</max>
|
||||
<wrap>false</wrap>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("CLR", 1, "down");</script>
|
||||
<script>mcdu.button("LONGCLR", 1);</script>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>/MCDU[1]/clrbtn-timeout</property>
|
||||
<value>5</value>
|
||||
</equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac-2</property>
|
||||
<value>110</value>
|
||||
</greater-than-equals>
|
||||
</greater-than-equals>
|
||||
<greater-than>
|
||||
<property>controls/lighting/DU/mcdu2</property>
|
||||
<value>0.01</value>
|
||||
</greater-than>
|
||||
</and>
|
||||
</condition>
|
||||
</binding>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>mcdu.button("CLR", 1, "up");</script>
|
||||
<script>mcdu.button("CLR", 1);</script>
|
||||
<condition>
|
||||
<and>
|
||||
<less-than>
|
||||
<property>/MCDU[1]/clrbtn-timeout</property>
|
||||
<value>5</value>
|
||||
</less-than>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/ac-2</property>
|
||||
<value>110</value>
|
||||
</greater-than-equals>
|
||||
</greater-than-equals>
|
||||
<greater-than>
|
||||
<property>controls/lighting/DU/mcdu2</property>
|
||||
<value>0.01</value>
|
||||
|
|
@ -1743,6 +1759,11 @@
|
|||
</and>
|
||||
</condition>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/MCDU[1]/clrbtn-timeout</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</action>
|
||||
</animation>
|
||||
|
|
|
|||
|
|
@ -1535,8 +1535,6 @@ var pagebutton = func(btn, i) {
|
|||
}
|
||||
}
|
||||
|
||||
var buttonCLRDown = [0,0]; # counter for down event
|
||||
|
||||
var button = func(btn, i, event = "") {
|
||||
page = pageNode[i].getValue();
|
||||
if (page != "MCDU") {
|
||||
|
|
@ -1546,41 +1544,32 @@ var button = func(btn, i, event = "") {
|
|||
} else if (btn == "SP") {
|
||||
mcdu_scratchpad.scratchpads[i].addChar(" ");
|
||||
} else if (btn == "CLR") {
|
||||
if (event == "down") {
|
||||
if (size(scratchpad) > 0) {
|
||||
if (buttonCLRDown[i] > 4) {
|
||||
mcdu_scratchpad.scratchpads[i].empty();
|
||||
}
|
||||
buttonCLRDown[i] = buttonCLRDown[i] + 1;
|
||||
}
|
||||
}
|
||||
else if (event == "" or buttonCLRDown[i]<=4) {
|
||||
buttonCLRDown[i] = 0;
|
||||
#var scratchpad = mcdu_scratchpad.scratchpads[i].scratchpad; <- useless??
|
||||
if (size(scratchpad) == 0) {
|
||||
mcdu_scratchpad.scratchpads[i].addChar("CLR");
|
||||
} else {
|
||||
mcdu_scratchpad.scratchpads[i].clear();
|
||||
}
|
||||
} else { # up with buttonCLRDown[i]>4
|
||||
buttonCLRDown[i] = 0;
|
||||
if (size(scratchpad) == 0) {
|
||||
mcdu_scratchpad.scratchpads[i].addChar("CLR");
|
||||
} else {
|
||||
mcdu_scratchpad.scratchpads[i].clear();
|
||||
}
|
||||
} else if (btn == "LONGCLR") {
|
||||
mcdu_scratchpad.scratchpads[i].empty();
|
||||
} else if (btn == "DOT") {
|
||||
mcdu_scratchpad.scratchpads[i].addChar(".");
|
||||
} else if (btn == "PLUSMINUS") {
|
||||
if (right(mcdu_scratchpad.scratchpads[i].scratchpad, 1) == "-") {
|
||||
mcdu_scratchpad.scratchpads[i].clear();
|
||||
mcdu_scratchpad.scratchpads[i].addChar("+");
|
||||
} else if (right(mcdu_scratchpad.scratchpads[i].scratchpad, 1) == "+") {
|
||||
mcdu_scratchpad.scratchpads[i].clear();
|
||||
if (size(scratchpad)==0) {
|
||||
mcdu_message(i, "NOT ALLOWED");
|
||||
} else if (isint(scratchpad)==1) {
|
||||
mcdu_scratchpad.scratchpads[i].addChar("-");
|
||||
} else {
|
||||
mcdu_scratchpad.scratchpads[i].addChar("-");
|
||||
var _toggle = right(scratchpad,1);
|
||||
if (find(_toggle,"-+")!=-1) {
|
||||
_toggle = (_toggle == "-") ? "+" : "-";
|
||||
mcdu_scratchpad.scratchpads[i].clear();
|
||||
mcdu_scratchpad.scratchpads[i].addChar(_toggle);
|
||||
} else {
|
||||
mcdu_message(i, "NOT ALLOWED");
|
||||
}
|
||||
}
|
||||
} else if (btn == "OVFY") {
|
||||
if (mcdu_scratchpad.scratchpads[i].scratchpad == "") {
|
||||
if (size(scratchpad)==0) {
|
||||
mcdu_scratchpad.scratchpads[i].addChar("@");
|
||||
} else {
|
||||
mcdu_message(i, "NOT ALLOWED");
|
||||
|
|
|
|||
Loading…
Reference in a new issue