diff --git a/film.png b/film.png index 681ff88..78a102f 100644 Binary files a/film.png and b/film.png differ diff --git a/film.svg b/film.svg index 83c82a6..dc52f01 100644 --- a/film.svg +++ b/film.svg @@ -29,8 +29,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" - inkscape:cx="158.44232" - inkscape:cy="306.45609" + inkscape:cx="-27.035262" + inkscape:cy="235.80716" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -39,7 +39,9 @@ inkscape:window-height="1041" inkscape:window-x="1680" inkscape:window-y="18" - inkscape:window-maximized="0" /> + inkscape:window-maximized="0" + showguides="true" + inkscape:guide-bbox="true" /> @@ -59,192 +61,240 @@ transform="translate(0,-169.99998)"> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.44665909;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.44665909;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect905" + width="168.80417" + height="107.36983" + x="21.609423" + y="291.26645" + ry="3.1763959" /> + + + + + + + + + + + + + + + diff --git a/photoboite.py b/photoboite.py index b5fe37c..8c7918a 100755 --- a/photoboite.py +++ b/photoboite.py @@ -46,6 +46,7 @@ except: def take(self, name): print('Take picture! ' + name) + return self.img def draw_on(self, screen): screen.blit(self.img, self.rect) @@ -102,6 +103,8 @@ class CaptureButton(Button): self.font = pygame.font.Font(None, 80) + self.photo_film = pygame.image.load('film.png').convert_alpha() + def draw_on(self, screen): if self.enabled: super(CaptureButton, self).draw_on(screen) @@ -140,6 +143,13 @@ class CaptureButton(Button): capture.take(self.photoboite.camera) pygame.time.wait(1000) + + for photo in capture.photos: + self.photoboite.screen.blit(self.photo_film, (0, 0)) + pygame.display.flip() + pygame.time.wait(1000) + self.photoboite.event() + pygame.event.set_allowed((pygame.MOUSEBUTTONDOWN, pygame.MOUSEBUTTONUP)) self.capture_mode = False self.enabled = True