early stages of support for pixel regions

1 files changed, 22 insertions, 10 deletions

diff --git a/pixelmappers/SimpleMapper.py b/pixelmappers/SimpleMapper.py
index 7d730f1..45082b5 100644
--- a/pixelmappers/SimpleMapper.py
+++ b/pixelmappers/SimpleMapper.py
@@ -2,13 +2,25 @@ from operationscore.PixelMapper import *
 import Util
 class SimpleMapper(PixelMapper):
     def mappingFunction(self, eventLocation, screen):
-        bestDist = 10**10 #don't kill me, I'm lazy
-        bestPixel = None
-        for pixel in screen:
-            pixelDist = Util.dist(pixel.location, eventLocation)
-            if pixelDist < bestDist:
-                bestPixel = pixel
-                bestDist = pixelDist
-        return [(bestPixel,1)]
-
-
+        if type(eventLocation) == type(tuple()):
+            bestDist = 10**10 #don't kill me, I'm lazy
+            bestPixel = None
+            for pixel in screen:
+                pixelDist = Util.dist(pixel.location, eventLocation)
+                if pixelDist < bestDist:
+                    bestPixel = pixel
+                    bestDist = pixelDist
+            return [(bestPixel,1)]
+        elif type(type(str)):
+            #[{x}>5,{y}<k]
+            #TODO: we should probably encapsulate this somewhere
+            ret = []
+            eventLocation = eventLocation.replace('{x}', 'pixel.location[0]')
+            eventLocation = eventLocation.replace('{y}', 'pixel.location[1]')
+            for pixel in screen:
+                try:
+                    pixelValid = sum(eval(eventLocation)) == len(eventLocation)
+                    ret.append((pixel, 1))
+                except:
+                    raise Exception('Bad event condition')
+            return ret