From ace16b269c884d4b79acbb8a14843a1506ecdc44 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Tue, 16 May 2017 15:29:05 +0100 Subject: [PATCH] add data page --- Models/Instruments/MCDU1/DATA/DATA.xml | 2 +- Models/Instruments/MCDU1/DATA2/DATA2.xml | 463 +++++++++++++++++++++++ Models/Instruments/MCDU1/DATA2/EMPTY.ac | 3 + Models/Instruments/MCDU1/MCDU1.xml | 120 ++++++ Models/Instruments/MCDU2/DATA/DATA.xml | 2 +- Models/Instruments/MCDU2/DATA2/DATA2.xml | 463 +++++++++++++++++++++++ Models/Instruments/MCDU2/DATA2/EMPTY.ac | 3 + Models/Instruments/MCDU2/MCDU2.xml | 166 ++++++-- Nasal/MCDU1.nas | 14 +- Nasal/MCDU2.nas | 12 +- 10 files changed, 1218 insertions(+), 30 deletions(-) create mode 100644 Models/Instruments/MCDU1/DATA2/DATA2.xml create mode 100644 Models/Instruments/MCDU1/DATA2/EMPTY.ac create mode 100644 Models/Instruments/MCDU2/DATA2/DATA2.xml create mode 100644 Models/Instruments/MCDU2/DATA2/EMPTY.ac diff --git a/Models/Instruments/MCDU1/DATA/DATA.xml b/Models/Instruments/MCDU1/DATA/DATA.xml index 8c07ec11..d4604444 100644 --- a/Models/Instruments/MCDU1/DATA/DATA.xml +++ b/Models/Instruments/MCDU1/DATA/DATA.xml @@ -20,7 +20,7 @@ center-center yz-plane text-value - DATA + DATA INDEX 1/2 <--> false BoeingCDU-Large.ttf autopilot/serviceable diff --git a/Models/Instruments/MCDU1/DATA2/DATA2.xml b/Models/Instruments/MCDU1/DATA2/DATA2.xml new file mode 100644 index 00000000..cc4e79da --- /dev/null +++ b/Models/Instruments/MCDU1/DATA2/DATA2.xml @@ -0,0 +1,463 @@ + + + + + + + EMPTY.ac + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DATA INDEX 2/2 <--> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilots + + -0.001 + 0.045 + 0.0760 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotswaypoints + + -0.001 + 0.045 + 0.0720 + + right-center + yz-plane + text-value + WAYPOINTS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + waypoints + + -0.001 + -0.045 + 0.0725 + + left-center + yz-plane + text-value + <WAYPOINTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilotsnav + + -0.001 + 0.045 + 0.066 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotsnavaids + + -0.001 + 0.045 + 0.0605 + + right-center + yz-plane + text-value + NAVAIDS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + navaids + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + <NAVAIDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilotsrwy + + -0.001 + 0.045 + 0.0545 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotsrunway + + -0.001 + 0.045 + 0.0505 + + right-center + yz-plane + text-value + RUNWAYS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + rwy + + -0.001 + -0.045 + 0.0505 + + left-center + yz-plane + text-value + <RUNWAYS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + winds + + -0.001 + -0.045 + 0.033 + + left-center + yz-plane + text-value + ACTIVE F-PLN + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + winds2 + + -0.001 + -0.045 + 0.029 + + left-center + yz-plane + text-value + <WINDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + routes + + -0.001 + -0.045 + 0.0410 + + left-center + yz-plane + text-value + <ROUTES + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + routes2 + + -0.001 + 0.045 + 0.0455 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + routes3 + + -0.001 + 0.045 + 0.0410 + + right-center + yz-plane + text-value + ROUTES> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + windssec2 + + -0.001 + -0.045 + 0.0230 + + left-center + yz-plane + text-value + SEC F-PLN + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + windssec + + -0.001 + -0.045 + 0.0190 + + left-center + yz-plane + text-value + <WINDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + pilots + waypoints + navaids + pilotsnav + pilotsnavaids + pilotswaypoints + pilotsrwy + pilotsrunway + rwy + winds + winds2 + routes + routes2 + routes3 + windssec + windssec2 + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + diff --git a/Models/Instruments/MCDU1/DATA2/EMPTY.ac b/Models/Instruments/MCDU1/DATA2/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU1/DATA2/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU1/MCDU1.xml b/Models/Instruments/MCDU1/MCDU1.xml index c126e7f1..0fb2bc3a 100644 --- a/Models/Instruments/MCDU1/MCDU1.xml +++ b/Models/Instruments/MCDU1/MCDU1.xml @@ -92,6 +92,28 @@ + + DATA2 + DATA2/DATA2.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA2 + + + + + pick init @@ -148,6 +170,104 @@ /MCDU[0]/page DATA + + + + + + + + + pick + right + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA + + + + + + + + pick + left + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA + + + + + + + + pick + right + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA2 + + + + + + + + pick + left + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[0]/page + DATA2 + diff --git a/Models/Instruments/MCDU2/DATA/DATA.xml b/Models/Instruments/MCDU2/DATA/DATA.xml index 8c07ec11..d4604444 100644 --- a/Models/Instruments/MCDU2/DATA/DATA.xml +++ b/Models/Instruments/MCDU2/DATA/DATA.xml @@ -20,7 +20,7 @@ center-center yz-plane text-value - DATA + DATA INDEX 1/2 <--> false BoeingCDU-Large.ttf autopilot/serviceable diff --git a/Models/Instruments/MCDU2/DATA2/DATA2.xml b/Models/Instruments/MCDU2/DATA2/DATA2.xml new file mode 100644 index 00000000..cc4e79da --- /dev/null +++ b/Models/Instruments/MCDU2/DATA2/DATA2.xml @@ -0,0 +1,463 @@ + + + + + + + EMPTY.ac + + + page + + -0.001 + 0.0 + 0.083 + + center-center + yz-plane + text-value + DATA INDEX 2/2 <--> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilots + + -0.001 + 0.045 + 0.0760 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotswaypoints + + -0.001 + 0.045 + 0.0720 + + right-center + yz-plane + text-value + WAYPOINTS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + waypoints + + -0.001 + -0.045 + 0.0725 + + left-center + yz-plane + text-value + <WAYPOINTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilotsnav + + -0.001 + 0.045 + 0.066 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotsnavaids + + -0.001 + 0.045 + 0.0605 + + right-center + yz-plane + text-value + NAVAIDS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + navaids + + -0.001 + -0.045 + 0.0605 + + left-center + yz-plane + text-value + <NAVAIDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + pilotsrwy + + -0.001 + 0.045 + 0.0545 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + pilotsrunway + + -0.001 + 0.045 + 0.0505 + + right-center + yz-plane + text-value + RUNWAYS> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + rwy + + -0.001 + -0.045 + 0.0505 + + left-center + yz-plane + text-value + <RUNWAYS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + winds + + -0.001 + -0.045 + 0.033 + + left-center + yz-plane + text-value + ACTIVE F-PLN + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + winds2 + + -0.001 + -0.045 + 0.029 + + left-center + yz-plane + text-value + <WINDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + routes + + -0.001 + -0.045 + 0.0410 + + left-center + yz-plane + text-value + <ROUTES + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + routes2 + + -0.001 + 0.045 + 0.0455 + + right-center + yz-plane + text-value + PILOTS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + + routes3 + + -0.001 + 0.045 + 0.0410 + + right-center + yz-plane + text-value + ROUTES> + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + windssec2 + + -0.001 + -0.045 + 0.0230 + + left-center + yz-plane + text-value + SEC F-PLN + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0040 + + 64 + 64 + + + + windssec + + -0.001 + -0.045 + 0.0190 + + left-center + yz-plane + text-value + <WINDS + false + BoeingCDU-Large.ttf + autopilot/serviceable + true + false + false + 0.0050 + + 64 + 64 + + + + + + + material + page + pilots + waypoints + navaids + pilotsnav + pilotsnavaids + pilotswaypoints + pilotsrwy + pilotsrunway + rwy + winds + winds2 + routes + routes2 + routes3 + windssec + windssec2 + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + + + diff --git a/Models/Instruments/MCDU2/DATA2/EMPTY.ac b/Models/Instruments/MCDU2/DATA2/EMPTY.ac new file mode 100644 index 00000000..4dd7e1f9 --- /dev/null +++ b/Models/Instruments/MCDU2/DATA2/EMPTY.ac @@ -0,0 +1,3 @@ +AC3Db +OBJECT world +kids 0 diff --git a/Models/Instruments/MCDU2/MCDU2.xml b/Models/Instruments/MCDU2/MCDU2.xml index 2289d33c..6fcfdce8 100644 --- a/Models/Instruments/MCDU2/MCDU2.xml +++ b/Models/Instruments/MCDU2/MCDU2.xml @@ -92,29 +92,27 @@ - - pick - L4 - - - false - - nasal - - - - - /systems/electrical/bus/ac1 - 25 - - - /MCDU[1]/page - DATA - - - - - + + DATA2 + DATA2/DATA2.xml + + 180 + 180 + 90 + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA2 + + + + pick @@ -154,6 +152,128 @@ + + pick + L4 + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA + + + + + + + + + pick + right + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA + + + + + + + + pick + left + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA + + + + + + + + pick + right + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA2 + + + + + + + + pick + left + + + false + + nasal + + + + + /systems/electrical/bus/ac1 + 25 + + + /MCDU[1]/page + DATA2 + + + + + + + pick a diff --git a/Nasal/MCDU1.nas b/Nasal/MCDU1.nas index 5514a735..6dc8476c 100644 --- a/Nasal/MCDU1.nas +++ b/Nasal/MCDU1.nas @@ -11,7 +11,7 @@ var MCDU_reset = func { setprop("/MCDU[0]/page", "STATUS"); setprop("/MCDU[0]/cost-index", 0); setprop("/MCDU[0]/flight-num", 0); - setprop("/MCDU[0]/scratchpad", ""); + setprop("/MCDU[0]/scratchpad", " "); } var pagebutton = func(btn) { @@ -27,12 +27,18 @@ var pagebutton = func(btn) { setprop("/MCDU[0]/page", "DATA"); }, 0.2); } - if (btn == "sttus") { + if (btn == "status") { setprop("/MCDU[0]/page", "NONE"); settimer(func { setprop("/MCDU[0]/page", "STATUS"); }, 0.2); } + if (btn == "data2") { + setprop("/MCDU[0]/page", "NONE"); + settimer(func { + setprop("/MCDU[0]/page", "DATA2"); + }, 0.2); + } } var button = func(btn) { @@ -97,8 +103,10 @@ var button = func(btn) { var scratchpad = getprop("/MCDU[0]/scratchpad"); if (scratchpad == " ") { setprop("/MCDU[0]/scratchpad", "CLR"); - } else { + } else if (scratchpad == "CLR") { setprop("/MCDU[0]/scratchpad", " "); + } else if (size(scratchpad) > 0) { + setprop("/MCDU[0]/scratchpad", left(scratchpad, size(scratchpad)-1)); } } else if (btn == "0") { setprop("/MCDU[0]/scratchpad", scratchpad ~ "0"); diff --git a/Nasal/MCDU2.nas b/Nasal/MCDU2.nas index 6c1693b2..e2e0eb16 100644 --- a/Nasal/MCDU2.nas +++ b/Nasal/MCDU2.nas @@ -11,7 +11,7 @@ var MCDU_reset = func { setprop("/MCDU[1]/page", "STATUS"); setprop("/MCDU[1]/cost-index", 0); setprop("/MCDU[1]/flight-num", 0); - setprop("/MCDU[1]/scratchpad", ""); + setprop("/MCDU[1]/scratchpad", " "); } var pagebutton = func(btn) { @@ -33,6 +33,12 @@ var pagebutton = func(btn) { setprop("/MCDU[1]/page", "STATUS"); }, 0.2); } + if (btn == "data2") { + setprop("/MCDU[1]/page", "NONE"); + settimer(func { + setprop("/MCDU[1]/page", "DATA2"); + }, 0.2); + } } var button = func(btn) { @@ -97,8 +103,10 @@ var button = func(btn) { var scratchpad = getprop("/MCDU[1]/scratchpad"); if (scratchpad == " ") { setprop("/MCDU[1]/scratchpad", "CLR"); - } else { + } else if (scratchpad == "CLR") { setprop("/MCDU[1]/scratchpad", " "); + } else if (size(scratchpad) > 0) { + setprop("/MCDU[1]/scratchpad", left(scratchpad, size(scratchpad)-1)); } } else if (btn == "0") { setprop("/MCDU[1]/scratchpad", scratchpad ~ "0");