diff options
author | Russell Cohen <rcoh@mit.edu> | 2011-01-12 10:02:10 -0500 |
---|---|---|
committer | Russell Cohen <rcoh@mit.edu> | 2011-01-12 10:02:10 -0500 |
commit | c7fc6c2725231eb1427f0edf00d3219409b3d55b (patch) | |
tree | 5b0040cb8673c9a01513977e3b11f440afd30d49 /pixelcore | |
parent | aaf8bdbee7fdc1d4721f43307fc824c373c69ec4 (diff) | |
parent | 9315ded6555a7afb8f11d96e5a4c446389f157cb (diff) |
Merge branch 'master' into behaviors
Conflicts:
LightInstallation.py
Diffstat (limited to 'pixelcore')
-rw-r--r-- | pixelcore/Screen.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pixelcore/Screen.py b/pixelcore/Screen.py index 198bd3f..3e8ad5e 100644 --- a/pixelcore/Screen.py +++ b/pixelcore/Screen.py @@ -37,9 +37,7 @@ class Screen: self.xSortedPixels.sort() self.xPixelLocs = [p[0] for p in self.xSortedPixels] - def render(self, surface): - [lS.render(surface) for lS in self.pixelStrips] - + #For debug only def allOn(self): [lS.allOn(-1) for lS in self.pixelStrips] @@ -89,8 +87,7 @@ class Screen: #if type(mapper) != type(PixelMapper): # raise Exception('No default mapper specified.') pixelWeightList = mapper.mapEvent(responseInfo['Location'], self) - main_log.debug(str(len(pixelWeightList))) - main_log.debug(pixelWeightList) + PixelEvent.addPixelEventIfMissing(responseInfo) currentTime = timeops.time() for (pixel, weight) in pixelWeightList: |