merge with biginstall

1 files changed, 4 insertions, 6 deletions

diff --git a/pixelcore/Screen.py b/pixelcore/Screen.py
index 22cfdb0..cfadee8 100644
--- a/pixelcore/Screen.py
+++ b/pixelcore/Screen.py
@@ -8,6 +8,7 @@ import util.Strings as Strings
 import util.TimeOps as timeops
 import itertools
 import sys
+import pdb
 from logger import main_log
 #Class representing a collection of Pixels grouped into PixelStrips.  Needs a
 #PixelMapper, currently set via setMapper by may be migrated into the argDict.
@@ -37,9 +38,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]
         
@@ -74,6 +73,7 @@ class Screen:
             maxY = max(y, maxY)
         self.size = (0,0, maxX, maxY)
         self.sizeValid = True
+        print self.size
         return (0, 0, maxX+100, maxY+100) #TODO: cleaner
         
     #private
@@ -89,9 +89,7 @@ class Screen:
         #if type(mapper) != type(PixelMapper):
         #    raise Exception('No default mapper specified.')
         pixelWeightList = mapper.mapEvent(responseInfo['Location'], self)
-
         PixelEvent.addPixelEventIfMissing(responseInfo)
         currentTime = timeops.time()
         for (pixel, weight) in pixelWeightList: 
-            pixel.processInput(responseInfo['PixelEvent'].scale(weight), 0, currentTime) #TODO: z-index
-
+            pixel.processInput(responseInfo['PixelEvent'], 0,weight, currentTime) #TODO: z-index