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

@@ @@ -5,45 +5,43 @@ import logging as log @@
 import PIL
 from util import MsgQueue
 from gui import gui
 from imageanalyzer import ImageAnalyzer
 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)
 		self._guiProc=multiprocessing.Process(name="gui", target=gui, args=(self._guiMessages,self._ownMessages))
 		self._guiProc.start()
 		self._guiMessages.send("setCurrentFrame",(self._frame.copy(),))
 	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()
 	def joinGui(self):
 		self._guiProc.join()
 		self._ownMessages.send("!kill")
 	def _handleEvent(self,e):

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._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):
 		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 the garbage collector
@@ @@ -53,39 +51,38 @@ class ImgView(ResizableCanvas): @@
 			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)
 		# 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):
 		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):
 		super()._onResize(event)
 		self.redraw()

src/imageanalyzer.py

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ class ImageAnalyzer: @@
 	def analyze(self,image):
 		if self.grid==None:
 			log.info("ImageAnalyzer.analyze() aborted: no grid available.")
 			return False
 		for r in range(19):
 			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)
 		for y in range(y1,y2+1):
 			for x in range(x1,x2+1):
 				red,green,blue=image.getpixel((x,y))
 				I=(red+green+blue)/255/3
 				m=min(red,green,blue)

0 comments (0 inline, 0 general)