aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2011-02-12 16:54:10 -0500
committerGravatar rcoh <rcoh@mit.edu>2011-02-12 16:54:10 -0500
commita239c7accdc634459d2db014b8d8b6d5b78bab1b (patch)
tree24b06239c3249498e1fb9eb5c25db6804d44e6d3
parent5f54bf57128dbca04a9325670a6ad1e03097d5cb (diff)
parenta9d8716e974611f17f2a66b66d905cb81cffa5fc (diff)
Merge branch 'objprops'
-rwxr-xr-xLightInstallation.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/LightInstallation.py b/LightInstallation.py
index 41cc925..cca1588 100755
--- a/LightInstallation.py
+++ b/LightInstallation.py
@@ -7,6 +7,7 @@ import pdb, sys, time, thread
import util.TimeOps as clock
import util.Config as configGetter
import util.ComponentRegistry as compReg
+import util.BehaviorQuerySystem as bqs
from logger import main_log
#Python class to instantiate and drive a Screen through different patterns,
#and effects.
@@ -27,7 +28,8 @@ class LightInstallation(object):
self.screen = Screen()
compReg.initRegistry()
compReg.registerComponent(self.screen, 'Screen') #TODO: move to constants file
-
+
+ bqs.initBQS() #initialize the behavior query system
#read configs from xml
config = configGetter.loadConfigFile(configFileName)
@@ -171,6 +173,7 @@ class LightInstallation(object):
self.behaviors = self.initializeComponent(behaviorConfig)
for behavior in self.behaviors:
self.addBehavior(behavior)
+ bqs.addBehavior(behavior)
def addBehavior(self, behavior):
"""Does work needed to add a behavior: currently -- maps behavior inputs into the input behavior