OneEye Changeset - 2bc2ee0a021c

Changeset - 2bc2ee0a021c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 8 years ago 2017-02-26 19:44:00

fixed imgview resizing, passing tresholds to analyzer, passing new state to core

3 files changed with 6 insertions and 10 deletions:

src/core.py

src/gui/imgview.py

src/imageanalyzer.py

0 comments (0 inline, 0 general)

src/core.py

➞

Show inline comments

@@ @@ -11,14 +11,12 @@ from go import Go @@
 class Core:
 	def __init__(self):
 		self.grid=None
 		self.go=Go()
 		self.detector=ImageAnalyzer()
 		self.tresW=60.0
 		self.tresB=30.0
 		self._ownMessages=MsgQueue(self._handleEvent)
 		self._guiMessages=MsgQueue()
 		imgPath=os.path.join(os.path.dirname(__file__), "..","images","5.jpg")
 		self._frame=PIL.Image.open(imgPath)
@@ @@ -30,14 +28,14 @@ class Core: @@
 	def setCorners(self,corners):
 		self.detector.setGridCorners(corners)
 		self.detector.analyze(self._frame)
 		self._guiMessages.send("setGameState",(self.detector.board,))
 	def setTresholds(self,tresB=None,tresW=None):
 		if tresB is not None: self.tresB=tresB
 		if tresW is not None: self.tresW=tresW
 		if tresB is not None: self.detector.tresB=tresB
 		if tresW is not None: self.detector.tresW=tresW
 		if self.detector.analyze(self._frame):
 			self._guiMessages.send("setGameState",(self.detector.board,))
 	def listen(self):
 		listenerThread=threading.Thread(target=lambda: self._ownMessages.listen())
 		listenerThread.start()

src/gui/imgview.py

➞

Show inline comments

@@ @@ -2,13 +2,12 @@ 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):
@@ @@ -18,13 +17,12 @@ class ImgView(ResizableCanvas): @@
 		self._corners=Corners()
 		self._boardGrid=None
 		self._img=None
 		self._tkImg=None
 		self._imgSizeCoef=1
 		self._imgShift=EPoint(0,0)
 		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):
@@ @@ -59,27 +57,26 @@ class ImgView(ResizableCanvas): @@
 		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)
 		# shift compensates possible horizontal or vertical empty margins from unmatching aspect ratios
 		self._imgShift=EPoint(wo-w*self._imgSizeCoef,ho-h*self._imgSizeCoef)/2
 		self._img=img
 		self.configure(width=wo,height=ho)
 	## 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, shift: %d,%d",self._imgSizeCoef,self._imgShift.x,self._imgShift.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+self._imgShift) for c in self._corners.corners]
 			corners=[(c*self._imgSizeCoef) 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):

src/imageanalyzer.py

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ class ImageAnalyzer: @@
 			for c in range(19):
 				intersection=self.grid.intersections[r][c]
 				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)

0 comments (0 inline, 0 general)