aboutsummaryrefslogtreecommitdiff
path: root/pixelmappers
diff options
context:
space:
mode:
authorGravatar Merritt Boyd <mboyd@mit.edu>2011-02-20 18:28:11 -0500
committerGravatar Merritt Boyd <mboyd@mit.edu>2011-02-20 18:28:11 -0500
commitcd6217a54ac34cd13cc43dc17fe35a834f98b278 (patch)
tree2a23fed9468992bf4fb877006fcf4a712ab2e8a4 /pixelmappers
parent868c8206ac18e07f4e9d2eae32ec804344e31f2b (diff)
parenta841c8efe5667bf99541a71f37311037cfd1210d (diff)
Merge branch 'conner5' of https://github.com/dxiao/SmootLight into conner5
Diffstat (limited to 'pixelmappers')
-rw-r--r--pixelmappers/C5SignMapper.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/pixelmappers/C5SignMapper.py b/pixelmappers/C5SignMapper.py
index 24631c4..6d5163d 100644
--- a/pixelmappers/C5SignMapper.py
+++ b/pixelmappers/C5SignMapper.py
@@ -98,8 +98,15 @@ class C5SignMapper(PixelMapper):
eventLocSplit = eventLocation.split('@')
if len(eventLocSplit) == 2:
[eventLocation, signPart] = eventLocSplit
- signParts = signPart.split('.')
- pixelLocs = signPosition[signParts[0]][signParts[1]]
+ signParts = signPart.split(' ')
+ #print "*******************"
+ #print signParts
+ pixelLocs = []
+ for part in signParts:
+ if len(part) > 0:
+ parts = part.split('.')
+ pixelLocs.extend(self.signPosition[parts[0]][parts[1]])
+ #print pixelLocs
screenPixels = [p for p in screen if (p.location in pixelLocs)]
else:
screenPixels = [p for p in screen]