OneEye Changeset - dde4374cb22a

Changeset - dde4374cb22a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 8 years ago 2017-04-09 16:12:51

imgView: fixed coordinates transformation. fixed onResize glitches

3 files changed with 21 insertions and 10 deletions:

src/gui/boardview.py

src/gui/imgview.py

src/imageanalyzer.py

0 comments (0 inline, 0 general)

src/gui/boardview.py

➞

Show inline comments

@@ @@ -49,12 +49,17 @@ class BoardView(ResizableCanvas): @@
 		if color==BLACK:
 			hexCode='#000000'
 			tag="black"
 		elif color==WHITE:
 			hexCode='#ffffff'
 			tag="white"
 		else: return False
 		x=c*self._cellWidth+self._padding
 		y=r*self._cellHeight+self._padding
 		radius=self._cellWidth/2
 		self.create_oval(x-radius,y-radius,x+radius,y+radius,tags=tag,fill=hexCode)
 	def _onResize(self,event):
 		super()._onResize(event)
 		self._cellWidth=(self._width-2*self._padding)/18
 		self._cellHeight=(self._height-2*self._padding)/18

src/gui/imgview.py

➞

Show inline comments

 import logging as log
 from PIL import ImageTk
 import config
 from .resizablecanvas import ResizableCanvas
 from corners import Corners
 from epoint import EPoint
 from grid import Grid
 import imageanalyzer
 class ImgView(ResizableCanvas):
 	def __init__(self,master=None,parent=None):
 		super().__init__(master)
 		self._parent=parent
 		self._corners=Corners()
 		self._boardGrid=None
 		self._img=None
 		self._tkImg=None
 		self._imgSizeCoef=1
 		self.configure(width=480,height=360)
 		self.bind('<1>',lambda e: self.addCorner(e.x,e.y))
 	## Redraws the current image and its overlay.
 	def redraw(self):
 		self.delete("all")
 		if self._img:
 			img=self._img.copy()
 			img.thumbnail((int(self._width),int(self._height)))
 			self._tkImg=ImageTk.PhotoImage(img) # just to save the image from garbage collector
@@ @@ -45,46 +45,50 @@ class ImgView(ResizableCanvas): @@
 			for c in range(19):
 				a=self._boardGrid.intersections[0][c]
 				b=self._boardGrid.intersections[-1][c]
 				self.create_line(a.x,a.y,b.x,b.y,fill='#00ff00')
 		if self._boardGrid!=None and config.gui.showBigPoints:
 			for r in range(19):
 				for c in range(19):
 					((r1,c1),(r2,c2))=imageanalyzer.relevantRect(self._boardGrid.intersections[r][c], *(self._boardGrid.stoneSizeAt(r, c)))
 					self.create_rectangle(r1,c1,r2,c2,outline="#00ffff")
 	def setImg(self,img):
 		w=int(self._width)
 		h=int(self._height)
 		wo,ho=img.size # o for original
 		widthRatio=wo/w
 		heightRatio=ho/h
 		self._imgSizeCoef=max(widthRatio,heightRatio)
 		self._img=img
 	## Stores a grid corner located at x,y coordinates.
 	def addCorner(self,x,y):
 		self._corners.add(x,y)
 		log.debug("click on %d,%d",x,y)
 		log.debug("sizeCoef: %f",self._imgSizeCoef)
 		if self._corners.canonizeOrder():
 			# transform corners from show coordinates to real coordinates
 			log.debug(self._corners.corners)
 			self._boardGrid=Grid(self._corners.corners)
-			corners=[(c*self._imgSizeCoef) for c in self._corners.corners]
+			corners=[self._transformPoint(c) for c in self._corners.corners]
 			self._parent.sendMsg("setCorners",(corners,))
 		self.redraw()
 	## Marks a point at the image with a green cross. Used for corners.
 	def markPoint(self,x,y):
 		self.create_line(x-3,y-3,x+4,y+4,fill="#00ff00")
 		self.create_line(x-3,y+3,x+4,y-4,fill="#00ff00")
 	def _onResize(self,event):
 		w=self._width
 		super()._onResize(event)
 		self._corners.scale(self._width/w)
 		if len(self._corners.corners)==4:
 		self._boardGrid=Grid(self._corners.corners)
 		self.redraw()
 	def _transformPoint(self,point):
 		w=int(self._width)
 		h=int(self._height)
 		wo,ho=self._img.size # o for original
 		widthRatio=wo/w
 		heightRatio=ho/h
 		self._imgSizeCoef=max(widthRatio,heightRatio)
 		# shift compensates possible horizontal or vertical empty margins from unmatching aspect ratios
 		self._imgShift=EPoint(wo-w*self._imgSizeCoef,ho-h*self._imgSizeCoef)/2
 		return EPoint(self.canvasx(point.x),self.canvasy(point.y)) * self._imgSizeCoef + self._imgShift

src/imageanalyzer.py

➞

Show inline comments

@@ @@ -26,25 +26,27 @@ class ImageAnalyzer: @@
 				self.board[r][c]=self.analyzePoint(image,r,c,intersection,*(self.grid.stoneSizeAt(r,c)))
 		log.info("board analyzed:\n%s", exportBoard(self.board))
 		return True
 	def analyzePoint(self,image,row,col,imageCoords,stoneWidth,stoneHeight):
 		b=w=e=0
 		((x1,y1),(x2,y2))=relevantRect(imageCoords,stoneWidth,stoneHeight)
 		for y in range(y1,y2+1):
 			for x in range(x1,x2+1):
 				try:
 				red,green,blue=image.getpixel((x,y))
 				except IndexError: continue
 				I=(red+green+blue)/255/3
 				m=min(red,green,blue)
 				S=1-m/I if I!=0 else 0
 				if 100*I<self.tresB: b+=1
 				elif 100*I>self.tresW: w+=1
 				else: e+=1
 		log.debug("(%d,%d) ... (b=%d,w=%d,e=%d)", row, col, b, w, e)
 		if b>=w and b>=e: return go.BLACK
 		if w>=b and w>=e: return go.WHITE

0 comments (0 inline, 0 general)