fly/fgdata
1
0
Fork 0
Code Activity

fix some route manager related breaks ... add more nil checks

Browse source
This commit is contained in:
sydadams 2010-03-14 20:57:55 +00:00
parent b27c3bb7a5
commit 553d6f2c21
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Aircraft/Instruments-3d/primus-1000/P1000.nas
View file

@ -266,17 +266,16 @@ var P1000 = {
if(me.ctl_fms.getBoolValue()){
me.CRStype.setValue("DTK");
me.CRSdeflection.setValue(0);
var maghdg=getprop("autopilot/settings/true-heading-deg");
maghdg -=getprop("environment/magnetic-variation-deg");
var maghdg=getprop("autopilot/settings/true-heading-deg") or 0;
maghdg -=getprop("environment/magnetic-variation-deg") or 0;
if(maghdg>359)maghdg-=360;
if(maghdg<0)maghdg+=360;
me.CRSheading.setValue(maghdg);
nm_calc = getprop("/autopilot/route-manager/wp/dist");
if(nm_calc == nil)nm_calc = 0.0;
id = getprop("autopilot/route-manager/wp/id");
if(id ==nil)id= " ";
id = getprop("autopilot/route-manager/wp/id") or " ";
me.NavType.setValue(4);
ttg=getprop("autopilot/route-manager/wp/eta");
ttg=getprop("autopilot/route-manager/wp/eta") or "- - : - -";
}else{
me.CRStype.setValue("CRS");
nm_calc = 0;
@ -284,8 +283,7 @@ var P1000 = {
me.CRSdeflection.setValue(getprop("/instrumentation/nav["~nv~"]/heading-needle-deflection"));
me.CRSheading.setValue(getprop("/instrumentation/nav["~nv~"]/radials/selected-deg"));
if(getprop("/instrumentation/nav["~nv~"]/data-is-valid")){
nm_calc = getprop("/instrumentation/nav["~nv~"]/nav-distance");
if(nm_calc == nil)nm_calc = 0.0;
nm_calc = getprop("/instrumentation/nav["~nv~"]/nav-distance") or 0.0;
nm_calc = 0.000539 * nm_calc;
if(getprop("/instrumentation/nav["~nv~"]/has-gs")){
me.NavType.setValue(2);
@ -293,8 +291,7 @@ var P1000 = {
var df = getprop("/instrumentation/nav["~nv~"]/gs-needle-deflection-norm");
me.GS_deflection.setValue(df);
}
id = getprop("instrumentation/nav["~nv~"]/nav-id");
if(id ==nil)id= "---";
id = getprop("instrumentation/nav["~nv~"]/nav-id") or "---";
ttg=getprop("instrumentation/dme/indicated-time-min");
if(ttg==nil or ttg == 0){
ttg="- - : - -";