From 2ef7e290fb3d915237ace5829ef1d1f2e5af888b Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Sat, 21 Apr 2018 10:23:23 +0100 Subject: [PATCH] Improvements to the hydraulic page --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 15 +- Models/Instruments/Lower-ECAM/res/hyd.svg | 219 +++++++++---------- 2 files changed, 118 insertions(+), 116 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index df3afb6d..65e31391 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -2093,7 +2093,7 @@ var canvas_lowerECAM_hyd = { getKeys: func() { return ["TAT","SAT","GW","UTCh","UTCm","Green-Indicator","Blue-Indicator","Yellow-Indicator","Press-Green","Press-Blue","Press-Yellow","Green-Line","Blue-Line","Yellow-Line","PTU-Supply-Line","PTU-supply-yellow","PTU-supply-green","PTU-connection", "PTU-Auto-or-off","RAT-label","RAT-stowed","RAT-not-stowed","ELEC-Yellow-off","ELEC-Yellow-on","ELEC-Yellow-label","ELEC-OVTH-Yellow","ELEC-Blue-label","ELEC-OVHT-Blue","ELEC-OVHT-Yellow","Pump-Green-label","Pump-Yellow-label","Pump-Green", - "Pump-LOPR-Green","Pump-Green-off","Pump-Green-on","Pump-Yellow","Pump-LOPR-Yellow","Pump-Yellow-off","Pump-Yellow-on","Pump-Blue","Pump-LOPR-Blue","Pump-Blue-off","Pump-Blue-on","Fire-Valve-Green","Fire-Valve-Yellow","LO-AIR-PRESS-Green", + "Pump-LOPR-Green","Pump-Green-off","Pump-Green-on","Pump-Yellow","Pump-LOPR-Yellow","Pump-Yellow-off","Pump-Yellow-on","Pump-Blue", "Pump-Blue-off","Pump-Blue-on","Fire-Valve-Green","Fire-Valve-Yellow","LO-AIR-PRESS-Green", "LO-AIR-PRESS-Yellow","LO-AIR-PRESS-Blue","OVHT-Green","OVHT-Blue","OVHT-Yellow","Quantity-Indicator-Green","Quantity-Indicator-Blue","Quantity-Indicator-Yellow","Green-label","Blue-label","Yellow-label"]; }, update: func() { @@ -2194,7 +2194,7 @@ var canvas_lowerECAM_hyd = { if (getprop("/controls/hydraulic/eng1-pump") == 1) { me["Pump-Green-off"].hide(); - if (yellow_psi >= 1500) { + if (green_psi >= 1500) { me["Pump-Green-on"].show(); me["Pump-LOPR-Green"].hide(); me["Pump-Green"].setColor(0.0509,0.7529,0.2941); @@ -2217,16 +2217,19 @@ var canvas_lowerECAM_hyd = { if (yellow_psi >= 1500) { me["Pump-Yellow-on"].show(); me["Pump-LOPR-Yellow"].hide(); + me["Pump-Yellow"].setColorFill(0.0509,0.7529,0.2941); me["Pump-Yellow"].setColor(0.0509,0.7529,0.2941); } else { me["Pump-Yellow-on"].hide(); me["Pump-LOPR-Yellow"].show(); + me["Pump-Yellow"].setColorFill(0.7333,0.3803,0); me["Pump-Yellow"].setColor(0.7333,0.3803,0); } } else { me["Pump-Yellow-off"].show(); me["Pump-Yellow-on"].hide(); me["Pump-LOPR-Yellow"].hide(); + me["Pump-Yellow"].setColorFill(0.7333,0.3803,0); me["Pump-Yellow"].setColor(0.7333,0.3803,0); } @@ -2234,17 +2237,19 @@ var canvas_lowerECAM_hyd = { me["Pump-Blue-off"].hide(); if (blue_psi >= 1500) { me["Pump-Blue-on"].show(); - me["Pump-LOPR-Blue"].hide(); + me["Pump-Blue-off"].hide(); + me["Pump-Blue"].setColorFill(0.0509,0.7529,0.2941); me["Pump-Blue"].setColor(0.0509,0.7529,0.2941); } else { - me["Pump-LOPR-Blue"].show(); + me["Pump-Blue-off"].show(); me["Pump-Blue-on"].hide(); + me["Pump-Blue"].setColorFill(0.7333,0.3803,0); me["Pump-Blue"].setColor(0.7333,0.3803,0); } } else { me["Pump-Blue-off"].show(); me["Pump-Blue-on"].hide(); - me["Pump-LOPR-Blue"].hide(); + me["Pump-Blue"].setColorFill(0.7333,0.3803,0); me["Pump-Blue"].setColor(0.7333,0.3803,0); } diff --git a/Models/Instruments/Lower-ECAM/res/hyd.svg b/Models/Instruments/Lower-ECAM/res/hyd.svg index bbb7f9f4..9be69769 100644 --- a/Models/Instruments/Lower-ECAM/res/hyd.svg +++ b/Models/Instruments/Lower-ECAM/res/hyd.svg @@ -12,7 +12,7 @@ viewBox="0 0 1024 1024" version="1.1" id="svg2" - inkscape:version="0.91 r13725" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="hyd.svg"> @@ -27,7 +27,22 @@ + id="defs373"> + + + + 1 + style="font-size:44.86862183px;line-height:1.25;fill:#cecdce;fill-opacity:1;stroke-width:1.12171543">1 2 + y="518.83655" + style="font-size:44.86899948px;line-height:1.25">2 + inkscape:label="#g5620" + style="stroke:none;stroke-opacity:1;fill:#0dc04b;fill-opacity:1;stroke-width:0.99974997;stroke-miterlimit:4;stroke-dasharray:none"> + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.99974997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.99974997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.99974997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:0.99974997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 3000 + style="font-size:44.42589188px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.11064732">3000 PRESS + sodipodi:role="line" + style="font-size:39.82600021px;line-height:0">PRESS PRESS + sodipodi:role="line" + style="font-size:39.82600021px;line-height:0">PRESS PRESS + sodipodi:role="line" + style="font-size:39.82600021px;line-height:0">PRESS OVHT + style="font-size:45.25045776px;line-height:0;stroke-width:3.77088857px">OVHT OVHT + style="font-size:45.25045395px;line-height:0;stroke-width:3.77088857px">OVHT OVHT + style="font-size:45.25045395px;line-height:0;stroke-width:3.77088857px">OVHT LO - LO + y="462.30356" + style="font-size:45.25px;line-height:0">LO LO 3000 + style="font-size:44.42589188px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.11064732">3000 3000 + style="font-size:44.42589188px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.11064732">3000 + inkscape:label="#g5620" + style="fill:#0dc04b;fill-opacity:1"> @@ -500,7 +509,8 @@ + inkscape:label="#g5620" + style="fill:#0dc04b;fill-opacity:1"> GREEN + style="font-size:38.8080368px;line-height:0;stroke-width:3.23399234px">GREEN BLUE + style="font-size:39.86965179px;line-height:0;stroke-width:3.32247186px">BLUE YELLOW + style="font-size:38.93328094px;line-height:0;stroke-width:3.24444103px">YELLOW @@ -685,7 +695,7 @@ PTU + style="font-size:33.22635651px;line-height:0;stroke-width:2.7688396px">PTU PSI + style="font-size:33.75585175px;line-height:0;fill:#179ab7;fill-opacity:1;stroke-width:2.81296372px">PSI PSI + style="font-size:33.75584793px;line-height:0;fill:#179ab7;fill-opacity:1;stroke-width:2.81296349px">PSI RAT + style="font-size:30px;line-height:1.25;fill:#cecdce;fill-opacity:1;stroke-width:0.75">RAT @@ -789,52 +799,52 @@ style="fill:none;fill-opacity:1;stroke:#cecdce;stroke-width:2.77499986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.80000019;stroke-dasharray:none;stroke-opacity:1" /> ELEC OVHT ELEC 120000 °C