migrate cameras, etc from camera control

Author: gkane26

dlclivegui/__init__.py

@@ -1,3 +1,4 @@
-from dlclivegui.process import CameraPoseProcess
+from dlclivegui.camera_process import CameraProcess
+from dlclivegui.pose_process import CameraPoseProcess
 from dlclivegui.video import create_labeled_video
 from dlclivegui.dlclivegui import DLCLiveGUI

dlclivegui/camera/__init__.py

@@ -1,16 +1,32 @@
+"""
+DeepLabCut Toolbox (deeplabcut.org)
+© A. & M. Mathis Labs
+
+Licensed under GNU Lesser General Public License v3.0
+"""
+
+
 import platform
 
-from dlclivegui.camera.camera import Camera, DLCLiveCameraError
+from dlclivegui.camera.camera import Camera, CameraError
 from dlclivegui.camera.opencv import OpenCVCam
 
 if platform.system() == "Windows":
     from dlclivegui.camera.tiscamera_windows import TISCam
 
 if platform.system() == "Linux":
-    from dlclivegui.camera.tiscamera_linux import TISCam
+    try:
+        from dlclivegui.camera.tiscamera_linux import TISCam
+    except Exception as e:
+        pass
+        # print(f"Error importing TISCam on Linux: {e}")
 
 if platform.system() in ["Darwin", "Linux"]:
-    from dlclivegui.camera.aravis import AravisCam
+    try:
+        from dlclivegui.camera.aravis import AravisCam
+    except Exception as e:
+        pass
+        # print(f"Error importing AravisCam: f{e}")
 
 if platform.system() == "Darwin":
     from dlclivegui.camera.pseye import PSEyeCam

dlclivegui/camera/aravis.py

@@ -5,13 +5,15 @@
 Licensed under GNU Lesser General Public License v3.0
 """
 
+
 import ctypes
 import numpy as np
 import time
 
 import gi
 gi.require_version('Aravis', '0.6')
 from gi.repository import Aravis
+import cv2
 
 from dlclivegui.camera import Camera
 
@@ -45,6 +47,8 @@ def set_capture_device(self):
         self.stream.push_buffer(Aravis.Buffer.new_allocate(self.cam.get_payload()))
         self.cam.start_acquisition()
 
+        return True
+
 
     def no_auto(self):
 
@@ -99,6 +103,9 @@ def _convert_image_to_numpy(self, buffer):
         frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
         frame = frame.copy()
 
+        if frame.ndim < 3:
+            frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
+
         return frame