bugs in manual mode fixed

[imago.git] / capture.py

diff --git a/capture.py b/capture.py
index 9b93ba6..7f3234b 100755 (executable)
--- a/capture.py
+++ b/capture.py
@@ -6,6 +6,8 @@ import os
 import sys
 import argparse
 import time
+from threading import Thread
+from Queue import Queue, Empty
 
 import pygame
 from pygame.locals import QUIT, KEYDOWN
@@ -25,30 +27,47 @@ class Screen:
         self._screen.blit(pg_img, (0,0))
         pygame.display.flip()
 
+class Capture:
+    def __init__(self, device, res):
+        self.cam = Camera(vid=device, res=res)
+        self.screen = Screen(res)
 
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('-d', type=int, default=0,
-                        help="video device id")
-    parser.add_argument('-a', type=int, default=0,
-                        help="take picture automaticaly every A seconds")
-    parser.add_argument('-r', type=int, nargs=2, default=[640, 480],
-                        help="set camera resolution")
-    args = parser.parse_args()
+        self.im_number = 0
 
-    res=(args.r[0], args.r[1])
+        self.saving_dir = "./captured/" + time.strftime("%Y-%m-%d %H:%M/")
 
-    cam = Camera(vid=args.d, res=res)
-    screen = Screen(res)
+        if not os.path.isdir(self.saving_dir):
+            os.makedirs(self.saving_dir)
 
-    im_number = 0
+    def __del__(self):
+        del self.cam
 
-    saving_dir = "./captured/" + time.strftime("%Y-%m-%d %H:%M")
-
-    if not os.path.isdir(saving_dir):
-        os.makedirs(saving_dir)
-    
-    if args.a > 0:
+    def live(self, q):
+        done = False
+        clock = pygame.time.Clock()
+        while not done: #live preview
+            if q:
+                try:
+                    line = q.get_nowait() # or q.get(timeout=.1)
+                except Empty:
+                    pass
+                else:
+                    if line == "stop\n":
+                        done = True
+                    elif line == "exit\n":
+                        sys.exit()
+            else:
+                for event in pygame.event.get():
+                    if event.type == pygame.QUIT:
+                        sys.exit()
+                    elif event.type == pygame.KEYDOWN:
+                        done = True
+
+            im = self.cam.get_image()
+            self.screen.display_picture(im)
+            clock.tick(5)
+
+    def auto(self, interval):
         last = 0
         clock = pygame.time.Clock()
         done = False
@@ -57,28 +76,79 @@ def main():
             for event in pygame.event.get():
                 if event.type == pygame.QUIT:
                     done = True
-            if time.time() - last > args.a:
+            if time.time() - last > interval:
                 last = time.time()
-                im = cam.get_image()
-                screen.display_picture(im)
-                im.save(saving_dir + "{0:0>3}.jpg".format(im_number), 'JPEG')
-                im_number += 1
+                self.take()
             clock.tick(15)
 
-    else:
+    def manual(self):
         while True:
             event = pygame.event.wait()
             if event.type == QUIT:
                 break
             if event.type != KEYDOWN:
                 continue
+            self.take()
+            
+
+    def take(self):
+        im = self.cam.get_image()
+        self.screen.display_picture(im)
+        im.save(self.saving_dir + "{0:0>3}.jpg".format(self.im_number), 'JPEG')
+        self.im_number += 1
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('-c', '--cmd', dest='cmd', action='store_true',
+                    help="take commands from stdin")
+    parser.add_argument('-d', type=int, default=0,
+                        help="video device id")
+    parser.add_argument('-a', type=int, default=0,
+                        help="take picture automaticaly every A seconds")
+    parser.add_argument('-r', type=int, nargs=2, default=[640, 480],
+                        help="set camera resolution")
+    args = parser.parse_args()
+
+    res=(args.r[0], args.r[1])
+    capture = Capture(args.d, res)
 
-            im = cam.get_image()
-            screen.display_picture(im)
-            im.save(saving_dir + "{0:0>3}.jpg".format(im_number), 'JPEG')
-            im_number += 1
 
-    del cam
+    if args.cmd:
+
+        def enqueue_input(queue):
+            for line in iter(sys.stdin.readline, b''):
+                queue.put(line)
+
+        q = Queue()
+        t = Thread(target=enqueue_input, args=(q,))
+        t.daemon = True 
+        t.start()
+        
+        capture.live(q)
+
+        clock = pygame.time.Clock()
+        while True:
+
+            try:
+                line = q.get_nowait() # or q.get(timeout=.1)
+            except Empty:
+                pass
+            else: 
+                if line == "take\n":
+                    capture.take()
+                elif line == "exit\n":
+                    break
+            clock.tick(10)
+
+    else:
+        capture.live(None)
+        if args.a > 0:
+            capture.auto(args.a)
+        else:
+            capture.manual()
+
+    del capture
     
 if __name__ == '__main__':
     try: