summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2012-05-05 12:30:51 +0100
committerTim Redfern <tim@eclectronics.org>2012-05-05 12:30:51 +0100
commit5763de58f064b05c69d2a83494ad33be21cdc6e7 (patch)
treedbb2a13905484778f2222f5bd3f9adee910ade85
parent97c80917a2bf4d0662b55df8f1ac28aca24127ea (diff)
fixed serial bug
-rw-r--r--layers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/layers.py b/layers.py
index ceaef1e..603b60d 100644
--- a/layers.py
+++ b/layers.py
@@ -52,8 +52,8 @@ class indexlayer(layer):
colour=-1
def setcoord(self,pos):
result=None
- #210 35 5 185
- c=self.image.getpixel(pos)
+ p=(min(max(int(pos[0]),0),self.image.size[0]-2),min(max(int(pos[1]),0),self.image.size[1]-2))
+ c=self.image.getpixel(p)
if c!=self.colour:
self.colour=c
print "indexlayer: new colour",c
@@ -71,8 +71,8 @@ class scalelayer(layer):
def setcommand(self,command):
self.command=command
def setcoord(self,pos):
- px=int(pos[0])
- py=int(pos[1])
+ px=min(max(int(pos[0]),0),self.image.size[0]-2)
+ py=min(max(int(pos[1]),0),self.image.size[1]-2)
c=float(self.image.getpixel((px,py)))/255.0
c1=float(self.image.getpixel((px+1,py)))/255.0
c2=float(self.image.getpixel((px,py+1)))/255.0