Waiting for assembled picture state added

This commit is contained in:
Balthasar Reuter
2018-05-06 00:34:36 +02:00
parent e0c2734fae
commit 3773d182a4
3 changed files with 14 additions and 3 deletions

View File

@@ -198,8 +198,7 @@ class Photobooth:
def capturePictures(self):
pictures = [ self.captureSinglePicture() for _ in range(self._pic_dims.totalNumPictures) ]
return self.assemblePictures(pictures)
return [ self.captureSinglePicture() for _ in range(self._pic_dims.totalNumPictures) ]
def trigger(self):
@@ -210,7 +209,10 @@ class Photobooth:
sleep(self.greeterTime)
img = self.capturePictures()
pics = self.capturePictures()
self._send.send(gui.AssembleState())
img = self.assemblePictures(pics)
img.save(self.getNextFilename(), 'JPEG')
self._send.send(gui.PictureState(img))

View File

@@ -87,6 +87,8 @@ class PyQt5Gui(Gui):
self._p.setCentralWidget(PyQt5PictureMessage(state.message, img))
elif isinstance(state, PoseState):
self._p.setCentralWidget(PyQt5PictureMessage('Pose!'))
elif isinstance(state, AssembleState):
self._p.setCentralWidget(PyQt5PictureMessage('Please wait!\nAssembling picture...'))
elif isinstance(state, PictureState):
img = ImageQt.ImageQt(state.picture)
self._p.setCentralWidget(PyQt5PictureMessage('', img))

View File

@@ -129,6 +129,13 @@ class PoseState(GuiState):
super().__init__(**kwargs)
class AssembleState(GuiState):
def __init__(self, **kwargs):
super().__init__(**kwargs)
class PreviewState(MessageState, PictureState):
def __init__(self, **kwargs):