more testing

Author: John Sun

Diff for: SimpleCV/tests/test_vimba.py

@@ -89,6 +89,12 @@ def _listAllCameras(c):
     for i in l:
         print 'Camera Id=%s' % i.cameraIdString
 
+"""
+def test_runCommand_only():
+    c = VimbaCamera()
+    _runCommand(c)
+"""
+
 def test_all():
     c = VimbaCamera()
     _getProperty(c)

Diff for: SimpleCV/tests/test_vimba_manyshots.py

@@ -1,7 +1,7 @@
 import numpy as np
 import cv2
 import time
-from SimpleCV.Camera import VimbaCamera
+from SimpleCV.Camera import VimbaCamera, AVTCamera
 from SimpleCV import Display
 
 #c = VimbaCamera(0, threaded=True) # async
@@ -22,23 +22,42 @@ def test_getImageDisplay():
     print "test_getImage_scv_display2.png saved"
 """
 
-def test_takeManyShots():
-    c = VimbaCamera()
-    printPrettyHeader("Test takeManyShots")
-
-    numPics = 50
+def _takeShots(cam, numPics, filename):
     start = time.time()
     print "Taking %d photos..." % numPics
     for i in range(numPics):
-        img = c.getImage()
-        img.save("takeManyShots_%d.png" % i)
+        img = cam.getImage()
+        img.save("%s_%d.png" % (filename, i))
     end = time.time()
     elapsed = end - start
     print "Took %f seconds" % elapsed
 
+"""
+def test_takeManyShots():
+    c = VimbaCamera()
+    printPrettyHeader("Test takeManyShots")
+
+    _takeShots(c, 50, "vimba")
+"""
+
+def test_oneGrayShot():
+    c = VimbaCamera(properties={"mode":"gray"})
+    printPrettyHeader("Test oneGrayShot")
+
+    img = c.getImage()
+    img.save("test_oneGrayShot.png")
+
 def test_oneShot():
     c = VimbaCamera()
     printPrettyHeader("Test oneShot")
 
     img = c.getImage()
-    img.save("test_oneShot.png")
+    img.save("test_oneShot.png")
+
+"""
+def test_AVT_takeManyShots():
+    c = AVTCamera()
+    printPrettyHeader("Test AVT_takeManyShots")
+
+    _takeShots(c, 50, "avtnative")
+"""