blackify

Author: AlexEMG

Diff for: README.md

@@ -2,6 +2,15 @@
 <img src=https://imagizer.imageshack.com/img923/2419/QQKyMH.png align="right" width="250">
 <img src="https://images.squarespace-cdn.com/content/v1/57f6d51c9f74566f55ecf271/1596193544929-NHMVMXPVEYZ6R4I45DSR/ke17ZwdGBToddI8pDm48kOHwsIwndRGCkvek0XAcW4ZZw-zPPgdn4jUwVcJE1ZvWEtT5uBSRWt4vQZAgTJucoTqqXjS3CfNDSuuf31e0tVH0wqgmu6zkAOZ3crWCtkmLcPIuzHaxU8QRzZwtrVtHupu3E9Ef3XsXP1C_826c-iU/DLCLIVEGUI_LOGO.png?format=750w" width="350" title="DLC-live GUI" alt="DLC LIVE! GUI" align="right" vspace = "50">
 
+<a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
+![PyPI - Python Version](https://img.shields.io/pypi/v/deeplabcut-live)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/deeplabcut-live?color=purple)
+![Python package](https://github.com/DeepLabCut/DeepLabCut-live/workflows/Python%20package/badge.svg)
+
+[![License](https://img.shields.io/pypi/l/deeplabcutcore.svg)](https://github.com/DeepLabCut/deeplabcutlive/raw/master/LICENSE)
+[![Image.sc forum](https://img.shields.io/badge/dynamic/json.svg?label=forum&amp;url=https%3A%2F%2Fforum.image.sc%2Ftags%2Fdeeplabcut.json&amp;query=%24.topic_list.tags.0.topic_count&amp;colorB=brightgreen&amp;&amp;suffix=%20topics&amp;logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABPklEQVR42m3SyyqFURTA8Y2BER0TDyExZ+aSPIKUlPIITFzKeQWXwhBlQrmFgUzMMFLKZeguBu5y+//17dP3nc5vuPdee6299gohUYYaDGOyyACq4JmQVoFujOMR77hNfOAGM+hBOQqB9TjHD36xhAa04RCuuXeKOvwHVWIKL9jCK2bRiV284QgL8MwEjAneeo9VNOEaBhzALGtoRy02cIcWhE34jj5YxgW+E5Z4iTPkMYpPLCNY3hdOYEfNbKYdmNngZ1jyEzw7h7AIb3fRTQ95OAZ6yQpGYHMMtOTgouktYwxuXsHgWLLl+4x++Kx1FJrjLTagA77bTPvYgw1rRqY56e+w7GNYsqX6JfPwi7aR+Y5SA+BXtKIRfkfJAYgj14tpOF6+I46c4/cAM3UhM3JxyKsxiOIhH0IO6SH/A1Kb1WBeUjbkAAAAAElFTkSuQmCC)](https://forum.image.sc/tags/deeplabcut)
+[![Gitter](https://badges.gitter.im/DeepLabCut/community.svg)](https://gitter.im/DeepLabCut/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Twitter Follow](https://img.shields.io/twitter/follow/DeepLabCut.svg?label=DeepLabCut&style=social)](https://twitter.com/DeepLabCut)
 
 GUI to run DeepLabCut-live video feed, record videos, and record external timestamps.
 

Diff for: dlclivegui/camera/aravis.py

@@ -11,29 +11,47 @@
 import time
 
 import gi
-gi.require_version('Aravis', '0.6')
+
+gi.require_version("Aravis", "0.6")
 from gi.repository import Aravis
 import cv2
 
 from dlclivegui.camera import Camera
 
 
 class AravisCam(Camera):
-
-
     @staticmethod
     def arg_restrictions():
 
         Aravis.update_device_list()
         n_cams = Aravis.get_n_devices()
         ids = [Aravis.get_device_id(i) for i in range(n_cams)]
-        return {'id' : ids}
-
-
-    def __init__(self, id='', resolution=[720,540], exposure=.005, gain=0, rotate=0, crop=None, fps=100, display=True, display_resize=1.0):
-
-        super().__init__(id, resolution=resolution, exposure=exposure, gain=gain, rotate=rotate, crop=crop, fps=fps, use_tk_display=display, display_resize=display_resize)
-
+        return {"id": ids}
+
+    def __init__(
+        self,
+        id="",
+        resolution=[720, 540],
+        exposure=0.005,
+        gain=0,
+        rotate=0,
+        crop=None,
+        fps=100,
+        display=True,
+        display_resize=1.0,
+    ):
+
+        super().__init__(
+            id,
+            resolution=resolution,
+            exposure=exposure,
+            gain=gain,
+            rotate=rotate,
+            crop=crop,
+            fps=fps,
+            use_tk_display=display,
+            display_resize=display_resize,
+        )
 
     def set_capture_device(self):
 
@@ -49,31 +67,27 @@ def set_capture_device(self):
 
         return True
 
-
     def no_auto(self):
 
         self.cam.set_exposure_time_auto(0)
         self.cam.set_gain_auto(0)
 
-
     def set_exposure(self, val):
 
         val = 1 if val > 1 else val
         val = 0 if val < 0 else val
-        self.cam.set_exposure_time(val*1e6)
-
+        self.cam.set_exposure_time(val * 1e6)
 
     def set_crop(self, crop):
 
         if crop:
             left = crop[0]
-            width = crop[1]-left
+            width = crop[1] - left
             top = crop[3]
-            height = top-crop[2]
+            height = top - crop[2]
             self.cam.set_region(left, top, width, height)
             self.im_size = (width, height)
 
-
     def get_image_on_time(self):
 
         buffer = None
@@ -85,12 +99,11 @@ def get_image_on_time(self):
 
         return frame, time.time()
 
-
     def _convert_image_to_numpy(self, buffer):
-        ''' from https://github.com/SintefManufacturing/python-aravis '''
+        """ from https://github.com/SintefManufacturing/python-aravis """
 
         pixel_format = buffer.get_image_pixel_format()
-        bits_per_pixel = pixel_format >> 16 & 0xff
+        bits_per_pixel = pixel_format >> 16 & 0xFF
 
         if bits_per_pixel == 8:
             INTP = ctypes.POINTER(ctypes.c_uint8)
@@ -100,15 +113,16 @@ def _convert_image_to_numpy(self, buffer):
         addr = buffer.get_data()
         ptr = ctypes.cast(addr, INTP)
 
-        frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
+        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
 
-
     def close_capture_device():
 
-        self.cam.stop_acquisition()
+        self.cam.stop_acquisition()

Diff for: dlclivegui/camera/camera.py

@@ -14,7 +14,7 @@ class CameraError(Exception):
     """
     Exception for incorrect use of cameras
     """
-    
+
     pass
 
 
@@ -41,25 +41,25 @@ class Camera(object):
         factor to resize images if using opencv display (display is very slow for large images), by default None
     """
 
-
     @staticmethod
     def arg_restrictions():
         """ Returns a dictionary of arguments restrictions for DLCLiveGUI
         """
 
         return {}
 
-
-    def __init__(self,
-                 id,
-                 resolution=None,
-                 exposure=None,
-                 gain=None,
-                 rotate=None,
-                 crop=None,
-                 fps=None,
-                 use_tk_display=False,
-                 display_resize=1.0):
+    def __init__(
+        self,
+        id,
+        resolution=None,
+        exposure=None,
+        gain=None,
+        rotate=None,
+        crop=None,
+        fps=None,
+        use_tk_display=False,
+        display_resize=1.0,
+    ):
         """ Constructor method
         """
 
@@ -74,7 +74,6 @@ def __init__(self,
         self.display_resize = display_resize if display_resize else 1.0
         self.next_frame = 0
 
-
     def set_im_size(self, res):
         """[summary]
         
@@ -92,16 +91,18 @@ def set_im_size(self, res):
         if not res:
             raise CameraError("Resolution is not set!")
 
-        self.im_size = (int(res[0]), int(res[1])) if self.crop is None else (self.crop[3]-self.crop[2], self.crop[1]-self.crop[0])
-
+        self.im_size = (
+            (int(res[0]), int(res[1]))
+            if self.crop is None
+            else (self.crop[3] - self.crop[2], self.crop[1] - self.crop[0])
+        )
 
     def set_capture_device(self):
         """ Sets frame capture device with desired properties
         """
 
         raise NotImplementedError
 
-    
     def get_image_on_time(self):
         """ Gets an image from frame capture device at the appropriate time (according to fps).
         
@@ -119,21 +120,20 @@ def get_image_on_time(self):
             if cur_time > self.next_frame:
                 frame = self.get_image()
                 timestamp = cur_time
-                self.next_frame = max(self.next_frame + 1.0/self.fps, cur_time + 0.5/self.fps)
+                self.next_frame = max(
+                    self.next_frame + 1.0 / self.fps, cur_time + 0.5 / self.fps
+                )
 
         return frame, timestamp
 
-
     def get_image(self):
         """ Gets image from frame capture device
         """
 
         raise NotImplementedError
 
-
     def close_capture_device(self):
         """ Closes frame capture device
         """
 
         raise NotImplementedError
-    

Diff for: dlclivegui/camera/opencv.py

@@ -16,8 +16,6 @@
 
 
 class OpenCVCam(Camera):
-
-
     @staticmethod
     def arg_restrictions():
         """ Returns a dictionary of arguments restrictions for DLCLiveGUI
@@ -33,53 +31,74 @@ def arg_restrictions():
                 devs.append(cur_index)
                 cap.release()
 
-        return {'device' : devs,
-                'display' : [True, False]}
-
-
-    def __init__(self,
-                 device=-1,
-                 file='',
-                 resolution=[640, 480],
-                 auto_exposure=0,
-                 exposure=0,
-                 gain=0,
-                 rotate=0,
-                 crop=None,
-                 fps=30,
-                 display=True,
-                 display_resize=1.0):
+        return {"device": devs, "display": [True, False]}
+
+    def __init__(
+        self,
+        device=-1,
+        file="",
+        resolution=[640, 480],
+        auto_exposure=0,
+        exposure=0,
+        gain=0,
+        rotate=0,
+        crop=None,
+        fps=30,
+        display=True,
+        display_resize=1.0,
+    ):
 
         if device != -1:
             if file:
-                raise DLCLiveCameraError("A device and file were provided to OpenCVCam. Must initialize an OpenCVCam with either a device id or a video file.")
+                raise DLCLiveCameraError(
+                    "A device and file were provided to OpenCVCam. Must initialize an OpenCVCam with either a device id or a video file."
+                )
 
             self.video = False
             id = int(device)
 
         else:
             if not file:
-                file = filedialog.askopenfilename(title="Select video file for DLC-live-GUI")
+                file = filedialog.askopenfilename(
+                    title="Select video file for DLC-live-GUI"
+                )
                 if not file:
-                    raise DLCLiveCameraError("Neither a device nor file were provided to OpenCVCam. Must initialize an OpenCVCam with either a device id or a video file.")
+                    raise DLCLiveCameraError(
+                        "Neither a device nor file were provided to OpenCVCam. Must initialize an OpenCVCam with either a device id or a video file."
+                    )
 
             self.video = True
             cap = cv2.VideoCapture(file)
-            resolution = (cap.get(cv2.CAP_PROP_FRAME_WIDTH), cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
+            resolution = (
+                cap.get(cv2.CAP_PROP_FRAME_WIDTH),
+                cap.get(cv2.CAP_PROP_FRAME_HEIGHT),
+            )
             fps = cap.get(cv2.CAP_PROP_FPS)
             del cap
             id = file
 
-        super().__init__(id, resolution=resolution, exposure=exposure, rotate=rotate, crop=crop, fps=fps, use_tk_display=display, display_resize=display_resize)
+        super().__init__(
+            id,
+            resolution=resolution,
+            exposure=exposure,
+            rotate=rotate,
+            crop=crop,
+            fps=fps,
+            use_tk_display=display,
+            display_resize=display_resize,
+        )
         self.auto_exposure = auto_exposure
         self.gain = gain
 
-
     def set_capture_device(self):
 
         if not self.video:
 
-            self.cap = cv2.VideoCapture(self.id, cv2.CAP_V4L) if platform.system() == "Linux" else cv2.VideoCapture(self.id)
+            self.cap = (
+                cv2.VideoCapture(self.id, cv2.CAP_V4L)
+                if platform.system() == "Linux"
+                else cv2.VideoCapture(self.id)
+            )
             ret, frame = self.cap.read()
 
             if self.im_size:
@@ -106,33 +125,31 @@ def set_capture_device(self):
 
         return True
 
-
     def get_image_on_time(self):
 
         # if video, wait...
         if self.video:
-            while time.time()-self.last_cap_read < (1.0 / self.fps):
+            while time.time() - self.last_cap_read < (1.0 / self.fps):
                 pass
-        
+
         ret, frame = self.cap.read()
 
         if ret:
             if self.rotate:
                 frame = rotate_bound(frame, self.rotate)
             if self.crop:
-                frame = frame[self.crop[2]:self.crop[3], self.crop[0]:self.crop[1]]
+                frame = frame[self.crop[2] : self.crop[3], self.crop[0] : self.crop[1]]
 
             if frame.ndim == 3:
                 if self.cv2_color == 1:
                     frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
 
             self.last_cap_read = time.time()
-            
+
             return frame, self.last_cap_read
         else:
             raise CameraError("OpenCV VideoCapture.read did not return an image!")
 
-
     def close_capture_device(self):
 
         self.cap.release()