From d8275e3c6b0ba92f4a0fc00520a64688f9095b70 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 18 Oct 2017 21:53:38 -0400 Subject: [PATCH] A32X: Change ROLLOUT to ROLL OUT, canvas WIP PFD work --- Models/Instruments/PFD-WIP/pfd.svg | 3211 +++++----------------------- Models/Instruments/PFD/PFD1.xml | 8 +- Models/Instruments/PFD/PFD2.xml | 8 +- Nasal/PFD_FMA.nas | 4 +- revision.txt | 2 +- 5 files changed, 568 insertions(+), 2665 deletions(-) diff --git a/Models/Instruments/PFD-WIP/pfd.svg b/Models/Instruments/PFD-WIP/pfd.svg index 23c2797e..5a340cf3 100644 --- a/Models/Instruments/PFD-WIP/pfd.svg +++ b/Models/Instruments/PFD-WIP/pfd.svg @@ -13,7 +13,7 @@ viewBox="0 0 960.49999 960.49999" version="1.1" id="svg2" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.91 r13725" sodipodi:docname="pfd.svg"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -42,14 +42,14 @@ inkscape:window-height="1030" id="namedview371" showgrid="true" - inkscape:zoom="0.5" - inkscape:cx="942.47517" - inkscape:cy="564.38358" + inkscape:zoom="2.8284271" + inkscape:cx="997.08237" + inkscape:cy="1108.4101" inkscape:window-x="1592" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg2" - showguides="false" + showguides="true" inkscape:snap-global="false" units="px" inkscape:measure-start="555.563,82.3672" @@ -70,2642 +70,137 @@ x="1335" y="498" />    + + + ALT + G/S + CLB + LOC + NAV + + + + + + + QNH - 1013 + x="832.24524" + y="723.21936" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.77171135px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.65757734">QNH 1 + + + + + + + + + + + + + + 40200080604020008060 + + + + + + + + 00 + 1013 + SPEED + + + + AP 1+2 + 1 FD 2 + A/THR + CAT 3 + DUAL + NO DH + + + + + + + + + FLARE + + DH + 250 diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index 6334690c..3d725229 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -428,7 +428,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT modes/pfd/fma/pitch-mode @@ -471,7 +471,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT modes/pfd/fma/roll-mode @@ -522,7 +522,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT @@ -564,7 +564,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 36722494..8c6d0831 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -428,7 +428,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT modes/pfd/fma/pitch-mode @@ -471,7 +471,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT modes/pfd/fma/roll-mode @@ -522,7 +522,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT @@ -564,7 +564,7 @@ modes/pfd/fma/pitch-mode - ROLLOUT + ROLL OUT diff --git a/Nasal/PFD_FMA.nas b/Nasal/PFD_FMA.nas index ee9777a0..5f1f8f59 100644 --- a/Nasal/PFD_FMA.nas +++ b/Nasal/PFD_FMA.nas @@ -233,8 +233,8 @@ setlistener("/it-autoflight/mode/vert", func { setprop("/modes/pfd/fma/pitch-mode", "FLARE"); } } else if (vert == "ROLLOUT") { - if (newvert != "ROLLOUT") { - setprop("/modes/pfd/fma/pitch-mode", "ROLLOUT"); + if (newvert != "ROLL OUT") { + setprop("/modes/pfd/fma/pitch-mode", "ROLL OUT"); } } else if (vert == "T/O CLB") { if (newvertarm != "CLB") { diff --git a/revision.txt b/revision.txt index b9dc6e97..7637952e 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -2135 \ No newline at end of file +2136 \ No newline at end of file