fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into new-flightplan

Browse source
This commit is contained in:
Jonathan Redpath 2022-02-09 22:10:42 +00:00
commit 9163fd3855
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Models/Instruments/MCDU/MCDU.nas
View file

@ -4029,6 +4029,7 @@ var canvas_MCDU_base = {
me.fontSizeLeft(normal, normal, normal, normal, 0, normal); me.fontSizeLeft(normal, normal, normal, normal, 0, normal);
me.fontSizeRight(normal, small, 0, 0, 0, normal); me.fontSizeRight(normal, small, 0, 0, 0, normal);
me.fontSizeCenter(small, small, small, 0, 0, 0); me.fontSizeCenter(small, small, small, 0, 0, 0);
me.fontSizeCenterS(small, small, small, small, small, small);
me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht"); me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht");
me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht"); me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
@ -4045,7 +4046,7 @@ var canvas_MCDU_base = {
} }
me["Simple_L4"].setText(sprintf("%3.0f", fmgc.FMGCInternal.transAlt)); me["Simple_L4"].setText(sprintf("%3.0f", fmgc.FMGCInternal.transAlt));
me["Simple_L5"].setText(sprintf("%3.0f", clbReducFt.getValue()) ~ sprintf("/%3.0f", reducFt.getValue())); me["Simple_L5"].setText(" " ~ sprintf("%3.0f", clbReducFt.getValue()) ~ sprintf("/%3.0f", reducFt.getValue()));
me["Simple_L6"].setText(" TO DATA"); me["Simple_L6"].setText(" TO DATA");
me["Simple_L1S"].setText(" V1"); me["Simple_L1S"].setText(" V1");
me["Simple_L2S"].setText(" VR"); me["Simple_L2S"].setText(" VR");
@ -4053,7 +4054,7 @@ var canvas_MCDU_base = {
me["Simple_L4S"].setText("TRANS ALT"); me["Simple_L4S"].setText("TRANS ALT");
me["Simple_L5S"].setText("THR RED/ACC"); me["Simple_L5S"].setText("THR RED/ACC");
me["Simple_L6S"].setText(" UPLINK"); me["Simple_L6S"].setText(" UPLINK");
me["Simple_R2"].setText("[ ] "); me["Simple_R2"].setText("[M][ ] ");
me["Simple_R5"].setText(sprintf("%3.0f", engOutAcc.getValue())); me["Simple_R5"].setText(sprintf("%3.0f", engOutAcc.getValue()));
me["Simple_R6"].setText("PHASE "); me["Simple_R6"].setText("PHASE ");
me["Simple_R1S"].setText("RWY "); me["Simple_R1S"].setText("RWY ");
@ -4140,14 +4141,14 @@ var canvas_MCDU_base = {
} }
} else { } else {
me["Simple_R3"].setFontSize(small); me["Simple_R3"].setFontSize(small);
me["Simple_R3"].setText("[ ]/[ ]"); me["Simple_R3"].setText("[ ]/[ ]");
} }
if (flexSet.getValue() == 1) { if (flexSet.getValue() == 1) {
me["Simple_R4"].setFontSize(normal); me["Simple_R4"].setFontSize(normal);
me["Simple_R4"].setText(sprintf("%3.0f", flex.getValue())); me["Simple_R4"].setText(sprintf("%3.0f°", flex.getValue()));
} else { } else {
me["Simple_R4"].setFontSize(small); me["Simple_R4"].setFontSize(small);
me["Simple_R4"].setText("[ ]"); me["Simple_R4"].setText("[ ]°");
} }
if (engOutAccSet.getValue() == 1) { if (engOutAccSet.getValue() == 1) {
me["Simple_R5"].setFontSize(normal); me["Simple_R5"].setFontSize(normal);
@ -4167,7 +4168,7 @@ var canvas_MCDU_base = {
me["Simple_C1S"].setText("FLP RETR"); me["Simple_C1S"].setText("FLP RETR");
me["Simple_C2S"].setText("SLT RETR"); me["Simple_C2S"].setText("SLT RETR");
me["Simple_C3S"].setText(" CLEAN"); me["Simple_C3S"].setText(" CLEAN");
} else if (page == "PERFCLB") { } else if (page == "PERFCLB") {
if (!pageSwitch[i].getBoolValue()) { if (!pageSwitch[i].getBoolValue()) {
@ -4624,6 +4625,7 @@ var canvas_MCDU_base = {
me.fontSizeLeft(small, small, small, small, small, normal); me.fontSizeLeft(small, small, small, small, small, normal);
me.fontSizeRight(normal, small, small, small, normal, normal); me.fontSizeRight(normal, small, small, small, normal, normal);
me.fontSizeCenter(small, small, small, 0, small, 0); me.fontSizeCenter(small, small, small, 0, small, 0);
me.fontSizeCenterS(small, small, small, small, small, small);
me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht"); me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht");
me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht"); me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
@ -4659,7 +4661,7 @@ var canvas_MCDU_base = {
if (dest_temp.getValue() != -999) { if (dest_temp.getValue() != -999) {
me["Simple_L2"].setText(sprintf("%3.0f°", dest_temp.getValue())); me["Simple_L2"].setText(sprintf("%3.0f°", dest_temp.getValue()));
} else { } else {
me["Simple_L2"].setText("---°"); me["Simple_L2"].setText("[ ]°");
} }
me["Simple_L3S"].setText("MAG WIND"); me["Simple_L3S"].setText("MAG WIND");
@ -4673,7 +4675,7 @@ var canvas_MCDU_base = {
var result = myDESWIND[math.abs(i-1)].returnGRND(); var result = myDESWIND[math.abs(i-1)].returnGRND();
me["Simple_L3"].setText(sprintf("%03.0f°", result[0]) ~ sprintf("/%.0f", result[1])); me["Simple_L3"].setText(sprintf("%03.0f°", result[0]) ~ sprintf("/%.0f", result[1]));
} else { } else {
me["Simple_L3"].setText("---°/---"); me["Simple_L3"].setText("[ ]°/[ ]");
} }
} }
@ -4756,14 +4758,14 @@ var canvas_MCDU_base = {
me["Simple_L5"].setText(sprintf("%3.0f", fmgc.FMGCInternal.vapp_appr)); me["Simple_L5"].setText(sprintf("%3.0f", fmgc.FMGCInternal.vapp_appr));
me.fontSizeLeft(0, 0, 0, 0, normal, 0); me.fontSizeLeft(0, 0, 0, 0, normal, 0);
} else { } else {
me["Simple_L5"].setText("[ ] "); me["Simple_L5"].setText("[ ] ");
me.fontSizeLeft(0, 0, 0, 0, small, 0); me.fontSizeLeft(0, 0, 0, 0, small, 0);
} }
} }
me["Simple_C1S"].setText("FLP RETR"); me["Simple_C1S"].setText("FLP RETR");
me["Simple_C2S"].setText("SLT RETR"); me["Simple_C2S"].setText("SLT RETR");
me["Simple_C3S"].setText(" CLEAN"); me["Simple_C3S"].setText(" CLEAN");
me["Simple_C5S"].setText("VLS"); me["Simple_C5S"].setText("VLS");
} else if (page == "PERFGA") { } else if (page == "PERFGA") {
@ -4840,7 +4842,7 @@ var canvas_MCDU_base = {
me["Simple_C1S"].setText("FLP RETR"); me["Simple_C1S"].setText("FLP RETR");
me["Simple_C2S"].setText("SLT RETR"); me["Simple_C2S"].setText("SLT RETR");
me["Simple_C3S"].setText(" CLEAN"); me["Simple_C3S"].setText(" CLEAN");
} else if (page == "WINDCLB" or page == "WINDCRZ" or page == "WINDDES" or page == "WINDHIST") { } else if (page == "WINDCLB" or page == "WINDCRZ" or page == "WINDDES" or page == "WINDHIST") {
if (!pageSwitch[i].getBoolValue()) { if (!pageSwitch[i].getBoolValue()) {
me.defaultHideWithCenter(); me.defaultHideWithCenter();