diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas index 5548d196..4b931bca 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-cruise.nas @@ -23,6 +23,86 @@ var canvas_lowerECAMPageCruise = # init obj.update_items = [ + props.UpdateManager.FromHashValue("engOil1", 0.005, func(val) { + if (obj.units) { + obj["Oil1"].setText(sprintf("%2.1f",(0.1 * math.round(val * QT2LTR * 10,5)))); + } else { + obj["Oil1"].setText(sprintf("%2.1f",(0.1 * math.round(val * 10,5)))); + } + }), + props.UpdateManager.FromHashValue("engOil2", 0.005, func(val) { + if (obj.units) { + obj["Oil2"].setText(sprintf("%2.1f",(0.1 * math.round(val * QT2LTR * 10,5)))); + } else { + obj["Oil2"].setText(sprintf("%2.1f",(0.1 * math.round(val * 10,5)))); + } + }), + props.UpdateManager.FromHashValue("acconfigUnits", nil, func(val) { + if (val) { + obj["Fused-weight-unit"].setText("KG"); + obj["OilUnit"].setText("LTR"); + # immediately update parameters + obj["Oil1"].setText(sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[0].getValue() * QT2LTR * 10,5)))); + obj["Oil2"].setText(sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[1].getValue() * QT2LTR * 10,5)))); + obj["FUsed1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue() * LBS2KGS, 10))); + obj["FUsed2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue() * LBS2KGS, 10))); + } else { + obj["Fused-weight-unit"].setText("LBS"); + obj["OilUnit"].setText("QT"); + obj["Oil1"].setText(sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[0].getValue() * 10,5)))); + obj["Oil2"].setText(sprintf("%2.1f",(0.1 * math.round(pts.Engines.Engine.oilQt[1].getValue() * 10,5)))); + obj["FUsed1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue(), 10))); + obj["FUsed2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue(), 10))); + } + }), + props.UpdateManager.FromHashValue("engFuelUsed1", 1, func(val) { + if (obj.units) { + obj["FUsed1"].setText(sprintf("%s", math.round(val * LBS2KGS, 10))); + } else { + obj["FUsed1"].setText(sprintf("%s", math.round(val, 10))); + } + }), + props.UpdateManager.FromHashValue("engFuelUsed2", 1, func(val) { + if (obj.units) { + obj["FUsed2"].setText(sprintf("%s", math.round(val * LBS2KGS, 10))); + } else { + obj["FUsed2"].setText(sprintf("%s", math.round(val, 10))); + } + }), + props.UpdateManager.FromHashList(["engFuelUsed1","engFuelUsed2"], 1, func(val) { + if (obj.units) { + obj["FUsed"].setText(sprintf("%s", math.round((val.engFuelUsed1 + val.engFuelUsed2) * LBS2KGS, 10))); + } else { + obj["FUsed"].setText(sprintf("%s", math.round((val.engFuelUsed1 + val.engFuelUsed2), 10))); + } + }), + props.UpdateManager.FromHashValue("pressDelta", 0.05, func(val) { + if (val > 31.9) { + obj["deltaPSI"].setText(sprintf("%2.1f", 31.9)); + } else if (val < -9.9) { + obj["deltaPSI"].setText(sprintf("%2.1f", -9.9)); + } else { + obj["deltaPSI"].setText(sprintf("%2.1f", val)); + } + }), + props.UpdateManager.FromHashValue("pressVS", 25, func(val) { + if (val > 9950) { + obj["CABVS"].setText(sprintf("%4.0f", 9950)); + } else if (val < -9950) { + obj["CABVS"].setText(sprintf("%4.0f", -9950)); + } else { + obj["CABVS"].setText(sprintf("%-4.0f", math.round(val,50))); + } + }), + props.UpdateManager.FromHashValue("condTempCockpit", 0.5, func(val) { + obj["CKPT-TEMP"].setText(sprintf("%2.0f",val)); + }), + props.UpdateManager.FromHashValue("condTempAft", 0.5, func(val) { + obj["AFT-TEMP"].setText(sprintf("%2.0f",val)); + }), + props.UpdateManager.FromHashValue("condTempFwd", 0.5, func(val) { + obj["FWD-TEMP"].setText(sprintf("%2.0f",val)); + }), ]; obj.displayedGForce = 0; @@ -62,10 +142,8 @@ var canvas_lowerECAMPageCruise = return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit"]; }, getKeys: func() { - return["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","DOOROXY-REGUL-LO-PR"];}, + return["Oil1","Oil2","FUsed1","FUsed2","FUsed","VIB1N1","VIB1N2","VIB2N1","VIB2N2","deltaPSI","LDGELEV-AUTO","LDGELEV","CABVS","CABALT","VS-Arrow-UP","VS-Arrow-DN","CKPT-TEMP","FWD-TEMP","AFT-TEMP","Fused-weight-unit"]; + }, updateBottom: func(notification) { foreach(var update_item_bottom; me.updateItemsBottom) { diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas index acaa3f50..9e279235 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas @@ -21,8 +21,171 @@ var canvas_lowerECAMPageDoor = obj.units = acconfig_weight_kgs.getValue(); # init + obj["Cabin2LeftSlide"].hide(); + obj["Cabin2RightSlide"].hide(); + obj["Cabin3LeftSlide"].hide(); + obj["Cabin3RightSlide"].hide(); + + obj["DOOROXY-REGUL-LO-PR"].hide(); + obj["AvionicsLine1"].hide(); + obj["AvionicsLine2"].hide(); + obj["AvionicsLbl1"].hide(); + obj["AvionicsLbl2"].hide(); + obj["ExitLLine"].hide(); + obj["ExitLLbl"].hide(); + obj["ExitRLine"].hide(); + obj["ExitRLbl"].hide(); + obj["Cabin2Left"].hide(); + obj["Cabin2LeftLine"].hide(); + obj["Cabin2LeftLbl"].hide(); + obj["Cabin2Right"].hide(); + obj["Cabin2RightLine"].hide(); + obj["Cabin2RightLbl"].hide(); + obj["Cabin3Left"].hide(); + obj["Cabin3LeftLine"].hide(); + obj["Cabin3LeftLbl"].hide(); + obj["Cabin3Right"].hide(); + obj["Cabin3RightLine"].hide(); + obj["Cabin3RightLbl"].hide(); + obj.update_items = [ + props.UpdateManager.FromHashValue("doorL1", nil, func(val) { + if (val > 0) { + obj["Cabin1Left"].show(); + obj["Cabin1Left"].setColor(0.7333,0.3803,0); + obj["Cabin1Left"].setColorFill(0.7333,0.3803,0); + obj["Cabin1LeftLbl"].show(); + obj["Cabin1LeftLine"].show(); + obj["Cabin1LeftSlide"].hide(); + } else { + obj["Cabin1Left"].setColor(0.0509,0.7529,0.2941); + obj["Cabin1Left"].setColorFill(0,0,0); + obj["Cabin1LeftLbl"].hide(); + obj["Cabin1LeftLine"].hide(); + obj["Cabin1LeftSlide"].show(); + } + }), + props.UpdateManager.FromHashValue("doorL4", nil, func(val) { + if (val > 0) { + obj["Cabin4Left"].show(); + obj["Cabin4Left"].setColor(0.7333,0.3803,0); + obj["Cabin4Left"].setColorFill(0.7333,0.3803,0); + obj["Cabin4LeftLbl"].show(); + obj["Cabin4LeftLine"].show(); + obj["Cabin4LeftSlide"].hide(); + } else { + obj["Cabin4Left"].setColor(0.0509,0.7529,0.2941); + obj["Cabin4Left"].setColorFill(0,0,0); + obj["Cabin4LeftLbl"].hide(); + obj["Cabin4LeftLine"].hide(); + obj["Cabin4LeftSlide"].show(); + } + }), + props.UpdateManager.FromHashValue("doorR1", nil, func(val) { + if (val > 0) { + obj["Cabin1Right"].show(); + obj["Cabin1Right"].setColor(0.7333,0.3803,0); + obj["Cabin1Right"].setColorFill(0.7333,0.3803,0); + obj["Cabin1RightLbl"].show(); + obj["Cabin1RightLine"].show(); + obj["Cabin1RightSlide"].hide(); + } else { + obj["Cabin1Right"].setColor(0.0509,0.7529,0.2941); + obj["Cabin1Right"].setColorFill(0,0,0); + obj["Cabin1RightLbl"].hide(); + obj["Cabin1RightLine"].hide(); + obj["Cabin1RightSlide"].show(); + } + }), + props.UpdateManager.FromHashValue("doorR4", nil, func(val) { + if (val > 0) { + obj["Cabin4Right"].show(); + obj["Cabin4Right"].setColor(0.7333,0.3803,0); + obj["Cabin4Right"].setColorFill(0.7333,0.3803,0); + obj["Cabin4RightLbl"].show(); + obj["Cabin4RightLine"].show(); + obj["Cabin4RightSlide"].hide(); + } else { + obj["Cabin4Right"].setColor(0.0509,0.7529,0.2941); + obj["Cabin4Right"].setColorFill(0,0,0); + obj["Cabin4RightLbl"].hide(); + obj["Cabin4RightLine"].hide(); + obj["Cabin4RightSlide"].show(); + } + }), + props.UpdateManager.FromHashValue("cargoAft", nil, func(val) { + if (val > 0) { + obj["Cargo2Door"].setColor(0.7333,0.3803,0); + obj["Cargo2Door"].setColorFill(0.7333,0.3803,0); + obj["Cargo2Lbl"].show(); + obj["Cargo2Line"].show(); + } else { + obj["Cargo2Door"].setColor(0.0509,0.7529,0.2941); + obj["Cargo2Door"].setColorFill(0,0,0); + obj["Cargo2Lbl"].hide(); + obj["Cargo2Line"].hide(); + } + }), + props.UpdateManager.FromHashValue("cargoBulk", nil, func(val) { + if (val > 0) { + obj["Bulk"].setColor(0.7333,0.3803,0); + obj["Bulk"].setColorFill(0.7333,0.3803,0); + obj["BulkLbl"].show(); + obj["BulkLine"].show(); + } else { + obj["Bulk"].setColor(0.0509,0.7529,0.2941); + obj["Bulk"].setColorFill(0,0,0); + obj["BulkLbl"].hide(); + obj["BulkLine"].hide(); + } + }), + props.UpdateManager.FromHashValue("cargoFwd", nil, func(val) { + if (val > 0) { + obj["Cargo1Door"].setColor(0.7333,0.3803,0); + obj["Cargo1Door"].setColorFill(0.7333,0.3803,0); + obj["Cargo1Lbl"].show(); + obj["Cargo1Line"].show(); + } else { + obj["Cargo1Door"].setColor(0.0509,0.7529,0.2941); + obj["Cargo1Door"].setColorFill(0,0,0); + obj["Cargo1Lbl"].hide(); + obj["Cargo1Line"].hide(); + } + }), + props.UpdateManager.FromHashValue("oxyPB", nil, func(val) { + if (val) { + obj["DOOROXY-OxyIndicator"].setColor(0.8078,0.8039,0.8078); + obj["DOOROXY-PR"].setColor(0.0509,0.7529,0.2941); + obj["DOOROXY-PR"].setText("1300"); + } else { + obj["DOOROXY-OxyIndicator"].setColor(0.7333,0.3803,0); + obj["DOOROXY-PR"].setColor(0.7333,0.3803,0); + obj["DOOROXY-PR"].setText("0"); + } + }), + props.UpdateManager.FromHashValue("pressVS", nil, func(val) { + if (val > 9950) { + obj["DOOR-VS"].setText(sprintf("%+4.0f", 9950)); + } else if (val < -9950) { + obj["DOOR-VS"].setText(sprintf("%+4.0f", -9950)); + } else { + obj["DOOR-VS"].setText(sprintf("%+4.0f", math.round(val,50))); + } + + if (abs(val) > 2000) { + obj["DOOR-VS"].setColor(0.7333,0.3803,0); + } else { + obj["DOOR-VS"].setColor(0.0509,0.7529,0.2941); + } + }), + props.UpdateManager.FromHashValue("FWCPhase", nil, func(val) { + if (val >= 5 and val <= 7) { + obj["DOOR-VS-Container"].show(); + } else { + obj["DOOR-VS-Container"].hide(); + } + }), ]; obj.displayedGForce = 0; @@ -65,7 +228,8 @@ var canvas_lowerECAMPageDoor = return["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","DOOROXY-REGUL-LO-PR"];}, + "Cabin4LeftSlide","Cabin4Right","Cabin4RightLbl","Cabin4RightLine","Cabin4RightSlide","DOOROXY-REGUL-LO-PR","DOOROXY-PR","DOOROXY-OxyIndicator","DOOR-VS","DOOR-VS-Container"]; + }, updateBottom: func(notification) { foreach(var update_item_bottom; me.updateItemsBottom) { @@ -140,6 +304,14 @@ var canvas_lowerECAMPageDoor = }; var input = { + doorL1: "/sim/model/door-positions/doorl1/position-norm", + doorL4: "/sim/model/door-positions/doorl4/position-norm", + doorR1: "/sim/model/door-positions/doorr1/position-norm", + doorR4: "/sim/model/door-positions/doorr4/position-norm", + cargoAft: "/sim/model/door-positions/cargoaft/position-norm", + cargoBulk: "/sim/model/door-positions/cargobulk/position-norm", + cargoFwd: "/sim/model/door-positions/cargofwd/position-norm", + oxyPB: "/controls/oxygen/crewOxyPB", }; foreach (var name; keys(input)) { diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas index 6dbc4edf..251a7ddd 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-old.nas @@ -105,13 +105,6 @@ var pack2_bypass = props.globals.getNode("/systems/pneumatics/pack-2-bypass", 1) var oil_qt1_actual = props.globals.getNode("", 1); var oil_qt2_actual = props.globals.getNode("/engines/engine[1]/oil-qt-actual", 1); var fuel_used_lbs1 = props.globals.getNode("", 1); -var doorL1_pos = props.globals.getNode("/sim/model/door-positions/doorl1/position-norm", 1); -var doorR1_pos = props.globals.getNode("/sim/model/door-positions/doorr1/position-norm", 1); -var doorL4_pos = props.globals.getNode("/sim/model/door-positions/doorl4/position-norm", 1); -var doorR4_pos = props.globals.getNode("/sim/model/door-positions/doorr4/position-norm", 1); -var cargobulk_pos = props.globals.getNode("/sim/model/door-positions/cargobulk/position-norm", 1); -var cargofwd_pos = props.globals.getNode("/sim/model/door-positions/cargofwd/position-norm", 1); -var cargoaft_pos = props.globals.getNode("/sim/model/door-positions/cargoaft/position-norm", 1); var gLoad = props.globals.getNode("", 1); # Hydraulic @@ -796,183 +789,6 @@ var canvas_lowerECAM_bleed = { }, }; - -var canvas_lowerECAM_crz = { - new: func(canvas_group, file) { - var m = {parents: [canvas_lowerECAM_crz, canvas_lowerECAM_base]}; - m.init(canvas_group, file); - - return m; - }, - getKeys: func() { - return ["TAT","SAT","GW","UTCh","UTCm","GLoad","GW-weight-unit","Oil1","Oil2","FUsed1","FUsed2","FUsed","VIB1N1","VIB1N2","VIB2N1","VIB2N2","deltaPSI","LDGELEV-AUTO","LDGELEV","CABVS","CABALT","VS-Arrow-UP","VS-Arrow-DN","CKPT-TEMP","FWD-TEMP","AFT-TEMP","Fused-weight-unit"]; - }, - update: func() { - - me["Oil1"].setText(sprintf("%2.1f", oil_qt1_actual.getValue())); - me["Oil2"].setText(sprintf("%2.1f", oil_qt2_actual.getValue())); - - if (acconfig_weight_kgs.getValue()) { - me["Fused-weight-unit"].setText("KG"); - me["FUsed1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue() * LBS2KGS, 10))); - me["FUsed2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue() * LBS2KGS, 10))); - me["FUsed"].setText(sprintf("%s", (math.round(fuel_used_lbs1.getValue() * LBS2KGS, 10) + math.round(fuel_used_lbs2.getValue() * LBS2KGS, 10)))); - } else { - me["Fused-weight-unit"].setText("LBS"); - me["FUsed1"].setText(sprintf("%s", math.round(fuel_used_lbs1.getValue(), 10))); - me["FUsed2"].setText(sprintf("%s", math.round(fuel_used_lbs2.getValue(), 10))); - me["FUsed"].setText(sprintf("%s", (math.round(fuel_used_lbs1.getValue(), 10) + math.round(fuel_used_lbs2.getValue(), 10)))); - } - - me.updateBottomStatus(); - }, -}; - -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","UTCh","UTCm","GLoad","GW-weight-unit","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","DOOROXY-REGUL-LO-PR"]; - }, - update: func() { - # If you make AirBerlin or Allegiant livery add below - - if (doorL1_pos.getValue() > 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 (doorR1_pos.getValue() > 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 (doorL4_pos.getValue() > 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 (doorR4_pos.getValue() > 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 (cargobulk_pos.getValue() > 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 (cargofwd_pos.getValue() > 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 (cargoaft_pos.getValue() > 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["DOOROXY-REGUL-LO-PR"].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["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(); - }, -}; - var canvas_lowerECAM_elec = { new: func(canvas_group, file) { var m = {parents: [canvas_lowerECAM_elec, canvas_lowerECAM_base]}; @@ -2646,73 +2462,4 @@ var canvas_lowerECAM_hyd = { me.updateBottomStatus(); }, -}; - if (fbw.FBW.Failures.spoilerr1.getValue() or green_psi < 1500) { - me["spoiler1Rex"].setColor(0.7333,0.3803,0); - me["spoiler1Rrt"].setColor(0.7333,0.3803,0); - if (spoiler_R1.getValue() < 1.5) { - me["spoiler1Rf"].show(); - } else { - me["spoiler1Rf"].hide(); - } - } else { - me["spoiler1Rex"].setColor(0.0509,0.7529,0.2941); - me["spoiler1Rrt"].setColor(0.0509,0.7529,0.2941); - me["spoiler1Rf"].hide(); - } - - if (fbw.FBW.Failures.spoilerr2.getValue() or yellow_psi < 1500) { - me["spoiler2Rex"].setColor(0.7333,0.3803,0); - me["spoiler2Rrt"].setColor(0.7333,0.3803,0); - if (spoiler_R2.getValue() < 1.5) { - me["spoiler2Rf"].show(); - } else { - me["spoiler2Rf"].hide(); - } - } else { - me["spoiler2Rex"].setColor(0.0509,0.7529,0.2941); - me["spoiler2Rrt"].setColor(0.0509,0.7529,0.2941); - me["spoiler2Rf"].hide(); - } - - if (fbw.FBW.Failures.spoilerr3.getValue() or blue_psi < 1500) { - me["spoiler3Rex"].setColor(0.7333,0.3803,0); - me["spoiler3Rrt"].setColor(0.7333,0.3803,0); - if (spoiler_R3.getValue() < 1.5) { - me["spoiler3Rf"].show(); - } else { - me["spoiler3Rf"].hide(); - } - } else { - me["spoiler3Rex"].setColor(0.0509,0.7529,0.2941); - me["spoiler3Rrt"].setColor(0.0509,0.7529,0.2941); - me["spoiler3Rf"].hide(); - } - - if (fbw.FBW.Failures.spoilerr4.getValue() or yellow_psi < 1500) { - me["spoiler4Rex"].setColor(0.7333,0.3803,0); - me["spoiler4Rrt"].setColor(0.7333,0.3803,0); - if (spoiler_R4.getValue() < 1.5) { - me["spoiler4Rf"].show(); - } else { - me["spoiler4Rf"].hide(); - } - } else { - me["spoiler4Rex"].setColor(0.0509,0.7529,0.2941); - me["spoiler4Rrt"].setColor(0.0509,0.7529,0.2941); - me["spoiler4Rf"].hide(); - } - - if (fbw.FBW.Failures.spoilerr5.getValue() or green_psi < 1500) { - me["spoiler5Rex"].setColor(0.7333,0.3803,0); - me["spoiler5Rrt"].setColor(0.7333,0.3803,0); - if (spoiler_R5.getValue() < 1.5) { - me["spoiler5Rf"].show(); - } else { - me["spoiler5Rf"].hide(); - } - } else { - me["spoiler5Rex"].setColor(0.0509,0.7529,0.2941); - me["spoiler5Rrt"].setColor(0.0509,0.7529,0.2941); - me["spoiler5Rf"].hide(); - } +}; \ No newline at end of file diff --git a/Models/Instruments/Lower-ECAM/res/crz.svg b/Models/Instruments/Lower-ECAM/res/crz.svg index a5626e87..6b0f58fe 100644 --- a/Models/Instruments/Lower-ECAM/res/crz.svg +++ b/Models/Instruments/Lower-ECAM/res/crz.svg @@ -12,7 +12,7 @@ viewBox="0 0 1024 1024" version="1.1" id="svg2" - inkscape:version="0.92.1 r15371" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="crz.svg"> @@ -37,16 +37,16 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1047" + inkscape:window-width="1366" + inkscape:window-height="705" id="namedview371" showgrid="true" - inkscape:zoom="0.5" - inkscape:cx="703.8872" - inkscape:cy="827.31856" - inkscape:window-x="3840" - inkscape:window-y="33" - inkscape:window-maximized="0" + inkscape:zoom="0.35355339" + inkscape:cx="242.38307" + inkscape:cy="680.25272" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:snap-nodes="false" inkscape:snap-global="false" @@ -298,13 +298,13 @@ 400 0.0 + sodipodi:role="line">0.2 0.0 + sodipodi:role="line">0.3 0.0 + sodipodi:role="line">0.1 0.0 + sodipodi:role="line">0.2 @@ -37,14 +37,14 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1030" + inkscape:window-width="1366" + inkscape:window-height="705" id="namedview371" showgrid="true" - inkscape:zoom="0.7521195" - inkscape:cx="944.15154" - inkscape:cy="187.23728" - inkscape:window-x="1592" + inkscape:zoom="0.35355339" + inkscape:cx="361.49345" + inkscape:cy="1842.4796" + inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg2"> @@ -81,8 +81,7 @@ style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="500.75214" y="977.31793" - id="text6232" - sodipodi:linespacing="0%">120000 °C G.LOAD 0.6 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">G.LOAD 0.6 SLIDE + style="font-size:32px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE SLIDE + y="522.78827" + style="font-size:32.86256409px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE + inkscape:label="#path4438" + inkscape:connector-curvature="0" /> EMEREXIT EMEREXIT + inkscape:label="#path4464" + inkscape:connector-curvature="0" /> SLIDE + style="font-size:32px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#cecdce;fill-opacity:1;">SLIDE OXY + x="852.17371" + y="64.937149" + style="font-size:30.04751396px;line-height:0;fill:#cecdce;fill-opacity:1;stroke-width:2.50395942px;">CKPT OXY REGUL LO PR + x="799.85938" + y="133.49768" + style="font-size:30.04800034px;line-height:0">REGUL LO PR 1300 PSI + x="953.60229" + y="100.29736" + style="font-size:30px;line-height:0">PSI + transform="translate(12.944435,6.250187)"> V/S 1650 FT/MIN - - - + id="DOOR-VS-Arrow-DN" /> - - - + id="DOOR-VS-Arrow-UP" />