From b568229f4ae3ff18966b20cc1d4e703d8d574a24 Mon Sep 17 00:00:00 2001 From: Henning Stahlke <github@henningstahlke.de> Date: Mon, 23 Jan 2017 17:54:15 +0100 Subject: [PATCH 1/2] Handle missing property to avoid runtime error --- Nasal/gui.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/gui.nas b/Nasal/gui.nas index e0413f937..51f724166 100644 --- a/Nasal/gui.nas +++ b/Nasal/gui.nas @@ -1043,7 +1043,7 @@ var showWeightDialog = func { var wgts = []; for(var i=0; i<size(wgts); i+=1) { var w = wgts[i]; - var wname = w.getNode("name", 1).getValue(); + var wname = w.getNode("name", 1).getValue() or ""; var wprop = fdmdata.payload ~ "/weight[" ~ i ~ "]"; var title = tcell(weightTable, "text", i+1, 0); From 962368eb2fcd3d59404e596b291474ff9792b4b9 Mon Sep 17 00:00:00 2001 From: Henning Stahlke <github@henningstahlke.de> Date: Mon, 23 Jan 2017 17:57:18 +0100 Subject: [PATCH 2/2] Add yasim c.g. display to weight-and-fuel dialog. --- Nasal/gui.nas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Nasal/gui.nas b/Nasal/gui.nas index 51f724166..318114bef 100644 --- a/Nasal/gui.nas +++ b/Nasal/gui.nas @@ -831,8 +831,9 @@ var showWeightDialog = func { var fdmdata = { grosswgt : "/yasim/gross-weight-lbs", payload : "/sim", - cg : nil, + cg : "/fdm/yasim/cg-x-m", }; + setprop("/limits/mass-and-balance/cg/dimension","m"); } elsif(fdm == "jsb") { var fdmdata = { grosswgt : "/fdm/jsbsim/inertia/weight-lbs", @@ -892,7 +893,7 @@ var showWeightDialog = func { if( fdmdata.cg != nil ) { var n = props.globals.getNode("/limits/mass-and-balance/cg/dimension"); - tablerow("Center of Gravity", props.globals.getNode(fdmdata.cg), "%.1f " ~ (n == nil ? "in" : n.getValue())); + tablerow("Center of Gravity", props.globals.getNode(fdmdata.cg), "%.2f " ~ (n == nil ? "in" : n.getValue())); } dialog[name].addChild("hrule");