DU: Many bugs in ND fixed
This commit is contained in:
parent
e2b32df4fb
commit
1e1eb44911
24 changed files with 863 additions and 836 deletions
Models/Instruments/ND/canvas
A3XX_ND.nasA3XX_ND_drivers.nasND_config.nashelpers.nasloaders.nas
map
ALT-profile.scontrollerAPS.scontrollerAPT.scontrollerDEBUG.lcontrollerDEBUG.symbolDECEL.lcontrollerDECEL.scontrollerDECEL.symbolRTE.scontrollerRWY-profile.symbolSPD-profile.lcontrollerSPD-profile.scontrollerSPD-profile.symbolVOR-airbus.lcontrollerVOR-airbus.symbolWPT-airbus.lcontrollerWPT-airbus.symbol
style.nasNasal
|
@ -5,8 +5,8 @@
|
|||
# Copyright (c) 2019 Joshua Davidson (it0uchpods)
|
||||
|
||||
var get_local_path = func(file){
|
||||
var aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1];
|
||||
return "Aircraft/" ~ aircraft_dir ~ "/Models/Instruments/ND/canvas/"~ file;
|
||||
var aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1];
|
||||
return "Aircraft/" ~ aircraft_dir ~ "/Models/Instruments/ND/canvas/"~ file;
|
||||
};
|
||||
|
||||
var version = getprop("sim/version/flightgear");
|
||||
|
|
|
@ -5,107 +5,118 @@
|
|||
# Copyright (c) 2019 Joshua Davidson (it0uchpods)
|
||||
|
||||
var A3XXRouteDriver = {
|
||||
new: func(){
|
||||
var m = {
|
||||
parents: [A3XXRouteDriver],
|
||||
};
|
||||
m.init();
|
||||
return m;
|
||||
},
|
||||
init: func(){
|
||||
me.update();
|
||||
},
|
||||
update: func(){
|
||||
me.flightplan = fmgc.r1;
|
||||
},
|
||||
getNumberOfFlightPlans: func(){1},
|
||||
getFlightPlanType: func(fpNum){"current"},
|
||||
getFlightPlan: func(fpNum){me.flightplan},
|
||||
getPlanSize: func(fpNum){me.flightplan.getPlanSize()},
|
||||
getWP: func(fpNum, idx){me.flightplan.getWP(idx)},
|
||||
getPlanModeWP: func(plan_wp_idx){me.flightplan.getWP(plan_wp_idx)},
|
||||
hasDiscontinuity: func(fpNum, wptID){0},
|
||||
getListeners: func(){[]},
|
||||
shouldUpdate: func 1
|
||||
new: func(){
|
||||
var m = {
|
||||
parents: [A3XXRouteDriver],
|
||||
};
|
||||
m.init();
|
||||
return m;
|
||||
},
|
||||
init: func(){
|
||||
me.update();
|
||||
},
|
||||
update: func(){
|
||||
me.flightplan = fmgc.r1;
|
||||
},
|
||||
getNumberOfFlightPlans: func(){1},
|
||||
getFlightPlanType: func(fpNum){"current"},
|
||||
getFlightPlan: func(fpNum){me.flightplan},
|
||||
getPlanSize: func(fpNum){me.flightplan.getPlanSize()},
|
||||
getWP: func(fpNum, idx){me.flightplan.getWP(idx)},
|
||||
getPlanModeWP: func(plan_wp_idx){me.flightplan.getWP(plan_wp_idx)},
|
||||
hasDiscontinuity: func(fpNum, wptID){0},
|
||||
triggerSignal: func(signal){
|
||||
setprop(me.signalPath(signal),1);
|
||||
setprop(me.signalPath(signal),0);
|
||||
},
|
||||
signalPath: func(signal){
|
||||
"autopilot/route-manager/signals/rd-"~ signal;
|
||||
},
|
||||
getListeners: func(){[
|
||||
me.signalPath("fp-added"),
|
||||
me.signalPath("fp-removed")
|
||||
]},
|
||||
shouldUpdate: func 1
|
||||
};
|
||||
|
||||
var MultiA3XXRouteDriver = {
|
||||
parents: [A3XXRouteDriver],
|
||||
new: func(){
|
||||
var m = {
|
||||
parents: [MultiA3XXRouteDriver],
|
||||
_flightplans: [],
|
||||
currentFlightPlan: 0
|
||||
};
|
||||
m.init();
|
||||
return m;
|
||||
},
|
||||
addFlightPlan: func(type, plan){
|
||||
append(me._flightplans, {
|
||||
type: type,
|
||||
flightplan: plan
|
||||
});
|
||||
},
|
||||
removeFlightPlanAtIndex: func(idx){
|
||||
var sz = size(me._flightplans);
|
||||
if(idx < sz){
|
||||
if(sz == 1)
|
||||
me._flightplans = [];
|
||||
elsif(sz == 2 and idx == 0)
|
||||
me._flightplans = [me._flightplans[1]];
|
||||
elsif(sz == 2 and idx == 1)
|
||||
pop(me._flightplans);
|
||||
else {
|
||||
var subv_l = subvec(me._flightplans, 0, idx);
|
||||
var subv_r = subvec(me._flightplans, idx + 1);
|
||||
me._flightplans = subv_l ~ subv_r;
|
||||
}
|
||||
}
|
||||
me.triggerSignal("fp-added");
|
||||
},
|
||||
removeFlightPlanOfType: func(type){
|
||||
var new_vec = [];
|
||||
foreach(var fp; me._flightplans){
|
||||
if(fp["type"] != type)
|
||||
append(new_vec, fp);
|
||||
}
|
||||
me._flightplans = new_vec;
|
||||
me.triggerSignal("fp-removed");
|
||||
},
|
||||
getNumberOfFlightPlans: func(){
|
||||
size(me._flightplans);
|
||||
},
|
||||
getFlightPlanType: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[fpNum];
|
||||
return fp.type;
|
||||
},
|
||||
getFlightPlan: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
return me._flightplans[fpNum];
|
||||
},
|
||||
getPlanSize: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return 0;
|
||||
return me._flightplans[fpNum].getPlanSize();
|
||||
},
|
||||
getWP: func(fpNum, idx){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[fpNum].getPlanSize();
|
||||
return fp.getWP(idx);
|
||||
},
|
||||
getPlanModeWP: func(idx){
|
||||
if(me.currentFlightPlan >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[me.currentFlightPlan];
|
||||
return fp.getWP(idx);
|
||||
},
|
||||
triggerSignal: func(signal){
|
||||
setprop(me.signalPath(signal));
|
||||
},
|
||||
signalPath: func(signal){
|
||||
"autopilot/route-manager/signals/rd-"~ signal;
|
||||
},
|
||||
getListeners: func(){[
|
||||
me.getSignal("fp-added"),
|
||||
me.getSignal("fp-removed")
|
||||
]}
|
||||
parents: [A3XXRouteDriver],
|
||||
new: func(){
|
||||
var m = {
|
||||
parents: [MultiA3XXRouteDriver],
|
||||
_flightplans: [],
|
||||
currentFlightPlan: 0
|
||||
};
|
||||
m.init();
|
||||
return m;
|
||||
},
|
||||
addFlightPlan: func(type, plan){
|
||||
append(me._flightplans, {
|
||||
type: type,
|
||||
flightplan: plan
|
||||
});
|
||||
},
|
||||
removeFlightPlanAtIndex: func(idx){
|
||||
var sz = size(me._flightplans);
|
||||
if(idx < sz){
|
||||
if(sz == 1)
|
||||
me._flightplans = [];
|
||||
elsif(sz == 2 and idx == 0)
|
||||
me._flightplans = [me._flightplans[1]];
|
||||
elsif(sz == 2 and idx == 1)
|
||||
pop(me._flightplans);
|
||||
else {
|
||||
var subv_l = subvec(me._flightplans, 0, idx);
|
||||
var subv_r = subvec(me._flightplans, idx + 1);
|
||||
me._flightplans = subv_l ~ subv_r;
|
||||
}
|
||||
}
|
||||
me.triggerSignal("fp-added");
|
||||
},
|
||||
removeFlightPlanOfType: func(type){
|
||||
var new_vec = [];
|
||||
foreach(var fp; me._flightplans){
|
||||
if(fp["type"] != type)
|
||||
append(new_vec, fp);
|
||||
}
|
||||
me._flightplans = new_vec;
|
||||
me.triggerSignal("fp-removed");
|
||||
},
|
||||
getNumberOfFlightPlans: func(){
|
||||
size(me._flightplans);
|
||||
},
|
||||
getFlightPlanType: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[fpNum];
|
||||
return fp.type;
|
||||
},
|
||||
getFlightPlan: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
return me._flightplans[fpNum];
|
||||
},
|
||||
getPlanSize: func(fpNum){
|
||||
if(fpNum >= size(me._flightplans)) return 0;
|
||||
return me._flightplans[fpNum].getPlanSize();
|
||||
},
|
||||
getWP: func(fpNum, idx){
|
||||
if(fpNum >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[fpNum].getPlanSize();
|
||||
return fp.getWP(idx);
|
||||
},
|
||||
getPlanModeWP: func(idx){
|
||||
if(me.currentFlightPlan >= size(me._flightplans)) return nil;
|
||||
var fp = me._flightplans[me.currentFlightPlan];
|
||||
return fp.getWP(idx);
|
||||
},
|
||||
triggerSignal: func(signal){
|
||||
setprop(me.signalPath(signal), 1);
|
||||
setprop(me.signalPath(signal), 0);
|
||||
},
|
||||
signalPath: func(signal){
|
||||
"autopilot/route-manager/signals/rd-"~ signal;
|
||||
},
|
||||
getListeners: func(){[
|
||||
me.getSignal("fp-added"),
|
||||
me.getSignal("fp-removed")
|
||||
]}
|
||||
};
|
||||
|
|
|
@ -5,23 +5,23 @@
|
|||
# Copyright (c) 2019 Joshua Davidson (it0uchpods)
|
||||
|
||||
canvas.NDConfig = {
|
||||
properties: {
|
||||
des_apt: "/autopilot/route-manager/destination/airport",
|
||||
dep_apt: "/autopilot/route-manager/departure/airport",
|
||||
des_rwy: "/autopilot/route-manager/destination/runway",
|
||||
dep_rwy: "/autopilot/route-manager/departure/runway",
|
||||
fplan_active: "autopilot/route-manager/active",
|
||||
athr: "/it-autoflight/output/athr",
|
||||
cur_wp: "/autopilot/route-manager/current-wp",
|
||||
vnav_node: "/autopilot/route-manager/vnav/",
|
||||
spd_node: "/autopilot/route-manager/spd/",
|
||||
holding: "/flight-management/hold",
|
||||
holding_points: "/flight-management/hold/points",
|
||||
adf1_frq: "instrumentation/adf[0]/frequencies/selected-khz",
|
||||
adf2_frq: "instrumentation/adf[1]/frequencies/selected-khz",
|
||||
nav1_frq: "instrumentation/nav[0]/frequencies/selected-mhz",
|
||||
nav2_frq: "instrumentation/nav[1]/frequencies/selected-mhz",
|
||||
lat_ctrl: "/it-autoflight/output/lat",
|
||||
ver_ctrl: "/it-autoflight/output/vert",
|
||||
}
|
||||
properties: {
|
||||
des_apt: "/autopilot/route-manager/destination/airport",
|
||||
dep_apt: "/autopilot/route-manager/departure/airport",
|
||||
des_rwy: "/autopilot/route-manager/destination/runway",
|
||||
dep_rwy: "/autopilot/route-manager/departure/runway",
|
||||
fplan_active: "autopilot/route-manager/active",
|
||||
athr: "/it-autoflight/output/athr",
|
||||
cur_wp: "/autopilot/route-manager/current-wp",
|
||||
vnav_node: "/autopilot/route-manager/vnav/",
|
||||
spd_node: "/autopilot/route-manager/spd/",
|
||||
holding: "/flight-management/hold",
|
||||
holding_points: "/flight-management/hold/points",
|
||||
adf1_frq: "instrumentation/adf[0]/frequencies/selected-khz",
|
||||
adf2_frq: "instrumentation/adf[1]/frequencies/selected-khz",
|
||||
nav1_frq: "instrumentation/nav[0]/frequencies/selected-mhz",
|
||||
nav2_frq: "instrumentation/nav[1]/frequencies/selected-mhz",
|
||||
lat_ctrl: "/it-autoflight/output/lat",
|
||||
ver_ctrl: "/it-autoflight/output/vert",
|
||||
}
|
||||
};
|
||||
|
|
|
@ -5,141 +5,141 @@
|
|||
# Copyright (c) 2019 Joshua Davidson (it0uchpods)
|
||||
|
||||
var SymbolPainter = {
|
||||
aircraft_dir: nil,
|
||||
getOpts: func(opts){
|
||||
if(opts == nil) opts = {};
|
||||
var defOpts = {id:nil,color:nil,scale:1,create_group:0,update_center:0};
|
||||
if(contains(opts, "id"))
|
||||
defOpts.id = opts.id;
|
||||
if(contains(opts, "color"))
|
||||
defOpts.color = opts.color;
|
||||
if(contains(opts, "scale"))
|
||||
defOpts.scale = opts.scale;
|
||||
if(contains(opts, "create_group"))
|
||||
defOpts.create_group = opts.create_group;
|
||||
if(contains(opts, "update_center"))
|
||||
defOpts.update_center = opts.update_center;
|
||||
return defOpts;
|
||||
},
|
||||
getAircraftDir: func(){
|
||||
if(me.aircraft_dir == nil)
|
||||
me.aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1];
|
||||
return me.aircraft_dir;
|
||||
},
|
||||
svgPath: func(file){
|
||||
return "Aircraft/" ~ me.getAircraftDir() ~ "/Models/Instruments/ND/canvas/res/"~file;
|
||||
},
|
||||
drawFIX : func(grp, opts = nil){
|
||||
var icon_fix = nil;
|
||||
opts = me.getOpts(opts);
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
icon_fix = grp.createChild("path", sym_id);
|
||||
else
|
||||
icon_fix = grp.createChild("path");
|
||||
var color = opts.color;
|
||||
if(color == nil){
|
||||
color = {
|
||||
r: 0.69,
|
||||
g: 0,
|
||||
b: 0.39
|
||||
};
|
||||
}
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
icon_fix.moveTo(-10,0)
|
||||
.lineTo(0,-17)
|
||||
.lineTo(10,0)
|
||||
.lineTo(0,17)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(color.r,color.g,color.b)
|
||||
.setScale(scale,scale);
|
||||
return icon_fix;
|
||||
},
|
||||
drawVOR: func(grp, opts = nil){
|
||||
opts = me.getOpts(opts);
|
||||
if(opts.create_group){
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
grp = grp.createChild("group", sym_id);
|
||||
else
|
||||
grp = grp.createChild("group");
|
||||
}
|
||||
var svg_path = me.svgPath("airbus_vor.svg");
|
||||
canvas.parsesvg(grp, svg_path);
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
grp.setScale(scale,scale);
|
||||
if(opts.update_center)
|
||||
grp.setTranslation(-24 * scale,-24 * scale);
|
||||
if(!contains(grp, "setColor")){
|
||||
grp.setColor = func {
|
||||
var layer1 = grp.getElementById("layer1");
|
||||
if(layer1 == nil) return;
|
||||
var children = layer1.getChildren();
|
||||
foreach(var c; children){
|
||||
if(isa(c, canvas.Path))
|
||||
c.setColor(arg);
|
||||
}
|
||||
};
|
||||
}
|
||||
return grp;
|
||||
},
|
||||
drawNDB: func(grp, opts = nil){
|
||||
var icon_ndb = nil;
|
||||
opts = me.getOpts(opts);
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
icon_ndb = grp.createChild("path", sym_id);
|
||||
else
|
||||
icon_ndb = grp.createChild("path");
|
||||
var color = opts.color;
|
||||
var color = opts.color;
|
||||
if(color == nil){
|
||||
color = {
|
||||
r: 0.69,
|
||||
g: 0,
|
||||
b: 0.39
|
||||
};
|
||||
}
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
icon_ndb.moveTo(-15,15)
|
||||
.lineTo(0,-15)
|
||||
.lineTo(15,15)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(color.r,color.g,color.b)
|
||||
.setScale(scale,scale);
|
||||
return icon_ndb;
|
||||
},
|
||||
drawAirport: func(grp, opts = nil){
|
||||
opts = me.getOpts(opts);
|
||||
if(opts.create_group){
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
grp = grp.createChild("group", sym_id);
|
||||
else
|
||||
grp = grp.createChild("group");
|
||||
}
|
||||
var svg_path = me.svgPath("airbus_airport.svg");
|
||||
canvas.parsesvg(grp, svg_path);
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
grp.setScale(scale,scale);
|
||||
if(opts.update_center)
|
||||
grp.setTranslation(-24 * scale,-24 * scale);
|
||||
return grp;
|
||||
},
|
||||
draw: func(type, grp, opts = nil){
|
||||
if(type == "VOR" or type == "vor")
|
||||
return me.drawVOR(grp, opts);
|
||||
elsif(type == "NDB" or type == "ndb")
|
||||
return me.drawNDB(grp, opts);
|
||||
elsif(type == "ARPT" or type == "arpt")
|
||||
return me.drawAirport(grp, opts);
|
||||
else
|
||||
return me.drawFIX(grp, opts);
|
||||
}
|
||||
aircraft_dir: nil,
|
||||
getOpts: func(opts){
|
||||
if(opts == nil) opts = {};
|
||||
var defOpts = {id:nil,color:nil,scale:1,create_group:0,update_center:0};
|
||||
if(contains(opts, "id"))
|
||||
defOpts.id = opts.id;
|
||||
if(contains(opts, "color"))
|
||||
defOpts.color = opts.color;
|
||||
if(contains(opts, "scale"))
|
||||
defOpts.scale = opts.scale;
|
||||
if(contains(opts, "create_group"))
|
||||
defOpts.create_group = opts.create_group;
|
||||
if(contains(opts, "update_center"))
|
||||
defOpts.update_center = opts.update_center;
|
||||
return defOpts;
|
||||
},
|
||||
getAircraftDir: func(){
|
||||
if(me.aircraft_dir == nil)
|
||||
me.aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1];
|
||||
return me.aircraft_dir;
|
||||
},
|
||||
svgPath: func(file){
|
||||
return "Aircraft/" ~ me.getAircraftDir() ~ "/Models/Instruments/ND/canvas/res/"~file;
|
||||
},
|
||||
drawFIX : func(grp, opts = nil){
|
||||
var icon_fix = nil;
|
||||
opts = me.getOpts(opts);
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
icon_fix = grp.createChild("path", sym_id);
|
||||
else
|
||||
icon_fix = grp.createChild("path");
|
||||
var color = opts.color;
|
||||
if(color == nil){
|
||||
color = {
|
||||
r: 0.69,
|
||||
g: 0,
|
||||
b: 0.39
|
||||
};
|
||||
}
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
icon_fix.moveTo(-10,0)
|
||||
.lineTo(0,-17)
|
||||
.lineTo(10,0)
|
||||
.lineTo(0,17)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(color.r,color.g,color.b)
|
||||
.setScale(scale,scale);
|
||||
return icon_fix;
|
||||
},
|
||||
drawVOR: func(grp, opts = nil){
|
||||
opts = me.getOpts(opts);
|
||||
if(opts.create_group){
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
grp = grp.createChild("group", sym_id);
|
||||
else
|
||||
grp = grp.createChild("group");
|
||||
}
|
||||
var svg_path = me.svgPath("airbus_vor.svg");
|
||||
canvas.parsesvg(grp, svg_path);
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
grp.setScale(scale,scale);
|
||||
if(opts.update_center)
|
||||
grp.setTranslation(-24 * scale,-24 * scale);
|
||||
if(!contains(grp, "setColor")){
|
||||
grp.setColor = func {
|
||||
var layer1 = grp.getElementById("layer1");
|
||||
if(layer1 == nil) return;
|
||||
var children = layer1.getChildren();
|
||||
foreach(var c; children){
|
||||
if(isa(c, canvas.Path))
|
||||
c.setColor(arg);
|
||||
}
|
||||
};
|
||||
}
|
||||
return grp;
|
||||
},
|
||||
drawNDB: func(grp, opts = nil){
|
||||
var icon_ndb = nil;
|
||||
opts = me.getOpts(opts);
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
icon_ndb = grp.createChild("path", sym_id);
|
||||
else
|
||||
icon_ndb = grp.createChild("path");
|
||||
var color = opts.color;
|
||||
var color = opts.color;
|
||||
if(color == nil){
|
||||
color = {
|
||||
r: 0.69,
|
||||
g: 0,
|
||||
b: 0.39
|
||||
};
|
||||
}
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
icon_ndb.moveTo(-15,15)
|
||||
.lineTo(0,-15)
|
||||
.lineTo(15,15)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(color.r,color.g,color.b)
|
||||
.setScale(scale,scale);
|
||||
return icon_ndb;
|
||||
},
|
||||
drawAirport: func(grp, opts = nil){
|
||||
opts = me.getOpts(opts);
|
||||
if(opts.create_group){
|
||||
var sym_id = opts.id;
|
||||
if(sym_id != nil)
|
||||
grp = grp.createChild("group", sym_id);
|
||||
else
|
||||
grp = grp.createChild("group");
|
||||
}
|
||||
var svg_path = me.svgPath("airbus_airport.svg");
|
||||
canvas.parsesvg(grp, svg_path);
|
||||
var scale = opts.scale;
|
||||
if(scale == nil) scale = 0.8;
|
||||
grp.setScale(scale,scale);
|
||||
if(opts.update_center)
|
||||
grp.setTranslation(-24 * scale,-24 * scale);
|
||||
return grp;
|
||||
},
|
||||
draw: func(type, grp, opts = nil){
|
||||
if(type == "VOR" or type == "vor")
|
||||
return me.drawVOR(grp, opts);
|
||||
elsif(type == "NDB" or type == "ndb")
|
||||
return me.drawNDB(grp, opts);
|
||||
elsif(type == "ARPT" or type == "arpt")
|
||||
return me.drawAirport(grp, opts);
|
||||
else
|
||||
return me.drawFIX(grp, opts);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -10,78 +10,78 @@ version = num(v[0]~"."~v[1]);
|
|||
|
||||
setlistener("/nasal/canvas/loaded", func() {
|
||||
|
||||
####### LOAD FILES #######
|
||||
#print("loading files");
|
||||
(func {
|
||||
var aircraft_root = getprop("/sim/aircraft-dir");
|
||||
####### LOAD FILES #######
|
||||
#print("loading files");
|
||||
(func {
|
||||
var aircraft_root = getprop("/sim/aircraft-dir");
|
||||
|
||||
var load = func(file, name) {
|
||||
#print("Loading ..." ~ file);
|
||||
if (name == nil)
|
||||
var name = split("/", file)[-1];
|
||||
if (substr(name, size(name)-4) == ".draw")
|
||||
name = substr(name, 0, size(name)-5);
|
||||
#print("reading file");
|
||||
var code = io.readfile(file);
|
||||
#print("compiling file");
|
||||
# This segfaults for some reason:
|
||||
#var code = call(compile, [code], var err=[]);
|
||||
var code = call(func compile(code, file), [code], var err=[]);
|
||||
if (size(err)) {
|
||||
#print("handling error");
|
||||
if (substr(err[0], 0, 12) == "Parse error:") { # hack around Nasal feature
|
||||
var e = split(" at line ", err[0]);
|
||||
if (size(e) == 2)
|
||||
err[0] = string.join("", [e[0], "\n at ", file, ", line ", e[1], "\n "]);
|
||||
}
|
||||
for (var i = 1; (var c = caller(i)) != nil; i += 1)
|
||||
err ~= subvec(c, 2, 2);
|
||||
debug.printerror(err);
|
||||
return;
|
||||
}
|
||||
#print("calling code");
|
||||
call(code, nil, nil, var hash = {});
|
||||
#debug.dump(keys(hash));
|
||||
return hash;
|
||||
};
|
||||
var load = func(file, name) {
|
||||
#print("Loading ..." ~ file);
|
||||
if (name == nil)
|
||||
var name = split("/", file)[-1];
|
||||
if (substr(name, size(name)-4) == ".draw")
|
||||
name = substr(name, 0, size(name)-5);
|
||||
#print("reading file");
|
||||
var code = io.readfile(file);
|
||||
#print("compiling file");
|
||||
# This segfaults for some reason:
|
||||
#var code = call(compile, [code], var err=[]);
|
||||
var code = call(func compile(code, file), [code], var err=[]);
|
||||
if (size(err)) {
|
||||
#print("handling error");
|
||||
if (substr(err[0], 0, 12) == "Parse error:") { # hack around Nasal feature
|
||||
var e = split(" at line ", err[0]);
|
||||
if (size(e) == 2)
|
||||
err[0] = string.join("", [e[0], "\n at ", file, ", line ", e[1], "\n "]);
|
||||
}
|
||||
for (var i = 1; (var c = caller(i)) != nil; i += 1)
|
||||
err ~= subvec(c, 2, 2);
|
||||
debug.printerror(err);
|
||||
return;
|
||||
}
|
||||
#print("calling code");
|
||||
call(code, nil, nil, var hash = {});
|
||||
#debug.dump(keys(hash));
|
||||
return hash;
|
||||
};
|
||||
|
||||
var load_deps = func(name) {
|
||||
print("Loading MapStructure Layer: "~ name);
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".lcontroller", name);
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".symbol", name);
|
||||
if(version < 3.2)
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".scontroller", name);
|
||||
}
|
||||
var load_deps = func(name) {
|
||||
print("Loading MapStructure Layer: "~ name);
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".lcontroller", name);
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".symbol", name);
|
||||
if(version < 3.2)
|
||||
load(aircraft_root~"/Models/Instruments/ND/map/"~name~".scontroller", name);
|
||||
}
|
||||
|
||||
#foreach( var name; ["APS","ALT-profile","SPD-profile","RTE","WPT","DECEL","NDB"] )
|
||||
#load_deps( name );
|
||||
var dep_names = [
|
||||
# With these extensions, in this order:
|
||||
"lcontroller",
|
||||
"symbol",
|
||||
"scontroller",
|
||||
"controller",
|
||||
];
|
||||
var map_root = aircraft_root~"/Models/Instruments/ND/canvas/map/";
|
||||
var files = directory(map_root);
|
||||
var deps = {};
|
||||
foreach (var d; dep_names) deps[d] = [];
|
||||
foreach(var f; files){
|
||||
var ext = size(var s=split(".", f)) > 1 ? s[-1] : nil;
|
||||
foreach (var d; dep_names) {
|
||||
if (ext == d) {
|
||||
append(deps[d], f);
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
#foreach( var name; ["APS","ALT-profile","SPD-profile","RTE","WPT","DECEL","NDB"] )
|
||||
#load_deps( name );
|
||||
var dep_names = [
|
||||
# With these extensions, in this order:
|
||||
"lcontroller",
|
||||
"symbol",
|
||||
"scontroller",
|
||||
"controller",
|
||||
];
|
||||
var map_root = aircraft_root~"/Models/Instruments/ND/canvas/map/";
|
||||
var files = directory(map_root);
|
||||
var deps = {};
|
||||
foreach (var d; dep_names) deps[d] = [];
|
||||
foreach(var f; files){
|
||||
var ext = size(var s=split(".", f)) > 1 ? s[-1] : nil;
|
||||
foreach (var d; dep_names) {
|
||||
if (ext == d) {
|
||||
append(deps[d], f);
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var d; dep_names) {
|
||||
foreach (var f; deps[d]) {
|
||||
var name = split(".", f)[0];
|
||||
load(map_root~f, name);
|
||||
}
|
||||
}
|
||||
foreach (var d; dep_names) {
|
||||
foreach (var f; deps[d]) {
|
||||
var name = split(".", f)[0];
|
||||
load(map_root~f, name);
|
||||
}
|
||||
}
|
||||
|
||||
})();
|
||||
|
||||
|
|
|
@ -8,5 +8,5 @@ var new = func(model) ; # this controller doesn't need an instance
|
|||
var LayerController = SymbolLayer.Controller.registry[name];
|
||||
var isActive = func(model) {return 1};#LayerController.a_instance.isActive(model);
|
||||
var query_range = func()
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
#var model = props.globals.getNode('/position');
|
||||
|
|
|
@ -8,5 +8,5 @@ var new = func(model) ; # this controller doesn't need an instance
|
|||
var LayerController = canvas.SymbolLayer.Controller.registry[name];
|
||||
var isActive = func(model) {return 1};#LayerController.a_instance.isActive(model);
|
||||
var query_range = func()
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
#var model = props.globals.getNode('/position');
|
||||
|
|
|
@ -11,6 +11,6 @@ var query_range = func()
|
|||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
|
||||
var getpos = func(model){
|
||||
[model.lat, model.lon];
|
||||
[model.lat, model.lon];
|
||||
}
|
||||
|
||||
|
|
|
@ -6,66 +6,66 @@ var __self__ = caller(0)[0];
|
|||
|
||||
canvas.SymbolLayer.Controller.add(name, __self__);
|
||||
canvas.SymbolLayer.add(name, {
|
||||
parents: [canvas.MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: {
|
||||
update_t : 'autopilot/route-manager/debug/update_t',
|
||||
listen: ['update_t']
|
||||
},
|
||||
df_style: {
|
||||
default_color: [1,0,0],
|
||||
}
|
||||
parents: [canvas.MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: {
|
||||
update_t : 'autopilot/route-manager/debug/update_t',
|
||||
listen: ['update_t']
|
||||
},
|
||||
df_style: {
|
||||
default_color: [1,0,0],
|
||||
}
|
||||
});
|
||||
|
||||
var new = func(layer) {
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.equals(b);
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.equals(b);
|
||||
|
||||
return m;
|
||||
return m;
|
||||
};
|
||||
|
||||
var del = func() {
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
};
|
||||
|
||||
var searchCmd = func {
|
||||
var result = [];
|
||||
#return result;
|
||||
var node = me['node'];
|
||||
if (node == nil) {
|
||||
node = props.globals.getNode('autopilot/route-manager/debug/', 1);
|
||||
me.node = node;
|
||||
}
|
||||
var points = me.node.getNode('points', 1).getChildren();
|
||||
#var count = getprop('autopilot/route-manager/debug/num') or 0;
|
||||
var count = size(points);
|
||||
#print('Map DEBUG: querying '~ count ~' results.');
|
||||
for(var idx = 0; idx < count; idx += 1){
|
||||
var point = points[idx];
|
||||
#var id = getprop('autopilot/route-manager/debug/point['~idx~']/id');
|
||||
#var lat = getprop('autopilot/route-manager/debug/point['~idx~']/lat');
|
||||
#var lon = getprop('autopilot/route-manager/debug/point['~idx~']/lon');
|
||||
var id = point.getValue('id');
|
||||
var lat = point.getValue('lat');
|
||||
var lon = point.getValue('lon');
|
||||
if (id == nil or id == '') continue;
|
||||
#print('Map DEBUG: found '~ id ~' debug point.');
|
||||
var model = {
|
||||
id: id,
|
||||
lat: lat,
|
||||
lon: lon,
|
||||
equals: func(o){
|
||||
me.id == o.id and me.lat == o.lat and me.lon == o.lon
|
||||
}
|
||||
};
|
||||
append(result, model);
|
||||
}
|
||||
return result;
|
||||
var result = [];
|
||||
#return result;
|
||||
var node = me['node'];
|
||||
if (node == nil) {
|
||||
node = props.globals.getNode('autopilot/route-manager/debug/', 1);
|
||||
me.node = node;
|
||||
}
|
||||
var points = me.node.getNode('points', 1).getChildren();
|
||||
#var count = getprop('autopilot/route-manager/debug/num') or 0;
|
||||
var count = size(points);
|
||||
#print('Map DEBUG: querying '~ count ~' results.');
|
||||
for(var idx = 0; idx < count; idx += 1){
|
||||
var point = points[idx];
|
||||
#var id = getprop('autopilot/route-manager/debug/point['~idx~']/id');
|
||||
#var lat = getprop('autopilot/route-manager/debug/point['~idx~']/lat');
|
||||
#var lon = getprop('autopilot/route-manager/debug/point['~idx~']/lon');
|
||||
var id = point.getValue('id');
|
||||
var lat = point.getValue('lat');
|
||||
var lon = point.getValue('lon');
|
||||
if (id == nil or id == '') continue;
|
||||
#print('Map DEBUG: found '~ id ~' debug point.');
|
||||
var model = {
|
||||
id: id,
|
||||
lat: lat,
|
||||
lon: lon,
|
||||
equals: func(o){
|
||||
me.id == o.id and me.lat == o.lat and me.lon == o.lon
|
||||
}
|
||||
};
|
||||
append(result, model);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -8,20 +8,20 @@ canvas.DotSym.makeinstance( name, __self__ );
|
|||
var element_type = "group";
|
||||
|
||||
var init = func {
|
||||
me.text_wps = me.element.createChild("text", "dbg-text-" ~ me.model.id)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.id)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15)
|
||||
.setColor(1,0,0);
|
||||
me.text_alt = nil;
|
||||
me.sym = me.element.createChild("path").
|
||||
setStrokeLineWidth(4).
|
||||
moveTo(-16,0).
|
||||
arcSmallCW(16,16,0,32,0).
|
||||
arcSmallCW(16,16,0,-32,0).
|
||||
setColor(1,0,0);
|
||||
me.text_wps = me.element.createChild("text", "dbg-text-" ~ me.model.id)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.id)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15)
|
||||
.setColor(1,0,0);
|
||||
me.text_alt = nil;
|
||||
me.sym = me.element.createChild("path").
|
||||
setStrokeLineWidth(4).
|
||||
moveTo(-16,0).
|
||||
arcSmallCW(16,16,0,32,0).
|
||||
arcSmallCW(16,16,0,-32,0).
|
||||
setColor(1,0,0);
|
||||
}
|
||||
|
||||
var draw = func{
|
||||
|
|
|
@ -6,32 +6,32 @@ var __self__ = caller(0)[0];
|
|||
|
||||
canvas.SymbolLayer.Controller.add(name, __self__);
|
||||
canvas.SymbolLayer.add(name, {
|
||||
parents: [MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options : { # default configuration options
|
||||
decel_node: "/autopilot/route-manager/vnav/decel/"
|
||||
}
|
||||
parents: [MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options : { # default configuration options
|
||||
decel_node: "/autopilot/route-manager/vnav/decel/"
|
||||
}
|
||||
});
|
||||
var new = func(layer) {
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.getName() == b.getName();
|
||||
return m;
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.getName() == b.getName();
|
||||
return m;
|
||||
};
|
||||
var del = func() {
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
};
|
||||
|
||||
var searchCmd = func {
|
||||
var results = [];
|
||||
var symNode = props.globals.getNode(me.layer.options.decel_node);
|
||||
if (symNode != nil and symNode.getValue('longitude-deg') != nil)
|
||||
append(results, symNode);
|
||||
return results;
|
||||
var results = [];
|
||||
var symNode = props.globals.getNode(me.layer.options.decel_node);
|
||||
if (symNode != nil and symNode.getValue('longitude-deg') != nil)
|
||||
append(results, symNode);
|
||||
return results;
|
||||
}
|
||||
|
|
|
@ -8,5 +8,5 @@ var new = func(model) ; # this controller doesn't need an instance
|
|||
var LayerController = canvas.SymbolLayer.Controller.registry[name];
|
||||
var isActive = func(model) {return 1};#LayerController.a_instance.isActive(model);
|
||||
var query_range = func()
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
#var model = props.globals.getNode('/position');
|
||||
|
|
|
@ -12,21 +12,21 @@ canvas.DotSym.makeinstance( name, __self__ );
|
|||
var element_type = "group";
|
||||
|
||||
var init = func {
|
||||
var svg_path = me.getStyle('svg_path');
|
||||
if(svg_path == nil)
|
||||
svg_path = get_local_path('res/airbus_decel.svg');
|
||||
me.decel_grp = me.element.createChild("group","decel");
|
||||
canvas.parsesvg(me.decel_grp, svg_path);
|
||||
me.decel_grp.set('z-index', 5);
|
||||
var svg_path = me.getStyle('svg_path');
|
||||
if(svg_path == nil)
|
||||
svg_path = get_local_path('res/airbus_decel.svg');
|
||||
me.decel_grp = me.element.createChild("group","decel");
|
||||
canvas.parsesvg(me.decel_grp, svg_path);
|
||||
me.decel_grp.set('z-index', 5);
|
||||
}
|
||||
|
||||
var draw = func{
|
||||
if(me.decel_grp != nil){
|
||||
var spd_ctrl = getprop(me.options.spd_ctrl);
|
||||
var spd_managed = (spd_ctrl == me.options.managed_val);
|
||||
if(spd_managed)
|
||||
me.decel_grp.setColor(me.style.managed_color);
|
||||
else
|
||||
me.decel_grp.setColor(me.style.selected_color);
|
||||
}
|
||||
if(me.decel_grp != nil){
|
||||
var spd_ctrl = getprop(me.options.spd_ctrl);
|
||||
var spd_managed = (spd_ctrl == me.options.managed_val);
|
||||
if(spd_managed)
|
||||
me.decel_grp.setColor(me.style.managed_color);
|
||||
else
|
||||
me.decel_grp.setColor(me.style.selected_color);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,5 +8,5 @@ var new = func(model) ; # this controller doesn't need an instance
|
|||
var LayerController = canvas.SymbolLayer.Controller.registry[name];
|
||||
var isActive = func(model) {return 1};#LayerController.a_instance.isActive(model);
|
||||
var query_range = func()
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
#var model = props.globals.getNode('/position');
|
||||
|
|
|
@ -9,72 +9,72 @@ DotSym.makeinstance( name, __self__ );
|
|||
var element_type = "group";
|
||||
|
||||
var style = { # style to use by default
|
||||
zoom: 20,
|
||||
color: [1,1,1],
|
||||
center_line_len: 0.75,
|
||||
line_width: 3
|
||||
zoom: 20,
|
||||
color: [1,1,1],
|
||||
center_line_len: 0.75,
|
||||
line_width: 3
|
||||
};
|
||||
|
||||
SymbolLayer.get(name).df_style = style;
|
||||
#var already_drawn = 0;
|
||||
|
||||
var init = func {
|
||||
#if(me.already_drawn) return;
|
||||
var lat = me.model.lat;
|
||||
var lon = me.model.lon;
|
||||
var rwyhdg = me.model.heading;
|
||||
var width = me.model.width;
|
||||
var length = me.model.length;
|
||||
var group = me.element;
|
||||
var ctr_len = length * me.getStyle('center_line_len', 0.75);
|
||||
var crds = [];
|
||||
var coord = geo.Coord.new();
|
||||
width = width * me.getStyle('zoom', 20); # Else rwy is too thin to be visible
|
||||
var line_w = me.getStyle('line_width', 3);
|
||||
var color = me.getStyle('color', [1,1,1]);
|
||||
coord.set_latlon(lat, lon);
|
||||
coord.apply_course_distance(rwyhdg, -(ctr_len / 2));
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, (ctr_len));
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy-cl")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4],crds)
|
||||
.setColor(color);
|
||||
#.setStrokeDashArray([10, 20, 10, 20, 10]);
|
||||
#icon_rwy.hide();
|
||||
var crds = [];
|
||||
coord.set_latlon(lat, lon);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg + 90, width/2);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, length);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4,4],crds)
|
||||
.setColor(color);
|
||||
var crds = [];
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg - 90, width);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, -length);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg + 90, width / 2);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4,4,4],crds)
|
||||
.setColor(color);
|
||||
#if(me.already_drawn) return;
|
||||
var lat = me.model.lat;
|
||||
var lon = me.model.lon;
|
||||
var rwyhdg = me.model.heading;
|
||||
var width = me.model.width;
|
||||
var length = me.model.length;
|
||||
var group = me.element;
|
||||
var ctr_len = length * me.getStyle('center_line_len', 0.75);
|
||||
var crds = [];
|
||||
var coord = geo.Coord.new();
|
||||
width = width * me.getStyle('zoom', 20); # Else rwy is too thin to be visible
|
||||
var line_w = me.getStyle('line_width', 3);
|
||||
var color = me.getStyle('color', [1,1,1]);
|
||||
coord.set_latlon(lat, lon);
|
||||
coord.apply_course_distance(rwyhdg, -(ctr_len / 2));
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, (ctr_len));
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy-cl")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4],crds)
|
||||
.setColor(color);
|
||||
#.setStrokeDashArray([10, 20, 10, 20, 10]);
|
||||
#icon_rwy.hide();
|
||||
var crds = [];
|
||||
coord.set_latlon(lat, lon);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg + 90, width/2);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, length);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4,4],crds)
|
||||
.setColor(color);
|
||||
var crds = [];
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg - 90, width);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg, -length);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
coord.apply_course_distance(rwyhdg + 90, width / 2);
|
||||
append(crds,"N"~coord.lat());
|
||||
append(crds,"E"~coord.lon());
|
||||
icon_rwy = group.createChild("path", "rwy")
|
||||
.setStrokeLineWidth(line_w)
|
||||
.setDataGeo([2,4,4,4],crds)
|
||||
.setColor(color);
|
||||
};
|
||||
|
||||
var draw = func{}
|
||||
|
|
|
@ -5,47 +5,47 @@ var parents = [canvas.SymbolLayer.Controller];
|
|||
var __self__ = caller(0)[0];
|
||||
|
||||
var _options = { # default configuration options
|
||||
alts: [100,140,250,260,'wp']
|
||||
alts: [100,140,250,260,'wp']
|
||||
};
|
||||
canvas.SymbolLayer.Controller.add(name, __self__);
|
||||
canvas.SymbolLayer.add(name, {
|
||||
parents: [MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: _options
|
||||
parents: [MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: _options
|
||||
});
|
||||
var new = func(layer) {
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
#map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.getName() == b.getName();
|
||||
#append(m.listeners, setlistener(layer.options.fplan_active, func m.layer.update() ));
|
||||
#m.addVisibilityListener();
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
#map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.getName() == b.getName();
|
||||
#append(m.listeners, setlistener(layer.options.fplan_active, func m.layer.update() ));
|
||||
#m.addVisibilityListener();
|
||||
|
||||
return m;
|
||||
return m;
|
||||
};
|
||||
var del = func() {
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
};
|
||||
|
||||
var searchCmd = func {
|
||||
var results = [];
|
||||
var spdNode = props.globals.getNode(me.layer.options.spd_node);
|
||||
if (spdNode != nil) {
|
||||
var limits = spdNode.getChildren();
|
||||
foreach (var limit; limits) {
|
||||
#t = 'spd-change-point' ~ '-' ~ alt;
|
||||
#print('SPD-Controller, search for '~t);
|
||||
#var n = spdNode.getNode(t);
|
||||
if (limit != nil and limit.getValue('longitude-deg') != nil){
|
||||
#print('SPD-Controller -> Append');
|
||||
append(results, limit);
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
var results = [];
|
||||
var spdNode = props.globals.getNode(me.layer.options.spd_node);
|
||||
if (spdNode != nil) {
|
||||
var limits = spdNode.getChildren();
|
||||
foreach (var limit; limits) {
|
||||
#t = 'spd-change-point' ~ '-' ~ alt;
|
||||
#print('SPD-Controller, search for '~t);
|
||||
#var n = spdNode.getNode(t);
|
||||
if (limit != nil and limit.getValue('longitude-deg') != nil){
|
||||
#print('SPD-Controller -> Append');
|
||||
append(results, limit);
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
|
|
@ -8,5 +8,5 @@ var new = func(model) ; # this controller doesn't need an instance
|
|||
var LayerController = canvas.SymbolLayer.Controller.registry[name];
|
||||
var isActive = func(model) {return 1};#LayerController.a_instance.isActive(model);
|
||||
var query_range = func()
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
die(name~".scontroller.query_range /MUST/ be provided by implementation");
|
||||
#var model = props.globals.getNode('/position');
|
||||
|
|
|
@ -32,9 +32,9 @@ var draw = func{
|
|||
# var name = me.model.getName();
|
||||
# var sym_group = me.element.getElementById(name);
|
||||
# sym_group.set('z-index', 5);
|
||||
if(me.spd_sym == nil){
|
||||
me.spd_sym = me.getElementById("airbus-spd-sym");
|
||||
me.spd_sym.setTranslation(-24, -24).set('z-index', 5);
|
||||
}
|
||||
|
||||
if(me.spd_sym == nil){
|
||||
me.spd_sym = me.getElementById("airbus-spd-sym");
|
||||
me.spd_sym.setTranslation(-24, -24).set('z-index', 5);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -5,58 +5,58 @@ var parents = [SymbolLayer.Controller];
|
|||
var __self__ = caller(0)[0];
|
||||
SymbolLayer.Controller.add(name, __self__);
|
||||
SymbolLayer.add(name, {
|
||||
parents: [NavaidSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: {
|
||||
vor1_frq: 'instrumentation/nav[2]/frequencies/selected-mhz',
|
||||
vor2_frq: 'instrumentation/nav[3]/frequencies/selected-mhz'
|
||||
},
|
||||
df_style: {
|
||||
scale: 1
|
||||
}
|
||||
parents: [NavaidSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: {
|
||||
vor1_frq: 'instrumentation/nav[2]/frequencies/selected-mhz',
|
||||
vor2_frq: 'instrumentation/nav[3]/frequencies/selected-mhz'
|
||||
},
|
||||
df_style: {
|
||||
scale: 1
|
||||
}
|
||||
});
|
||||
var new = func(layer) {
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
active_vors: [],
|
||||
navNs: props.globals.getNode("instrumentation").getChildren("nav"),
|
||||
listeners: [],
|
||||
query_type:'vor',
|
||||
};
|
||||
setsize(m.active_vors, size(m.navNs));
|
||||
foreach (var navN; m.navNs) {
|
||||
append(m.listeners, setlistener(
|
||||
navN.getNode("frequencies/selected-mhz"),
|
||||
func m.changed_freq()
|
||||
));
|
||||
}
|
||||
#call(debug.dump, keys(layer));
|
||||
m.changed_freq(update:0);
|
||||
m.addVisibilityListener();
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
active_vors: [],
|
||||
navNs: props.globals.getNode("instrumentation").getChildren("nav"),
|
||||
listeners: [],
|
||||
query_type:'vor',
|
||||
};
|
||||
setsize(m.active_vors, size(m.navNs));
|
||||
foreach (var navN; m.navNs) {
|
||||
append(m.listeners, setlistener(
|
||||
navN.getNode("frequencies/selected-mhz"),
|
||||
func m.changed_freq()
|
||||
));
|
||||
}
|
||||
#call(debug.dump, keys(layer));
|
||||
m.changed_freq(update:0);
|
||||
m.addVisibilityListener();
|
||||
|
||||
return m;
|
||||
return m;
|
||||
};
|
||||
var del = func() {
|
||||
printlog(_MP_dbg_lvl, name,".lcontroller.del()");
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
printlog(_MP_dbg_lvl, name,".lcontroller.del()");
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
};
|
||||
|
||||
# Controller methods
|
||||
var isActive = func(model) {
|
||||
var my_freq = model.frequency/100;
|
||||
foreach (var freq; me.active_vors)
|
||||
if (freq == my_freq) return 1;
|
||||
return 0;
|
||||
var my_freq = model.frequency/100;
|
||||
foreach (var freq; me.active_vors)
|
||||
if (freq == my_freq) return 1;
|
||||
return 0;
|
||||
};
|
||||
var changed_freq = func(update=1) {
|
||||
#debug.dump(me.active_vors);
|
||||
foreach (var navN; me.navNs)
|
||||
me.active_vors[ navN.getIndex() ] = navN.getValue("frequencies/selected-mhz");
|
||||
if (update) me.layer.update();
|
||||
#debug.dump(me.active_vors);
|
||||
foreach (var navN; me.navNs)
|
||||
me.active_vors[ navN.getIndex() ] = navN.getValue("frequencies/selected-mhz");
|
||||
if (update) me.layer.update();
|
||||
};
|
||||
|
||||
var searchCmd = NavaidSymbolLayer.make('vor');
|
|
@ -11,33 +11,33 @@ var svg_path = get_local_path('res/airbus_vor.svg');
|
|||
var vor_sym = nil;
|
||||
|
||||
var draw = func{
|
||||
if(me.vor_sym == nil)
|
||||
me.vor_sym = me.element.getElementById("airbus-vor-sym");
|
||||
me.vor_sym.setTranslation(-24,-24);
|
||||
if(me.text_vor == nil){
|
||||
var transl = me.getStyle('translation', [25,10]);
|
||||
var text_color = me.getStyle('text_color', [1,1,1]);
|
||||
me.text_vor = me.element.createChild("text")
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.id)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setColor(text_color)
|
||||
.setTranslation(transl);
|
||||
}
|
||||
|
||||
var frq = me.model.frequency;
|
||||
if(frq != nil){
|
||||
var dfcolor = me.getStyle('color', [0.9,0,0.47]);
|
||||
var tuned_color = me.getStyle('tuned_color', [0,0.62,0.84]);
|
||||
frq = frq / 100;
|
||||
var vor1_frq = getprop(me.options.vor1_frq);
|
||||
var vor2_frq = getprop(me.options.vor2_frq);
|
||||
if(vor1_frq == frq or vor2_frq == frq){
|
||||
me.element.setColor(tuned_color);
|
||||
} else {
|
||||
me.element.setColor(dfcolor);
|
||||
}
|
||||
}
|
||||
me.text_vor.setColor(me.getStyle('text_color', [1,1,1]));
|
||||
if(me.vor_sym == nil)
|
||||
me.vor_sym = me.element.getElementById("airbus-vor-sym");
|
||||
me.vor_sym.setTranslation(-24,-24);
|
||||
if(me.text_vor == nil){
|
||||
var transl = me.getStyle('translation', [25,10]);
|
||||
var text_color = me.getStyle('text_color', [1,1,1]);
|
||||
me.text_vor = me.element.createChild("text")
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.id)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setColor(text_color)
|
||||
.setTranslation(transl);
|
||||
}
|
||||
|
||||
var frq = me.model.frequency;
|
||||
if(frq != nil){
|
||||
var dfcolor = me.getStyle('color', [0.9,0,0.47]);
|
||||
var tuned_color = me.getStyle('tuned_color', [0,0.62,0.84]);
|
||||
frq = frq / 100;
|
||||
var vor1_frq = getprop(me.options.vor1_frq);
|
||||
var vor2_frq = getprop(me.options.vor2_frq);
|
||||
if(vor1_frq == frq or vor2_frq == frq){
|
||||
me.element.setColor(tuned_color);
|
||||
} else {
|
||||
me.element.setColor(dfcolor);
|
||||
}
|
||||
}
|
||||
me.text_vor.setColor(me.getStyle('text_color', [1,1,1]));
|
||||
}
|
|
@ -6,132 +6,132 @@ var __self__ = caller(0)[0];
|
|||
|
||||
canvas.SymbolLayer.Controller.add(name, __self__);
|
||||
canvas.SymbolLayer.add(name, {
|
||||
parents: [canvas.MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: { # default configuration options
|
||||
fix_symbol: func(group){
|
||||
group.createChild('path')
|
||||
.moveTo(-10,0)
|
||||
.lineTo(0,-17)
|
||||
.lineTo(10,0)
|
||||
.lineTo(0,17)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(1,1,1)
|
||||
.setScale(1);
|
||||
},
|
||||
vor_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_vor.svg',
|
||||
airport_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_airport.svg',
|
||||
ndb_symbol: func(group){
|
||||
group.createChild('path')
|
||||
.moveTo(-15,15)
|
||||
.lineTo(0,-15)
|
||||
.lineTo(15,15)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
#.setColor(0.69,0,0.39)
|
||||
#.setTranslation(-24, -24),
|
||||
.setScale(1,1);
|
||||
}
|
||||
},
|
||||
df_style: {
|
||||
active_wp_color: [0.4,0.7,0.4],
|
||||
current_wp_color: [1,1,1],
|
||||
translation: {
|
||||
'airport': [-24,-24],
|
||||
'vor': [-24,-24]
|
||||
}
|
||||
},
|
||||
toggle_cstr: 0
|
||||
parents: [canvas.MultiSymbolLayer],
|
||||
type: name, # Symbol type
|
||||
df_controller: __self__, # controller to use by default -- this one
|
||||
df_options: { # default configuration options
|
||||
fix_symbol: func(group){
|
||||
group.createChild('path')
|
||||
.moveTo(-10,0)
|
||||
.lineTo(0,-17)
|
||||
.lineTo(10,0)
|
||||
.lineTo(0,17)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
.setColor(1,1,1)
|
||||
.setScale(1);
|
||||
},
|
||||
vor_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_vor.svg',
|
||||
airport_symbol: 'Nasal/canvas/map/Airbus/Images/airbus_airport.svg',
|
||||
ndb_symbol: func(group){
|
||||
group.createChild('path')
|
||||
.moveTo(-15,15)
|
||||
.lineTo(0,-15)
|
||||
.lineTo(15,15)
|
||||
.close()
|
||||
.setStrokeLineWidth(3)
|
||||
#.setColor(0.69,0,0.39)
|
||||
#.setTranslation(-24, -24),
|
||||
.setScale(1,1);
|
||||
}
|
||||
},
|
||||
df_style: {
|
||||
active_wp_color: [0.4,0.7,0.4],
|
||||
current_wp_color: [1,1,1],
|
||||
translation: {
|
||||
'airport': [-24,-24],
|
||||
'vor': [-24,-24]
|
||||
}
|
||||
},
|
||||
toggle_cstr: 0
|
||||
});
|
||||
|
||||
var new = func(layer) {
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.equals(b);
|
||||
var driver = opt_member(m.layer.options, 'route_driver');
|
||||
if(driver == nil){
|
||||
driver = RouteDriver.new();
|
||||
}
|
||||
var driver_listeners = driver.getListeners();
|
||||
foreach(var listener; driver_listeners){
|
||||
append(m.listeners, setlistener(listener, func m.layer.update()));
|
||||
}
|
||||
m.route_driver = driver;
|
||||
return m;
|
||||
var m = {
|
||||
parents: [__self__],
|
||||
layer: layer,
|
||||
map: layer.map,
|
||||
listeners: [],
|
||||
};
|
||||
layer.searcher._equals = func(a,b) a.equals(b);
|
||||
var driver = opt_member(m.layer.options, 'route_driver');
|
||||
if(driver == nil){
|
||||
driver = RouteDriver.new();
|
||||
}
|
||||
var driver_listeners = driver.getListeners();
|
||||
foreach(var listener; driver_listeners){
|
||||
append(m.listeners, setlistener(listener, func m.layer.update()));
|
||||
}
|
||||
m.route_driver = driver;
|
||||
return m;
|
||||
};
|
||||
|
||||
var del = func() {
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
foreach (var l; me.listeners)
|
||||
removelistener(l);
|
||||
};
|
||||
|
||||
var WPTModel = {
|
||||
new: func(fp, idx) {
|
||||
var m = { parents:[WPTModel] };
|
||||
var wp = fp.getWP(idx);
|
||||
new: func(fp, idx) {
|
||||
var m = { parents:[WPTModel] };
|
||||
var wp = fp.getWP(idx);
|
||||
|
||||
m.id = wp.id;
|
||||
m.name = wp.wp_name;
|
||||
m.alt = wp.alt_cstr;
|
||||
m.spd = wp.speed_cstr;
|
||||
m.type = wp.wp_type;
|
||||
m.id = wp.id;
|
||||
m.name = wp.wp_name;
|
||||
m.alt = wp.alt_cstr;
|
||||
m.spd = wp.speed_cstr;
|
||||
m.type = wp.wp_type;
|
||||
|
||||
(m.lat,m.lon) = (wp.wp_lat,wp.wp_lon);
|
||||
var is_rwy = (m.type == 'runway');
|
||||
var id_len = size(m.id);
|
||||
if(!is_rwy and id_len < 5){
|
||||
if(id_len == 4 and airportinfo(m.id) != nil)
|
||||
m.navtype = 'airport';
|
||||
else {
|
||||
var navaid = nil;
|
||||
foreach(var t; ['vor', 'ndb']){
|
||||
navaid = navinfo(m.lat, m.lon, t, m.id);
|
||||
if(navaid != nil and size(navaid)){
|
||||
m.navtype = t;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(navaid == nil or !size(navaid)) m.navtype = 'fix';
|
||||
}
|
||||
} else {
|
||||
m.navtype = (is_rwy ? 'rwy' : 'fix');
|
||||
}
|
||||
|
||||
m.wp = wp;
|
||||
idx = wp.index;
|
||||
m.idx = idx;
|
||||
m.is_departure = (idx == 0 and is_rwy);
|
||||
m.is_destination = (idx > 0 and is_rwy);
|
||||
return m;
|
||||
},
|
||||
equals: func(other) {
|
||||
# this is set on symbol init, so use this for equality...
|
||||
me.name == other.name and me.alt == other.alt and
|
||||
me.type == other.type and me.idx == other.idx and
|
||||
me.navtype == other.navtype
|
||||
},
|
||||
(m.lat,m.lon) = (wp.wp_lat,wp.wp_lon);
|
||||
var is_rwy = (m.type == 'runway');
|
||||
var id_len = size(m.id);
|
||||
if(!is_rwy and id_len < 5){
|
||||
if(id_len == 4 and airportinfo(m.id) != nil)
|
||||
m.navtype = 'airport';
|
||||
else {
|
||||
var navaid = nil;
|
||||
foreach(var t; ['vor', 'ndb']){
|
||||
navaid = navinfo(m.lat, m.lon, t, m.id);
|
||||
if(navaid != nil and size(navaid)){
|
||||
m.navtype = t;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(navaid == nil or !size(navaid)) m.navtype = 'fix';
|
||||
}
|
||||
} else {
|
||||
m.navtype = (is_rwy ? 'rwy' : 'fix');
|
||||
}
|
||||
|
||||
m.wp = wp;
|
||||
idx = wp.index;
|
||||
m.idx = idx;
|
||||
m.is_departure = (idx == 0 and is_rwy);
|
||||
m.is_destination = (idx > 0 and is_rwy);
|
||||
return m;
|
||||
},
|
||||
equals: func(other) {
|
||||
# this is set on symbol init, so use this for equality...
|
||||
me.name == other.name and me.alt == other.alt and
|
||||
me.type == other.type and me.idx == other.idx and
|
||||
me.navtype == other.navtype
|
||||
},
|
||||
};
|
||||
|
||||
var searchCmd = func {
|
||||
var driver = me.route_driver;
|
||||
if(!driver.shouldUpdate()) return [];
|
||||
driver.update();
|
||||
var result = [];
|
||||
var planCount = driver.getNumberOfFlightPlans();
|
||||
for(var idx = 0; idx < planCount; idx += 1){
|
||||
var fp = driver.getFlightPlan(idx);
|
||||
if(fp == nil) continue;
|
||||
var fpSize = fp.getPlanSize(idx);
|
||||
for (var i = 0; i < fpSize; i+=1){
|
||||
if(!driver.shouldUpdate()) return[];
|
||||
append(result, WPTModel.new(fp, i));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
var driver = me.route_driver;
|
||||
if(!driver.shouldUpdate()) return [];
|
||||
driver.update();
|
||||
var result = [];
|
||||
var planCount = driver.getNumberOfFlightPlans();
|
||||
for(var idx = 0; idx < planCount; idx += 1){
|
||||
var fp = driver.getFlightPlan(idx);
|
||||
if(fp == nil) continue;
|
||||
var fpSize = fp.getPlanSize(idx);
|
||||
for (var i = 0; i < fpSize; i+=1){
|
||||
if(!driver.shouldUpdate()) return[];
|
||||
append(result, WPTModel.new(fp, i));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -8,130 +8,130 @@ canvas.DotSym.makeinstance( name, __self__ );
|
|||
var element_type = "group";
|
||||
|
||||
var init = func {
|
||||
var name = me.model.name;
|
||||
var alt = me.model.alt;
|
||||
var spd = me.model.spd;
|
||||
var wp_group = me.element;
|
||||
me.alt_path = nil;
|
||||
var name = me.model.name;
|
||||
var alt = me.model.alt;
|
||||
var spd = me.model.spd;
|
||||
var wp_group = me.element;
|
||||
me.alt_path = nil;
|
||||
|
||||
var colors = [
|
||||
'wp_color',
|
||||
'current_wp_color',
|
||||
'constraint_color',
|
||||
'active_constraint_color',
|
||||
'missed_constraint_color'
|
||||
];
|
||||
foreach(col; colors){
|
||||
me[col] = me.getStyle(col, me.getOption(col));
|
||||
}
|
||||
var colors = [
|
||||
'wp_color',
|
||||
'current_wp_color',
|
||||
'constraint_color',
|
||||
'active_constraint_color',
|
||||
'missed_constraint_color'
|
||||
];
|
||||
foreach(col; colors){
|
||||
me[col] = me.getStyle(col, me.getOption(col));
|
||||
}
|
||||
|
||||
var idLen = size(me.model.id);
|
||||
var draw_sym = nil;
|
||||
var navtype = me.model.navtype;
|
||||
if (navtype == nil) navtype = 'fix';
|
||||
if(navtype == 'airport')
|
||||
draw_sym = me.options.airport_symbol;
|
||||
elsif(navtype == 'vor')
|
||||
draw_sym = me.options.vor_symbol;
|
||||
elsif(navtype == 'ndb')
|
||||
draw_sym = me.options.ndb_symbol;
|
||||
else
|
||||
draw_sym = me.options.fix_symbol;
|
||||
me.wp_sym = me.element.createChild('group', 'wp-'~ me.model.idx);
|
||||
if(typeof(draw_sym) == 'func')
|
||||
draw_sym(me.wp_sym);
|
||||
elsif(typeof(draw_sym) == 'scalar')
|
||||
canvas.parsesvg(me.wp_sym, draw_sym);
|
||||
var translation = me.getStyle('translation', {});
|
||||
if(contains(translation, navtype)){
|
||||
me.wp_sym.setTranslation(translation[navtype]);
|
||||
}
|
||||
me.text_wps = wp_group.createChild("text", "wp-text-" ~ me.model.idx)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.name)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15)
|
||||
.setColor(1,1,1);
|
||||
me.text_alt = nil;
|
||||
if(alt > 0 or spd > 0){
|
||||
var cstr_txt = "\n";
|
||||
if(alt > 0){
|
||||
if(alt > 10000)
|
||||
cstr_txt ~= sprintf('FL%3.0f', int(alt / 100));
|
||||
else
|
||||
cstr_txt ~= sprintf('%4.0f', int(alt));
|
||||
}
|
||||
if(spd > 0){
|
||||
if(alt > 0) cstr_txt ~= "\n";
|
||||
if(spd <= 1)
|
||||
cstr_txt ~= sprintf('%1.2fM', spd);
|
||||
else
|
||||
cstr_txt ~= sprintf('%3.0fKT', int(spd));
|
||||
}
|
||||
me.text_alt = wp_group.createChild("text", "wp-alt-text-" ~ me.model.idx)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(cstr_txt)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15);
|
||||
}
|
||||
var idLen = size(me.model.id);
|
||||
var draw_sym = nil;
|
||||
var navtype = me.model.navtype;
|
||||
if (navtype == nil) navtype = 'fix';
|
||||
if(navtype == 'airport')
|
||||
draw_sym = me.options.airport_symbol;
|
||||
elsif(navtype == 'vor')
|
||||
draw_sym = me.options.vor_symbol;
|
||||
elsif(navtype == 'ndb')
|
||||
draw_sym = me.options.ndb_symbol;
|
||||
else
|
||||
draw_sym = me.options.fix_symbol;
|
||||
me.wp_sym = me.element.createChild('group', 'wp-'~ me.model.idx);
|
||||
if(typeof(draw_sym) == 'func')
|
||||
draw_sym(me.wp_sym);
|
||||
elsif(typeof(draw_sym) == 'scalar')
|
||||
canvas.parsesvg(me.wp_sym, draw_sym);
|
||||
var translation = me.getStyle('translation', {});
|
||||
if(contains(translation, navtype)){
|
||||
me.wp_sym.setTranslation(translation[navtype]);
|
||||
}
|
||||
me.text_wps = wp_group.createChild("text", "wp-text-" ~ me.model.idx)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(me.model.name)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15)
|
||||
.setColor(1,1,1);
|
||||
me.text_alt = nil;
|
||||
if(alt > 0 or spd > 0){
|
||||
var cstr_txt = "\n";
|
||||
if(alt > 0){
|
||||
if(alt > 10000)
|
||||
cstr_txt ~= sprintf('FL%3.0f', int(alt / 100));
|
||||
else
|
||||
cstr_txt ~= sprintf('%4.0f', int(alt));
|
||||
}
|
||||
if(spd > 0){
|
||||
if(alt > 0) cstr_txt ~= "\n";
|
||||
if(spd <= 1)
|
||||
cstr_txt ~= sprintf('%1.2fM', spd);
|
||||
else
|
||||
cstr_txt ~= sprintf('%3.0fKT', int(spd));
|
||||
}
|
||||
me.text_alt = wp_group.createChild("text", "wp-alt-text-" ~ me.model.idx)
|
||||
.setDrawMode( canvas.Text.TEXT )
|
||||
.setText(cstr_txt)
|
||||
.setFont("LiberationFonts/LiberationSans-Regular.ttf")
|
||||
.setFontSize(28)
|
||||
.setTranslation(25,15);
|
||||
}
|
||||
}
|
||||
|
||||
var draw = func{
|
||||
var wp_group = me.element;
|
||||
var alt = me.model.alt;
|
||||
var i = me.model.idx;
|
||||
var vnav_actv = getprop(me.options.ver_ctrl) == me.options.managed_val;
|
||||
var curwp = getprop(me.options.current_wp);
|
||||
if(alt > 0){
|
||||
var wp_d = me.model.wp.distance_along_route;
|
||||
var lvl_off_at = getprop(me.options.level_off_alt);
|
||||
if(lvl_off_at == nil) lvl_off_at = 0;
|
||||
if(me.alt_path == nil){
|
||||
me.alt_path = wp_group.createChild("path").
|
||||
setStrokeLineWidth(4).
|
||||
moveTo(-22,0).
|
||||
arcSmallCW(22,22,0,44,0).
|
||||
arcSmallCW(22,22,0,-44,0);
|
||||
}
|
||||
if(vnav_actv){
|
||||
if(lvl_off_at and (lvl_off_at - wp_d) > 0.5 and curwp == i)
|
||||
me.alt_path.setColor(me.missed_constraint_color);
|
||||
else
|
||||
me.alt_path.setColor(me.active_constraint_color);
|
||||
}
|
||||
else
|
||||
me.alt_path.setColor(me.constraint_color);
|
||||
if(me.layer.toggle_cstr)
|
||||
me.alt_path.show();
|
||||
else
|
||||
me.alt_path.hide();
|
||||
} else {
|
||||
if(me.alt_path != nil) me.alt_path.hide();
|
||||
}
|
||||
wp_group.set("z-index",4);
|
||||
#var sym = me.element.getElementById('wp-' ~ me.model.idx);
|
||||
if(alt > 0 and me.text_alt != nil){
|
||||
if(vnav_actv)
|
||||
me.text_alt.setColor(me.active_constraint_color);
|
||||
else
|
||||
me.text_alt.setColor(me.constraint_color);
|
||||
}
|
||||
if(i == curwp) {
|
||||
me.wp_sym.setColor(me.current_wp_color);
|
||||
me.text_wps.setColor(me.current_wp_color);
|
||||
} else {
|
||||
me.wp_sym.setColor(me.wp_color);
|
||||
me.text_wps.setColor(me.wp_color);
|
||||
}
|
||||
if(me.model.is_departure or me.model.is_destination){
|
||||
var prop = (me.model.is_departure ? 'departure' : 'destination');
|
||||
var rwy = getprop("/autopilot/route-manager/"~prop~"/runway");
|
||||
if(rwy != nil and size(rwy) > 0){
|
||||
me.wp_sym.hide();
|
||||
} else {
|
||||
me.wp_sym.show();
|
||||
}
|
||||
}
|
||||
var wp_group = me.element;
|
||||
var alt = me.model.alt;
|
||||
var i = me.model.idx;
|
||||
var vnav_actv = getprop(me.options.ver_ctrl) == me.options.managed_val;
|
||||
var curwp = getprop(me.options.current_wp);
|
||||
if(alt > 0){
|
||||
var wp_d = me.model.wp.distance_along_route;
|
||||
var lvl_off_at = getprop(me.options.level_off_alt);
|
||||
if(lvl_off_at == nil) lvl_off_at = 0;
|
||||
if(me.alt_path == nil){
|
||||
me.alt_path = wp_group.createChild("path").
|
||||
setStrokeLineWidth(4).
|
||||
moveTo(-22,0).
|
||||
arcSmallCW(22,22,0,44,0).
|
||||
arcSmallCW(22,22,0,-44,0);
|
||||
}
|
||||
if(vnav_actv){
|
||||
if(lvl_off_at and (lvl_off_at - wp_d) > 0.5 and curwp == i)
|
||||
me.alt_path.setColor(me.missed_constraint_color);
|
||||
else
|
||||
me.alt_path.setColor(me.active_constraint_color);
|
||||
}
|
||||
else
|
||||
me.alt_path.setColor(me.constraint_color);
|
||||
if(me.layer.toggle_cstr)
|
||||
me.alt_path.show();
|
||||
else
|
||||
me.alt_path.hide();
|
||||
} else {
|
||||
if(me.alt_path != nil) me.alt_path.hide();
|
||||
}
|
||||
wp_group.set("z-index",4);
|
||||
#var sym = me.element.getElementById('wp-' ~ me.model.idx);
|
||||
if(alt > 0 and me.text_alt != nil){
|
||||
if(vnav_actv)
|
||||
me.text_alt.setColor(me.active_constraint_color);
|
||||
else
|
||||
me.text_alt.setColor(me.constraint_color);
|
||||
}
|
||||
if(i == curwp) {
|
||||
me.wp_sym.setColor(me.current_wp_color);
|
||||
me.text_wps.setColor(me.current_wp_color);
|
||||
} else {
|
||||
me.wp_sym.setColor(me.wp_color);
|
||||
me.text_wps.setColor(me.wp_color);
|
||||
}
|
||||
if(me.model.is_departure or me.model.is_destination){
|
||||
var prop = (me.model.is_departure ? 'departure' : 'destination');
|
||||
var rwy = getprop("/autopilot/route-manager/"~prop~"/runway");
|
||||
if(rwy != nil and size(rwy) > 0){
|
||||
me.wp_sym.hide();
|
||||
} else {
|
||||
me.wp_sym.show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -759,7 +759,11 @@ canvas.NDStyles["Airbus"] = {
|
|||
nd.in_mode("toggle_display_mode", ["MAP", "PLAN"]),
|
||||
is_true: func(nd) {
|
||||
#var cur_wp = getprop("autopilot/route-manager/current-wp");
|
||||
var deg = int(getprop("/FMGC/flightplan/r1/current-leg-course"));
|
||||
if (nd.get_switch("toggle_true_north")) {
|
||||
var deg = math.round(getprop("/FMGC/flightplan/r1/current-leg-course"));
|
||||
} else {
|
||||
var deg = math.round(getprop("/FMGC/flightplan/r1/current-leg-course-mag"));
|
||||
}
|
||||
nd.symbols.wpActiveCrs.setText((deg or "")~"°");
|
||||
nd.symbols.wpActiveCrs.show();
|
||||
},
|
||||
|
|
|
@ -18,14 +18,18 @@ var geoPosPrev = geo.Coord.new();
|
|||
var courseDistanceFrom = nil;
|
||||
var courseDistanceFromPrev = nil;
|
||||
var sizeWP = nil;
|
||||
var magTrueError = 0;
|
||||
var altFeet = props.globals.getNode("/instrumentation/altimeter/indicated-altitude-ft", 1);
|
||||
var r1_active_out = props.globals.initNode("/FMGC/flightplan/r1/active", 0, "BOOL");
|
||||
var r1_currentWP_out = props.globals.initNode("/FMGC/flightplan/r1/current-wp", 0, "INT");
|
||||
var r1_currentLeg_out = props.globals.initNode("/FMGC/flightplan/r1/current-leg", "", "STRING");
|
||||
var r1_currentLegCourse_out = props.globals.initNode("/FMGC/flightplan/r1/current-leg-course", 0, "DOUBLE");
|
||||
var r1_currentLegDist_out = props.globals.initNode("/FMGC/flightplan/r1/current-leg-dist", 0, "DOUBLE");
|
||||
var r1_currentLegCourseMag_out = props.globals.initNode("/FMGC/flightplan/r1/current-leg-course-mag", 0, "DOUBLE");
|
||||
var r1_num_out = props.globals.initNode("/FMGC/flightplan/r1/num", 0, "INT");
|
||||
var toFromSet = props.globals.initNode("/FMGC/internal/tofrom-set", 0, "BOOL");
|
||||
var magHDG = props.globals.getNode("/orientation/heading-magnetic-deg", 1);
|
||||
var trueHDG = props.globals.getNode("/orientation/heading-deg", 1);
|
||||
|
||||
# props.nas for flightplan
|
||||
var wpID = [props.globals.initNode("/FMGC/flightplan/r1/wp[0]/id", "", "STRING")];
|
||||
|
@ -84,7 +88,12 @@ var flightplan = {
|
|||
me.checkWPOutputs();
|
||||
}
|
||||
},
|
||||
deleteWP: func(i) {
|
||||
r1.deleteWP(i);
|
||||
canvas_nd.A3XXRouteDriver.triggerSignal("fp-removed");
|
||||
},
|
||||
checkWPOutputs: func() {
|
||||
canvas_nd.A3XXRouteDriver.triggerSignal("fp-added");
|
||||
sizeWP = size(wpID);
|
||||
for (var counter = sizeWP; counter < r1.getPlanSize(); counter += 1) {
|
||||
append(wpID, props.globals.initNode("/FMGC/flightplan/r1/wp[" ~ counter ~ "]/id", "", "STRING"));
|
||||
|
@ -119,6 +128,9 @@ var flightplan = {
|
|||
r1_currentLegCourse_out.setValue(r1_currentLegCourseDist[0]);
|
||||
r1_currentLegDist_out.setValue(r1_currentLegCourseDist[1]);
|
||||
|
||||
magTrueError = magHDG.getValue() - trueHDG.getValue();
|
||||
r1_currentLegCourseMag_out.setValue(r1_currentLegCourseDist[0] + magTrueError); # Convert to Magnetic
|
||||
|
||||
for (var i = 0; i < r1.getPlanSize(); i += 1) {
|
||||
wpID[i].setValue(r1.getWP(i).wp_name);
|
||||
courseDistanceFrom = r1.getWP(i).courseAndDistanceFrom(geoPos);
|
||||
|
|
Reference in a new issue