loading screens fix
This commit is contained in:
parent
e32acae572
commit
353934b1fb
@ -177,8 +177,6 @@ class Fotobox:
|
|||||||
screen.blit(FOTOBOX_COUNTDOWN1_SURFACE, FOTOBOX_COUNTDOWN1_RECT)
|
screen.blit(FOTOBOX_COUNTDOWN1_SURFACE, FOTOBOX_COUNTDOWN1_RECT)
|
||||||
elif self._state == State.SHOOTING:
|
elif self._state == State.SHOOTING:
|
||||||
screen.blit(self._event.frame, self._event.frame_rect)
|
screen.blit(self._event.frame, self._event.frame_rect)
|
||||||
elif self._state == State.PREPARE:
|
|
||||||
screen.blit(LOADING_SURFACE, LOADING_RECT)
|
|
||||||
elif self._state == State.CHOOSE:
|
elif self._state == State.CHOOSE:
|
||||||
screen.blit(CHOOSE_SURFACE, CHOOSE_RECT)
|
screen.blit(CHOOSE_SURFACE, CHOOSE_RECT)
|
||||||
screen.blit(CANCEL_SURFACE, CANCEL_RECT)
|
screen.blit(CANCEL_SURFACE, CANCEL_RECT)
|
||||||
@ -214,6 +212,9 @@ class Fotobox:
|
|||||||
print("Starting shooting: S%04d-%s" % (self._shooting_number, iso(self._shooting_datetime)))
|
print("Starting shooting: S%04d-%s" % (self._shooting_number, iso(self._shooting_datetime)))
|
||||||
self._shooting_timer.restart()
|
self._shooting_timer.restart()
|
||||||
elif new_state == State.PREPARE:
|
elif new_state == State.PREPARE:
|
||||||
|
screen.fill((0, 0, 0))
|
||||||
|
screen.blit(LOADING_SURFACE, LOADING_RECT)
|
||||||
|
pygame.display.flip()
|
||||||
for photo in self._photos:
|
for photo in self._photos:
|
||||||
photo.prepare(self._event)
|
photo.prepare(self._event)
|
||||||
self._set_state(State.CHOOSE)
|
self._set_state(State.CHOOSE)
|
||||||
@ -224,6 +225,9 @@ class Fotobox:
|
|||||||
else:
|
else:
|
||||||
self._choice = None
|
self._choice = None
|
||||||
elif new_state == State.QR:
|
elif new_state == State.QR:
|
||||||
|
screen.fill((0, 0, 0))
|
||||||
|
screen.blit(LOADING_SURFACE, LOADING_RECT)
|
||||||
|
pygame.display.flip()
|
||||||
self._printed = False
|
self._printed = False
|
||||||
try:
|
try:
|
||||||
if self._printer is None or not self._printer.is_online():
|
if self._printer is None or not self._printer.is_online():
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user