From ffb37492900b28ed8006cd249999aa15cc891523 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Sat, 4 Nov 2017 19:46:48 -0400 Subject: [PATCH] Fixing the alignment and expanding the function --- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 11 ++- Models/Instruments/Lower-ECAM/res/elec.svg | 78 ++++++++++---------- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 764930fa..44c92d4d 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1151,7 +1151,7 @@ var canvas_lowerECAM_elec = { return m; }, getKeys: func() { - return ["TAT","SAT","GW","BAT1volts","BAT1amps","BAT1v","BAT1a","BAT1off","BAT2volts","BAT2amps","BAT2v","BAT2a","BAT2off","TR1volts","EMERGENvolts"]; + return ["TAT","SAT","GW","BAT1volts","BAT1amps","BAT1v","BAT1a","BAT1off","BAT2volts","BAT2amps","BAT2v","BAT2a","BAT2off","TR1volts","TR1amps","TR2volts","TR2amps","EMERGENvolts","EXTvolts","EXThz"]; }, update: func() { if (getprop("/controls/electrical/switches/battery1") == 0) { @@ -1186,8 +1186,13 @@ var canvas_lowerECAM_elec = { me["BAT1amps"].setText(sprintf("%3.0f", getprop("/systems/electrical/battery1-amps"))); me["BAT2amps"].setText(sprintf("%3.0f", getprop("/systems/electrical/battery2-amps"))); - me["TR1volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/battery2-volts"))); - me["EMERGENvolts"].setText(sprintf("%3.0f", "1")); + me["TR1volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/dc1"))); + me["TR1amps"].setText(sprintf("%2.0f", getprop("/systems/electrical/bus/dc1-amps"))); + me["TR2volts"].setText(sprintf("%2.0f", getprop("/systems/electrical/dc2"))); + me["TR2amps"].setText(sprintf("%2.0f", getprop("/systems/electrical/bus/dc2-amps"))); + + me["EXTvolts"].setText(sprintf("%2.0f", getprop("/systems/electrical/extra/ext-volts"))); + me["EXThz"].setText(sprintf("%2.0f", getprop("/systems/electrical/extra/ext-hz"))); me.updateBottomStatus(); }, }; diff --git a/Models/Instruments/Lower-ECAM/res/elec.svg b/Models/Instruments/Lower-ECAM/res/elec.svg index 31336534..216fec36 100644 --- a/Models/Instruments/Lower-ECAM/res/elec.svg +++ b/Models/Instruments/Lower-ECAM/res/elec.svg @@ -41,9 +41,9 @@ inkscape:window-height="706" id="namedview371" showgrid="false" - inkscape:zoom="1.3859293" - inkscape:cx="222.12227" - inkscape:cy="924.66459" + inkscape:zoom="1.13" + inkscape:cx="790.96106" + inkscape:cy="891.32878" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -52,10 +52,36 @@ type="xygrid" id="grid5153" /> + 000 + 000 000 000 000 000 - 0 - 0