fly/A320-family
1
0
Fork 0
Code Activity

Fix the ARRIVAL page; remove version checks for approach VIAs

Browse source
This commit is contained in:
legoboyvdlp R 2021-05-26 16:06:49 +01:00
parent 4146260147
commit bdd2c6c9fe
1 changed files with 69 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
Nasal/MCDU/ARRIVAL.nas
View file

@ -2,8 +2,6 @@ var isNoStar = [0, 0, 0];
var isNoTransArr = [0, 0, 0]; var isNoTransArr = [0, 0, 0];
var isNoVia = [0, 0, 0]; var isNoVia = [0, 0, 0];
var version = nil;
var arrivalPage = { var arrivalPage = {
title: [nil, nil, nil], title: [nil, nil, nil],
subtitle: [nil, nil], subtitle: [nil, nil],
@ -42,9 +40,11 @@ var arrivalPage = {
enableScrollApproach: 0, enableScrollApproach: 0,
enableScrollStars: 0, enableScrollStars: 0,
enableScrollVias: 0, enableScrollVias: 0,
enableScrollTrans: 0,
scrollApproach: 0, scrollApproach: 0,
scrollStars: 0, scrollStars: 0,
scrollVias: 0, scrollVias: 0,
scrollTrans: 0,
activePage: 0, # runways, stars, vias activePage: 0, # runways, stars, vias
oldPage: 0, oldPage: 0,
_approaches: nil, _approaches: nil,
@ -76,13 +76,10 @@ var arrivalPage = {
if (fmgc.flightPlanController.flightplans[2].approach != nil) { if (fmgc.flightPlanController.flightplans[2].approach != nil) {
me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach; me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach;
version = pts.Sim.Version.getValue(); if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) {
if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans;
if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) { } elsif (isNoVia[2] == 1) {
me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans; me.selectedVIA = "NO VIA";
} elsif (isNoVia[2] == 1) {
me.selectedVIA = "NO VIA";
}
} }
} }
@ -101,21 +98,15 @@ var arrivalPage = {
} else { } else {
if (fmgc.flightPlanController.flightplans[me.computer].approach != nil) { if (fmgc.flightPlanController.flightplans[me.computer].approach != nil) {
me.selectedApproach = fmgc.flightPlanController.flightplans[me.computer].approach; me.selectedApproach = fmgc.flightPlanController.flightplans[me.computer].approach;
version = pts.Sim.Version.getValue(); if (fmgc.flightPlanController.flightplans[me.computer].approach_trans != nil) {
if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { me.selectedVIA = fmgc.flightPlanController.flightplans[me.computer].approach_trans;
if (fmgc.flightPlanController.flightplans[me.computer].approach_trans != nil) { } elsif (isNoVia[me.computer] == 1) {
me.selectedVIA = fmgc.flightPlanController.flightplans[me.computer].approach_trans; me.selectedVIA = "NO VIA";
} elsif (isNoVia[me.computer] == 1) {
me.selectedVIA = "NO VIA";
}
} }
} elsif (fmgc.flightPlanController.flightplans[2].approach != nil) { } elsif (fmgc.flightPlanController.flightplans[2].approach != nil) {
me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach; me.selectedApproach = fmgc.flightPlanController.flightplans[2].approach;
version = pts.Sim.Version.getValue(); if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) {
if (version == "2020.2.0" or version == "2020.2.1" or version == "2020.3.0") { me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans;
if (fmgc.flightPlanController.flightplans[2].approach_trans != nil) {
me.selectedVIA = fmgc.flightPlanController.flightplans[2].approach_trans;
}
} }
} }
if (fmgc.flightPlanController.flightplans[me.computer].star != nil) { if (fmgc.flightPlanController.flightplans[me.computer].star != nil) {
@ -237,9 +228,6 @@ var arrivalPage = {
}, },
updateActiveVIAs: func() { updateActiveVIAs: func() {
version = pts.Sim.Version.getValue();
if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; }
if (me.selectedVIA == "NO VIA") { if (me.selectedVIA == "NO VIA") {
if (!fmgc.flightPlanController.temporaryFlag[me.computer]) { if (!fmgc.flightPlanController.temporaryFlag[me.computer]) {
me.C1 = ["NONE", "VIA", "grn"]; me.C1 = ["NONE", "VIA", "grn"];
@ -509,8 +497,6 @@ var arrivalPage = {
canvas_mcdu.pageSwitch[me.computer].setBoolValue(0); canvas_mcdu.pageSwitch[me.computer].setBoolValue(0);
}, },
updateVIAs: func() { updateVIAs: func() {
version = pts.Sim.Version.getValue();
if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; }
if (me.selectedApproach == nil or me.activePage != 2) { if (me.selectedApproach == nil or me.activePage != 2) {
me.clearVias(); me.clearVias();
return; return;
@ -617,8 +603,8 @@ var arrivalPage = {
append(me.transitions, "NO TRANS"); append(me.transitions, "NO TRANS");
if (size(me.transitions) >= 1) { if (size(me.transitions) >= 1) {
me.R3 = [me.transitions[0] ~ " ", "TRANS", "blu"]; me.R3 = [me.transitions[0 + me.scrollTrans] ~ " ", "TRANS", "blu"];
if (me.transitions[0] != me.selectedTransition) { if (me.transitions[0 + me.scrollTrans] != me.selectedTransition) {
me.arrowsMatrix[1][2] = 1; me.arrowsMatrix[1][2] = 1;
me.arrowsColour[1][2] = "blu"; me.arrowsColour[1][2] = "blu";
} else { } else {
@ -627,8 +613,8 @@ var arrivalPage = {
} }
} }
if (size(me.transitions) >= 2) { if (size(me.transitions) >= 2) {
me.R4 = [me.transitions[1] ~ " ", nil, "blu"]; me.R4 = [me.transitions[1 + me.scrollTrans] ~ " ", nil, "blu"];
if (me.transitions[1] != me.selectedTransition) { if (me.transitions[1 + me.scrollTrans] != me.selectedTransition) {
me.arrowsMatrix[1][3] = 1; me.arrowsMatrix[1][3] = 1;
me.arrowsColour[1][3] = "blu"; me.arrowsColour[1][3] = "blu";
} else { } else {
@ -637,8 +623,8 @@ var arrivalPage = {
} }
} }
if (size(me.transitions) >= 3) { if (size(me.transitions) >= 3) {
me.R5 = [me.transitions[2] ~ " ", nil, "blu"]; me.R5 = [me.transitions[2 + me.scrollTrans] ~ " ", nil, "blu"];
if (me.transitions[2] != me.selectedTransition) { if (me.transitions[2 + me.scrollTrans] != me.selectedTransition) {
me.arrowsMatrix[1][4] = 1; me.arrowsMatrix[1][4] = 1;
me.arrowsColour[1][4] = "blu"; me.arrowsColour[1][4] = "blu";
} else { } else {
@ -647,7 +633,9 @@ var arrivalPage = {
} }
} }
# no indication it is scrollable... if (size(me.transitions) > 3) {
me.enableScrollTrans = 1;
}
canvas_mcdu.pageSwitch[me.computer].setBoolValue(0); canvas_mcdu.pageSwitch[me.computer].setBoolValue(0);
}, },
makeTmpy: func() { makeTmpy: func() {
@ -683,15 +671,25 @@ var arrivalPage = {
me.updateApproaches(); me.updateApproaches();
} }
} elsif (me.activePage == 1) { } elsif (me.activePage == 1) {
if (me.enableScrollStars) { if (me.selectedSTAR == nil) {
me.scrollStars += 1; if (me.enableScrollStars) {
if (me.scrollStars > size(me.stars) - 3) { me.scrollStars += 1;
me.scrollStars = 0; if (me.scrollStars > size(me.stars) - 3) {
me.scrollStars = 0;
}
me.updateSTARs();
if (me.selectedSTAR == nil or me.selectedSTAR == "NO STAR") {
me.clearTransitions();
} else {
me.updateTransitions();
}
} }
me.updateSTARs(); } else {
if (me.selectedSTAR == nil or me.selectedSTAR == "NO STAR") { if (me.enableScrollTrans) {
me.clearTransitions(); me.scrollTrans += 1;
} else { if (me.scrollTrans > size(me.transitions) - 4) {
me.scrollTrans = 0;
}
me.updateTransitions(); me.updateTransitions();
} }
} }
@ -716,15 +714,25 @@ var arrivalPage = {
me.updateApproaches(); me.updateApproaches();
} }
} elsif (me.activePage == 1) { } elsif (me.activePage == 1) {
if (me.enableScrollStars) { if (me.selectedSTAR == nil) {
me.scrollStars -= 1; if (me.enableScrollStars) {
if (me.scrollStars < 0) { me.scrollStars -= 1;
me.scrollStars = size(me.stars) - 3; if (me.scrollStars < 0) {
me.scrollStars = size(me.stars) - 3;
}
me.updateSTARs();
if (me.selectedSTAR == nil or me.selectedSTAR == "NO STAR") {
me.clearTransitions();
} else {
me.updateTransitions();
}
} }
me.updateSTARs(); } else {
if (me.selectedSTAR == nil or me.selectedSTAR == "NO STAR") { if (me.enableScrollTrans) {
me.clearTransitions(); me.scrollTrans -= 1;
} else { if (me.scrollTrans < 0) {
me.scrollTrans = size(me.transitions) - 4;
}
me.updateTransitions(); me.updateTransitions();
} }
} }
@ -753,8 +761,6 @@ var arrivalPage = {
}, },
arrPushbuttonLeft: func(index) { arrPushbuttonLeft: func(index) {
if (index == 2 and me.activePage == 1 and me.selectedApproach != nil) { if (index == 2 and me.activePage == 1 and me.selectedApproach != nil) {
version = pts.Sim.Version.getValue();
if (version != "2020.2.0" and version != "2020.2.1" and version != "2020.3.0") { return; }
me.oldPage = me.activePage; me.oldPage = me.activePage;
me.activePage = 2; me.activePage = 2;
me.updatePage(); me.updatePage();
@ -773,6 +779,14 @@ var arrivalPage = {
if (size(me.approaches) >= (index - 2) and index != 2) { # index = 3, size = 1 if (size(me.approaches) >= (index - 2) and index != 2) { # index = 3, size = 1
if (!dirToFlag) { if (!dirToFlag) {
me.selectedVIA = nil; me.selectedVIA = nil;
fmgc.flightPlanController.flightplans[me.computer].approach_trans = nil;
me.scrollVias = 0;
me.selectedSTAR = nil;
fmgc.flightPlanController.flightplans[me.computer].star = nil;
me.scrollStars = 0;
me.selectedTransition = nil;
fmgc.flightPlanController.flightplans[me.computer].star_trans = nil;
me.scrollTrans = 0;
isNoTransArr[me.computer] = 0; isNoTransArr[me.computer] = 0;
isNoStar[me.computer] = 0; isNoStar[me.computer] = 0;
me.makeTmpy(); me.makeTmpy();
@ -815,8 +829,11 @@ var arrivalPage = {
} }
} }
me.updateSTARs(); me.updateSTARs();
me.scrollTrans = 0;
if (me.selectedSTAR != "NO STAR") { if (me.selectedSTAR != "NO STAR") {
isNoTransArr[me.computer] = 0; isNoTransArr[me.computer] = 0;
me.selectedTransition = nil;
fmgc.flightPlanController.flightplans[me.computer].star_trans = nil;
} else { } else {
isNoTransArr[me.computer] = 1; isNoTransArr[me.computer] = 1;
me.selectedTransition = "NO TRANS"; me.selectedTransition = "NO TRANS";
@ -857,7 +874,7 @@ var arrivalPage = {
arrPushbuttonRight: func(index) { arrPushbuttonRight: func(index) {
if (size(me.transitions) >= (index - 2)) { if (size(me.transitions) >= (index - 2)) {
if (!dirToFlag) { if (!dirToFlag) {
me.selectedTransition = me.transitions[index - 3]; me.selectedTransition = me.transitions[index - 3 + me.scrollTrans];
me.makeTmpy(); me.makeTmpy();
if (me.selectedTransition != "NO TRANS") { if (me.selectedTransition != "NO TRANS") {
isNoTransArr[me.computer] = 0; isNoTransArr[me.computer] = 0;