better manual mode, grid-fitting preparation

[imago.git] / camera.py

diff --git a/camera.py b/camera.py
index 308ca93..d5dac75 100644 (file)
--- a/camera.py
+++ b/camera.py
@@ -6,8 +6,12 @@ if os.name == 'posix':
     import cv
 
     class Camera:
-        def __init__(self, vid=0):
+        def __init__(self, vid=0, res=None):
             self._cam = cv.CreateCameraCapture(vid)
+            if res:
+                cv.SetCaptureProperty(self._cam, cv.CV_CAP_PROP_FRAME_WIDTH, res[0])
+                cv.SetCaptureProperty(self._cam, cv.CV_CAP_PROP_FRAME_HEIGHT,
+                                      res[1])
 
         def get_image(self):
             for _ in range(5): #HACK