fly/fgdata
1
0
Fork 0
Code Activity

Better support for numeric properties in PropertyUpdateManager

Browse source
This commit is contained in:
Richard Harrison 2018-07-21 18:05:12 +02:00
parent e80258f4c7
commit 04adc76265
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Nasal/props.nas
View file

@ -363,15 +363,15 @@ var runBinding = func(node, module = nil) {
# this is using the hashlist (which works well with an Emesary notification) # this is using the hashlist (which works well with an Emesary notification)
# basically when the method is called it will call each section (in the lambda) # basically when the method is called it will call each section (in the lambda)
# when the value changes by more than the amount specified as the second parameter. # when the value changes by more than the amount specified as the second parameter.
# It is possible to reference multiple elements from the hashlist in each newFromHashList; if either # It is possible to reference multiple elements from the hashlist in each FromHashList; if either
# one changes then it will result in the lambda being called. # one changes then it will result in the lambda being called.
# #
# obj.update_items = [ # obj.update_items = [
# UpdateManager.newFromHashList(["VV_x","VV_y"], 0.01, func(val) # UpdateManager.FromHashList(["VV_x","VV_y"], 0.01, func(val)
# { # {
# obj.VV.setTranslation (val.VV_x, val.VV_y + pitch_offset); # obj.VV.setTranslation (val.VV_x, val.VV_y + pitch_offset);
# }), # }),
# UpdateManager.newFromHashList(["pitch","roll"], 0.025, func(hdp) # UpdateManager.FromHashList(["pitch","roll"], 0.025, func(hdp)
# { # {
# obj.ladder.setTranslation (0.0, hdp.pitch * pitch_factor+pitch_offset); # obj.ladder.setTranslation (0.0, hdp.pitch * pitch_factor+pitch_offset);
# obj.ladder.setCenter (118,830 - hdp.pitch * pitch_factor-pitch_offset); # obj.ladder.setCenter (118,830 - hdp.pitch * pitch_factor-pitch_offset);
@ -543,6 +543,7 @@ var UpdateManager =
obj.hashkey = nil; obj.hashkey = nil;
obj.changed = _changed_method; obj.changed = _changed_method;
obj.needs_update = 0; obj.needs_update = 0;
obj.isnum = _delta != nil;
obj.update = func(obj) obj.update = func(obj)
{ {
if (me.lastval == nil) if (me.lastval == nil)
@ -552,7 +553,12 @@ var UpdateManager =
if (obj != nil or me.lastval == nil) { if (obj != nil or me.lastval == nil) {
foreach (hashkey; me.hashkeylist) { foreach (hashkey; me.hashkeylist) {
if (me.lastval[hashkey] == nil or math.abs(me.lastval[hashkey] - obj[hashkey]) >= me.delta) { if (me.isnum) {
if (me.lastval[hashkey] == nil or math.abs(me.lastval[hashkey] - obj[hashkey]) >= me.delta) {
me.needs_update = 1;
break;
}
} elsif (me.lastval[hashkey] == nil or me.lastval[hashkey] != obj[hashkey]) {
me.needs_update = 1; me.needs_update = 1;
break; break;
} }