diff --git a/src/core.py b/src/core.py --- a/src/core.py +++ b/src/core.py @@ -1,7 +1,10 @@ import multiprocessing import threading import logging + import PIL + +import config as cfg from util import MsgQueue from gui import gui from analyzer import ImageAnalyzer @@ -9,7 +12,6 @@ from analyzer.framecache import FrameCac from go.core import Go, isLegalPosition from statebag import StateBag from video import capVideo -import config as cfg log=logging.getLogger(__name__) @@ -37,16 +39,16 @@ class Core: ) self._vidProc.start() - def showFrame(self,key): + def fetchFrame(self,key): frame=self._cache.get(key) if frame is None: (key,frame)=self._cache.getRelative(10) - self._guiMessages.send("setCurrentFrame", (frame.copy(), gui.PREVIEW, key)) + self._guiMessages.send("setFrame", (frame.copy(), gui.PREVIEW, key)) def putFrame(self,frame): self._frame=PIL.Image.fromarray(frame) k=self._cache.put(self._frame) - self._guiMessages.send("setCurrentFrame", (self._frame, gui.RECORDING, k)) + self._guiMessages.send("setFrame", (self._frame, gui.RECORDING, k)) self.analyze() def sendParams(self): @@ -82,8 +84,7 @@ class Core: def _handleEvent(self,e): actions={ - "prevFrame": lambda: self.relativeFrame(-1), - "nextFrame": lambda: self.relativeFrame(1), + "fetchFrame": self.fetchFrame, "putFrame": self.putFrame, "fetchParams": self.sendParams, "setParams": self.setParams