fly/A320-family
1
0
Fork 0
Code Activity

Improvements

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-20 18:50:09 +01:00
parent 5364eaf714
commit 6903e1976c
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Nasal/FMGC/flightplan-waypoints.nas
View file

@ -76,6 +76,16 @@ var WaypointDatabase = {
}
return -1;
},
# getNonNilIndex - find the first non-nil
# post 2020.1 use dedicated function vecindex()
getNonNilIndex: func() {
for (var i = 0; i < me.getSize(); i = i + 1) {
if (me.waypointsVec[i] != nil) {
return i;
}
}
return -1;
},
# getCount - return size, neglecting "nil"
getCount: func() {
var count = 0;

21
Nasal/MCDU/PILOTWAYPOINT.nas
View file

@ -23,7 +23,7 @@ var pilotWaypointPage = {
R6: [nil, nil, "ack"],
new: func(computer) {
var ap = {parents:[pilotWaypointPage]};
ap.scroll = 0;
ap.scroll = fmgc.WaypointDatabase.getNonNilIndex();
ap.computer = computer;
ap._setupPageWithData();
return ap;
@ -48,14 +48,24 @@ var pilotWaypointPage = {
translateLatitude: func(latitude) {
var split = split(".", sprintf("%s", latitude));
var degree = split[0];
var decimal = sprintf("%0.1f", split[1] * 60);
return degree ~ decimal;
if (latitude >= 0) {
var decimal = sprintf("%04.1f", (latitude - num(degree)) * 60);
return sprintf("%02.0f", degree) ~ decimal ~ "N";
} else {
var decimal = sprintf("%04.1f", (latitude - num(degree)) * 60);
return sprintf("%02.0f", degree) ~ decimal ~ "S";
}
},
translateLongitude: func(longitude) {
var split = split(".", sprintf("%s", longitude));
var degree = split[0];
var decimal = sprintf("%0.1f", split[1] * 60);
return degree ~ decimal;
if (longitude >= 0) {
var decimal = sprintf("%04.1f", (longitude - num(degree)) * 60);
return sprintf("%03.0f", degree) ~ decimal ~ "E";
} else {
var decimal = sprintf("%04.1f", (longitude - num(degree)) * 60);
return sprintf("%03.0f", degree) ~ decimal ~ "W";
}
},
scrollLeft: func() {
me.scroll -= 1;
@ -82,6 +92,7 @@ var pilotWaypointPage = {
me.arrowsColour[1][5] = "blu";
fmgc.WaypointDatabase.delete();
}
me.scroll = fmgc.WaypointDatabase.getNonNilIndex();
canvas_mcdu.pageSwitch[me.computer].setBoolValue(0);
},
};