felix/photobooth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Threading module with Communicator added

Browse Source
This commit is contained in:
Balthasar Reuter
2018-07-13 22:30:49 +02:00
parent 2925b3ecb0
commit f8918e895e
5 changed files with 144 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
photobooth/gui/GuiSkeleton.py
View File

@@ -19,12 +19,15 @@
from . import GuiState
from .. import StateMachine
class GuiSkeleton:
def __init__(self):
def __init__(self, communicator):
super().__init__()
self._comm = communicator
@property
def idle(self):

11
photobooth/gui/Qt5Gui/PyQt5Gui.py
View File

@@ -27,6 +27,9 @@ from PyQt5 import QtWidgets
from PIL import ImageQt
from ... import StateMachine
from ...Threading import Workers
from .. import GuiState
from ..GuiSkeleton import GuiSkeleton
from ..GuiPostprocessor import GuiPostprocessor
@@ -38,9 +41,9 @@ from . import Receiver
class PyQt5Gui(GuiSkeleton):
def __init__(self, argv, config, camera_conn, worker_queue):
def __init__(self, argv, config, camera_conn, worker_queue, communicator):
super().__init__()
super().__init__(communicator)
self._cfg = config
self._conn = camera_conn
@@ -181,6 +184,8 @@ class PyQt5Gui(GuiSkeleton):
self.restart))
def _showSettings(self):
self._comm.send(Workers.MASTER, StateMachine.GuiEvent('settings'))
self._disableTrigger()
self._disableEscape()
@@ -190,6 +195,8 @@ class PyQt5Gui(GuiSkeleton):
def _showStart(self, state):
self._comm.send(Workers.MASTER, StateMachine.GuiEvent('start'))
self._disableTrigger()
self._enableEscape()
self._lastHandle = self._showWelcomeScreen