fly/fgdata
1
0
Fork 0
Code Activity

NavDisplay: fix route drawing

Browse source
This commit is contained in:
Gijs de Rooy 2014-02-13 19:36:27 +01:00
parent 38b916a18c
commit 69280a75c9
1 changed files with 56 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Nasal/canvas/map/route.draw
View file

@ -6,9 +6,9 @@
var wp = []; var wp = [];
var text_wp = []; var text_wp = [];
# Change color of active waypoints # Change color of active waypoints
var updatewp = func(activeWp) var updatewp = func(activeWp)
{ {
forindex(var i; wp) { forindex(var i; wp) {
if(i == activeWp) { if(i == activeWp) {
wp[i].setColor(1,0,1); wp[i].setColor(1,0,1);
@ -18,7 +18,7 @@ var text_wp = [];
#text_wp[i].setColor(1,1,1); #text_wp[i].setColor(1,1,1);
} }
} }
}; };
var draw_route = func (group, theroute, controller=nil, lod=0) var draw_route = func (group, theroute, controller=nil, lod=0)
{ {
@ -45,17 +45,24 @@ var draw_route = func (group, theroute, controller=nil, lod=0)
{ {
if (i == 0) { if (i == 0) {
var leg = fp.getWP(1); var leg = fp.getWP(1);
append(coords,"N"~leg.path()[0].lat); foreach (var pt; leg.path()) {
append(coords,"E"~leg.path()[0].lon); append(coords,"N"~pt.lat);
append(coords,"E"~pt.lon);
if (i==0){
append(cmds,2); append(cmds,2);
canvas.drawwp(group, leg.path()[0].lat, leg.path()[0].lon, fp.getWP(0).alt_cstr, fp.getWP(0).wp_name, i, wp);
i+=1; i+=1;
} else
append(cmds,4);
}
canvas.drawwp(group, leg.path()[0].lat, leg.path()[0].lon, fp.getWP(0).alt_cstr, fp.getWP(0).wp_name, i, wp);
} }
var leg = fp.getWP(i); var leg = fp.getWP(i);
append(coords,"N"~leg.path()[1].lat); foreach (var pt; leg.path()) {
append(coords,"E"~leg.path()[1].lon); append(coords,"N"~pt.lat);
append(coords,"E"~pt.lon);
append(cmds,4); append(cmds,4);
canvas.drawwp(group, leg.path()[1].lat, leg.path()[1].lon, leg.alt_cstr, leg.wp_name, i, wp); }
canvas.drawwp(group, leg.path()[-1].lat, leg.path()[-1].lon, leg.alt_cstr, leg.wp_name, i, wp);
} }
# Set Top Of Climb coordinate # Set Top Of Climb coordinate