scalable edge-detection

[imago.git] / capture.py

diff --git a/capture.py b/capture.py
index b9879d8..bbc3c1e 100755 (executable)
--- a/capture.py
+++ b/capture.py
@@ -2,6 +2,7 @@
 
 """Go image capture"""
 
 
 """Go image capture"""
 

+import os

 import sys
 import argparse
 
 import sys
 import argparse
 


@@ -12,9 +13,9 @@ import Image
 from camera import Camera
 
 class Screen:
 from camera import Camera
 
 class Screen:

-    def __init__(self):
+    def __init__(self, res):

         pygame.init()
         pygame.init()

-        pygame.display.set_mode((640,480))
+        pygame.display.set_mode(res)

         pygame.display.set_caption("Go image capture")
         self._screen = pygame.display.get_surface()
 
         pygame.display.set_caption("Go image capture")
         self._screen = pygame.display.get_surface()
 


@@ -28,13 +29,22 @@ def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('-d', type=int, default=0,
                         help="video device id")
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('-d', type=int, default=0,
                         help="video device id")

+    parser.add_argument('-r', type=int, nargs=2, default=[640, 480],
+                        help="set camera resolution")

     args = parser.parse_args()
     args = parser.parse_args()

-   
-    cam = Camera(vid=args.d)
-    screen = Screen()
+
+    res=(args.r[0], args.r[1])
+
+    cam = Camera(vid=args.d, res=res)
+    screen = Screen(res)

 
     im_number = 0
 
 
     im_number = 0
 

+    saving_dir = "./captured/"
+
+    if not os.path.isdir(saving_dir):
+        os.makedirs(saving_dir)
+

     while True:
         event = pygame.event.wait()
         if event.type == QUIT:
     while True:
         event = pygame.event.wait()
         if event.type == QUIT:


@@ -42,8 +52,10 @@ def main():
         elif event.type == KEYDOWN:
             im = cam.get_image()
             screen.display_picture(im)
         elif event.type == KEYDOWN:
             im = cam.get_image()
             screen.display_picture(im)

-            im.save("./captured/{0:0>3}.jpg".format(im_number), 'JPEG')
+            im.save(saving_dir + "{0:0>3}.jpg".format(im_number), 'JPEG')

             im_number += 1
             im_number += 1

+
+    del cam

     
 if __name__ == '__main__':
     try:
     
 if __name__ == '__main__':
     try: