fly/A320-family
1
0
Fork 0
Code Activity

Merge branch 'dev' into 3D

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

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

@ -4312,6 +4312,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");
@ -4327,7 +4328,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");
@ -4335,7 +4336,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 ");
@ -4424,10 +4425,10 @@ var canvas_MCDU_base = {
} }
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);
@ -4897,6 +4898,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");
@ -4932,7 +4934,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");
@ -4946,7 +4948,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("[ ]°/[ ]");
} }
} }