untested auto refactor changes to tests

7 files changed, 64 insertions, 64 deletions

diff --git a/tests/opencv_example.py b/tests/opencv_example.py
index 238e8b4..edc6a5d 100644
--- a/tests/opencv_example.py
+++ b/tests/opencv_example.py
@@ -13,7 +13,7 @@ with Vimba() as vimba:
 
     # list available cameras (after enabling discovery for GigE cameras)
     if system.GeVTLIsPresent:
-        system.runFeatureCommand("GeVDiscoveryAllOnce")
+        system.run_feature_command("GeVDiscoveryAllOnce")
         time.sleep(0.2)
     cameraIds = vimba.getCameraIds()
     for cameraId in cameraIds:
@@ -21,10 +21,10 @@ with Vimba() as vimba:
 
     # get and open a camera
     camera0 = vimba.getCamera(cameraIds[0])
-    camera0.openCamera()
+    camera0.open()
 
     # list camera features
-    cameraFeatureNames = camera0.getFeatureNames()
+    cameraFeatureNames = camera0.get_feature_names()
     for name in cameraFeatureNames:
         print('Camera feature:', name)
 
@@ -40,25 +40,25 @@ with Vimba() as vimba:
     camera0.AcquisitionMode = 'SingleFrame'
 
     # create new frames for the camera
-    frame0 = camera0.getFrame()    # creates a frame
-    frame1 = camera0.getFrame()    # creates a second frame
+    frame0 = camera0.create_frame()    # creates a frame
+    frame1 = camera0.create_frame()    # creates a second frame
 
     # announce frame
-    frame0.announceFrame()
+    frame0.announce()
 
     # capture a camera image
     count = 0
     while count < 10:
-        camera0.startCapture()
-        frame0.queueFrameCapture()
-        camera0.runFeatureCommand('AcquisitionStart')
-        camera0.runFeatureCommand('AcquisitionStop')
-        frame0.waitFrameCapture()
+        camera0.start_capture()
+        frame0.queue_capture()
+        camera0.run_feature_command('AcquisitionStart')
+        camera0.run_feature_command('AcquisitionStop')
+        frame0.wait_capture()
         
         # get image data...
-        imgData = frame0.getBufferByteData()
+        imgData = frame0.get_buffer()
         
-        moreUsefulImgData = np.ndarray(buffer = frame0.getBufferByteData(),
+        moreUsefulImgData = np.ndarray(buffer = frame0.get_buffer(),
                                        dtype = np.uint8,
                                        shape = (frame0.height,
                                                 frame0.width,
@@ -67,10 +67,10 @@ with Vimba() as vimba:
         cv2.imwrite('foo{}.png'.format(count), rgb)
         print("image {} saved".format(count))
         count += 1
-        camera0.endCapture()
+        camera0.end_capture()
     # clean up after capture
-    camera0.revokeAllFrames()
+    camera0.revoke_all_frames()
 
     # close camera
-    camera0.closeCamera()
+    camera0.close()
 
diff --git a/tests/opencv_liveview_example.py b/tests/opencv_liveview_example.py
index 78b6b67..9c83264 100644
--- a/tests/opencv_liveview_example.py
+++ b/tests/opencv_liveview_example.py
@@ -16,7 +16,7 @@ cv2.namedWindow("test")
 with Vimba() as vimba:
     system = vimba.getSystem()
 
-    system.runFeatureCommand("GeVDiscoveryAllOnce")
+    system.run_feature_command("GeVDiscoveryAllOnce")
     time.sleep(0.2)
 
     camera_ids = vimba.getCameraIds()
@@ -25,7 +25,7 @@ with Vimba() as vimba:
         print("Camera found: ", cam_id)
         
     c0 = vimba.getCamera(camera_ids[0])
-    c0.openCamera()
+    c0.open()
 
     try:
         #gigE camera
@@ -40,25 +40,25 @@ with Vimba() as vimba:
     c0.PixelFormat="Mono8"
     #c0.ExposureTimeAbs=60000
 
-    frame = c0.getFrame()
-    frame.announceFrame()
+    frame = c0.create_frame()
+    frame.announce()
 
-    c0.startCapture()
+    c0.start_capture()
 
     framecount = 0
     droppedframes = []
 
     while 1:
         try:
-            frame.queueFrameCapture()
+            frame.queue_capture()
             success = True
         except:
             droppedframes.append(framecount)
             success = False
-        c0.runFeatureCommand("AcquisitionStart")
-        c0.runFeatureCommand("AcquisitionStop")
-        frame.waitFrameCapture(1000)
-        frame_data = frame.getBufferByteData()
+        c0.run_feature_command("AcquisitionStart")
+        c0.run_feature_command("AcquisitionStop")
+        frame.wait_capture(1000)
+        frame_data = frame.get_buffer()
         if success:
             img = np.ndarray(buffer=frame_data,
                              dtype=np.uint8,
@@ -73,7 +73,7 @@ with Vimba() as vimba:
             break
 
 
-    c0.endCapture()
-    c0.revokeAllFrames()
+    c0.end_capture()
+    c0.revoke_all_frames()
 
-    c0.closeCamera()
+    c0.close()
diff --git a/tests/opencv_liveview_example_color.py b/tests/opencv_liveview_example_color.py
index fd7a819..e2e2379 100644
--- a/tests/opencv_liveview_example_color.py
+++ b/tests/opencv_liveview_example_color.py
@@ -25,7 +25,7 @@ cv2.namedWindow("test")
 with Vimba() as vimba:
     system = vimba.getSystem()
 
-    system.runFeatureCommand("GeVDiscoveryAllOnce")
+    system.run_feature_command("GeVDiscoveryAllOnce")
     time.sleep(0.2)
 
     camera_ids = vimba.getCameraIds()
@@ -34,7 +34,7 @@ with Vimba() as vimba:
         print("Camera found: ", cam_id)
 
     c0 = vimba.getCamera(camera_ids[0])
-    c0.openCamera()
+    c0.open()
 
     try:
         #gigE camera
@@ -49,25 +49,25 @@ with Vimba() as vimba:
     c0.PixelFormat = "BGR8Packed"  # OPENCV DEFAULT
     time.sleep(0.2)
 
-    frame = c0.getFrame()
-    frame.announceFrame()
+    frame = c0.create_frame()
+    frame.announce()
 
-    c0.startCapture()
+    c0.start_capture()
 
     framecount = 0
     droppedframes = []
 
     while 1:
         try:
-            frame.queueFrameCapture()
+            frame.queue_capture()
             success = True
         except:
             droppedframes.append(framecount)
             success = False
-        c0.runFeatureCommand("AcquisitionStart")
-        c0.runFeatureCommand("AcquisitionStop")
-        frame.waitFrameCapture(1000)
-        frame_data = frame.getBufferByteData()
+        c0.run_feature_command("AcquisitionStart")
+        c0.run_feature_command("AcquisitionStop")
+        frame.wait_capture(1000)
+        frame_data = frame.get_buffer()
         if success:
             img = np.ndarray(buffer=frame_data,
                              dtype=np.uint8,
@@ -82,8 +82,8 @@ with Vimba() as vimba:
             break
 
 
-    c0.endCapture()
-    c0.revokeAllFrames()
+    c0.end_capture()
+    c0.revoke_all_frames()
 
-    c0.closeCamera()
+    c0.close()
 
diff --git a/tests/test_cameras.py b/tests/test_cameras.py
index a5a4dd9..7879ce8 100644
--- a/tests/test_cameras.py
+++ b/tests/test_cameras.py
@@ -12,7 +12,7 @@ def test_cameras():
 
         # list available cameras (after enabling discovery for GigE cameras)
         if system.GeVTLIsPresent:
-            system.runFeatureCommand("GeVDiscoveryAllOnce")
+            system.run_feature_command("GeVDiscoveryAllOnce")
             time.sleep(0.2)
 
         cameraIds = vimba.getCameraIds()
@@ -21,10 +21,10 @@ def test_cameras():
 
         # get and open a camera
         camera0 = vimba.getCamera(cameraIds[0])
-        camera0.openCamera()
+        camera0.open()
 
         # list camera features
-        cameraFeatureNames = camera0.getFeatureNames()
+        cameraFeatureNames = camera0.get_feature_names()
         for name in cameraFeatureNames:
             print('Camera feature:', name)
 
@@ -35,37 +35,37 @@ def test_cameras():
         camera0.AcquisitionMode = 'SingleFrame'
 
         # create new frames for the camera
-        frame0 = camera0.getFrame()  # creates a frame
-        frame1 = camera0.getFrame()  # creates a second frame
+        frame0 = camera0.create_frame()  # creates a frame
+        frame1 = camera0.create_frame()  # creates a second frame
 
         # announce frame
-        frame0.announceFrame()
+        frame0.announce()
 
         # capture a camera image
-        camera0.startCapture()
-        frame0.queueFrameCapture()
-        camera0.runFeatureCommand('AcquisitionStart')
-        camera0.runFeatureCommand('AcquisitionStop')
-        frame0.waitFrameCapture()
+        camera0.start_capture()
+        frame0.queue_capture()
+        camera0.run_feature_command('AcquisitionStart')
+        camera0.run_feature_command('AcquisitionStop')
+        frame0.wait_capture()
 
         # get image data...
-        imgData = frame0.getBufferByteData()
+        imgData = frame0.get_buffer()
 
         # ...or use NumPy for fast image display (for use with OpenCV, etc)
         import numpy as np
 
-        moreUsefulImgData = np.ndarray(buffer=frame0.getBufferByteData(),
+        moreUsefulImgData = np.ndarray(buffer=frame0.get_buffer(),
                                        dtype=np.uint8,
                                        shape=(frame0.height,
                                               frame0.width,
                                               1))
 
         # clean up after capture
-        camera0.endCapture()
-        camera0.revokeAllFrames()
+        camera0.end_capture()
+        camera0.revoke_all_frames()
 
         # close camera
-        camera0.closeCamera()
+        camera0.close()
 
 
 if __name__ == '__main__':
diff --git a/tests/test_enumfeature.py b/tests/test_enumfeature.py
index 7f9dd4c..0744820 100644
--- a/tests/test_enumfeature.py
+++ b/tests/test_enumfeature.py
@@ -12,7 +12,7 @@ def test_enumfeature():
         print ("get enum value (DiscoveryCameraEvent): '%s'" % (system.DiscoveryCameraEvent))
         
         # get enum range
-        range = system.getFeatureRange('DiscoveryCameraEvent')
+        range = system.get_feature_range('DiscoveryCameraEvent')
         print ("get enum value range (DiscoveryCameraEvent): '%s'" % (str(range)))
         
         # set enum value
diff --git a/tests/test_interfaces.py b/tests/test_interfaces.py
index 270d42c..3fc4a94 100644
--- a/tests/test_interfaces.py
+++ b/tests/test_interfaces.py
@@ -14,15 +14,15 @@ def test_interfaces():
 
         # get interface object and open it
         interface0 = vimba.getInterface(interfaceIds[0])
-        interface0.openInterface()
+        interface0.open()
 
         # list interface features
-        interfaceFeatureNames = interface0.getFeatureNames()
+        interfaceFeatureNames = interface0.get_feature_names()
         for name in interfaceFeatureNames:
             print('Interface feature:', name)
 
         # close interface
-        interface0.closeInterface()
+        interface0.close()
 
 if __name__ == '__main__':
     test_interfaces()
\ No newline at end of file
diff --git a/tests/test_systemfeature.py b/tests/test_systemfeature.py
index abb4da7..f61d55d 100644
--- a/tests/test_systemfeature.py
+++ b/tests/test_systemfeature.py
@@ -9,9 +9,9 @@ def test_systemfeature():
         system = vimba.getSystem()
 
         # list system features
-        for featureName in system.getFeatureNames():
+        for featureName in system.get_feature_names():
             print('System feature:', featureName)
-            fInfo = system.getFeatureInfo(featureName)
+            fInfo = system.get_feature_info(featureName)
             for field in fInfo.getFieldNames():
                 print("\t", featureName, ":", field, getattr(fInfo, field))