diff options
Diffstat (limited to 'pixelmappers')
| -rw-r--r-- | pixelmappers/GaussianMapper.py | 5 | ||||
| -rw-r--r-- | pixelmappers/SimpleMapper.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pixelmappers/GaussianMapper.py b/pixelmappers/GaussianMapper.py index 04bd447..e94235e 100644 --- a/pixelmappers/GaussianMapper.py +++ b/pixelmappers/GaussianMapper.py @@ -1,4 +1,5 @@ from operationscore.PixelMapper import * +import util.Geo as Geo import Util class GaussianMapper(PixelMapper): def mappingFunction(self, eventLocation, screen): @@ -6,8 +7,8 @@ class GaussianMapper(PixelMapper): [x,y] = eventLocation for (x,pixel) in screen.pixelsInRange(x-self['CutoffDist'], \ x+self['CutoffDist']): - pixelDist = Util.dist(pixel.location, eventLocation) + pixelDist = Geo.dist(pixel.location, eventLocation) if pixelDist < self['CutoffDist']: - w = Util.gaussian(pixelDist, self['Height'], 0, self['Width']) + w = Geo.gaussian(pixelDist, self['Height'], 0, self['Width']) returnPixels.append((pixel, w)) return returnPixels diff --git a/pixelmappers/SimpleMapper.py b/pixelmappers/SimpleMapper.py index 7d730f1..4b5377d 100644 --- a/pixelmappers/SimpleMapper.py +++ b/pixelmappers/SimpleMapper.py @@ -5,7 +5,7 @@ class SimpleMapper(PixelMapper): bestDist = 10**10 #don't kill me, I'm lazy bestPixel = None for pixel in screen: - pixelDist = Util.dist(pixel.location, eventLocation) + pixelDist = Geo.dist(pixel.location, eventLocation) if pixelDist < bestDist: bestPixel = pixel bestDist = pixelDist |