Waiting for assembled picture state added
This commit is contained in:
@@ -198,8 +198,7 @@ class Photobooth:
|
|||||||
|
|
||||||
def capturePictures(self):
|
def capturePictures(self):
|
||||||
|
|
||||||
pictures = [ self.captureSinglePicture() for _ in range(self._pic_dims.totalNumPictures) ]
|
return [ self.captureSinglePicture() for _ in range(self._pic_dims.totalNumPictures) ]
|
||||||
return self.assemblePictures(pictures)
|
|
||||||
|
|
||||||
|
|
||||||
def trigger(self):
|
def trigger(self):
|
||||||
@@ -210,7 +209,10 @@ class Photobooth:
|
|||||||
|
|
||||||
sleep(self.greeterTime)
|
sleep(self.greeterTime)
|
||||||
|
|
||||||
img = self.capturePictures()
|
pics = self.capturePictures()
|
||||||
|
self._send.send(gui.AssembleState())
|
||||||
|
|
||||||
|
img = self.assemblePictures(pics)
|
||||||
img.save(self.getNextFilename(), 'JPEG')
|
img.save(self.getNextFilename(), 'JPEG')
|
||||||
self._send.send(gui.PictureState(img))
|
self._send.send(gui.PictureState(img))
|
||||||
|
|
||||||
|
|||||||
@@ -87,6 +87,8 @@ class PyQt5Gui(Gui):
|
|||||||
self._p.setCentralWidget(PyQt5PictureMessage(state.message, img))
|
self._p.setCentralWidget(PyQt5PictureMessage(state.message, img))
|
||||||
elif isinstance(state, PoseState):
|
elif isinstance(state, PoseState):
|
||||||
self._p.setCentralWidget(PyQt5PictureMessage('Pose!'))
|
self._p.setCentralWidget(PyQt5PictureMessage('Pose!'))
|
||||||
|
elif isinstance(state, AssembleState):
|
||||||
|
self._p.setCentralWidget(PyQt5PictureMessage('Please wait!\nAssembling picture...'))
|
||||||
elif isinstance(state, PictureState):
|
elif isinstance(state, PictureState):
|
||||||
img = ImageQt.ImageQt(state.picture)
|
img = ImageQt.ImageQt(state.picture)
|
||||||
self._p.setCentralWidget(PyQt5PictureMessage('', img))
|
self._p.setCentralWidget(PyQt5PictureMessage('', img))
|
||||||
|
|||||||
@@ -129,6 +129,13 @@ class PoseState(GuiState):
|
|||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class AssembleState(GuiState):
|
||||||
|
|
||||||
|
def __init__(self, **kwargs):
|
||||||
|
|
||||||
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
|
|
||||||
class PreviewState(MessageState, PictureState):
|
class PreviewState(MessageState, PictureState):
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
|
|||||||
Reference in New Issue
Block a user