OneEye Changeset - 4c1ba49ea859

Changeset - 4c1ba49ea859

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Laman - 8 years ago 2017-04-08 11:42:05

walking through the frames

5 files changed with 24 insertions and 7 deletions:

src/config.py

src/core.py

src/gui/__init__.py

src/gui/imgview.py

src/gui/mainwindow.py

0 comments (0 inline, 0 general)

src/config.py

➞

Show inline comments

@@ @@ -7,12 +7,12 @@ logging.basicConfig(format='%(asctime)s @@
 with open(os.path.join(os.path.dirname(__file__), "..", "config.json")) as f:
 	cfgFile=json.load(f)
 class misc:
 	file=cfgFile["misc"]
 	version=(0,0,0)
-	defaultImage=file.get("defaultImage", "1.jpg")
+	defaultImage=file.get("defaultImage", 0)
 class gui:
 	file=cfgFile["gui"]
 	showBigPoints=file.get("showBigPoints", False)
 	showGrid=file.get("showGrid", True)

src/core.py

➞

Show inline comments

@@ @@ -16,40 +16,54 @@ class Core: @@
 		self.go=Go()
 		self.detector=ImageAnalyzer()
 		self._ownMessages=MsgQueue(self._handleEvent)
 		self._guiMessages=MsgQueue()
 		imgPath=os.path.join(os.path.dirname(__file__), "..","images",cfg.misc.defaultImage)
 		self._imgDir=os.path.join(os.path.dirname(__file__), "..","images")
 		self._imgs=sorted(os.listdir(self._imgDir))
 		self._imgIndex=cfg.misc.defaultImage
 		imgPath=os.path.join(self._imgDir,self._imgs[self._imgIndex])
 		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(),))
+		self.relativeFrame(0)
 	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.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 relativeFrame(self,step):
 		self._imgIndex=(self._imgIndex+step)%len(self._imgs)
 		imgPath=os.path.join(self._imgDir,self._imgs[self._imgIndex])
 		self._frame=PIL.Image.open(imgPath)
 		self._guiMessages.send("setCurrentFrame",(self._frame.copy(),))
 	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):
 		actions={"setCorners":self.setCorners, "setTresholds":self.setTresholds}
 		actions={
 			"setCorners": self.setCorners,
 			"setTresholds": self.setTresholds,
 			"prevFrame": lambda: self.relativeFrame(-1),
 			"nextFrame": lambda: self.relativeFrame(1)
+		}
 		(actionName,args,kwargs)=e
 		return actions[actionName](*args,**kwargs)
 core=Core()
 core.listen()

src/gui/__init__.py

➞

Show inline comments

@@ @@ -15,13 +15,14 @@ class GUI: @@
 		self.mainWindow = MainWindow(self, master=self.root)
 		self.root.columnconfigure(0,weight=1)
 		self.root.rowconfigure(0,weight=1)
 		self.root.bind("<<redrawImgView>>", lambda e: self.mainWindow.redrawImgView())
 		self.root.bind("<<receiveState>>", lambda e: print("fired receiveState"))
 		self.root.bind("<Left>",lambda e: self.sendMsg("prevFrame"))
 		self.root.bind("<Right>",lambda e: self.sendMsg("nextFrame"))
 	def __call__(self,ownMessages,coreMessages):
 		self._coreMessages=coreMessages
 		self.listenerThread=threading.Thread(target=lambda: ownMessages.listen(self._handleEvent))
 		self.listenerThread.start()

src/gui/imgview.py

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ class ImgView(ResizableCanvas): @@
 	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
 			self._tkImg=ImageTk.PhotoImage(img) # just to save the image from garbage collector
 			self.create_image(self._width//2, self._height//2, anchor="center", image=self._tkImg)
 		for corner in self._corners.corners:
 			self.markPoint(corner.x,corner.y)
 		if self._boardGrid!=None and config.gui.showGrid:
@@ @@ -59,13 +59,12 @@ class ImgView(ResizableCanvas): @@
 		wo,ho=img.size # o for original
 		widthRatio=wo/w
 		heightRatio=ho/h
 		self._imgSizeCoef=max(widthRatio,heightRatio)
 		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",self._imgSizeCoef)

src/gui/mainwindow.py

➞

Show inline comments

@@ @@ -10,12 +10,15 @@ class MainWindow(tk.Frame): @@
 		self.parent=parent
 		tk.Frame.__init__(self, master)
 		self.grid(column=0,row=0,sticky=(N,S,E,W))
 		self._createWidgets()
 		self.bind("<Left>",lambda e: self.sendMsg("prevFrame"))
 		self.bind("<Right>",lambda e: self.sendMsg("nextFrame"))
 	def setCurrentFrame(self,frame):
 		self.imgView.setImg(frame)
 	def _createWidgets(self):
 		# a captured frame with overlay graphics
 		self._imgWrapper=tk.Frame(self,width=480,height=360)

0 comments (0 inline, 0 general)