Lots of stuff INCOMPLETE

4 files changed, 28 insertions, 10 deletions

diff --git a/behaviors/ExpandingColorZones.py b/behaviors/ExpandingColorZones.py
index 345851e..75be761 100644
--- a/behaviors/ExpandingColorZones.py
+++ b/behaviors/ExpandingColorZones.py
@@ -2,13 +2,14 @@ from operationscore.Behavior import *
 from logger import main_log
 class ExpandingColorZones(Behavior):
     def behaviorInit(self):
-        self.mapping = {'r':[(132,0),(255,0,0)], 'g':[(400,0), (0,255,0)],
-                'b':[(668,0),
+        self.mapping = {'s001':[(132,0),(255,0,0)], 's002':[(400,0), (0,255,0)],
+                's003':[(668,0),
             (0,0,255)]}
-        self.mappingkey = 'KeyChar'
+        self.mappingkey = 'data'
     def processResponse(self, sensorInputs, recursiveInputs):
         ret = []
         for data in sensorInputs:
+            print data
             data = dict(data)
             if self.mappingkey in data:
                 try:
diff --git a/behaviors/MITDoors.py b/behaviors/MITDoors.py
index 03bef6d..cee47f0 100644
--- a/behaviors/MITDoors.py
+++ b/behaviors/MITDoors.py
@@ -23,5 +23,6 @@ class MITDoors(Behavior):
                 data['Left'], data['Right'] = bounds 
                 data['Bottom'] = self['Bottom']
                 data['Location'] = (sum(bounds) / 2., self['Bottom'])
+                data['Oscillate'] = False
                 ret.append(data)
         return (ret, [])
diff --git a/behaviors/RiseFall.py b/behaviors/RiseFall.py
index 109cd10..eea2283 100644
--- a/behaviors/RiseFall.py
+++ b/behaviors/RiseFall.py
@@ -29,7 +29,13 @@ class RiseFall(Behavior):
                     data['Right'] = data['Location'][0]+data['Width']/2.
             currentTime = timeOps.time()
             deltaTime = currentTime-data['StartTime']
+            #if data['Oscillate'] == True:
             data['Height'] = data['MaxHeight']*math.sin(deltaTime/data['Period']*(math.pi*2))
+            #else:
+            #    data['Height'] = data['MaxHeight']
+            #if (currentTime-data['StartTime']) > data['Period']:
+            #    del data['StartTime']
+
             data['Location'] = "{x}>"+str(data['Left']) + ", " +\
             "{x}<"+str(data['Right'])+", {y}<" + str(data['Bottom']) + ",\
             {y}>"+str(data['Bottom']-data['Height'])
diff --git a/behaviors/SmootWind.py b/behaviors/SmootWind.py
index 347e2fc..804183c 100755
--- a/behaviors/SmootWind.py
+++ b/behaviors/SmootWind.py
@@ -22,12 +22,22 @@ class SmootWind(Behavior):
         for sensory in sensorInputs:

             print sensory

             # input[0] is windspeed, [1] is dir

-            windSpeed = sensory[0]

-            windDir = sensory[1]

+	    if 0 in sensory and 1 in sensory:

+		    windSpeed = sensory[0]

+		    windDir = sensory[1]

+		    #print self.mapper.argDict

+		    self.mapper.argDict['Width'] = self.mapper.argDict['Width']+float(windSpeed)*2+20

+		    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']+float(windSpeed)*3+10*random.random(); 

+		    #print 'Width: ' + str(self.mapper.argDict['Width'])

+		    #print 'xFor: ' + str(self.xFor.argDict['ParamOp'])

+

+	    elif 'Key' in sensory:

+		    if sensory['Key'] == 273:

+			    self.mapper.argDict['Width'] = self.mapper.argDict['Width']+10;

+			    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']+5;

+		   

+		    elif sensory['Key'] == 274:

+			    self.mapper.argDict['Width'] = self.mapper.argDict['Width']-10;

+			    self.xFor.argDict['ParamOp'] = self.xFor.argDict['ParamOp']-5;

 

-            #print self.mapper.argDict

-            self.mapper.argDict['Width'] = float(windSpeed)*2+20

-            self.xFor.argDict['ParamOp'] = float(windSpeed)*3+10*random.random(); 

-            #print 'Width: ' + str(self.mapper.argDict['Width'])

-            #print 'xFor: ' + str(self.xFor.argDict['ParamOp'])

         return (sensorInputs, recursiveInputs)