diff options
| author |  rcoh <rcoh@mit.edu> | 2010-12-20 14:50:08 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2010-12-20 14:50:08 -0500 |
| commit | 2736307c1d6d67868ca54a3df951f9e959efedd0 (patch) | |
| tree | 50a61c798d52987f8fe575f678aaff5b5b9455b9 /pixelcore | |
| parent | 7386cbc7ce48e3996d92d84cff3d1a4dab8f538d (diff) | |
Util cleanup is done! Util.py is now refactored into the util module. Woo! RCOH
Diffstat (limited to 'pixelcore')
| -rw-r--r-- | pixelcore/PixelStrip.py | 6 | ||||
| -rw-r--r-- | pixelcore/Screen.py | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pixelcore/PixelStrip.py b/pixelcore/PixelStrip.py index c82a87a..cfab948 100644 --- a/pixelcore/PixelStrip.py +++ b/pixelcore/PixelStrip.py @@ -1,4 +1,6 @@ from pixelcore.Pixel import * +import util.Strings as Strings +import util.Geo as Geo from pixelevents.StepEvent import * import pygame import math @@ -21,7 +23,7 @@ class PixelStrip: [l.turnOnFor(time) for l in self.pixels] #TODO: add test-on method to #pixels def respond(self, responseInfo): - location = responseInfo[Util.location] + location = responseInfo[Strings.LOCATION] if not 'PixelEvent' in responseInfo: if 'Color' in responseInfo: color = responseInfo['Color'] @@ -32,7 +34,7 @@ class PixelStrip: pixel.processInput(responseInfo['PixelEvent'], 0) #TODO: z-index def getPixelNearest(self, location): - dists = [(Util.dist(location, pixel.location), pixel) for pixel in self.pixels] + dists = [(Geo.dist(location, pixel.location), pixel) for pixel in self.pixels] dists.sort() return dists[0] #just for now. diff --git a/pixelcore/Screen.py b/pixelcore/Screen.py index 92805a8..a20cc72 100644 --- a/pixelcore/Screen.py +++ b/pixelcore/Screen.py @@ -1,5 +1,7 @@ from pixelcore.Pixel import * from pixelcore.PixelStrip import * +from operationscore.PixelEvent import * +import util.Search as Search import itertools #Class representing a collection of Pixels grouped into PixelStrips. Needs a #PixelMapper, currently set via setMapper by may be migrated into the argDict. @@ -17,8 +19,8 @@ class Screen: self.computeXSortedPixels() #Returns (pixelIndex, pixel). Does a binary search. def pixelsInRange(self, minX, maxX): - minIndex = Util.find_ge(self.xPixelLocs, minX) - maxIndex = Util.find_le(self.xPixelLocs, maxX)+1 + minIndex = Search.find_ge(self.xPixelLocs, minX) + maxIndex = Search.find_le(self.xPixelLocs, maxX)+1 return self.xSortedPixels[minIndex:maxIndex] def computeXSortedPixels(self): for pixel in self: @@ -70,7 +72,7 @@ class Screen: pass #pdb.set_trace() pixelWeightList = self.mapper.mapEvent(responseInfo['Location'], self) - Util.addPixelEventIfMissing(responseInfo) + PixelEvent.addPixelEventIfMissing(responseInfo) for (pixel, weight) in pixelWeightList: pixel.processInput(responseInfo['PixelEvent'].scale(weight), 0) #TODO: z-index |