From 46d118d32edace60bfcc7013af65c972aef39c67 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 8 Nov 2017 20:15:39 -0400 Subject: [PATCH 1/5] DOOR / OXY ECAM PAGE --- Models/Instruments/Lower-ECAM/res/door.svg | 929 +++++++++++++++++++++ 1 file changed, 929 insertions(+) create mode 100644 Models/Instruments/Lower-ECAM/res/door.svg diff --git a/Models/Instruments/Lower-ECAM/res/door.svg b/Models/Instruments/Lower-ECAM/res/door.svg new file mode 100644 index 00000000..e47289ef --- /dev/null +++ b/Models/Instruments/Lower-ECAM/res/door.svg @@ -0,0 +1,929 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + °C + H + °C + LBS + GW + TAT + SAT + 25 + 25 + 120000 + DOOR/OXY + + + + + + + AVIONIC + + + + + + + CABIN + + + + SLIDE + + + + + + + + + + AVIONIC + + + + + + + + + + + CABIN + SLIDE + + + + + + + + + + CARGO + + + + SLIDE + SLIDE + + + + EMEREXIT + EMEREXIT + + + + + + + + + CARGO + + + + BULK + + + + + + + + CABIN + SLIDE + + + + + + + + + CABIN + SLIDE + + + + + + + + + From 347341aeb79fd802ce48a95f193406f1a3c62b81 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Thu, 9 Nov 2017 12:30:40 -0400 Subject: [PATCH 2/5] DOOR / OXY page completed and working --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 208 ++++- Models/Instruments/Lower-ECAM/res/door.svg | 768 ++++++++----------- Nasal/libraries.nas | 2 +- 3 files changed, 526 insertions(+), 452 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 06486c0a..8e3db0e7 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -9,6 +9,7 @@ var lowerECAM_apu = nil; var lowerECAM_eng = nil; var lowerECAM_fctl = nil; var lowerECAM_wheel = nil; +var lowerECAM_door = nil; var lowerECAM_display = nil; var page = "eng"; var oat = getprop("/environment/temperature-degc"); @@ -90,36 +91,49 @@ var canvas_lowerECAM_base = { lowerECAM_eng.page.hide(); lowerECAM_fctl.page.hide(); lowerECAM_wheel.page.hide(); + lowerECAM_door.page.hide(); lowerECAM_apu.update(); } else if (page == "eng") { lowerECAM_apu.page.hide(); lowerECAM_eng.page.show(); - lowerECAM_eng.update(); lowerECAM_fctl.page.hide(); lowerECAM_wheel.page.hide(); + lowerECAM_door.page.hide(); + lowerECAM_eng.update(); } else if (page == "fctl") { lowerECAM_apu.page.hide(); lowerECAM_eng.page.hide(); lowerECAM_fctl.page.show(); lowerECAM_wheel.page.hide(); + lowerECAM_door.page.hide(); lowerECAM_fctl.update(); } else if (page == "wheel") { lowerECAM_apu.page.hide(); lowerECAM_eng.page.hide(); lowerECAM_fctl.page.hide(); lowerECAM_wheel.page.show(); + lowerECAM_door.page.hide(); lowerECAM_wheel.update(); + } else if (page == "door") { + lowerECAM_apu.page.hide(); + lowerECAM_eng.page.hide(); + lowerECAM_fctl.page.hide(); + lowerECAM_wheel.page.hide(); + lowerECAM_door.page.show(); + lowerECAM_door.update(); } else { lowerECAM_apu.page.hide(); lowerECAM_eng.page.hide(); lowerECAM_fctl.page.hide(); lowerECAM_wheel.page.hide(); + lowerECAM_door.page.hide(); } } else { lowerECAM_apu.page.hide(); lowerECAM_eng.page.hide(); lowerECAM_fctl.page.hide(); lowerECAM_wheel.page.hide(); + lowerECAM_door.page.hide(); } }, updateBottomStatus: func() { @@ -1133,6 +1147,196 @@ var canvas_lowerECAM_wheel = { }, }; +var canvas_lowerECAM_door = { + new: func(canvas_group, file) { + var m = {parents: [canvas_lowerECAM_door, canvas_lowerECAM_base]}; + m.init(canvas_group, file); + + return m; + }, + getKeys: func() { + return ["TAT","SAT","GW","Bulk","BulkLine","BulkLbl", "Exit1L", "Exit1R", "Cabin1Left", "Cabin1LeftLbl", "Cabin1LeftLine", "Cabin1LeftSlide", "Cabin1Right", "Cabin1RightLbl", "Cabin1RightLine", "Cabin1RightSlide", "Cabin2Left", "Cabin2LeftLbl", "Cabin2LeftLine", "Cabin2LeftSlide", + "Cabin2Right", "Cabin2RightLbl", "Cabin2RightLine", "Cabin2RightSlide", "Cabin3Left","Cabin3LeftLbl", "Cabin3LeftLine", "Cabin3LeftSlide", "Cabin3Right", "Cabin3RightLbl", "Cabin3RightLine", "Cabin3RightSlide", "AvionicsLine1", "AvionicsLbl1", "AvionicsLine2", "AvionicsLbl2", + "Cargo1Line", "Cargo1Lbl", "Cargo2Line", "Cargo2Lbl", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; + }, + update: func() { + # if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { + # me["Bulk"].hide(); + # me["BulkLine"].hide(); + # me["BulkLbl"].hide(); + # } else { + # me["Bulk"].show(); + # me["BulkLine"].show(); + # me["BulkLbl"].show(); + # } + + + # If you make AirBerlin or Allegiant livery add below + if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { + me["Exit1L"].hide(); + me["Exit1R"].hide() + } else { + me["Exit1L"].show(); + me["Exit1R"].show(); + } + + if (getprop("sim/model/door-positions/doorl1/position-norm") > 0) { + me["Cabin1Left"].show(); + me["Cabin1Left"].setColor(0.7333,0.3803,0); + me["Cabin1Left"].setColorFill(0.7333,0.3803,0); + me["Cabin1LeftLbl"].show(); + me["Cabin1LeftLine"].show(); + } else { + me["Cabin1Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin1Left"].setColorFill(0,0,0); + me["Cabin1LeftLbl"].hide(); + me["Cabin1LeftLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorr1/position-norm") > 0) { + me["Cabin1Right"].show(); + me["Cabin1Right"].setColor(0.7333,0.3803,0); + me["Cabin1Right"].setColorFill(0.7333,0.3803,0); + me["Cabin1RightLbl"].show(); + me["Cabin1RightLine"].show(); + } else { + me["Cabin1Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin1Right"].setColorFill(0,0,0); + me["Cabin1RightLbl"].hide(); + me["Cabin1RightLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl2/position-norm") > 0) { + me["Cabin2Left"].show(); + me["Cabin2Left"].setColor(0.7333,0.3803,0); + me["Cabin2Left"].setColorFill(0.7333,0.3803,0); + me["Cabin2LeftLbl"].show(); + me["Cabin2LeftLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin2Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin2Left"].setColorFill(0,0,0); + me["Cabin2LeftLbl"].hide(); + me["Cabin2LeftLine"].hide(); + } else { + me["Cabin2Left"].hide(); + me["Cabin2LeftLbl"].hide(); + me["Cabin2LeftLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr2/position-norm") > 0) { + me["Cabin2Right"].show(); + me["Cabin2Right"].setColor(0.7333,0.3803,0); + me["Cabin2Right"].setColorFill(0.7333,0.3803,0); + me["Cabin2RightLbl"].show(); + me["Cabin2RightLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin2Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin2Right"].setColorFill(0,0,0); + me["Cabin2RightLbl"].hide(); + me["Cabin2RightLine"].hide(); + } else { + me["Cabin2Right"].hide(); + me["Cabin2RightLbl"].hide(); + me["Cabin2RightLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl3/position-norm") > 0) { + me["Cabin3Left"].show(); + me["Cabin3Left"].setColor(0.7333,0.3803,0); + me["Cabin3Left"].setColorFill(0.7333,0.3803,0); + me["Cabin3LeftLbl"].show(); + me["Cabin3LeftLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin3Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin3Left"].setColorFill(0,0,0); + me["Cabin3LeftLbl"].hide(); + me["Cabin3LeftLine"].hide(); + } else { + me["Cabin3Left"].hide(); + me["Cabin3LeftLbl"].hide(); + me["Cabin3LeftLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr3/position-norm") > 0) { + me["Cabin3Right"].show(); + me["Cabin3Right"].setColor(0.7333,0.3803,0); + me["Cabin3Right"].setColorFill(0.7333,0.3803,0); + me["Cabin3RightLbl"].show(); + me["Cabin3RightLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin3Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin3Right"].setColorFill(0,0,0); + me["Cabin3RightLbl"].hide(); + me["Cabin3RightLine"].hide(); + } else { + me["Cabin3Right"].hide(); + me["Cabin3RightLbl"].hide(); + me["Cabin3RightLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorl4/position-norm") > 0) { + me["Cabin4Left"].show(); + me["Cabin4Left"].setColor(0.7333,0.3803,0); + me["Cabin4Left"].setColorFill(0.7333,0.3803,0); + me["Cabin4LeftLbl"].show(); + me["Cabin4LeftLine"].show(); + } else { + me["Cabin4Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin4Left"].setColorFill(0,0,0); + me["Cabin4LeftLbl"].hide(); + me["Cabin4LeftLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorr4/position-norm") > 0) { + me["Cabin4Right"].show(); + me["Cabin4Right"].setColor(0.7333,0.3803,0); + me["Cabin4Right"].setColorFill(0.7333,0.3803,0); + me["Cabin4RightLbl"].show(); + me["Cabin4RightLine"].show(); + } else { + me["Cabin4Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin4Right"].setColorFill(0,0,0); + me["Cabin4RightLbl"].hide(); + me["Cabin4RightLine"].hide(); + } + + + me["Cabin1LeftSlide"].hide(); + me["Cabin1RightSlide"].hide(); + me["Cabin2LeftSlide"].hide(); + me["Cabin2RightSlide"].hide(); + me["Cabin3LeftSlide"].hide(); + me["Cabin3RightSlide"].hide(); + me["Cabin4LeftSlide"].hide(); + me["Cabin4RightSlide"].hide(); + + me["AvionicsLine1"].hide(); + me["AvionicsLine2"].hide(); + me["AvionicsLbl1"].hide(); + me["AvionicsLbl2"].hide(); + me["ExitLSlide"].hide(); + me["ExitLLine"].hide(); + me["ExitLLbl"].hide(); + me["ExitRSlide"].hide(); + me["ExitRLine"].hide(); + me["ExitRLbl"].hide(); + me["Bulk"].hide(); + me["BulkLine"].hide(); + me["BulkLbl"].hide(); + me["Cargo1Line"].hide(); + me["Cargo1Lbl"].hide(); + me["Cargo2Line"].hide(); + me["Cargo2Lbl"].hide(); + me["Cabin1LeftSlide"].hide(); + me["Cabin1RightSlide"].hide(); + me["Cabin4LeftSlide"].hide(); + me["Cabin4RightSlide"].hide(); + + + me.updateBottomStatus(); + }, +}; + setlistener("sim/signals/fdm-initialized", func { lowerECAM_display = canvas.new({ "name": "lowerECAM", @@ -1145,11 +1349,13 @@ setlistener("sim/signals/fdm-initialized", func { var groupEng = lowerECAM_display.createGroup(); var groupFctl = lowerECAM_display.createGroup(); var groupWheel = lowerECAM_display.createGroup(); + var groupDoor = lowerECAM_display.createGroup(); lowerECAM_apu = canvas_lowerECAM_apu.new(groupApu, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/apu.svg"); lowerECAM_eng = canvas_lowerECAM_eng.new(groupEng, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/eng-eis2.svg"); lowerECAM_fctl = canvas_lowerECAM_fctl.new(groupFctl, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/fctl.svg"); lowerECAM_wheel = canvas_lowerECAM_wheel.new(groupWheel, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/wheel.svg"); + lowerECAM_door = canvas_lowerECAM_door.new(groupDoor, "Aircraft/IDG-A32X/Models/Instruments/Lower-ECAM/res/door.svg"); lowerECAM_update.start(); }); diff --git a/Models/Instruments/Lower-ECAM/res/door.svg b/Models/Instruments/Lower-ECAM/res/door.svg index e47289ef..e1e182d4 100644 --- a/Models/Instruments/Lower-ECAM/res/door.svg +++ b/Models/Instruments/Lower-ECAM/res/door.svg @@ -5,7 +5,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1024pt" @@ -42,9 +41,9 @@ inkscape:window-height="706" id="namedview371" showgrid="true" - inkscape:zoom="0.4" - inkscape:cx="569.36765" - inkscape:cy="726.82143" + inkscape:zoom="1.0636576" + inkscape:cx="622.37647" + inkscape:cy="794.12977" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -53,15 +52,6 @@ type="xygrid" id="grid5153" /> - + id="aircraft" + inkscape:connector-curvature="0" + inkscape:label="#path4255" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4261" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4267" /> AVIONIC - - - + style="fill:#bb6100;fill-opacity:1;fill-rule:evenodd;stroke:#bb6100;stroke-width:2.61183023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.67999983;stroke-opacity:1" + d="M 516.83594 214.30664 L 535.33398 214.30664 L 516.83594 214.30664 z M 542.48438 214.30664 L 560.98047 214.30664 L 542.48438 214.30664 z M 589.58203 214.30664 L 608.08008 214.30664 L 589.58203 214.30664 z M 565.48828 214.46094 L 583.98633 214.46094 L 565.48828 214.46094 z " + transform="scale(0.8,0.8)" + id="AvionicsLine1" + inkscape:label="#path4273" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4285" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4287" /> CABIN - + x="289.62112" + y="275.52078">CABIN - + sodipodi:nodetypes="ccccccccc" /> SLIDE - - - - - - - - - + x="436.25317" + y="279.40991">SLIDE AVIONIC - - - - - - - + style="fill:#bb6100;fill-opacity:1;fill-rule:evenodd;stroke:#bb6100;stroke-width:2.61183023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.67999983;stroke-opacity:1" + d="M 559.28906 403.19531 L 577.78711 403.19531 L 559.28906 403.19531 z M 584.9375 403.19531 L 603.43359 403.19531 L 584.9375 403.19531 z M 632.03516 403.19531 L 650.5332 403.19531 L 632.03516 403.19531 z M 607.94141 403.34961 L 626.43945 403.34961 L 607.94141 403.34961 z M 462.02344 403.46289 L 480.52148 403.46289 L 462.02344 403.46289 z M 487.67188 403.46289 L 506.16797 403.46289 L 487.67188 403.46289 z M 534.76953 403.46289 L 553.26758 403.46289 L 534.76953 403.46289 z M 510.67578 403.61914 L 529.17383 403.61914 L 510.67578 403.61914 z " + transform="scale(0.8,0.8)" + id="AvionicsLine2" + inkscape:label="#path4366" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4382" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4384" /> CABIN SLIDE - - - - - - - + sodipodi:nodetypes="ccccccccc" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4418" /> CARGO + x="812.60498" + y="335.27933">CARGO - - + d="m 581.43302,358.81865 14.79843,0 -14.79843,0 z m 20.51875,0 14.79688,0 -14.79688,0 z m 18.40312,0.125 14.79844,0 -14.79844,0 z" + id="Cargo1Line" + inkscape:label="#path4424" + inkscape:connector-curvature="0" /> SLIDE SLIDE - - + style="fill:#bb6100;fill-opacity:1;fill-rule:evenodd;stroke:#bb6100;stroke-width:2.61183023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.67999983;stroke-opacity:1" + d="M 853.75 652.0918 L 872.24805 652.0918 L 853.75 652.0918 z M 879.39844 652.0918 L 897.89648 652.0918 L 879.39844 652.0918 z M 902.4043 652.24805 L 920.90039 652.24805 L 902.4043 652.24805 z " + transform="scale(0.8,0.8)" + id="ExitRLine" + inkscape:label="#path4438" /> EXIT - - + style="fill:#bb6100;fill-opacity:1;fill-rule:evenodd;stroke:#bb6100;stroke-width:2.61183023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.67999983;stroke-opacity:1" + d="M 359.47656 652.55273 L 377.97461 652.55273 L 359.47656 652.55273 z M 385.125 652.55273 L 403.62109 652.55273 L 385.125 652.55273 z M 408.12891 652.70898 L 426.62695 652.70898 L 408.12891 652.70898 z " + transform="scale(0.8,0.8)" + id="ExitLLine" + inkscape:label="#path4464" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4470" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4472" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4474" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4476" /> + id="Cargo2Door" + d="m 573.07425,636.68576 -26.92307,0.0621 -0.0512,29.44538 26.89714,-0.0807 z" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4478" /> CARGO - - + d="m 581.625,646.70799 14.79844,0 -14.79844,0 z m 20.51875,0 14.79688,0 -14.79688,0 z m 18.40312,0.12344 14.79844,0 -14.79844,0 z" + id="Cargo2Line" + inkscape:label="#path4484" + inkscape:connector-curvature="0" /> BULK - - - + style="fill:#bb6100;fill-opacity:1;fill-rule:evenodd;stroke:#bb6100;stroke-width:2.61183023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.67999983;stroke-opacity:1" + d="M 704.91992 889.13281 L 723.41602 889.13281 L 704.91992 889.13281 z M 730.79297 889.1543 L 749.29102 889.1543 L 730.79297 889.1543 z M 756.44141 889.1543 L 774.93945 889.1543 L 756.44141 889.1543 z M 779.44727 889.30859 L 797.94336 889.30859 L 779.44727 889.30859 z " + transform="scale(0.8,0.8)" + id="BulkLine" + inkscape:label="#path4504" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4518" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4262" /> + sodipodi:nodetypes="ccccc" + inkscape:label="#path4264" /> CABIN SLIDE - - - - - - - + sodipodi:nodetypes="ccccccccc" /> SLIDE + + + CABIN + + SLIDE + CABIN + SLIDE + + sodipodi:nodetypes="ccccc" + inkscape:label="#path4285" /> + id="Cabin3Right" + d="m 573.01948,580.87937 -10.90875,0.0633 0.0285,29.90121 10.83876,0.0238 z" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0dc04b;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:label="#path4287" /> + CABIN - + sodipodi:nodetypes="ccccccccc" /> + SLIDE + CABIN + SLIDE - - + sodipodi:nodetypes="ccccccccc" /> diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 8168a6b9..e8b5b85d 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -185,7 +185,7 @@ var triggerDoor = func(door, doorName, doorDesc) { door.toggle(); } else { if (getprop("/velocities/groundspeed-kt") > 5) { - gui.popupTip("You cannot open the doors while the aircraft is moving!!!"); + gui.popupTip("You cannot open the doors while the aircraft is moving!"); } else { gui.popupTip("Opening " ~ doorDesc ~ " door"); door.toggle(); From 234e87341970b64b1f8b73b26421a72d62bf8cf2 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Fri, 10 Nov 2017 15:42:19 -0400 Subject: [PATCH 3/5] Add cargo doors, fix a319 / a318 doors --- Models/Fuselages/A318/fuselage.xml | 12 ++--- Models/Fuselages/A319/fuselage.xml | 12 ++--- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 57 +++++++++++++++----- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Models/Fuselages/A318/fuselage.xml b/Models/Fuselages/A318/fuselage.xml index 4c9dbd7e..e6dce0a1 100644 --- a/Models/Fuselages/A318/fuselage.xml +++ b/Models/Fuselages/A318/fuselage.xml @@ -154,7 +154,7 @@ nasal @@ -164,7 +164,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.250 @@ -181,7 +181,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.25-0.2 @@ -205,7 +205,7 @@ nasal @@ -215,7 +215,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250 @@ -232,7 +232,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250.2 diff --git a/Models/Fuselages/A319/fuselage.xml b/Models/Fuselages/A319/fuselage.xml index 27ab6070..b0144890 100644 --- a/Models/Fuselages/A319/fuselage.xml +++ b/Models/Fuselages/A319/fuselage.xml @@ -153,7 +153,7 @@ nasal @@ -163,7 +163,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.250 @@ -180,7 +180,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.25-0.2 @@ -204,7 +204,7 @@ nasal @@ -214,7 +214,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250 @@ -231,7 +231,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250.2 diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 8e3db0e7..6e82d23c 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1157,19 +1157,9 @@ var canvas_lowerECAM_door = { getKeys: func() { return ["TAT","SAT","GW","Bulk","BulkLine","BulkLbl", "Exit1L", "Exit1R", "Cabin1Left", "Cabin1LeftLbl", "Cabin1LeftLine", "Cabin1LeftSlide", "Cabin1Right", "Cabin1RightLbl", "Cabin1RightLine", "Cabin1RightSlide", "Cabin2Left", "Cabin2LeftLbl", "Cabin2LeftLine", "Cabin2LeftSlide", "Cabin2Right", "Cabin2RightLbl", "Cabin2RightLine", "Cabin2RightSlide", "Cabin3Left","Cabin3LeftLbl", "Cabin3LeftLine", "Cabin3LeftSlide", "Cabin3Right", "Cabin3RightLbl", "Cabin3RightLine", "Cabin3RightSlide", "AvionicsLine1", "AvionicsLbl1", "AvionicsLine2", "AvionicsLbl2", - "Cargo1Line", "Cargo1Lbl", "Cargo2Line", "Cargo2Lbl", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; + "Cargo1Line", "Cargo1Lbl", "Cargo1Door", "Cargo2Line", "Cargo2Lbl", "Cargo2Door", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; }, update: func() { - # if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { - # me["Bulk"].hide(); - # me["BulkLine"].hide(); - # me["BulkLbl"].hide(); - # } else { - # me["Bulk"].show(); - # me["BulkLine"].show(); - # me["BulkLbl"].show(); - # } - # If you make AirBerlin or Allegiant livery add below if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { @@ -1300,6 +1290,48 @@ var canvas_lowerECAM_door = { me["Cabin4RightLine"].hide(); } + if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { + me["Bulk"].hide(); + } else { + me["Bulk"].show(); + } + + if (getprop("/sim/model/door-positions/cargobulk/position-norm") > 0) { + me["Bulk"].setColor(0.7333,0.3803,0); + me["Bulk"].setColorFill(0.7333,0.3803,0); + me["BulkLbl"].show(); + me["BulkLine"].show(); + } else { + me["Bulk"].setColor(0.0509,0.7529,0.2941); + me["Bulk"].setColorFill(0,0,0); + me["BulkLbl"].hide(); + me["BulkLine"].hide(); + } + + if (getprop("/sim/model/door-positions/cargofwd/position-norm") > 0) { + me["Cargo1Door"].setColor(0.7333,0.3803,0); + me["Cargo1Door"].setColorFill(0.7333,0.3803,0); + me["Cargo1Lbl"].show(); + me["Cargo1Line"].show(); + } else { + me["Cargo1Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo1Door"].setColorFill(0,0,0); + me["Cargo1Lbl"].hide(); + me["Cargo1Line"].hide(); + } + + if (getprop("/sim/model/door-positions/cargoaft/position-norm") > 0) { + me["Cargo2Door"].setColor(0.7333,0.3803,0); + me["Cargo2Door"].setColorFill(0.7333,0.3803,0); + me["Cargo2Lbl"].show(); + me["Cargo2Line"].show(); + } else { + me["Cargo2Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo2Door"].setColorFill(0,0,0); + me["Cargo2Lbl"].hide(); + me["Cargo2Line"].hide(); + } + me["Cabin1LeftSlide"].hide(); me["Cabin1RightSlide"].hide(); @@ -1320,9 +1352,6 @@ var canvas_lowerECAM_door = { me["ExitRSlide"].hide(); me["ExitRLine"].hide(); me["ExitRLbl"].hide(); - me["Bulk"].hide(); - me["BulkLine"].hide(); - me["BulkLbl"].hide(); me["Cargo1Line"].hide(); me["Cargo1Lbl"].hide(); me["Cargo2Line"].hide(); From 58846b86a79adc0661693be71db8142e7b77b8e9 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 14 Nov 2017 20:18:08 -0500 Subject: [PATCH 4/5] A32X: Lower ECAM fixes --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 436 +++++++++---------- 1 file changed, 217 insertions(+), 219 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 3eccc12a..28f73d8c 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -264,6 +264,223 @@ var canvas_lowerECAM_apu = { }, }; +var canvas_lowerECAM_door = { + new: func(canvas_group, file) { + var m = {parents: [canvas_lowerECAM_door, canvas_lowerECAM_base]}; + m.init(canvas_group, file); + + return m; + }, + getKeys: func() { + return ["TAT","SAT","GW","Bulk","BulkLine","BulkLbl", "Exit1L", "Exit1R", "Cabin1Left", "Cabin1LeftLbl", "Cabin1LeftLine", "Cabin1LeftSlide", "Cabin1Right", "Cabin1RightLbl", "Cabin1RightLine", "Cabin1RightSlide", "Cabin2Left", "Cabin2LeftLbl", + "Cabin2LeftLine", "Cabin2LeftSlide", "Cabin2Right", "Cabin2RightLbl", "Cabin2RightLine", "Cabin2RightSlide", "Cabin3Left","Cabin3LeftLbl", "Cabin3LeftLine", "Cabin3LeftSlide", "Cabin3Right", "Cabin3RightLbl", "Cabin3RightLine", "Cabin3RightSlide", + "AvionicsLine1", "AvionicsLbl1", "AvionicsLine2", "AvionicsLbl2","Cargo1Line", "Cargo1Lbl", "Cargo1Door", "Cargo2Line", "Cargo2Lbl", "Cargo2Door", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", + "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; + }, + update: func() { + # If you make AirBerlin or Allegiant livery add below + if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { + me["Exit1L"].hide(); + me["Exit1R"].hide() + } else { + me["Exit1L"].show(); + me["Exit1R"].show(); + } + + if (getprop("sim/model/door-positions/doorl1/position-norm") > 0) { + me["Cabin1Left"].show(); + me["Cabin1Left"].setColor(0.7333,0.3803,0); + me["Cabin1Left"].setColorFill(0.7333,0.3803,0); + me["Cabin1LeftLbl"].show(); + me["Cabin1LeftLine"].show(); + } else { + me["Cabin1Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin1Left"].setColorFill(0,0,0); + me["Cabin1LeftLbl"].hide(); + me["Cabin1LeftLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorr1/position-norm") > 0) { + me["Cabin1Right"].show(); + me["Cabin1Right"].setColor(0.7333,0.3803,0); + me["Cabin1Right"].setColorFill(0.7333,0.3803,0); + me["Cabin1RightLbl"].show(); + me["Cabin1RightLine"].show(); + } else { + me["Cabin1Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin1Right"].setColorFill(0,0,0); + me["Cabin1RightLbl"].hide(); + me["Cabin1RightLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl2/position-norm") > 0) { + me["Cabin2Left"].show(); + me["Cabin2Left"].setColor(0.7333,0.3803,0); + me["Cabin2Left"].setColorFill(0.7333,0.3803,0); + me["Cabin2LeftLbl"].show(); + me["Cabin2LeftLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin2Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin2Left"].setColorFill(0,0,0); + me["Cabin2LeftLbl"].hide(); + me["Cabin2LeftLine"].hide(); + } else { + me["Cabin2Left"].hide(); + me["Cabin2LeftLbl"].hide(); + me["Cabin2LeftLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr2/position-norm") > 0) { + me["Cabin2Right"].show(); + me["Cabin2Right"].setColor(0.7333,0.3803,0); + me["Cabin2Right"].setColorFill(0.7333,0.3803,0); + me["Cabin2RightLbl"].show(); + me["Cabin2RightLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin2Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin2Right"].setColorFill(0,0,0); + me["Cabin2RightLbl"].hide(); + me["Cabin2RightLine"].hide(); + } else { + me["Cabin2Right"].hide(); + me["Cabin2RightLbl"].hide(); + me["Cabin2RightLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl3/position-norm") > 0) { + me["Cabin3Left"].show(); + me["Cabin3Left"].setColor(0.7333,0.3803,0); + me["Cabin3Left"].setColorFill(0.7333,0.3803,0); + me["Cabin3LeftLbl"].show(); + me["Cabin3LeftLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin3Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin3Left"].setColorFill(0,0,0); + me["Cabin3LeftLbl"].hide(); + me["Cabin3LeftLine"].hide(); + } else { + me["Cabin3Left"].hide(); + me["Cabin3LeftLbl"].hide(); + me["Cabin3LeftLine"].hide(); + } + + if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr3/position-norm") > 0) { + me["Cabin3Right"].show(); + me["Cabin3Right"].setColor(0.7333,0.3803,0); + me["Cabin3Right"].setColorFill(0.7333,0.3803,0); + me["Cabin3RightLbl"].show(); + me["Cabin3RightLine"].show(); + } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { + me["Cabin3Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin3Right"].setColorFill(0,0,0); + me["Cabin3RightLbl"].hide(); + me["Cabin3RightLine"].hide(); + } else { + me["Cabin3Right"].hide(); + me["Cabin3RightLbl"].hide(); + me["Cabin3RightLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorl4/position-norm") > 0) { + me["Cabin4Left"].show(); + me["Cabin4Left"].setColor(0.7333,0.3803,0); + me["Cabin4Left"].setColorFill(0.7333,0.3803,0); + me["Cabin4LeftLbl"].show(); + me["Cabin4LeftLine"].show(); + } else { + me["Cabin4Left"].setColor(0.0509,0.7529,0.2941); + me["Cabin4Left"].setColorFill(0,0,0); + me["Cabin4LeftLbl"].hide(); + me["Cabin4LeftLine"].hide(); + } + + if (getprop("sim/model/door-positions/doorr4/position-norm") > 0) { + me["Cabin4Right"].show(); + me["Cabin4Right"].setColor(0.7333,0.3803,0); + me["Cabin4Right"].setColorFill(0.7333,0.3803,0); + me["Cabin4RightLbl"].show(); + me["Cabin4RightLine"].show(); + } else { + me["Cabin4Right"].setColor(0.0509,0.7529,0.2941); + me["Cabin4Right"].setColorFill(0,0,0); + me["Cabin4RightLbl"].hide(); + me["Cabin4RightLine"].hide(); + } + + if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { + me["Bulk"].hide(); + } else { + me["Bulk"].show(); + } + + if (getprop("/sim/model/door-positions/cargobulk/position-norm") > 0) { + me["Bulk"].setColor(0.7333,0.3803,0); + me["Bulk"].setColorFill(0.7333,0.3803,0); + me["BulkLbl"].show(); + me["BulkLine"].show(); + } else { + me["Bulk"].setColor(0.0509,0.7529,0.2941); + me["Bulk"].setColorFill(0,0,0); + me["BulkLbl"].hide(); + me["BulkLine"].hide(); + } + + if (getprop("/sim/model/door-positions/cargofwd/position-norm") > 0) { + me["Cargo1Door"].setColor(0.7333,0.3803,0); + me["Cargo1Door"].setColorFill(0.7333,0.3803,0); + me["Cargo1Lbl"].show(); + me["Cargo1Line"].show(); + } else { + me["Cargo1Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo1Door"].setColorFill(0,0,0); + me["Cargo1Lbl"].hide(); + me["Cargo1Line"].hide(); + } + + if (getprop("/sim/model/door-positions/cargoaft/position-norm") > 0) { + me["Cargo2Door"].setColor(0.7333,0.3803,0); + me["Cargo2Door"].setColorFill(0.7333,0.3803,0); + me["Cargo2Lbl"].show(); + me["Cargo2Line"].show(); + } else { + me["Cargo2Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo2Door"].setColorFill(0,0,0); + me["Cargo2Lbl"].hide(); + me["Cargo2Line"].hide(); + } + + me["Cabin1LeftSlide"].hide(); + me["Cabin1RightSlide"].hide(); + me["Cabin2LeftSlide"].hide(); + me["Cabin2RightSlide"].hide(); + me["Cabin3LeftSlide"].hide(); + me["Cabin3RightSlide"].hide(); + me["Cabin4LeftSlide"].hide(); + me["Cabin4RightSlide"].hide(); + + me["AvionicsLine1"].hide(); + me["AvionicsLine2"].hide(); + me["AvionicsLbl1"].hide(); + me["AvionicsLbl2"].hide(); + me["ExitLSlide"].hide(); + me["ExitLLine"].hide(); + me["ExitLLbl"].hide(); + me["ExitRSlide"].hide(); + me["ExitRLine"].hide(); + me["ExitRLbl"].hide(); + me["Cargo1Line"].hide(); + me["Cargo1Lbl"].hide(); + me["Cargo2Line"].hide(); + me["Cargo2Lbl"].hide(); + me["Cabin1LeftSlide"].hide(); + me["Cabin1RightSlide"].hide(); + me["Cabin4LeftSlide"].hide(); + me["Cabin4RightSlide"].hide(); + + me.updateBottomStatus(); + }, +}; + var canvas_lowerECAM_eng = { new: func(canvas_group, file) { var m = {parents: [canvas_lowerECAM_eng, canvas_lowerECAM_base]}; @@ -1147,225 +1364,6 @@ var canvas_lowerECAM_wheel = { }, }; -var canvas_lowerECAM_door = { - new: func(canvas_group, file) { - var m = {parents: [canvas_lowerECAM_door, canvas_lowerECAM_base]}; - m.init(canvas_group, file); - - return m; - }, - getKeys: func() { - return ["TAT","SAT","GW","Bulk","BulkLine","BulkLbl", "Exit1L", "Exit1R", "Cabin1Left", "Cabin1LeftLbl", "Cabin1LeftLine", "Cabin1LeftSlide", "Cabin1Right", "Cabin1RightLbl", "Cabin1RightLine", "Cabin1RightSlide", "Cabin2Left", "Cabin2LeftLbl", "Cabin2LeftLine", "Cabin2LeftSlide", - "Cabin2Right", "Cabin2RightLbl", "Cabin2RightLine", "Cabin2RightSlide", "Cabin3Left","Cabin3LeftLbl", "Cabin3LeftLine", "Cabin3LeftSlide", "Cabin3Right", "Cabin3RightLbl", "Cabin3RightLine", "Cabin3RightSlide", "AvionicsLine1", "AvionicsLbl1", "AvionicsLine2", "AvionicsLbl2", - "Cargo1Line", "Cargo1Lbl", "Cargo1Door", "Cargo2Line", "Cargo2Lbl", "Cargo2Door", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; - }, - update: func() { - - # If you make AirBerlin or Allegiant livery add below - if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { - me["Exit1L"].hide(); - me["Exit1R"].hide() - } else { - me["Exit1L"].show(); - me["Exit1R"].show(); - } - - if (getprop("sim/model/door-positions/doorl1/position-norm") > 0) { - me["Cabin1Left"].show(); - me["Cabin1Left"].setColor(0.7333,0.3803,0); - me["Cabin1Left"].setColorFill(0.7333,0.3803,0); - me["Cabin1LeftLbl"].show(); - me["Cabin1LeftLine"].show(); - } else { - me["Cabin1Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin1Left"].setColorFill(0,0,0); - me["Cabin1LeftLbl"].hide(); - me["Cabin1LeftLine"].hide(); - } - - if (getprop("sim/model/door-positions/doorr1/position-norm") > 0) { - me["Cabin1Right"].show(); - me["Cabin1Right"].setColor(0.7333,0.3803,0); - me["Cabin1Right"].setColorFill(0.7333,0.3803,0); - me["Cabin1RightLbl"].show(); - me["Cabin1RightLine"].show(); - } else { - me["Cabin1Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin1Right"].setColorFill(0,0,0); - me["Cabin1RightLbl"].hide(); - me["Cabin1RightLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl2/position-norm") > 0) { - me["Cabin2Left"].show(); - me["Cabin2Left"].setColor(0.7333,0.3803,0); - me["Cabin2Left"].setColorFill(0.7333,0.3803,0); - me["Cabin2LeftLbl"].show(); - me["Cabin2LeftLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin2Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin2Left"].setColorFill(0,0,0); - me["Cabin2LeftLbl"].hide(); - me["Cabin2LeftLine"].hide(); - } else { - me["Cabin2Left"].hide(); - me["Cabin2LeftLbl"].hide(); - me["Cabin2LeftLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr2/position-norm") > 0) { - me["Cabin2Right"].show(); - me["Cabin2Right"].setColor(0.7333,0.3803,0); - me["Cabin2Right"].setColorFill(0.7333,0.3803,0); - me["Cabin2RightLbl"].show(); - me["Cabin2RightLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin2Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin2Right"].setColorFill(0,0,0); - me["Cabin2RightLbl"].hide(); - me["Cabin2RightLine"].hide(); - } else { - me["Cabin2Right"].hide(); - me["Cabin2RightLbl"].hide(); - me["Cabin2RightLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl3/position-norm") > 0) { - me["Cabin3Left"].show(); - me["Cabin3Left"].setColor(0.7333,0.3803,0); - me["Cabin3Left"].setColorFill(0.7333,0.3803,0); - me["Cabin3LeftLbl"].show(); - me["Cabin3LeftLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin3Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin3Left"].setColorFill(0,0,0); - me["Cabin3LeftLbl"].hide(); - me["Cabin3LeftLine"].hide(); - } else { - me["Cabin3Left"].hide(); - me["Cabin3LeftLbl"].hide(); - me["Cabin3LeftLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr3/position-norm") > 0) { - me["Cabin3Right"].show(); - me["Cabin3Right"].setColor(0.7333,0.3803,0); - me["Cabin3Right"].setColorFill(0.7333,0.3803,0); - me["Cabin3RightLbl"].show(); - me["Cabin3RightLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin3Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin3Right"].setColorFill(0,0,0); - me["Cabin3RightLbl"].hide(); - me["Cabin3RightLine"].hide(); - } else { - me["Cabin3Right"].hide(); - me["Cabin3RightLbl"].hide(); - me["Cabin3RightLine"].hide(); - } - - if (getprop("sim/model/door-positions/doorl4/position-norm") > 0) { - me["Cabin4Left"].show(); - me["Cabin4Left"].setColor(0.7333,0.3803,0); - me["Cabin4Left"].setColorFill(0.7333,0.3803,0); - me["Cabin4LeftLbl"].show(); - me["Cabin4LeftLine"].show(); - } else { - me["Cabin4Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin4Left"].setColorFill(0,0,0); - me["Cabin4LeftLbl"].hide(); - me["Cabin4LeftLine"].hide(); - } - - if (getprop("sim/model/door-positions/doorr4/position-norm") > 0) { - me["Cabin4Right"].show(); - me["Cabin4Right"].setColor(0.7333,0.3803,0); - me["Cabin4Right"].setColorFill(0.7333,0.3803,0); - me["Cabin4RightLbl"].show(); - me["Cabin4RightLine"].show(); - } else { - me["Cabin4Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin4Right"].setColorFill(0,0,0); - me["Cabin4RightLbl"].hide(); - me["Cabin4RightLine"].hide(); - } - - if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { - me["Bulk"].hide(); - } else { - me["Bulk"].show(); - } - - if (getprop("/sim/model/door-positions/cargobulk/position-norm") > 0) { - me["Bulk"].setColor(0.7333,0.3803,0); - me["Bulk"].setColorFill(0.7333,0.3803,0); - me["BulkLbl"].show(); - me["BulkLine"].show(); - } else { - me["Bulk"].setColor(0.0509,0.7529,0.2941); - me["Bulk"].setColorFill(0,0,0); - me["BulkLbl"].hide(); - me["BulkLine"].hide(); - } - - if (getprop("/sim/model/door-positions/cargofwd/position-norm") > 0) { - me["Cargo1Door"].setColor(0.7333,0.3803,0); - me["Cargo1Door"].setColorFill(0.7333,0.3803,0); - me["Cargo1Lbl"].show(); - me["Cargo1Line"].show(); - } else { - me["Cargo1Door"].setColor(0.0509,0.7529,0.2941); - me["Cargo1Door"].setColorFill(0,0,0); - me["Cargo1Lbl"].hide(); - me["Cargo1Line"].hide(); - } - - if (getprop("/sim/model/door-positions/cargoaft/position-norm") > 0) { - me["Cargo2Door"].setColor(0.7333,0.3803,0); - me["Cargo2Door"].setColorFill(0.7333,0.3803,0); - me["Cargo2Lbl"].show(); - me["Cargo2Line"].show(); - } else { - me["Cargo2Door"].setColor(0.0509,0.7529,0.2941); - me["Cargo2Door"].setColorFill(0,0,0); - me["Cargo2Lbl"].hide(); - me["Cargo2Line"].hide(); - } - - - me["Cabin1LeftSlide"].hide(); - me["Cabin1RightSlide"].hide(); - me["Cabin2LeftSlide"].hide(); - me["Cabin2RightSlide"].hide(); - me["Cabin3LeftSlide"].hide(); - me["Cabin3RightSlide"].hide(); - me["Cabin4LeftSlide"].hide(); - me["Cabin4RightSlide"].hide(); - - me["AvionicsLine1"].hide(); - me["AvionicsLine2"].hide(); - me["AvionicsLbl1"].hide(); - me["AvionicsLbl2"].hide(); - me["ExitLSlide"].hide(); - me["ExitLLine"].hide(); - me["ExitLLbl"].hide(); - me["ExitRSlide"].hide(); - me["ExitRLine"].hide(); - me["ExitRLbl"].hide(); - me["Cargo1Line"].hide(); - me["Cargo1Lbl"].hide(); - me["Cargo2Line"].hide(); - me["Cargo2Lbl"].hide(); - me["Cabin1LeftSlide"].hide(); - me["Cabin1RightSlide"].hide(); - me["Cabin4LeftSlide"].hide(); - me["Cabin4RightSlide"].hide(); - - - me.updateBottomStatus(); - }, -}; - setlistener("sim/signals/fdm-initialized", func { lowerECAM_display = canvas.new({ "name": "lowerECAM", From 53cb1c6c5b6845d41c1959a91cd325f2cb60ca78 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 15 Nov 2017 11:16:03 -0400 Subject: [PATCH 5/5] Fix the ECAM after removal of the A319 / A321 --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 98 +++----------------- 1 file changed, 12 insertions(+), 86 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 28f73d8c..44b3def5 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -279,13 +279,6 @@ var canvas_lowerECAM_door = { }, update: func() { # If you make AirBerlin or Allegiant livery add below - if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { - me["Exit1L"].hide(); - me["Exit1R"].hide() - } else { - me["Exit1L"].show(); - me["Exit1R"].show(); - } if (getprop("sim/model/door-positions/doorl1/position-norm") > 0) { me["Cabin1Left"].show(); @@ -313,74 +306,6 @@ var canvas_lowerECAM_door = { me["Cabin1RightLine"].hide(); } - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl2/position-norm") > 0) { - me["Cabin2Left"].show(); - me["Cabin2Left"].setColor(0.7333,0.3803,0); - me["Cabin2Left"].setColorFill(0.7333,0.3803,0); - me["Cabin2LeftLbl"].show(); - me["Cabin2LeftLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin2Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin2Left"].setColorFill(0,0,0); - me["Cabin2LeftLbl"].hide(); - me["Cabin2LeftLine"].hide(); - } else { - me["Cabin2Left"].hide(); - me["Cabin2LeftLbl"].hide(); - me["Cabin2LeftLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr2/position-norm") > 0) { - me["Cabin2Right"].show(); - me["Cabin2Right"].setColor(0.7333,0.3803,0); - me["Cabin2Right"].setColorFill(0.7333,0.3803,0); - me["Cabin2RightLbl"].show(); - me["Cabin2RightLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin2Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin2Right"].setColorFill(0,0,0); - me["Cabin2RightLbl"].hide(); - me["Cabin2RightLine"].hide(); - } else { - me["Cabin2Right"].hide(); - me["Cabin2RightLbl"].hide(); - me["Cabin2RightLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorl3/position-norm") > 0) { - me["Cabin3Left"].show(); - me["Cabin3Left"].setColor(0.7333,0.3803,0); - me["Cabin3Left"].setColorFill(0.7333,0.3803,0); - me["Cabin3LeftLbl"].show(); - me["Cabin3LeftLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin3Left"].setColor(0.0509,0.7529,0.2941); - me["Cabin3Left"].setColorFill(0,0,0); - me["Cabin3LeftLbl"].hide(); - me["Cabin3LeftLine"].hide(); - } else { - me["Cabin3Left"].hide(); - me["Cabin3LeftLbl"].hide(); - me["Cabin3LeftLine"].hide(); - } - - if (((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) and getprop("sim/model/door-positions/doorr3/position-norm") > 0) { - me["Cabin3Right"].show(); - me["Cabin3Right"].setColor(0.7333,0.3803,0); - me["Cabin3Right"].setColorFill(0.7333,0.3803,0); - me["Cabin3RightLbl"].show(); - me["Cabin3RightLine"].show(); - } else if ((getprop("/sim/aircraft") == "A321-200-CFM") or (getprop("/sim/aircraft") == "A321-200-IAE") or (getprop("/sim/aircraft") == "A321neo-CFM") or (getprop("/sim/aircraft") == "A321neo-PW")) { - me["Cabin3Right"].setColor(0.0509,0.7529,0.2941); - me["Cabin3Right"].setColorFill(0,0,0); - me["Cabin3RightLbl"].hide(); - me["Cabin3RightLine"].hide(); - } else { - me["Cabin3Right"].hide(); - me["Cabin3RightLbl"].hide(); - me["Cabin3RightLine"].hide(); - } - if (getprop("sim/model/door-positions/doorl4/position-norm") > 0) { me["Cabin4Left"].show(); me["Cabin4Left"].setColor(0.7333,0.3803,0); @@ -407,12 +332,6 @@ var canvas_lowerECAM_door = { me["Cabin4RightLine"].hide(); } - if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { - me["Bulk"].hide(); - } else { - me["Bulk"].show(); - } - if (getprop("/sim/model/door-positions/cargobulk/position-norm") > 0) { me["Bulk"].setColor(0.7333,0.3803,0); me["Bulk"].setColorFill(0.7333,0.3803,0); @@ -468,15 +387,22 @@ var canvas_lowerECAM_door = { me["ExitRSlide"].hide(); me["ExitRLine"].hide(); me["ExitRLbl"].hide(); - me["Cargo1Line"].hide(); - me["Cargo1Lbl"].hide(); - me["Cargo2Line"].hide(); - me["Cargo2Lbl"].hide(); me["Cabin1LeftSlide"].hide(); me["Cabin1RightSlide"].hide(); me["Cabin4LeftSlide"].hide(); me["Cabin4RightSlide"].hide(); - + me["Cabin2Left"].hide(); + me["Cabin2LeftLine"].hide(); + me["Cabin2LeftLbl"].hide(); + me["Cabin2Right"].hide(); + me["Cabin2RightLine"].hide(); + me["Cabin2RightLbl"].hide(); + me["Cabin3Left"].hide(); + me["Cabin3LeftLine"].hide(); + me["Cabin3LeftLbl"].hide(); + me["Cabin3Right"].hide(); + me["Cabin3RightLine"].hide(); + me["Cabin3RightLbl"].hide(); me.updateBottomStatus(); }, };