update setup, fix bugs in windows tiscamera

Author: MMathisLab

dlclivegui/camera/camera.py

@@ -72,6 +72,7 @@ def __init__(self,
         self.fps = fps
         self.use_tk_display = use_tk_display
         self.display_resize = display_resize if display_resize else 1.0
+        self.next_frame = 0
 
 
     def set_im_size(self, res):
@@ -135,32 +136,4 @@ def close_capture_device(self):
         """
 
         raise NotImplementedError
-
-
-
-    def get_display_frame(self):
-        """ Get latest frame for display
-        
-        Returns
-        -------
-        :class:`numpy.ndarray`
-            the lastest frame
-        """
-
-        frame_read = qread(self.display_frame_queue, self.display_frame_lock)
-        if frame_read is not None:
-            frame, _ = frame_read
-            if self.display_resize != 1:
-                frame = cv2.resize(frame, (int(frame.shape[1]*self.display_resize), int(frame.shape[0]*self.display_resize)))
-        else:
-            frame = None
-
-        return frame
-
-
-
-    def close_capture_device(self):
-        """ Closes camera
-        """
-
-        raise NotImplementedError
+    

dlclivegui/camera/tiscamera_windows.py

@@ -1,5 +1,4 @@
 """
-"""
 DeepLabCut Toolbox (deeplabcut.org)
 © A. & M. Mathis Labs
 
@@ -19,7 +18,8 @@ class TISCam(Camera):
     @staticmethod
     def arg_restrictions():
 
-        return {'serial_number' : TIS_CAM().GetDevices()}
+        return {'serial_number' : TIS_CAM().GetDevices(),
+                'rotate' : [0, 90, 180, 270]}
 
 
     def __init__(self,
@@ -29,7 +29,8 @@ def __init__(self,
                  rotate=0,
                  crop=None,
                  fps=100,
-                 display=True):
+                 display=True,
+                 display_resize=1.0):
         '''
         Params
         ------
@@ -38,11 +39,16 @@ def __init__(self,
             default = None, uses default parameters specific to camera
         '''
 
-        super().__init__(serial_number, exposure=exposure, rotate=rotate, crop=crop, fps=fps)
+        if (rotate == 90) or (rotate == 270):
+            resolution = [resolution[1], resolution[0]]
+
+        super().__init__(serial_number, resolution=resolution, exposure=exposure, rotate=rotate, crop=crop, fps=fps, use_tk_display=display, display_resize=display_resize)
         self.display = display
 
-    def set_exposure(self, val):
 
+    def set_exposure(self):
+
+        val = self.exposure
         val = 1 if val > 1 else val
         val = 0 if val < 0 else val
         self.cam.SetPropertyAbsoluteValue("Exposure", "Value", val)
@@ -55,49 +61,54 @@ def get_exposure(self):
         return round(exposure[0], 3)
 
 
-    def set_crop(self, crop):
+    # def set_crop(self):
 
-        if crop:
-            left = crop[0]
-            width = crop[1]-left
-            top = crop[3]
-            height = top-crop[2]
+    #     crop = self.crop
 
-            if not self.crop_filter:
-                self.crop_filter = self.cam.CreateFrameFilter(b'ROI')
-                self.cam.AddFrameFilter(self.crop_filter)
+    #     if crop:
+    #         top = int(crop[0])
+    #         left = int(crop[2])
+    #         height = int(crop[1]-top)
+    #         width = int(crop[3]-left)
 
-            self.cam.FilterSetParameter(self.crop_filter, b'Top', top)
-            self.cam.FilterSetParameter(self.crop_filter, b'Left', left)
-            self.cam.FilterSetParameter(self.crop_filter, b'Height', height)
-            self.cam.FilterSetParameter(self.crop_filter, b'Width', width)
-            self.im_size = (width, height)
+    #         if not self.crop_filter:
+    #             self.crop_filter = self.cam.CreateFrameFilter(b'ROI')
+    #             self.cam.AddFrameFilter(self.crop_filter)
 
+    #         self.cam.FilterSetParameter(self.crop_filter, b'Top', top)
+    #         self.cam.FilterSetParameter(self.crop_filter, b'Left', left)
+    #         self.cam.FilterSetParameter(self.crop_filter, b'Height', height)
+    #         self.cam.FilterSetParameter(self.crop_filter, b'Width', width)
 
-    def set_rotation(self, rotate):
+
+    def set_rotation(self):
 
         if not self.rotation_filter:
             self.rotation_filter = self.cam.CreateFrameFilter(b'Rotate Flip')
             self.cam.AddFrameFilter(self.rotation_filter)
-        self.cam.FilterSetParameter(self.rotation_filter, b'Rotation Angle', rotate)
+        self.cam.FilterSetParameter(self.rotation_filter, b'Rotation Angle', self.rotate)
 
 
-    def set_fps(self, fps):
+    def set_fps(self):
 
-        self.fps = fps
-        self.cam.SetFrameRate(fps)
+        self.cam.SetFrameRate(self.fps)
 
 
     def set_capture_device(self):
 
         self.cam = TIS_CAM()
         self.crop_filter = None
         self.rotation_filter = None
-        self.next_frame = None
+        self.set_rotation()
+        # self.set_crop()
+        self.set_fps()
+        self.next_frame = time.time()
 
-        self.cam.open(self.serial_number)
+        self.cam.open(self.id)
         self.cam.SetContinuousMode(0)
-        self.cam.StartLive(int(self.display))
+        self.cam.StartLive(0)
+
+        self.set_exposure()
 
         return True
 
@@ -107,10 +118,11 @@ def get_image(self):
         self.cam.SnapImage()
         frame = self.cam.GetImageEx()
         frame = cv2.flip(frame, 0)
+        if self.crop is not None:
+            frame = frame[self.crop[0]:self.crop[1], self.crop[2]:self.crop[3]]
         return frame
 
 
     def close_capture_device(self):
 
         self.cam.StopLive()
-        self.cam.close()

dlclivegui/camera/tisgrabber_windows.py

@@ -807,7 +807,7 @@ def FilterGetParameter(self, frame_filter_handle, parameter_name):
             data = C.c_int()
 
             err = TIS_GrabberDLL.FilterGetParameter(frame_filter_handle, parameter_name, C.byref(data))
-            return err
+            return data.value
 
         def FilterSetParameter(self, frame_filter_handle, parameter_name, data):
             if type(data) is int:

dlclivegui/dlclivegui.py

@@ -24,8 +24,8 @@
 
 from dlclivegui import CameraPoseProcess
 from dlclivegui import processor
-from cameracontrol import camera
-from cameracontrol.tkutil import SettingsWindow
+from dlclivegui import camera
+from dlclivegui.tkutil import SettingsWindow
 
 
 class DLCLiveGUI(object):

setup.py

@@ -15,7 +15,7 @@
     name="deeplabcut-live-gui",
     version="0.0.b0",
     author="A. & M. Mathis Labs",
-    author_email="alexander@deeplabcut.org",
+    author_email="adim@deeplabcut.org",
     description="GUI to run real time deeplabcut experiments",
     long_description=long_description,
     long_description_content_type="text/markdown",