diff --git a/Fonts/Airbus7Seg.ttf b/Fonts/Airbus7Seg.ttf new file mode 100644 index 00000000..54bd572f Binary files /dev/null and b/Fonts/Airbus7Seg.ttf differ diff --git a/Fonts/AirbusRMP.ttf b/Fonts/AirbusRMP.ttf new file mode 100644 index 00000000..c2925555 Binary files /dev/null and b/Fonts/AirbusRMP.ttf differ diff --git a/Fonts/ECAMFontBold100em.ttf b/Fonts/ECAMFontBold100em.ttf new file mode 100644 index 00000000..df286818 Binary files /dev/null and b/Fonts/ECAMFontBold100em.ttf differ diff --git a/Fonts/ECAMFontRegular.ttf b/Fonts/ECAMFontRegular.ttf new file mode 100644 index 00000000..3f660741 Binary files /dev/null and b/Fonts/ECAMFontRegular.ttf differ diff --git a/Fonts/HoneywellMCDU.ttf b/Fonts/HoneywellMCDU.ttf new file mode 100644 index 00000000..f4ed812c Binary files /dev/null and b/Fonts/HoneywellMCDU.ttf differ diff --git a/Fonts/HoneywellMCDUSmall.ttf b/Fonts/HoneywellMCDUSmall.ttf new file mode 100644 index 00000000..d2919375 Binary files /dev/null and b/Fonts/HoneywellMCDUSmall.ttf differ diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index 57a45985..d282c3f4 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -25,7 +25,7 @@ var canvas_IESI = { obj.group = obj.canvas.createGroup(); obj.font_mapper = func(family, weight) { - return "LiberationFonts/LiberationSans-Regular.ttf"; + return "ECAMFontRegular.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} ); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas index 6d811e4a..e2ea4682 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas @@ -25,7 +25,7 @@ var canvas_lowerECAM_base = me.canvas.addPlacement({"node": "uecam.screen2"}); me.font_mapper = func(family, weight) { - return "LiberationFonts/LiberationSans-Regular.ttf"; + return "ECAMFontRegular.ttf"; }; me.test = me.canvas.createGroup(); diff --git a/Models/Instruments/Lower-ECAM/res/apu.svg b/Models/Instruments/Lower-ECAM/res/apu.svg index 5c375974..5e052f92 100644 --- a/Models/Instruments/Lower-ECAM/res/apu.svg +++ b/Models/Instruments/Lower-ECAM/res/apu.svg @@ -119,7 +119,7 @@ id="tspan3914" x="695.24951" y="939.8045" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT APU + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">APU APU GEN + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">APU GEN N + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">N EGT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">EGT BLEED + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">BLEED 1 0 + 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';letter-spacing:0px;word-spacing:0px;fill:#ffffff">0 1 0 + 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';letter-spacing:0px;word-spacing:0px;fill:#ffffff">0 7 + 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';letter-spacing:0px;word-spacing:0px;fill:#ffffff">7 0 + 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';letter-spacing:0px;word-spacing:0px;fill:#ffffff">0 3 + 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';letter-spacing:0px;word-spacing:0px;fill:#ffffff">3 LEVEL + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="bleed.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -37,17 +37,19 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="705" + inkscape:window-width="1920" + inkscape:window-height="986" id="namedview371" showgrid="true" - inkscape:zoom="0.73868665" - inkscape:cx="201.82373" - inkscape:cy="930.76571" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:zoom="2.0893214" + inkscape:cx="578.8961" + inkscape:cy="463.30833" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="svg2"> + inkscape:current-layer="svg2" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> @@ -73,7 +75,7 @@ PSI 1 RAM + id="tspan4770" + x="1004.2363" + y="332.37225">RAM AIR 30 + style="fill:#0dc04b;fill-opacity:1;stroke-width:2.85654px;font-size:29.99999964px">30 160 + style="fill:#0dc04b;fill-opacity:1;stroke-width:2.4394px;font-size:30.00000001px">160 + style="fill:none;stroke:#ffffff;stroke-width:2.8736;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.98259;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> °C + style="stroke-width:2.52313px"> °C + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.98259;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.924863;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.924863;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.80428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.80428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.763139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.763139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> H + sodipodi:role="line" + x="334.82782" + y="244.55246">H LO + sodipodi:role="line" + x="107.72722" + y="342.13403">LO + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -637,9 +645,9 @@ id="BLEED-Pack-2-Out-Temp" y="213.52299" x="222.32513" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.36720085px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.44726658px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.00000058px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.44727px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve"> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.98259;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> °C + style="stroke-width:2.52313px"> °C + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.98259;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.924863;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.924863;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.80428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.80428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.763139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.763139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -836,27 +844,27 @@ id="text-1-6-4-1" y="550.95148" x="296.90491" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.27799988px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:2.52312994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.278px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke:none;stroke-width:2.52313px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve">°C + style="stroke-width:2.52313px">°C °C + style="stroke-width:2.52313px">°C IP IP HP HP 30 + style="fill:#0dc04b;fill-opacity:1;stroke-width:2.85654px;font-size:29.99999979px">30 160 + style="fill:#0dc04b;fill-opacity:1;stroke-width:2.4394px;font-size:29.99999985px">160 @@ -1118,7 +1126,7 @@ id="APUGentext-7-2-1-3-6" y="429.54611" x="111.96634" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.18700027px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:2.68228602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.99999997px;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.68229px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve"> ANTI + sodipodi:role="line">ANTI BLEED + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">BLEED GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT 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 GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="cond.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -37,24 +37,26 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="705" + inkscape:window-width="1920" + inkscape:window-height="986" id="namedview371" showgrid="false" - inkscape:zoom="0.64" - inkscape:cx="695.07573" - inkscape:cy="944.3933" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:zoom="0.90509668" + inkscape:cx="561.81843" + inkscape:cy="232.01941" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="svg2"> + inkscape:current-layer="svg2" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> COND + style="font-size:44.0809px;line-height:0;fill:#ffffff;fill-opacity:1;stroke-width:3.6734px">COND FAN + style="font-size:33.2931px;line-height:0;fill:#bb6100;fill-opacity:1;stroke-width:2.77442px">FAN 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;font-size:38px">34 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:38px">34 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:38px">34 FAN + style="font-size:33.2931px;line-height:0;fill:#bb6100;fill-opacity:1;stroke-width:2.77442px">FAN TEMP : + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.278px;line-height:0;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start"> TEMP: °C + style="font-size:30.278px;line-height:0;-inkscape-font-specification:'FBW Display-EIS';font-family:'FBW Display-EIS';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"> °C + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.76551205;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> C H + style="font-size:25.5403px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.638508">H CKPT + style="font-size:32.1874px;line-height:0;fill:#ffffff;fill-opacity:1;stroke-width:2.68229px">CKPT FWD + style="font-size:32.187px;line-height:0">FWD AFT + style="font-size:32.187px;line-height:0">AFT 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:36px">34 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:36px">34 34 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:36px">34 + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75068456;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> C H + style="font-size:25.5403px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.638508">H + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.73555821;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> C H + style="font-size:25.5403px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.638508">H HOT + style="font-size:29.595px;line-height:1.25">HOT C @@ -604,9 +606,9 @@ id="text4979-2-5-3" y="285.13028" x="343.26071" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#cecdce;fill-opacity:1;stroke:none;stroke-width:0.6385085" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.638508" xml:space="preserve"> HOT AIR + style="font-size:33.5708px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.83927">AIR + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.18858;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:1.11282;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.771404;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.771404;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.47978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.3177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.99222;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.13363;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.73989;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> AFT + style="font-size:32.187px;line-height:0;stroke-width:2.68229px">AFT @@ -894,7 +896,7 @@ id="tspan3914" x="695.24951" y="939.8045" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT 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 + + + diff --git a/Models/Instruments/Lower-ECAM/res/crz.svg b/Models/Instruments/Lower-ECAM/res/crz.svg index bfc066bb..1a7a3614 100644 --- a/Models/Instruments/Lower-ECAM/res/crz.svg +++ b/Models/Instruments/Lower-ECAM/res/crz.svg @@ -57,7 +57,7 @@ CRUISE + style="font-size:48.29243088px;line-height:0;fill:#ffffff;fill-opacity:1;stroke-width:4.02436924px">CRUISE GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT LDG ELEV LBS AIR QT VIB N1 °C CKPT FWD AFT GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT DOOR/OXY + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:46.36207199px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">DOOR/OXY SLIDE + style="font-size:32px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE SLIDE + style="font-size:32px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE SLIDE + style="font-size:32.86256409px;line-height:1.25;fill:#ffffff;fill-opacity:1;">SLIDE CKPT OXY + style="font-size:30.04751396px;line-height:0;fill:#ffffff;fill-opacity:1;stroke-width:2.50395942px;">CKPT OXY V/S diff --git a/Models/Instruments/Lower-ECAM/res/elec.svg b/Models/Instruments/Lower-ECAM/res/elec.svg index f9a31f55..bd9528e8 100644 --- a/Models/Instruments/Lower-ECAM/res/elec.svg +++ b/Models/Instruments/Lower-ECAM/res/elec.svg @@ -92,7 +92,7 @@ ELEC + style="font-size:48.29243088px;line-height:0;fill:#ffffff;fill-opacity:1;stroke-width:4.02436924px">ELEC GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT BAT 2 GEN IDG GALLEY SHED + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="eng.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -37,17 +37,19 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="705" + inkscape:window-width="1920" + inkscape:window-height="986" id="namedview371" showgrid="true" inkscape:zoom="1" - inkscape:cx="593.89152" - inkscape:cy="650.40507" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:cx="594.5" + inkscape:cy="330" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="svg2"> + inkscape:current-layer="svg2" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> @@ -119,7 +121,7 @@ id="tspan3914" x="695.24951" y="939.8045" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT ENGINE + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">ENGINE F.USED + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">F.USED VIB N1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">VIB N1 N2 + style="font-size:36px;line-height:1.25;text-align:center;text-anchor:middle;fill:#ffffff">N2 OIL + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">OIL 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;font-size:40px">00 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;font-size:40px">00 00 0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;font-size:32px">0 + style="stroke:#ffffff;stroke-opacity:1"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="stroke:#ffffff;stroke-opacity:1"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 0000 + style="font-size:31.9999px;line-height:1.25;fill:#0dc04b;fill-opacity:1;stroke-width:0.750002;text-anchor:middle;text-align:center">0000 0000 + style="font-size:32px;line-height:1.25;fill:#0dc04b;fill-opacity:1;stroke-width:0.75;text-anchor:middle;text-align:center">0000 CLOG + style="line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.749999;font-size:28.0000336px">CLOG CLOG CLOG CLOG + style="line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:0.749999;font-size:28.0000336px">CLOG 22 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:40px">22 0.6 0.1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:40px">0.1 0.6 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;stroke-width:1px;font-size:40px">0.6 GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT F/CTL + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">F/CTL @@ -466,7 +466,7 @@ id="tspan4333" x="594.52124" y="350.0433" - style="font-size:33.51122284px;line-height:1.25;fill:#cecdce;fill-opacity:1">SEC + style="font-size:33.51122284px;line-height:1.25;fill:#ffffff;fill-opacity:1">SEC SPD BRK + style="font-size:34.58100891px;line-height:1.25;fill:#ffffff;fill-opacity:1">SPD BRK Y   AIL + style="font-size:38.63742447px;line-height:1.25;fill:#ffffff;fill-opacity:1">AIL   AIL + style="font-size:38.63742447px;line-height:1.25;fill:#ffffff;fill-opacity:1">AIL G L Y ELEV + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="fuel.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -45,24 +45,26 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="705" + inkscape:window-width="1920" + inkscape:window-height="986" id="namedview371" - showgrid="false" - inkscape:zoom="0.68" - inkscape:cx="434.43172" - inkscape:cy="1022.8371" - inkscape:window-x="-8" - inkscape:window-y="-8" + showgrid="true" + inkscape:zoom="2.72" + inkscape:cx="149.81618" + inkscape:cy="964.70588" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="svg2"> + inkscape:current-layer="svg2" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> 1 + style="font-size:30.0586px;line-height:1.25">1 FUEL + style="font-size:44.081px;line-height:0">FUEL F.USED + style="font-size:31.729px;line-height:0">F.USED APU + style="font-size:30.278px;line-height:0">APU 0000 + style="font-size:30.1991px;line-height:0;fill:#0dc04b;fill-opacity:1;stroke-width:2.51659px">0000 1+2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.729px;line-height:0;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS'">1+2 LBS + style="font-size:31.729px;line-height:0">LBS 0000 + style="font-size:30.199px;line-height:0;text-align:end;text-anchor:end">0000 0000 000 + style="font-size:30.199px;line-height:0;text-align:center;text-anchor:middle">000 000 + style="font-size:30.199px;line-height:0;text-align:end;text-anchor:end">000 1 + style="font-size:44.8686px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:1.12172">1 2 + style="font-size:44.869px;line-height:1.25">2 F.FLOW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS'">F.FLOW 2 : + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS'">: 00 : + x="120.54752" + y="846.51776">: FOB + style="font-size:30px;line-height:1.25;-inkscape-font-specification:'FBW Display-EIS';font-family:'FBW Display-EIS';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">FOB 00000 + style="font-size:33.1642px;line-height:1.25;stroke-width:0.829105">00000 0000 + style="font-size:30px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">0000 0000 + style="font-size:30px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">0000 0000 + style="font-size:30px;line-height:1.25;text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">0000 °C 00 + style="font-size:30.199px;line-height:0">00 00 + style="font-size:30.199px;line-height:0">00 00 z   + style="font-size:32px;line-height:1.25;-inkscape-font-specification:'FBW Display-EIS';font-family:'FBW Display-EIS';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">  + + x="43.067074" + y="772.62933" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS'">+ GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT 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 diff --git a/Models/Instruments/Lower-ECAM/res/hyd.svg b/Models/Instruments/Lower-ECAM/res/hyd.svg index 54de4b5e..8c13b36d 100644 --- a/Models/Instruments/Lower-ECAM/res/hyd.svg +++ b/Models/Instruments/Lower-ECAM/res/hyd.svg @@ -90,7 +90,7 @@ 1 + style="font-size:44.86862183px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:1.12171543">1 GREEN BLUE PSI RAT + style="font-size:30px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.75">RAT @@ -777,7 +777,7 @@ inkscape:connector-curvature="0" id="RAT-stowed" d="m 482.25,426.99999 -15.75,7.5 -16.50001,8.25 v -17.25 -15.30854 c 0,0 1.69343,0.68362 19.69535,10.2091 11.05466,5.84944 12.55466,6.59944 12.55466,6.59944 z" - 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" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.77499986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.80000019;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.77499986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.80000019;stroke-dasharray:none;stroke-opacity:1" /> OVHT + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.57043672;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.49036217;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.63435125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> HYD + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">HYD GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT CAB PRESS FT P 4150 FT CAB ALT VENT INLET OUTLET MAN PACK 1 + style="font-size:34.92427444px;line-height:1.25;fill:#ffffff;fill-opacity:1;stroke-width:0.87310684;">PACK 1 PACK 2 + style="font-size:34.92399979px;line-height:1.25;fill:#ffffff;fill-opacity:1;">PACK 2 @@ -540,7 +540,7 @@ transform="rotate(90)" inkscape:label="#rect5105-6-0-7-4-5-6-7" /> UP DN 0 2 2 8 4 + style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.4749999;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /> + style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.4749999;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /> + style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.4749999;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /> + style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.4749999;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /> @@ -953,7 +953,7 @@ id="tspan3914" x="695.24951" y="939.8045" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce">GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT STATUS + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">STATUS + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="wheel.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -37,17 +37,19 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="705" + inkscape:window-width="1920" + inkscape:window-height="986" id="namedview371" showgrid="true" - inkscape:zoom="0.64" - inkscape:cx="1071.5554" - inkscape:cy="763.4389" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:zoom="1.8101934" + inkscape:cx="932.77328" + inkscape:cy="542.48348" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="svg2"> + inkscape:current-layer="svg2" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> GW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">GW TAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">TAT SAT + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff">SAT 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 WHEEL + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff">WHEEL NORM BRK + style="font-size:32px;line-height:1.25;fill:#bb6100;fill-opacity:1">NORM BRK ACCU PRESS 3 4 1 2 999 + 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:start;text-anchor:start">999 999 + 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:start;text-anchor:start">999 999 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start">999 999 + 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:start;text-anchor:start">999 ||| + style="font-size:21.6389px;line-height:1.25;fill:#bb6100;fill-opacity:1">||| ||| + style="font-size:21.6389px;line-height:1.25;fill:#bb6100;fill-opacity:1">||| ||| + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.6389px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#bb6100;fill-opacity:1">||| REL ||| + style="font-size:23.3301px;line-height:1.25;fill:#bb6100;fill-opacity:1">||| ||| + style="font-size:23.3301px;line-height:1.25;fill:#bb6100;fill-opacity:1">||| ||| + style="font-size:23.3301px;line-height:1.25;fill:#bb6100;fill-opacity:1">||| ||| + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.3301px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#bb6100;fill-opacity:1">||| + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83352798px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.16106236;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 1 + style="font-size:43.1136px;line-height:1.25">1 2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">2 4 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">4 1 + style="font-size:43.1136px;line-height:1.25">1 3 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">3 5 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:43.1136px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans'">5   + style="font-size:34.508px;line-height:1.25">  GG  + style="font-size:34.508px;line-height:1.25;fill:#0dc04b;fill-opacity:1">  2 + style="font-size:32px;line-height:1.25;fill:#0dc04b;fill-opacity:1">2 1 + style="font-size:32px;line-height:1.25;fill:#0dc04b;fill-opacity:1">1 Y + style="font-size:34.508px;line-height:1.25;fill:#bb6100;fill-opacity:1">Y ||| + style="font-size:21.6389px;line-height:1.25;fill:#bb6100;fill-opacity:1;stroke-width:1px">||| 999 999 999 999 999 + style="font-size:32px;line-height:1.25;text-align:start;text-anchor:start">999 999 + 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:start;text-anchor:start">999 diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index f9af7448..a45c6dfd 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -24,11 +24,10 @@ var myCRZWIND = [nil, nil]; var myDESWIND = [nil, nil]; var myHISTWIND = [nil, nil]; var myAtis = [nil, nil]; -var default = "BoeingCDU-Large.ttf"; -#var symbol = "helvetica_medium.txf"; -var symbol = "LiberationMonoCustom.ttf"; -var normal = 70; -var small = 56; +var default = "HoneywellMCDU.ttf"; +var symbol = "HoneywellMCDU.ttf"; +var normal = 60; +var small = 46; var page = ""; var fplnLineSize = 0; var fplnl1 = ""; @@ -143,7 +142,7 @@ var togglePageFreeze = func(i) { var canvas_MCDU_base = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { - return "BoeingCDU-Large.ttf"; + return "HoneywellMCDU.ttf"; }; canvas.parsesvg(canvas_group, file, {"font-mapper": font_mapper}); var svg_keys = me.getKeys(); @@ -380,7 +379,7 @@ var canvas_MCDU_base = { }, doIRSFunc: func(i,degrees,minutes,sign,degrees2,minutes2,sign2) { if (systems.ADIRS.ADIRunits[i].operative and getprop("/FMGC/internal/align" ~ (i + 1) ~ "-done")) { - me["Simple_C" ~ (3 + i)].setText(abs(degrees) ~ "g" ~ minutes ~ " " ~ sign ~ "/" ~ abs(degrees2) ~ "g" ~ minutes2 ~ " " ~ sign2); + me["Simple_C" ~ (3 + i)].setText(abs(degrees) ~ "°" ~ minutes ~ " " ~ sign ~ "/" ~ abs(degrees2) ~ "°" ~ minutes2 ~ " " ~ sign2); } else { me["Simple_C" ~ (3 + i)].setText("-----.--/-----.--"); } @@ -3055,7 +3054,7 @@ var canvas_MCDU_base = { if (!fmgc.FMGCInternal.toFromSet and !fmgc.FMGCInternal.crzSet) { me["INITA_CruiseFLTemp"].hide(); me["Simple_L6"].setColor(WHITE); - me["Simple_L6"].setText("-----/---g"); + me["Simple_L6"].setText("-----/---°"); } else if (fmgc.FMGCInternal.crzSet and fmgc.FMGCInternal.crzTempSet) { me["INITA_CruiseFLTemp"].hide(); me["Simple_L6"].setColor(BLUE); @@ -3069,7 +3068,7 @@ var canvas_MCDU_base = { } else { me["INITA_CruiseFLTemp"].show(); me["Simple_L6"].setColor(AMBER); - me["Simple_L6"].setText(" g"); + me["Simple_L6"].setText(" °"); } if (fmgc.FMGCInternal.coRouteSet) { # show coRoute when valid me["INITA_CoRoute"].hide(); @@ -3258,12 +3257,12 @@ var canvas_MCDU_base = { degrees = int(dms); minutes = sprintf("%.1f",abs((dms - degrees) * 60)); sign = degrees >= 0 ? "N" : "S"; - me["Simple_L2"].setText(abs(degrees) ~ "g" ~ minutes ~ " " ~ sign); + me["Simple_L2"].setText(abs(degrees) ~ "°" ~ minutes ~ " " ~ sign); dms2 = getprop("/position/longitude-deg"); degrees2 = int(dms2); minutes2 = sprintf("%.1f",abs((dms2 - degrees2) * 60)); sign2 = degrees2 >= 0 ? "E" : "W"; - me["Simple_R2"].setText(abs(degrees2) ~ "g" ~ minutes2 ~ " " ~ sign2); + me["Simple_R2"].setText(abs(degrees2) ~ "°" ~ minutes2 ~ " " ~ sign2); me.doIRSFunc(0,degrees,minutes,sign,degrees2,minutes2,sign2); me.doIRSFunc(1,degrees,minutes,sign,degrees2,minutes2,sign2); me.doIRSFunc(2,degrees,minutes,sign,degrees2,minutes2,sign2); @@ -4971,23 +4970,23 @@ var canvas_MCDU_base = { me["Simple_L2S"].setText("TEMP"); if (dest_temp.getValue() != -999) { - me["Simple_L2"].setText(sprintf("%3.0fg", dest_temp.getValue())); + me["Simple_L2"].setText(sprintf("%3.0f°", dest_temp.getValue())); } else { - me["Simple_L2"].setText("---g"); + me["Simple_L2"].setText("---°"); } me["Simple_L3S"].setText("MAG WIND"); if (fmgc.FMGCInternal.destMagSet and fmgc.FMGCInternal.destWindSet) { - me["Simple_L3"].setText(sprintf("%03.0fg", fmgc.FMGCInternal.destMag) ~ sprintf("/%.0f", fmgc.FMGCInternal.destWind)); + me["Simple_L3"].setText(sprintf("%03.0f°", fmgc.FMGCInternal.destMag) ~ sprintf("/%.0f", fmgc.FMGCInternal.destWind)); me["Simple_L3"].setFontSize(normal); } else { me["Simple_L3"].setFontSize(small); if (myDESWIND[i] != nil and myDESWIND[i].returnGRND() != nil) { var result = myDESWIND[i].returnGRND(); - me["Simple_L3"].setText(sprintf("%03.0fg", result[0]) ~ sprintf("/%.0f", result[1])); + me["Simple_L3"].setText(sprintf("%03.0f°", result[0]) ~ sprintf("/%.0f", result[1])); } else if (myDESWIND[math.abs(i-1)] != nil and myDESWIND[math.abs(i-1)].returnGRND() != nil) { var result = myDESWIND[math.abs(i-1)].returnGRND(); - me["Simple_L3"].setText(sprintf("%03.0fg", result[0]) ~ sprintf("/%.0f", result[1])); + me["Simple_L3"].setText(sprintf("%03.0f°", result[0]) ~ sprintf("/%.0f", result[1])); } else { me["Simple_L3"].setText("---g/---"); } diff --git a/Models/Instruments/MCDU/res/mcdu.svg b/Models/Instruments/MCDU/res/mcdu.svg index ecda2737..5dd1bc33 100644 --- a/Models/Instruments/MCDU/res/mcdu.svg +++ b/Models/Instruments/MCDU/res/mcdu.svg @@ -1,19 +1,19 @@ + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="mcdu.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -38,20 +38,21 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-height="986" id="namedview371" showgrid="true" inkscape:zoom="0.55824076" - inkscape:cx="608.20261" - inkscape:cy="690.7315" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:cx="980.75963" + inkscape:cy="1065.8484" + inkscape:window-x="-11" + inkscape:window-y="-11" inkscape:window-maximized="1" - inkscape:current-layer="Simple" - showguides="false" + inkscape:current-layer="svg2" + showguides="true" inkscape:snap-global="false" units="px" - inkscape:document-rotation="0"> + inkscape:document-rotation="0" + inkscape:pagecheckerboard="0"> @@ -62,9 +63,9 @@ id="Scratchpad" y="836.87567" x="20.138426" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:55.4667px;line-height:0%;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve"> TITLE + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:64px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">TITLE TITLE + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:64px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">TITLE F S + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">S O = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= = = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= F S + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">S O = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= = = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= + style="fill:none;stroke:#179ab7;stroke-width:4.08;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#179ab7;stroke-width:4.08;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#179ab7;stroke-width:4.08;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#179ab7;stroke-width:4.08;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> F S + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">S O = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= = = + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.0667px;line-height:1.25;font-family:HoneywellMCDU;-inkscape-font-specification:HoneywellMCDU;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1">= 999.99 999 W + style="font-size:32px;line-height:1.25;fill:#ffffff">W S + style="font-size:32px;line-height:1.25;fill:#ffffff">S Battery-volt1 -0.008 - -0.057 + -0.058 0.0155 62 88 @@ -6336,7 +6336,7 @@ center-center xy-plane number-value - %2.1f + %2.1fV systems/electrical/bus/dc-hot-1 led.txf true @@ -6353,7 +6353,7 @@ Battery-volt1-test -0.008 - -0.057 + -0.058 0.0155 62 88 @@ -6362,7 +6362,7 @@ center-center xy-plane text-value - 88.8 + 88.8V autopilot/serviceable led.txf true @@ -6379,7 +6379,7 @@ Battery-volt2 -0.008 - 0.035 + 0.033 0.0155 62 90 @@ -6388,7 +6388,7 @@ center-center xy-plane number-value - %2.1f + %2.1fV systems/electrical/bus/dc-hot-2 led.txf true @@ -6405,7 +6405,7 @@ Battery-volt2-test -0.008 - 0.035 + 0.033 0.0155 62 90 @@ -6414,7 +6414,7 @@ center-center xy-plane text-value - 88.8 + 88.8V autopilot/serviceable led.txf true diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 6537bb14..3b7e7239 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -103,7 +103,7 @@ var canvas_pfd = { obj.mismatch = obj.canvas.createGroup(); obj.font_mapper = func(family, weight) { - return "LiberationFonts/LiberationSans-Regular.ttf"; + return "ECAMFontRegular.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} ); diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg index 2a53ec54..4637cb9e 100644 --- a/Models/Instruments/PFD/res/pfd.svg +++ b/Models/Instruments/PFD/res/pfd.svg @@ -46,8 +46,8 @@ inkscape:zoom="0.5" showgrid="false" id="namedview371" - inkscape:window-height="1030" - inkscape:window-width="1920" + inkscape:window-height="657" + inkscape:window-width="1280" inkscape:pageshadow="2" inkscape:pageopacity="1" guidetolerance="10" @@ -107,7 +107,7 @@ inkscape:label="#g5492" id="AI_background"> @@ -127,7 +127,7 @@ height="1102.3193" width="1287.3096" id="AI_sky" - style="opacity:1;fill:#368acd;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="opacity:1;fill:#368acd;fill-opacity:1;stroke:none;stroke-width:2.58922005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -145,17 +145,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4686" - d="m 433.99987,521.5684 h 28.50952" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,521.5684 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -163,11 +163,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path5073" - d="m 433.99987,462.4348 h 28.50952" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,462.4348 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -175,17 +175,17 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path5077" - d="M 393.624,373.7344 H 502.88512" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 393.624,373.7344 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,314.60083 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -193,10 +193,10 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path5121" - d="m 433.99987,285.034 h 28.50952" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 433.99987,285.034 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20010996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20024991;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -230,12 +230,13 @@ y="480.29712" id="text4718" transform="scale(0.95383277,1.0484018)" - inkscape:label="#text975">10 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">10 20 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">20 30 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">30 50 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">50 80 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">80 10 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">10 20 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">20 30 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">30 50 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">50 80 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">80 + d="m 433.99987,639.8352 28.50952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 420.6008,669.402 55.30952,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -513,11 +533,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4511" - d="M 393.624,728.5356 H 502.88512" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 393.624,728.5356 109.26112,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -526,29 +546,29 @@ inkscape:connector-curvature="0" id="path4535" d="m 393.624,876.36943 109.26112,4e-5" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 375.59592,994.63672 145.31728,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.20000005;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -556,23 +576,23 @@ sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path1023" - d="m 488.00383,982.17305 h -13.2497 l -26.49939,-55.28317 -26.49939,55.28317 h -13.2497 l 39.74909,-87.68731 z" - style="fill:none;stroke:#ff0000;stroke-width:5.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 488.00383,982.17305 -13.2497,0 -26.49939,-55.28317 -26.49939,55.28317 -13.2497,0 39.74909,-87.68731 z" + style="fill:none;stroke:#ff0000;stroke-width:5.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 388.6311,-3.2290207 19.87455,-2.09e-5 39.74909,82.9247116 39.74908,-82.9247116 19.87455,0 -59.62363,131.5303716 z" + style="fill:none;stroke:#ff0000;stroke-width:6.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -580,14 +600,14 @@ sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path886" - d="m 448.25473,1194.8172 66.90422,59.142 h -59.49742 v -14.7583 h 11.11022 l -18.51702,-19.615 -18.51702,19.615 h 11.11022 v 14.7583 h -59.49741 z" - style="fill:none;stroke:#ff0000;stroke-width:7.425;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 448.25473,1194.8172 66.90422,59.142 -59.49742,0 0,-14.7583 11.11022,0 -18.51702,-19.615 -18.51702,19.615 11.11022,0 0,14.7583 -59.49741,0 z" + style="fill:none;stroke:#ff0000;stroke-width:7.42500019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 370.5312,169.07528 21.6616,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + transform="translate(133.78495,0)"> @@ -622,15 +642,15 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4956" - d="m 370.53103,177.1501 h 21.66136" - style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 370.53103,177.1501 21.66136,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -638,8 +658,8 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4968" - d="m 370.53103,147.50219 h 21.66136" - style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 370.53103,147.50219 21.66136,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 370.5312,139.42737 21.6616,0" + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -668,9 +688,10 @@ id="text4924" y="178.57314" x="392.94345" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#bb6100;fill-opacity:1;stroke:none;stroke-width:1.00001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"> + - @@ -749,11 +773,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4732" - d="m 404.73197,944.75532 v 12.35406" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 404.73197,944.75532 0,12.35406" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -761,11 +785,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4736" - d="m 601.81517,944.75532 v 12.35406" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 601.81517,944.75532 0,12.35406" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -773,11 +797,11 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4754" - d="m 798.89798,944.75532 v 12.35406" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 798.89798,944.75532 0,12.35406" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -793,10 +817,10 @@ height="102.31912" width="1287.3096" id="rect4600" - style="opacity:1;fill:#368acd;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="opacity:1;fill:#368acd;fill-opacity:1;stroke:none;stroke-width:2.58922005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -804,7 +828,7 @@ @@ -821,9 +845,9 @@ height="12.775722" width="12.257594" id="rect4756" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.73024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.73024011;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.87750006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + transform="matrix(0,1,-1,0,0,0)" /> + transform="translate(-0.38165298,0)"> + d="m 452.50015,509.31081 29.04648,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -862,8 +886,8 @@ transform="matrix(-1,0,0,1,897.27706,0)" id="g4806"> @@ -871,15 +895,15 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4810" - d="m 452.49998,480.26394 v 29.04648" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 452.49998,480.26394 0,29.04648" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -887,28 +911,28 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4816" - d="m 452.49998,480.26394 v 29.04648" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 452.49998,480.26394 0,29.04648" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + transform="matrix(-1,0,0,-1,897.27706,1026.344)"> + d="m 452.50015,509.31081 29.04648,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:4.30556011;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:8.10006046;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 418.32961,292.18309 59.8472,-3e-5 -8.6432,-14.52797 -42.5608,0 z" + style="fill:none;fill-opacity:1;stroke:#c9cc15;stroke-width:3.99993992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -1034,9 +1058,9 @@ inkscape:connector-curvature="0" id="path3932" d="m 340.35189,239.5184 5.62182,14.20878" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + transform="matrix(0.9840407,0.17794355,-0.17794355,0.9840407,97.433203,-71.336798)"> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> 0000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">0000 + d="m 247.69915,662.50422 40.64303,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -1254,8 +1281,8 @@ id="g4634" transform="matrix(-1,0,0,1,894.37964,0)"> @@ -1263,15 +1290,15 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4638" - d="m 252.22478,621.86099 v 40.64303" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 252.22478,621.86099 0,40.64303" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -1279,21 +1306,21 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4668" - d="m 247.6993,621.86099 v 40.64303" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 247.6993,621.86099 0,40.64303" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 252.22463,662.50422 40.64303,0" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19994998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> @@ -1395,7 +1422,7 @@ id="ALT_scale_clip" style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 1 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:29.77169991px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">1 2 6 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:29.77169991px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">6 + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.43549;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.6819;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.6819;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 6 2 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:31.75600052px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">2 + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.43549;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.6819;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.43549;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">00 000 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000 MAN + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">MAN MAN PITCH TRIM ONLY + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.65757698">MAN PITCH TRIM ONLY G/S + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">G/S LOC + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">LOC NAV + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">NAV STD + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.3993988px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.75">STD @@ -2226,32 +2253,34 @@ id="tspan4800" x="890.99316" y="506.26898" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.8348px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83480072px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000 FL 000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">FL 000 FL 000 QNH + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.75600052px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">QNH 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83480072px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">00 1 FD 2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">1 FD 2 CAT 3 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">CAT 3 NO RADIO + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">NO RADIO SPEED + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.65757698">SPEED 0250 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">0250 @@ -4054,7 +4083,7 @@ +40 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">+40 00 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00 00 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00 00 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">00 000 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">000 160 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">160 120 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">120 080 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">080 040 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">040 200 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">200 240 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">240 280 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">280 320 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">320 360 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">360 400 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke-width:0.75">400 . + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.83480072px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">. + style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> + d="m 11.5656,415.26108 55.643,44.53492 55.64301,-44.53492 0,44.53492 -111.28601,-3.8e-4 z" + style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" /> FAST SLOW + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.17490005px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">SLOW 000 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#b055be;fill-opacity:1;stroke-width:0.75">000 000 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#b055be;fill-opacity:1;stroke-width:0.75">000 402000806040200080FLX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.65757698">FLX SPDLIM @@ -6344,17 +6375,17 @@ x="823.7511" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75" xml:space="preserve">NE-800 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.65757698">-800 11070 M + style="font-size:38.3993988px;line-height:1.25;fill:#179ab7;fill-opacity:1;stroke-width:0.75">M true false false - 0.008 + 0.012 32 32 @@ -2065,7 +2065,7 @@ true false false - 0.008 + 0.012 32 32 @@ -2113,7 +2113,7 @@ true false false - 0.008 + 0.012 32 32 @@ -2161,7 +2161,7 @@ true false false - 0.008 + 0.012 32 32 diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml index 9cb6e331..6f81c435 100644 --- a/Models/Instruments/Radio/Radio2.xml +++ b/Models/Instruments/Radio/Radio2.xml @@ -2017,7 +2017,7 @@ true false false - 0.008 + 0.012 32 32 @@ -2065,7 +2065,7 @@ true false false - 0.008 + 0.012 32 32 @@ -2113,7 +2113,7 @@ true false false - 0.008 + 0.012 32 32 @@ -2161,7 +2161,7 @@ true false false - 0.008 + 0.012 32 32 diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 05a8d7c7..ae92d384 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -51,7 +51,7 @@ var canvas_upperECAM = { obj.typeString = type; obj.font_mapper = func(family, weight) { - return "LiberationFonts/LiberationSans-Regular.ttf"; + return "ECAMFontRegular.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} ); @@ -79,6 +79,23 @@ var canvas_upperECAM = { obj[key] = obj.test.getElementById(key); }; + obj["ECAML1"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML2"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML3"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML4"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML5"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML6"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML7"].setFont("ECAMFontBold100em.ttf"); + obj["ECAML8"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR1"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR2"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR3"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR4"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR5"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR6"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR7"].setFont("ECAMFontBold100em.ttf"); + obj["ECAMR8"].setFont("ECAMFontBold100em.ttf"); + obj.units = acconfig_weight_kgs.getValue(); obj.update_items = [ @@ -465,23 +482,6 @@ var canvas_upperECAM = { obj.createListenerForLine("/ECAM/rightmsg/linec7", ECAM_line7rc, "ECAMR7"); obj.createListenerForLine("/ECAM/rightmsg/linec8", ECAM_line8rc, "ECAMR8"); - obj["ECAML1"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML2"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML3"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML4"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML5"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML6"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML7"].setFont("LiberationMonoCustom.ttf"); - obj["ECAML8"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR1"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR2"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR3"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR4"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR5"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR6"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR7"].setFont("LiberationMonoCustom.ttf"); - obj["ECAMR8"].setFont("LiberationMonoCustom.ttf"); - # cache obj._cachedN1 = [nil, nil]; obj._cachedN2 = [nil, nil]; diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg index 7470c948..5b1e3e47 100644 --- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg +++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg @@ -37,60 +37,62 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1030" + inkscape:window-width="1280" + inkscape:window-height="657" id="namedview371" showgrid="true" - inkscape:zoom="2.8284271" - inkscape:cx="1039.9444" - inkscape:cy="1186.7028" - inkscape:window-x="1592" + inkscape:zoom="2" + inkscape:cx="1170.035" + inkscape:cy="1178.1005" + inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg2" showguides="false" - inkscape:snap-global="false"> + inkscape:snap-global="false" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> - - - + + + 1+F + + transform="translate(-12.155904,31.48427)" + style="fill:#ffffff"> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> S + style="font-size:32px;line-height:1.25;fill:#ffffff">S FOB : + sodipodi:role="line">FOB : 000000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">000000 LBS/H + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">LBS/H N2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;fill-opacity:1;">N2 °C + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">°C % + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">% 0000 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:36.99999996px">XX 0000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">0000 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">00 0 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:36.99999996px">XX % + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">% TOGA + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">TOGA 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">00 XX XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:35.99999996px">XX 000 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:37.00000056px">XX + inkscape:label="#g4442" + style="fill:#ffffff"> 10 5 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff">5 + inkscape:label="#g4339" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">0 + inkscape:transform-center-x="96.359495" + inkscape:transform-center-y="-0.00625" /> XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">XX REV + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#bb6100;fill-opacity:1;font-size:40px">REV + transform="matrix(1.0382,0,0,1.0382,-11.935506,-11.473538)" + style="stroke:#ffffff"> + d="m 312.4476,261.18529 v 9.47635" + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> @@ -871,16 +873,16 @@ 000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">000 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">00 + inkscape:label="#g4448" + style="fill:#ffffff"> 10 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff">10 + transform="translate(398.71946)" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 620.06156,139.96061 c 0,2.90825 -2.35732,5.26587 -5.26527,5.26587 -2.90795,0 -5.26529,-2.35762 -5.26529,-5.26587 0,-2.90826 2.35734,-5.26589 5.26529,-5.26589 2.90795,0 5.26527,2.35763 5.26527,5.26589 z" + style="fill:#000000;stroke:#179ab7;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">XX + id="EGT2-scaletick" + style="stroke:#ffffff"> - - LINE 1 - LINE 2 - LINE 3 - LINE 4 - LINE 5 - LINE 6 - LINE 7 - LINE 8 - + transform="translate(676.49997)" + style="fill:#ffffff"> LINE 1 + y="691.63379" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 1 LINE 2 LINE 3 + y="763.862" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 3 LINE 4 LINE 5 + y="837.48468" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 5 LINE 6 LINE 7 + y="911.10736" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 7 LINE 8 + + LINE 1 + LINE 2 + LINE 3 + LINE 4 + LINE 5 + LINE 6 + LINE 7 + LINE 8 + A-LOCK + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#0dc04b;fill-opacity:1;stroke-width:0.75">A-LOCK - @@ -1434,34 +1437,6 @@ width="137.63597" id="SlatLine_clip" style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:3.34691048;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" /> - 00 - °C A FLOOR - 00 + °C + + inkscape:snap-global="false" + inkscape:pagecheckerboard="0" + inkscape:document-units="pt"> - - - + + 1+F + transform="translate(-12.155904,31.48427)" + style="fill:#ffffff"> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> S + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff">S   LBS - FOB : + sodipodi:role="line">FOB : 000000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">000000 LBS/H + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1;font-size:32.00000013px">LBS/H N2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;fill-opacity:1;font-size:37.00000014px;">N2 °C + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">°C % + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1">% 0000 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:39.99999996px">XX 0000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;font-size:39.99999996px">0000 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;font-size:39.99999996px">00 00 0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">0 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:39.99999996px">XX XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:37.00000018px">XX 1 + inkscape:label="#g4305" + style="fill:#ffffff"> 1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;font-size:30px">1 1.2 1.4 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;font-size:30px">1.4 + inkscape:label="#g4315" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#0dc04b;fill-opacity:1">000 + inkscape:transform-center-x="96.359252" + inkscape:transform-center-y="-0.0062501266" /> XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.7149px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1">XX + transform="matrix(1.0382,0,0,1.0382,-11.935506,-33.033336)" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> % + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#179ab7;fill-opacity:1;font-size:32.00000013px">% FF + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;fill-opacity:1;font-size:36.00000014px;">FF EPR + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;fill-opacity:1;">EPR + inkscape:label="#g4445" + style="fill:#ffffff"> 4 10 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff">10 + inkscape:label="#g4415" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssss" + inkscape:label="#N11-thr" + inkscape:transform-center-x="96.359252" + inkscape:transform-center-y="-0.0062501266" /> 00 0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1">0 XX + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:39.99999996px">XX - XX REV + style="line-height:1.25;fill:#bb6100;fill-opacity:1;-inkscape-font-specification:'FBW Display-EIS';font-family:'FBW Display-EIS';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:40px">REV + XX 000 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;font-size:36.99999996px">000 1 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;font-size:39.99999974px">1 + transform="translate(398.71903)" + style="fill:#ffffff"> 1 1.2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff;font-size:30px">1.2 1.4 1.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';fill:#ffffff">1.6 + transform="translate(398.71903,0)" + style="stroke:#ffffff"> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 620.06156,127.28213 c 0,2.90825 -2.35732,5.26587 -5.26527,5.26587 -2.90795,0 -5.26529,-2.35762 -5.26529,-5.26587 0,-2.90826 2.35734,-5.26589 5.26529,-5.26589 2.90795,0 5.26527,2.35763 5.26527,5.26589 z" + style="fill:#000000;stroke:#179ab7;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="EGT2-scaletick" + style="stroke:#ffffff"> + transform="translate(398.71903)" + sodipodi:insensitive="true"> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:3.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="translate(398.71903)" + style="fill:#ffffff"> 4 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#ffffff">4 + sodipodi:nodetypes="sssss" + inkscape:connector-curvature="0" + id="N12-thr" + d="m 620.06156,455.65813 c 0,2.90825 -2.35732,5.26587 -5.26527,5.26587 -2.90795,0 -5.26529,-2.35762 -5.26529,-5.26587 0,-2.90826 2.35734,-5.26589 5.26529,-5.26589 2.90795,0 5.26527,2.35763 5.26527,5.26589 z" + style="fill:#000000;stroke:#179ab7;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 00 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;font-size:39.99999996px">00 + REV XX - REV - - LINE 1 - LINE 2 - LINE 3 - LINE 4 - LINE 5 - LINE 6 - LINE 7 - LINE 8 - + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:center;text-anchor:middle;fill:#bb6100;fill-opacity:1;font-size:39.99999986px">XX + transform="translate(676.49997)" + style="fill:#ffffff"> LINE 1 + y="691.63379" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 1 LINE 2 LINE 3 + y="763.862" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 3 LINE 4 LINE 5 + y="837.48468" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 5 LINE 6 LINE 7 + y="911.10736" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;line-height:1.25;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';text-align:start;text-anchor:start;fill:#ffffff">LINE 7 LINE 8 + + + LINE 1 + LINE 2 + LINE 3 + LINE 4 + LINE 5 + LINE 6 + LINE 7 + LINE 8 A-LOCK + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;font-family:'FBW Display-EIS';-inkscape-font-specification:'FBW Display-EIS';fill:#0dc04b;fill-opacity:1;stroke-width:0.75">A-LOCK @@ -1723,6 +1721,20 @@ width="137.63597" id="SlatLine_clip" style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:3.34691048;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" /> + A FLOOR °C LBS + + A FLOOR - IDLE + @@ -1971,17 +1999,4 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" /> - IDLE diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas index 63e389d8..07248983 100644 --- a/Nasal/ECAM/ECAM-messages.nas +++ b/Nasal/ECAM/ECAM-messages.nas @@ -47,12 +47,12 @@ var warnings = std.Vector.new([ var eng1FireFlAgent1Timer = warning.new(msg: " -AGENT 1 AFT 10 S.DISCH", colour: "w"), var eng1FireFlAgent1 = warning.new(msg: " -AGENT 1..........DISCH", colour: "c"), var eng1FireFlATC = warning.new(msg: " -ATC.............NOTIFY", colour: "c"), - var eng1FireFl30Sec = warning.new(msg: " •IF FIRE AFTER 30 S:", colour: "w"), + var eng1FireFl30Sec = warning.new(msg: " .IF FIRE AFTER 30 S:", colour: "w"), var eng1FireFlAgent2 = warning.new(msg: " -AGENT 2..........DISCH", colour: "c"), # ENG 1 FIRE (ground) var eng1FireGnlever = warning.new(msg: " -THR LEVERS........IDLE", colour: "c"), - var eng1FireGnstopped = warning.new(msg: " •WHEN A/C IS STOPPED:", colour: "w"), + var eng1FireGnstopped = warning.new(msg: " .WHEN A/C IS STOPPED:", colour: "w"), var eng1FireGnparkbrk = warning.new(msg: " -PARKING BRK.........ON", colour: "c"), var eng1FireGnATC = warning.new(msg: " -ATC.............NOTIFY", colour: "c"), var eng1FireGncrew = warning.new(msg: " -CABIN CREW.......ALERT", colour: "c"), @@ -70,12 +70,12 @@ var warnings = std.Vector.new([ var eng2FireFlAgent1Timer = warning.new(msg: " -AGENT 1 AFT 10 S.DISCH", colour: "w"), var eng2FireFlAgent1 = warning.new(msg: " -AGENT 1..........DISCH", colour: "c"), var eng2FireFlATC = warning.new(msg: " -ATC.............NOTIFY", colour: "c"), - var eng2FireFl30Sec = warning.new(msg: " •IF FIRE AFTER 30 S:", colour: "w"), + var eng2FireFl30Sec = warning.new(msg: " .IF FIRE AFTER 30 S:", colour: "w"), var eng2FireFlAgent2 = warning.new(msg: " -AGENT 2..........DISCH", colour: "c"), # ENG 2 FIRE (ground) var eng2FireGnlever = warning.new(msg: " -THR LEVERS........IDLE", colour: "c"), - var eng2FireGnstopped = warning.new(msg: " •WHEN A/C IS STOPPED:", colour: "w"), + var eng2FireGnstopped = warning.new(msg: " .WHEN A/C IS STOPPED:", colour: "w"), var eng2FireGnparkbrk = warning.new(msg: " -PARKING BRK.........ON", colour: "c"), var eng2FireGnATC = warning.new(msg: " -ATC.............NOTIFY", colour: "c"), var eng2FireGncrew = warning.new(msg: " -CABIN CREW.......ALERT", colour: "c"), @@ -101,7 +101,7 @@ var warnings = std.Vector.new([ var ADR123FaultBUSSF = warning.new(msg: " -FO BKUP SPD/ALT.....ON", colour: "c"), var ADR123FaultADRPB = warning.new(msg: " -ADR 1+2+3 P/B......OFF", colour: "c"), var ADR123FaultSPD = warning.new(msg: " -SPD......FLY THE GREEN", colour: "c"), - var ADR123FaultAOADISAG = warning.new(msg: " •IF AOA DISAGREE: ", colour: "w"), + var ADR123FaultAOADISAG = warning.new(msg: " .IF AOA DISAGREE: ", colour: "w"), var ADR123FaultBUSSINOP = warning.new(msg: " BKUP SPD/ALT.DO NOT USE", colour: "c"), var ADR123FaultSTBY = warning.new(msg: " -STBY INST.MAY BE UNREL", colour: "c"), var ADR123FaultPROC = warning.new(msg: " -ALL ADR OFF PROC.APPLY", colour: "c"), @@ -130,7 +130,7 @@ var warnings = std.Vector.new([ var excessCabAlt = warning.new(msg: "CAB PR EXCESS CAB ALT", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "cabPressPage"), var excessCabAltMask = warning.new(msg: " -CREW OXY MASKS.....USE", colour: "c"), var excessCabAltSigns = warning.new(msg: " -SIGNS...............ON", colour: "c"), - var excessCabAltEmerD = warning.new(msg: " •EMER DESCENT:", colour: "w"), + var excessCabAltEmerD = warning.new(msg: " .EMER DESCENT:", colour: "w"), var excessCabAltDES = warning.new(msg: " -DESCENT.......INITIATE", colour: "c"), var excessCabAltTHRLVR = warning.new(msg: " -THR LEVERS........IDLE", colour: "c"), var excessCabAltSPDBRK = warning.new(msg: " -SPD BRK...........FULL", colour: "c"), @@ -141,20 +141,20 @@ var warnings = std.Vector.new([ var excessCabAltPA = warning.new(msg: " -EMER DES (PA).ANNOUNCE", colour: "c"), var excessCabAltXPDR = warning.new(msg: " -XPDR 7700.....CONSIDER", colour: "c"), var excessCabAltMEA = warning.new(msg: " MAX FL.....100/MEA-MORA", colour: "c"), - var excessCabAltCabAlt = warning.new(msg: " •IF CAB ALT>14000 FT:", colour: "w"), + var excessCabAltCabAlt = warning.new(msg: " .IF CAB ALT>14000 FT:", colour: "w"), var excessCabAltMasks = warning.new(msg: " -PAX OXY MASKS...MAN ON", colour: "c"), # ENG 1 OIL LO PR var eng1OilLoPr = warning.new(msg: "ENG 1 OIL LO PR ", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "enginePage"), - var eng1OilLoPrIf = warning.new(msg: " •IF OIL PR < 13 PSI :", colour: "w"), - var eng1OilLoPrIf2 = warning.new(msg: " •IF OIL PR < 60 PSI :", colour: "w"), + var eng1OilLoPrIf = warning.new(msg: " .IF OIL PR < 13 PSI :", colour: "w"), + var eng1OilLoPrIf2 = warning.new(msg: " .IF OIL PR < 60 PSI :", colour: "w"), var eng1OilLoPrThrot = warning.new(msg: " -THR LEVER 1.......IDLE", colour: "c"), var eng1OilLoPrMaster = warning.new(msg: " -ENG MASTER 1.......OFF", colour: "c"), # ENG 2 OIL LO PR var eng2OilLoPr = warning.new(msg: "ENG 2 OIL LO PR ", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "enginePage"), - var eng2OilLoPrIf = warning.new(msg: " •IF OIL PR < 13 PSI :", colour: "w"), - var eng2OilLoPrIf2 = warning.new(msg: " •IF OIL PR < 60 PSI :", colour: "w"), + var eng2OilLoPrIf = warning.new(msg: " .IF OIL PR < 13 PSI :", colour: "w"), + var eng2OilLoPrIf2 = warning.new(msg: " .IF OIL PR < 60 PSI :", colour: "w"), var eng2OilLoPrThrot = warning.new(msg: " -THR LEVER 2.......IDLE", colour: "c"), var eng2OilLoPrMaster = warning.new(msg: " -ENG MASTER 2.......OFF", colour: "c"), @@ -169,7 +169,7 @@ var warnings = std.Vector.new([ var gearNotDownLocked = warning.new(msg: "L/G GEAR NOT DOWNLOCKED", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "wheelPage"), var gearNotDownLockedRec = warning.new(msg: " -L/G LEVER......RECYCLE", colour: "c"), - var gearNotDownLockedWork = warning.new(msg: " •IF UNSUCCESSFUL:", colour: "w"), + var gearNotDownLockedWork = warning.new(msg: " .IF UNSUCCESSFUL:", colour: "w"), var gearNotDownLocked120 = warning.new(msg: " AFTER 120S:", colour: "w"), var gearNotDownLockedGrav = warning.new(msg: " -L/G.........GRVTY EXTN", colour: "c"), @@ -179,16 +179,16 @@ var warnings = std.Vector.new([ # Cargo smoke var cargoSmokeFwd = warning.new(msg: "SMOKE FWD CARGO SMOKE", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "condPage"), var cargoSmokeFwdFans = warning.new(msg: " -CAB FANS...........OFF", colour: "c"), - var cargoSmokeFwdGrdClsd = warning.new(msg: " •IF FWD CRG CLSD:", colour: "w"), + var cargoSmokeFwdGrdClsd = warning.new(msg: " .IF FWD CRG CLSD:", colour: "w"), var cargoSmokeFwdAgent = warning.new(msg: " -AGENT............DISCH", colour: "c"), - var cargoSmokeFwdGrd = warning.new(msg: " •WHEN ON GROUND", colour: "w"), + var cargoSmokeFwdGrd = warning.new(msg: " .WHEN ON GROUND", colour: "w"), var cargoSmokeFwdDoors = warning.new(msg: " BEFORE OPEN CRG DOORS:", colour: "w"), var cargoSmokeFwdDisemb = warning.new(msg: "-PAX..........DISEMBARK", colour: "c"), var cargoSmokeAft = warning.new(msg: "SMOKE AFT CARGO SMOKE", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "condPage"), var cargoSmokeAftFans = warning.new(msg: " -CAB FANS...........OFF", colour: "c"), - var cargoSmokeAftGrdClsd = warning.new(msg: " •IF AFT CRG CLSD:", colour: "w"), + var cargoSmokeAftGrdClsd = warning.new(msg: " .IF AFT CRG CLSD:", colour: "w"), var cargoSmokeAftAgent = warning.new(msg: " -AGENT............DISCH", colour: "c"), - var cargoSmokeAftGrd = warning.new(msg: " •WHEN ON GROUND", colour: "w"), + var cargoSmokeAftGrd = warning.new(msg: " .WHEN ON GROUND", colour: "w"), var cargoSmokeAftDoors = warning.new(msg: " BEFORE OPEN CRG DOORS:", colour: "w"), var cargoSmokeAftDisemb = warning.new(msg: "-PAX..........DISEMBARK", colour: "c"), @@ -211,7 +211,7 @@ var warnings = std.Vector.new([ var emerconfig = warning.new(msg: "ELEC EMER CONFIG", colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "elecPage"), var emerconfigMinRat = warning.new(msg: " MIN RAT SPD......140 KT", colour: "c"), var emerconfigGen = warning.new(msg: " -GEN 1+2....OFF THEN ON", colour: "c"), - var emerconfigGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var emerconfigGen2 = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var emerconfigBusTie = warning.new(msg: " -BUS TIE............OFF", colour: "c"), var emerconfigGen3 = warning.new(msg: " -GEN 1+2....OFF THEN ON", colour: "c"), var emerconfigManOn = warning.new(msg: " -EMER ELEC PWR...MAN ON", colour: "c"), @@ -280,7 +280,7 @@ var warnings = std.Vector.new([ var shaftFailure1 = warning.new(msg: " SHAFT FAILURE ", colour: "a"), var eng1FailModeSel = warning.new(msg: " -ENG MODE SEL.......IGN", colour: "c"), var eng1FailThrLvrIdle = warning.new(msg: " -THR LEVER 1.......IDLE", colour: "c"), - var eng1FailNoRelight = warning.new(msg: "•IF NO RELIGHT AFTER 30S", colour: "w"), + var eng1FailNoRelight = warning.new(msg: ".IF NO RELIGHT AFTER 30S", colour: "w"), var eng1FailMasterOff = warning.new(msg: " -ENG MASTER 1.......OFF", colour: "c"), var eng1FailDamage = warning.new(msg: " IF DAMAGE : ", colour: "w"), var eng1FailFirePB = warning.new(msg: " -ENG 1 FIRE P/B....PUSH", colour: "c"), @@ -292,7 +292,7 @@ var warnings = std.Vector.new([ # ENG 1 OIL HI TEMP var eng1OilHiTemp = warning.new(msg: "ENG 1 OIL HI TEMP ", colour: "a", aural: 1, light: 1, isMainMsg: 1), var eng1OilHiTempIdle = warning.new(msg: " -THR LEVER 1.......IDLE", colour: "c"), - var eng1OilHiTempSuccess = warning.new(msg: " •IF UNSUCCESSFUL: ", colour: "w"), + var eng1OilHiTempSuccess = warning.new(msg: " .IF UNSUCCESSFUL: ", colour: "w"), var eng1OilHiTempMaster = warning.new(msg: " -ENG MASTER 1.......OFF", colour: "c"), # ENG 1 SHUT DOWN @@ -300,10 +300,10 @@ var warnings = std.Vector.new([ var eng1ShutDownPack = warning.new(msg: " -PACK 1.............OFF", colour: "c"), var eng1ShutDownXBleed = warning.new(msg: " -X BLEED...........OPEN", colour: "c"), var eng1ShutDownModeSel = warning.new(msg: " -ENG MODE SEL.......IGN", colour: "c"), - var eng1ShutDownFuelLeak = warning.new(msg: " •IF NO FUEL LEAK :", colour: "w"), + var eng1ShutDownFuelLeak = warning.new(msg: " .IF NO FUEL LEAK :", colour: "w"), var eng1ShutDownImbalance = warning.new(msg: " -IMBALANCE......MONITOR", colour: "c"), var eng1ShutDownTCAS = warning.new(msg: " -TCAS MODE SEL.......TA", colour: "c"), - var eng1ShutDownBuffet = warning.new(msg: " •IF BUFFET : ", colour: "w"), + var eng1ShutDownBuffet = warning.new(msg: " .IF BUFFET : ", colour: "w"), var eng1ShutDownSpeed = warning.new(msg: " MAX SPEED...........240", colour: "c"), var eng1ShutDownXBleedS = warning.new(msg: " -X BLEED...........SHUT", colour: "c"), var eng1ShutDownWingAI = warning.new(msg: " -WING ANTI ICE......OFF", colour: "c"), @@ -315,7 +315,7 @@ var warnings = std.Vector.new([ var shaftFailure2 = warning.new(msg: " SHAFT FAILURE ", colour: "a"), var eng2FailModeSel = warning.new(msg: " -ENG MODE SEL.......IGN", colour: "c"), var eng2FailThrLvrIdle = warning.new(msg: " -THR LEVER 2.......IDLE", colour: "c"), - var eng2FailNoRelight = warning.new(msg: "•IF NO RELIGHT AFTER 30S", colour: "w"), + var eng2FailNoRelight = warning.new(msg: ".IF NO RELIGHT AFTER 30S", colour: "w"), var eng2FailMasterOff = warning.new(msg: " -ENG MASTER 2.......OFF", colour: "c"), var eng2FailDamage = warning.new(msg: " IF DAMAGE : ", colour: "w"), var eng2FailFirePB = warning.new(msg: " -ENG 2 FIRE P/B....PUSH", colour: "c"), @@ -327,7 +327,7 @@ var warnings = std.Vector.new([ # ENG 2 OIL HI TEMP var eng2OilHiTemp = warning.new(msg: "ENG 2 OIL HI TEMP ", colour: "a", aural: 1, light: 1, isMainMsg: 1), var eng2OilHiTempIdle = warning.new(msg: " -THR LEVER 2.......IDLE", colour: "c"), - var eng2OilHiTempSuccess = warning.new(msg: " •IF UNSUCCESSFUL: ", colour: "w"), + var eng2OilHiTempSuccess = warning.new(msg: " .IF UNSUCCESSFUL: ", colour: "w"), var eng2OilHiTempMaster = warning.new(msg: " -ENG MASTER 2.......OFF", colour: "c"), # ENG 2 SHUT DOWN @@ -336,10 +336,10 @@ var warnings = std.Vector.new([ var eng2ShutDownPack = warning.new(msg: " -PACK 2.............OFF", colour: "c"), var eng2ShutDownXBleed = warning.new(msg: " -X BLEED...........OPEN", colour: "c"), var eng2ShutDownModeSel = warning.new(msg: " -ENG MODE SEL.......IGN", colour: "c"), - var eng2ShutDownFuelLeak = warning.new(msg: " •IF NO FUEL LEAK :", colour: "w"), + var eng2ShutDownFuelLeak = warning.new(msg: " .IF NO FUEL LEAK :", colour: "w"), var eng2ShutDownImbalance = warning.new(msg: " -IMBALANCE......MONITOR", colour: "c"), var eng2ShutDownTCAS = warning.new(msg: " -TCAS MODE SEL.......TA", colour: "c"), - var eng2ShutDownBuffet = warning.new(msg: " •IF BUFFET : ", colour: "w"), + var eng2ShutDownBuffet = warning.new(msg: " .IF BUFFET : ", colour: "w"), var eng2ShutDownSpeed = warning.new(msg: " MAX SPEED...........240", colour: "c"), var eng2ShutDownXBleedS = warning.new(msg: " -X BLEED...........SHUT", colour: "c"), var eng2ShutDownWingAI = warning.new(msg: " -WING ANTI ICE......OFF", colour: "c"), @@ -457,7 +457,7 @@ var warnings = std.Vector.new([ # GEN 1 FAULT var gen1fault = warning.new(msg: "ELEC GEN 1 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var gen1faultGen = warning.new(msg: " -GEN 1......OFF THEN ON", colour: "c"), - var gen1faultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var gen1faultGen2 = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var gen1faultGen3 = warning.new(msg: " -GEN 1..............OFF", colour: "c"), # ESS TR FAULT @@ -466,13 +466,13 @@ var warnings = std.Vector.new([ # GEN 2 FAULT var gen2fault = warning.new(msg: "ELEC GEN 2 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var gen2faultGen = warning.new(msg: " -GEN 2......OFF THEN ON", colour: "c"), - var gen2faultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var gen2faultGen2 = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var gen2faultGen3 = warning.new(msg: " -GEN 2..............OFF", colour: "c"), # APU GEN FAULT var apuGenfault = warning.new(msg: "ELEC APU GEN FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var apuGenfaultGen = warning.new(msg: " -APU GEN....OFF THEN ON", colour: "c"), - var apuGenfaultGen2 = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var apuGenfaultGen2 = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var apuGenfaultGen3 = warning.new(msg: " -APU GEN............OFF", colour: "c"), # GEN OFF @@ -532,7 +532,7 @@ var warnings = std.Vector.new([ var fac12Fault = warning.new(msg: "AUTO FLT FAC 1+2 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var fac12FaultRud = warning.new(msg: "RUD WITH CARE ABV 160 KT", colour: "c"), var fac12FaultFac = warning.new(msg: " -FAC 1+2....OFF THEN ON", colour: "c"), - var fac12FaultSuccess = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var fac12FaultSuccess = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var fac12FaultFacOff = warning.new(msg: " -FAC 1+2............OFF", colour: "c"), var yawDamperSysFault = warning.new(msg: "AUTO FLT YAW DAMPER SYS", colour: "a", aural: 1, light: 1, isMainMsg: 1), var yawDamperSysFaultFac1 = warning.new(msg: " -FAC 1......OFF THEN ON", colour: "c"), @@ -544,11 +544,11 @@ var warnings = std.Vector.new([ var rudTravLimSysFaultFac = warning.new(msg: " -FAC 1+2....OFF THEN ON", colour: "c"), var fac1Fault = warning.new(msg: "AUTO FLT FAC 1 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var fac1FaultFac = warning.new(msg: " -FAC 1......OFF THEN ON", colour: "c"), - var fac1FaultSuccess = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var fac1FaultSuccess = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var fac1FaultFacOff = warning.new(msg: " -FAC 1..............OFF", colour: "c"), var fac2Fault = warning.new(msg: "AUTO FLT FAC 2 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var fac2FaultFac = warning.new(msg: " -FAC 2......OFF THEN ON", colour: "c"), - var fac2FaultSuccess = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "w"), + var fac2FaultSuccess = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "w"), var fac2FaultFacOff = warning.new(msg: " -FAC 2..............OFF", colour: "c"), # FCU fault @@ -564,9 +564,9 @@ var warnings = std.Vector.new([ var wingLoLvlPumpR1 = warning.new(msg: " -R TK PUMP 1.........ON", colour: "c"), var wingLoLvlPumpR2 = warning.new(msg: " -R TK PUMP 2.........ON", colour: "c"), var wingLoLvlPumpC2 = warning.new(msg: " -CTR TK PUMP 2.......ON", colour: "c"), - var wingLoLvlLeak = warning.new(msg: " •IF NO FUEL LEAK: ", colour: "w"), + var wingLoLvlLeak = warning.new(msg: " .IF NO FUEL LEAK: ", colour: "w"), var wingLoLvlXFeed = warning.new(msg: " -FUEL X FEED.........ON", colour: "c"), - var wingLoLvlGrav = warning.new(msg: " •IF GRVTY FEED: ", colour: "w"), + var wingLoLvlGrav = warning.new(msg: " .IF GRVTY FEED: ", colour: "w"), var wingLoLvlXFeedOff = warning.new(msg: " -FUEL X FEED........OFF", colour: "c"), var ctrPumpsOff = warning.new(msg: "FUEL CTR TK PUMPS OFF ", colour: "a", aural: 1, light: 1, isMainMsg: 1), @@ -600,13 +600,13 @@ var warnings = std.Vector.new([ var engBleedLowTemp = warning.new(msg: "AIR ENG 1+2 BLEED LO TEMP", colour: "a", aural: 1, light: 1, isMainMsg: 1), var engBleedLowTempAthr = warning.new(msg: " -A/THR..............OFF", colour: "c"), var engBleedLowTempAdv = warning.new(msg: " -THR LEVERS.....ADVANCE", colour: "c"), - var engBleedLowTempSucc = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "c"), + var engBleedLowTempSucc = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "c"), var engBleedLowTempIce = warning.new(msg: " -WING A.ICE.........OFF", colour: "c"), var engBleedLowTempIcing = warning.new(msg: " AVOID ICING CONDITIONS", colour: "c"), var eng1BleedLowTemp = warning.new(msg: "AIR ENG 1 BLEED LO TEMP", colour: "a", aural: 1, light: 1, isMainMsg: 1), var eng1BleedLowTempAthr = warning.new(msg: " -A/THR..............OFF", colour: "c"), var eng1BleedLowTempAdv = warning.new(msg: " -THR LEVER 1....ADVANCE", colour: "c"), - var eng1BleedLowTempSucc = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "c"), + var eng1BleedLowTempSucc = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "c"), var eng1BleedLowTempXBld = warning.new(msg: " -X BLEED...........OPEN", colour: "c"), var eng1BleedLowTempOff = warning.new(msg: " -ENG 1 BLEED........OFF", colour: "c"), var eng1BleedLowTempPack = warning.new(msg: " -PACK 1.............OFF", colour: "c"), @@ -615,7 +615,7 @@ var warnings = std.Vector.new([ var eng2BleedLowTemp = warning.new(msg: "AIR ENG 2 BLEED LO TEMP", colour: "a", aural: 1, light: 1, isMainMsg: 1), var eng2BleedLowTempAthr = warning.new(msg: " -A/THR..............OFF", colour: "c"), var eng2BleedLowTempAdv = warning.new(msg: " -THR LEVER 2....ADVANCE", colour: "c"), - var eng2BleedLowTempSucc = warning.new(msg: " •IF UNSUCCESSFUL :", colour: "c"), + var eng2BleedLowTempSucc = warning.new(msg: " .IF UNSUCCESSFUL :", colour: "c"), var eng2BleedLowTempXBld = warning.new(msg: " -X BLEED...........OPEN", colour: "c"), var eng2BleedLowTempOff = warning.new(msg: " -ENG 2 BLEED........OFF", colour: "c"), var eng2BleedLowTempPack = warning.new(msg: " -PACK 2.............OFF", colour: "c"), @@ -640,20 +640,20 @@ var warnings = std.Vector.new([ var pack12FaultPackOff1 = warning.new(msg: " -PACK 1.............OFF", colour: "c"), var pack12FaultPackOff2 = warning.new(msg: " -PACK 2.............OFF", colour: "c"), var pack12FaultDescend = warning.new(msg: " -DESCENT TO FL 100/MEA ", colour: "c"), - var pack12FaultDiffPr = warning.new(msg: " •WHEN DIFF PR <1 PSI", colour: "w"), + var pack12FaultDiffPr = warning.new(msg: " .WHEN DIFF PR <1 PSI", colour: "w"), var pack12FaultDiffPr2 = warning.new(msg: " AND FL BELOW 100 :", colour: "w"), var pack12FaultRam = warning.new(msg: " -RAM AIR...........OPEN", colour: "c"), var pack12FaultMax = warning.new(msg: " MAX FL..........100/MEA", colour: "c"), - var pack12FaultOvht = warning.new(msg: " •WHEN PACK OVHT OUT:", colour: "w"), + var pack12FaultOvht = warning.new(msg: " .WHEN PACK OVHT OUT:", colour: "w"), var pack12FaultPackOn1 = warning.new(msg: " -PACK 1..............ON", colour: "c"), var pack12FaultPackOn2 = warning.new(msg: " -PACK 2..............ON", colour: "c"), var pack1Ovht = warning.new(msg: "AIR PACK 1 OVHT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var pack1OvhtOff = warning.new(msg: " -PACK 1.............OFF", colour: "c"), - var pack1OvhtOut = warning.new(msg: " •WHEN PACK OVHT OUT:", colour: "w"), + var pack1OvhtOut = warning.new(msg: " .WHEN PACK OVHT OUT:", colour: "w"), var pack1OvhtPack = warning.new(msg: " -PACK 1..............ON", colour: "c"), var pack2Ovht = warning.new(msg: "AIR PACK 2 OVHT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var pack2OvhtOff = warning.new(msg: " -PACK 2.............OFF", colour: "c"), - var pack2OvhtOut = warning.new(msg: " •WHEN PACK OVHT OUT:", colour: "w"), + var pack2OvhtOut = warning.new(msg: " .WHEN PACK OVHT OUT:", colour: "w"), var pack2OvhtPack = warning.new(msg: " -PACK 2..............ON", colour: "c"), var pack1Fault = warning.new(msg: "AIR PACK 1 FAULT", colour: "a", aural: 1, light: 1, isMainMsg: 1), var pack1FaultOff = warning.new(msg: " -PACK 1.............OFF", colour: "c"), @@ -785,16 +785,16 @@ var specialLines = std.Vector.new([ ]); var secondaryFailures = std.Vector.new([ - var secondary_bleed = memo.new(msg: "•AIR BLEED", colour: "a"), # Not yet implemented - var secondary_press = memo.new(msg: "•CAB PRESS", colour: "a"), # Not yet implemented - var secondary_vent = memo.new(msg: "•AVNCS VENT", colour: "a"), # Not yet implemented - var secondary_elec = memo.new(msg: "•ELEC", colour: "a"), # Not yet implemented - var secondary_hyd = memo.new(msg: "•HYD", colour: "a"), # Not yet implemented - var secondary_fuel = memo.new(msg: "•FUEL", colour: "a"), # Not yet implemented - var secondary_cond = memo.new(msg: "•AIR COND", colour: "a"), # Not yet implemented - var secondary_brake = memo.new(msg: "•BRAKES", colour: "a"), # Not yet implemented - var secondary_wheel = memo.new(msg: "•WHEEL", colour: "a"), # Not yet implemented - var secondary_fctl = memo.new(msg: "•F/CTL", colour: "a") # Not yet implemented + var secondary_bleed = memo.new(msg: ".AIR BLEED", colour: "a"), # Not yet implemented + var secondary_press = memo.new(msg: ".CAB PRESS", colour: "a"), # Not yet implemented + var secondary_vent = memo.new(msg: ".AVNCS VENT", colour: "a"), # Not yet implemented + var secondary_elec = memo.new(msg: ".ELEC", colour: "a"), # Not yet implemented + var secondary_hyd = memo.new(msg: ".HYD", colour: "a"), # Not yet implemented + var secondary_fuel = memo.new(msg: ".FUEL", colour: "a"), # Not yet implemented + var secondary_cond = memo.new(msg: ".AIR COND", colour: "a"), # Not yet implemented + var secondary_brake = memo.new(msg: ".BRAKES", colour: "a"), # Not yet implemented + var secondary_wheel = memo.new(msg: ".WHEEL", colour: "a"), # Not yet implemented + var secondary_fctl = memo.new(msg: ".F/CTL", colour: "a") # Not yet implemented ]); var memos = std.Vector.new([ @@ -847,7 +847,7 @@ var statusLim = std.Vector.new([ var min_rat_spd = status.new(msg: "MIN RAT SPD.....140 KT", colour: "c"), # Not yet implemented var max_spd_gear = status.new(msg: "MAX SPD........280/.67", colour: "c"), # Not yet implemented var max_spd_rev = status.new(msg: "MAX SPD........300/.78", colour: "c"), # Not yet implemented - var buffet_rev = status.new(msg: " •IF BUFFET :", colour: "w"), # Not yet implemented + var buffet_rev = status.new(msg: " .IF BUFFET :", colour: "w"), # Not yet implemented var max_spd_rev_buf = status.new(msg: "MAX SPD.............240", colour: "c"), # Not yet implemented var max_spd_fctl = status.new(msg: "MAX SPD........320/.77", colour: "c"), # Not yet implemented var max_spd_fctl2 = status.new(msg: "MAX SPD.........300 KT", colour: "c"), # Not yet implemented @@ -875,50 +875,50 @@ var statusLim = std.Vector.new([ var statusApprProc = std.Vector.new([ var dual_hyd_b_g = status.new(msg: "APPR PROC DUAL HYD LO PR", colour: "r"), # Not yet implemented - var dual_hyd_b_g_2 = status.new(msg: " •IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_b_g_2 = status.new(msg: " .IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_b_g_3 = status.new(msg: "-BLUE ELEC PUMP.....AUTO", colour: "c"), # Not yet implemented - var dual_hyd_b_g_4 = status.new(msg: " •IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_b_g_4 = status.new(msg: " .IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_b_g_5 = status.new(msg: "-GREEN ENG 1 PUMP.....ON", colour: "c"), # Not yet implemented var dual_hyd_b_g_6 = status.new(msg: "-PTU................AUTO", colour: "c"), # Not yet implemented var dual_hyd_b_y = status.new(msg: "APPR PROC DUAL HYD LO PR", colour: "r"), # Not yet implemented - var dual_hyd_b_y_2 = status.new(msg: " •IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_b_y_2 = status.new(msg: " .IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_b_y_3 = status.new(msg: "-BLUE ELEC PUMP.....AUTO", colour: "c"), # Not yet implemented - var dual_hyd_b_y_4 = status.new(msg: " •IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_b_y_4 = status.new(msg: " .IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_b_y_5 = status.new(msg: "-YELLOW ENG 2 PUMP....ON", colour: "c"), # Not yet implemented var dual_hyd_b_y_6 = status.new(msg: "-PTU................AUTO", colour: "c"), # Not yet implemented var dual_hyd_g_y = status.new(msg: "APPR PROC DUAL HYD LO PR", colour: "r"), # Not yet implemented - var dual_hyd_g_y_2 = status.new(msg: " •IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_g_y_2 = status.new(msg: " .IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_b_y_3 = status.new(msg: "-GREEN ENG 1 PUMP.....ON", colour: "c"), # Not yet implemented - var dual_hyd_g_y_4 = status.new(msg: " •IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented + var dual_hyd_g_y_4 = status.new(msg: " .IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented var dual_hyd_g_y_5 = status.new(msg: "-YELLOW ENG 2 PUMP....ON", colour: "c"), # Not yet implemented var dual_hyd_g_y_6 = status.new(msg: "-PTU................AUTO", colour: "c"), # Not yet implemented var single_hyd_b = status.new(msg: "APPR PROC HYD LO PR", colour: "a"), # Not yet implemented - var single_hyd_b_2 = status.new(msg: " •IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented + var single_hyd_b_2 = status.new(msg: " .IF BLUE OVHT OUT:", colour: "w"), # Not yet implemented var single_hyd_b_3 = status.new(msg: "-BLUE ELEC PUMP.....AUTO", colour: "c"), # Not yet implemented var single_hyd_g = status.new(msg: "APPR PROC HYD LO PR", colour: "a"), # Not yet implemented - var single_hyd_g_2 = status.new(msg: " •IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented + var single_hyd_g_2 = status.new(msg: " .IF GREEN OVHT OUT:", colour: "w"), # Not yet implemented var single_hyd_g_3 = status.new(msg: "-GREEN ENG 1 PUMP.....ON", colour: "c"), # Not yet implemented var single_hyd_g_4 = status.new(msg: "-PTU................AUTO", colour: "c"), # Not yet implemented var single_hyd_y = status.new(msg: "APPR PROC HYD LO PR", colour: "a"), # Not yet implemented - var single_hyd_y_2 = status.new(msg: " •IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented + var single_hyd_y_2 = status.new(msg: " .IF YELLOW OVHT OUT:", colour: "w"), # Not yet implemented var single_hyd_y_3 = status.new(msg: "-YELLOW ENG 1 PUMP....ON", colour: "c"), # Not yet implemented var single_hyd_y_4 = status.new(msg: "-PTU................AUTO", colour: "c"), # Not yet implemented var avionics_smk = status.new(msg: "APPR PROC:", colour: "w"), # Not yet implemented - var avionics_smk_2 = status.new(msg: " •BEFORE L/G EXTENSION :", colour: "w"), # Not yet implemented + var avionics_smk_2 = status.new(msg: " .BEFORE L/G EXTENSION :", colour: "w"), # Not yet implemented var avionics_smk_2 = status.new(msg: "-GEN 2...............ON", colour: "c"), # Not yet implemented var avionics_smk_4 = status.new(msg: "-EMER ELEC GEN1 LINE ON", colour: "c"), # Not yet implemented var ths_stuck = status.new(msg: "APPR PROC:", colour: "w"), # Not yet implemented var ths_stuck_2 = status.new(msg: "-FOR LDG.....USE FLAP 3", colour: "c"), # Not yet implemented var ths_stuck_3 = status.new(msg: "-GPWS LDG FLAP 3.....ON", colour: "c"), # Not yet implemented - var ths_stuck_4 = status.new(msg: " •IF MAN TRIM NOT AVAIL:", colour: "w"), # Not yet implemented - var ths_stuck_5 = status.new(msg: " •WHEN CONF3 AND VAPP :", colour: "w"), # Not yet implemented + var ths_stuck_4 = status.new(msg: " .IF MAN TRIM NOT AVAIL:", colour: "w"), # Not yet implemented + var ths_stuck_5 = status.new(msg: " .WHEN CONF3 AND VAPP :", colour: "w"), # Not yet implemented var ths_stuck_6 = status.new(msg: "-L/G.................DN", colour: "c"), # Not yet implemented var flap_stuck = status.new(msg: "APPR PROC:", colour: "w"), # Not yet implemented @@ -935,13 +935,13 @@ var statusApprProc = std.Vector.new([ var slat_stuck_6 = status.new(msg: "-GPWS FLAP MODE.....OFF", colour: "c"), # Not yet implemented var fctl_proc = status.new(msg: "APPR PROC:", colour: "w"), # Not yet implemented - var fctl_proc_2 = status.new(msg: " •IF BUFFET:", colour: "w"), # Not yet implemented + var fctl_proc_2 = status.new(msg: " .IF BUFFET:", colour: "w"), # Not yet implemented var fctl_proc_3 = status.new(msg: "-FOR LDG.....USE FLAP 3", colour: "c"), # Not yet implemented var fctl_proc_4 = status.new(msg: "-GPWS LDG FLAP 3.....ON", colour: "c"), # Not yet implemented var fctl_proc_5 = status.new(msg: "-AT 1000FT AGL:L/G...DN", colour: "c"), # Not yet implemented var rev_unlc_proc = status.new(msg: "APPR PROC:", colour: "w"), # Not yet implemented - var rev_unlc_proc_2 = status.new(msg: " •IF BUFFET:", colour: "w"), # Not yet implemented + var rev_unlc_proc_2 = status.new(msg: " .IF BUFFET:", colour: "w"), # Not yet implemented var rev_unlc_proc_3 = status.new(msg: "-FOR LDG.....USE FLAP 3", colour: "c"), # Not yet implemented var rev_unlc_proc_4 = status.new(msg: "-APPR SPD : VREF + 55KT", colour: "c"), # Not yet implemented var rev_unlc_proc_5 = status.new(msg: "-APPR SPD : VREF + 60KT", colour: "c"), # Not yet implemented @@ -949,23 +949,23 @@ var statusApprProc = std.Vector.new([ var rev_unlc_proc_7 = status.new(msg: "-RUD TRIM.......5 DEG L", colour: "c"), # Not yet implemented var rev_unlc_proc_8 = status.new(msg: "-ATHR...............OFF", colour: "c"), # Not yet implemented var rev_unlc_proc_9 = status.new(msg: "-GPWS FLAP MODE.....OFF", colour: "c"), # Not yet implemented - var rev_unlc_proc_10 = status.new(msg: " •WHEN LDG ASSURED:", colour: "w"), # Not yet implemented + var rev_unlc_proc_10 = status.new(msg: " .WHEN LDG ASSURED:", colour: "w"), # Not yet implemented var rev_unlc_proc_11 = status.new(msg: "-L/G...............DOWN", colour: "c"), # Not yet implemented - var rev_unlc_proc_12 = status.new(msg: " •AT 800FT AGL:", colour: "w"), # Not yet implemented + var rev_unlc_proc_12 = status.new(msg: " .AT 800FT AGL:", colour: "w"), # Not yet implemented var rev_unlc_proc_13 = status.new(msg: "-TARGET SPD : VREF+40KT", colour: "c"), # Not yet implemented var rev_unlc_proc_14 = status.new(msg: "-TARGET SPD : VREF+45KT", colour: "c"), # Not yet implemented var thr_lvr_flt = status.new(msg: "APPR PROC THR LEVER", colour: "a"), # Not yet implemented var thr_lvr_flt_2 = status.new(msg: "-AUTOLAND...........USE", colour: "c"), # Not yet implemented - var thr_lvr_flt_3 = status.new(msg: " •IF AUTOLAND NOT USED:", colour: "w"), # Not yet implemented - var thr_lvr_flt_4 = status.new(msg: " •AT 500FT AGL :", colour: "w"), # Not yet implemented + var thr_lvr_flt_3 = status.new(msg: " .IF AUTOLAND NOT USED:", colour: "w"), # Not yet implemented + var thr_lvr_flt_4 = status.new(msg: " .AT 500FT AGL :", colour: "w"), # Not yet implemented var thr_lvr_flt_5 = status.new(msg: "-ENG MASTER 1.......OFF", colour: "c"), # Not yet implemented var thr_lvr_flt_6 = status.new(msg: "-ENG MASTER 2.......OFF", colour: "c"), # Not yet implemented var fuel_ctl_flt = status.new(msg: "APPR PROC FUEL CTL FAULT", colour: "a"), # Not yet implemented var fuel_ctl_flt_2 = status.new(msg: "REV 1........DO NOT USE", colour: "w"), # Not yet implemented var fuel_ctl_flt_3 = status.new(msg: "REV 2........DO NOT USE", colour: "w"), # Not yet implemented - var fuel_ctl_flt_4 = status.new(msg: " •AFTER TOUCHDOWN:", colour: "w"), # Not yet implemented + var fuel_ctl_flt_4 = status.new(msg: " .AFTER TOUCHDOWN:", colour: "w"), # Not yet implemented var fuel_ctl_flt_5 = status.new(msg: "-ENG MASTER 1.......OFF", colour: "c"), # Not yet implemented var fuel_ctl_flt_6 = status.new(msg: "-ENG MASTER 2.......OFF", colour: "c") # Not yet implemented ]); diff --git a/THANKS.md b/THANKS.md index 8c918974..49423e6b 100644 --- a/THANKS.md +++ b/THANKS.md @@ -3,3 +3,5 @@ Immersive Design Group for the aircraft this is based on Amanda Santos for the sound "botaodepressao", used for the overhead panel under the CC0 license: https://freesound.org/people/amandasantos/sounds/392148/ + +Fly By Wire Simulations for the use of the font "ECAMFontRegular.ttf", used under the GPL license