From cc552853624c56c2de633839cfdf05300a791af1 Mon Sep 17 00:00:00 2001
From: Artur <35294812+arturoptophys@users.noreply.github.com>
Date: Tue, 21 Oct 2025 11:22:49 +0200
Subject: [PATCH 001/132] Add modular camera backends with Basler and GenTL
support
---
.gitignore | 2 +
README.md | 165 +-
dlclivegui/__init__.py | 21 +-
dlclivegui/camera/__init__.py | 43 -
dlclivegui/camera/aravis.py | 128 --
dlclivegui/camera/basler.py | 104 --
dlclivegui/camera/camera.py | 139 --
dlclivegui/camera/opencv.py | 155 --
dlclivegui/camera/pseye.py | 101 --
dlclivegui/camera/tiscamera_linux.py | 204 ---
dlclivegui/camera/tiscamera_windows.py | 129 --
dlclivegui/camera/tisgrabber_windows.py | 781 ---------
dlclivegui/camera_controller.py | 120 ++
dlclivegui/camera_process.py | 338 ----
dlclivegui/cameras/__init__.py | 6 +
dlclivegui/cameras/base.py | 46 +
dlclivegui/cameras/basler_backend.py | 132 ++
dlclivegui/cameras/factory.py | 70 +
dlclivegui/cameras/gentl_backend.py | 130 ++
dlclivegui/cameras/opencv_backend.py | 61 +
dlclivegui/config.py | 112 ++
dlclivegui/dlc_processor.py | 123 ++
dlclivegui/dlclivegui.py | 1498 -----------------
dlclivegui/gui.py | 542 ++++++
dlclivegui/pose_process.py | 273 ---
dlclivegui/processor/__init__.py | 1 -
dlclivegui/processor/processor.py | 23 -
dlclivegui/processor/teensy_laser/__init__.py | 1 -
.../processor/teensy_laser/teensy_laser.ino | 77 -
.../processor/teensy_laser/teensy_laser.py | 77 -
dlclivegui/queue.py | 208 ---
dlclivegui/tkutil.py | 195 ---
dlclivegui/video.py | 274 ---
dlclivegui/video_recorder.py | 46 +
setup.py | 35 +-
35 files changed, 1533 insertions(+), 4827 deletions(-)
delete mode 100644 dlclivegui/camera/__init__.py
delete mode 100644 dlclivegui/camera/aravis.py
delete mode 100644 dlclivegui/camera/basler.py
delete mode 100644 dlclivegui/camera/camera.py
delete mode 100644 dlclivegui/camera/opencv.py
delete mode 100644 dlclivegui/camera/pseye.py
delete mode 100644 dlclivegui/camera/tiscamera_linux.py
delete mode 100644 dlclivegui/camera/tiscamera_windows.py
delete mode 100644 dlclivegui/camera/tisgrabber_windows.py
create mode 100644 dlclivegui/camera_controller.py
delete mode 100644 dlclivegui/camera_process.py
create mode 100644 dlclivegui/cameras/__init__.py
create mode 100644 dlclivegui/cameras/base.py
create mode 100644 dlclivegui/cameras/basler_backend.py
create mode 100644 dlclivegui/cameras/factory.py
create mode 100644 dlclivegui/cameras/gentl_backend.py
create mode 100644 dlclivegui/cameras/opencv_backend.py
create mode 100644 dlclivegui/config.py
create mode 100644 dlclivegui/dlc_processor.py
delete mode 100644 dlclivegui/dlclivegui.py
create mode 100644 dlclivegui/gui.py
delete mode 100644 dlclivegui/pose_process.py
delete mode 100644 dlclivegui/processor/__init__.py
delete mode 100644 dlclivegui/processor/processor.py
delete mode 100644 dlclivegui/processor/teensy_laser/__init__.py
delete mode 100644 dlclivegui/processor/teensy_laser/teensy_laser.ino
delete mode 100644 dlclivegui/processor/teensy_laser/teensy_laser.py
delete mode 100644 dlclivegui/queue.py
delete mode 100644 dlclivegui/tkutil.py
delete mode 100644 dlclivegui/video.py
create mode 100644 dlclivegui/video_recorder.py
diff --git a/.gitignore b/.gitignore
index 208ed2c..1a13ced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,5 @@ venv.bak/
# ide files
.vscode
+
+!dlclivegui/config.py
diff --git a/README.md b/README.md
index acdadf2..a886a98 100644
--- a/README.md
+++ b/README.md
@@ -1,69 +1,126 @@
-# DeepLabCut-Live! GUI 
-
-
-
-
-
-
-[](https://github.com/DeepLabCut/deeplabcutlive/raw/master/LICENSE)
-[](https://forum.image.sc/tags/deeplabcut)
-[](https://gitter.im/DeepLabCut/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[](https://twitter.com/DeepLabCut)
-
-GUI to run [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) on a video feed, record videos, and record external timestamps.
-
-## [Installation Instructions](docs/install.md)
-
-## Getting Started
-
-#### Open DeepLabCut-live-GUI
-
-In a terminal, activate the conda or virtual environment where DeepLabCut-live-GUI is installed, then run:
-
-```
-dlclivegui
+# DeepLabCut Live GUI
+
+A modernised PyQt6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) experiments. The application
+streams frames from a camera, optionally performs DLCLive inference, and records video using the
+[vidgear](https://github.com/abhiTronix/vidgear) toolkit.
+
+## Features
+
+- Python 3.11+ compatible codebase with a PyQt6 interface.
+- Modular architecture with dedicated modules for camera control, video recording, configuration
+ management, and DLCLive processing.
+- Single JSON configuration file that captures camera settings, DLCLive parameters, and recording
+ options. All fields can be edited directly within the GUI.
+- Optional DLCLive inference with pose visualisation over the live video feed.
+- Recording support via vidgear's `WriteGear`, including custom encoder options.
+
+## Installation
+
+1. Install the package and its dependencies:
+
+ ```bash
+ pip install deeplabcut-live-gui
+ ```
+
+ The GUI requires additional runtime packages for optional features:
+
+ - [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) for pose estimation.
+ - [vidgear](https://github.com/abhiTronix/vidgear) for video recording.
+ - [OpenCV](https://opencv.org/) for camera access.
+
+ These libraries are listed in `setup.py` and will be installed automatically when the package is
+ installed via `pip`.
+
+2. Launch the GUI:
+
+ ```bash
+ dlclivegui
+ ```
+
+## Configuration
+
+The GUI works with a single JSON configuration describing the experiment. The configuration contains
+three main sections:
+
+```json
+{
+ "camera": {
+ "index": 0,
+ "width": 1280,
+ "height": 720,
+ "fps": 60.0,
+ "backend": "opencv",
+ "properties": {}
+ },
+ "dlc": {
+ "model_path": "/path/to/exported-model",
+ "processor": "cpu",
+ "shuffle": 1,
+ "trainingsetindex": 0,
+ "processor_args": {},
+ "additional_options": {}
+ },
+ "recording": {
+ "enabled": true,
+ "directory": "~/Videos/deeplabcut",
+ "filename": "session.mp4",
+ "container": "mp4",
+ "options": {
+ "compression_mode": "mp4"
+ }
+ }
+}
```
+Use **File → Load configuration…** to open an existing configuration, or **File → Save configuration**
+to persist the current settings. Every field in the GUI is editable, and values entered in the
+interface will be written back to the JSON file.
-#### Configurations
+### Camera backends
+Set `camera.backend` to one of the supported drivers:
-First, create a configuration file: select the drop down menu labeled `Config`, and click `Create New Config`. All settings, such as details about cameras, DLC networks, and DLC-live Processors, will be saved into configuration files so that you can close and reopen the GUI without losing all of these details. You can create multiple configuration files on the same system, so that different users can save different camera options, etc on the same computer. To load previous settings from a configuration file, please just select the file from the drop-down menu. Configuration files are stored at `$HOME/Documents/DeepLabCut-live-GUI/config`. These files do not need to be edited manually, they can be entirely created and edited automatically within the GUI.
+- `opencv` – standard `cv2.VideoCapture` fallback available on every platform.
+- `basler` – uses the Basler Pylon SDK via `pypylon` (install separately).
+- `gentl` – uses Aravis for GenTL-compatible cameras (requires `python-gi` bindings).
-#### Set Up Cameras 
+Backend specific parameters can be supplied through the `camera.properties` object. For example:
-To setup a new camera, select `Add Camera` from the dropdown menu, and then click `Init Cam`. This will be bring up a new window where you need to select the type of camera (see [Camera Support](docs/camera_support.md)), input a name for the camera, and click `Add Camera`. This will initialize a new `Camera` entry in the drop down menu. Now, select your camera from the dropdown menu and click`Edit Camera Settings` to setup your camera settings (i.e. set the serial number, exposure, cropping parameters, etc; the exact settings depend on the specific type of camera). Once you have set the camera settings, click `Init Cam` to start streaming. To stop streaming data, click `Close Camera`, and to remove a camera from the dropdown menu, click `Remove Camera`.
-
-#### Processor (optional)
-
-To write custom `Processors`, please see [here](https://github.com/DeepLabCut/DeepLabCut-live/tree/master/dlclive/processor). The directory that contains your custom `Processor` should be a python module -- this directory must contain an `__init__.py` file that imports your custom `Processor`. For examples of how to structure a custom `Processor` directory, please see [here](https://github.com/DeepLabCut/DeepLabCut-live/tree/master/example_processors).
-
-To use your processor in the GUI, you must first add your custom `Processor` directory to the dropdown menu: next to the `Processor Dir` label, click `Browse`, and select your custom `Processor` directory. Next, select the desired directory from the `Processor Dir` dropdown menu, then select the `Processor` you would like to use from the `Processor` menu. If you would like to edit the arguments for your processor, please select `Edit Proc Settings`, and finally, to use the processor, click `Set Proc`. If you have previously set a `Processor` and would like to clear it, click `Clear Proc`.
-
-#### Configure DeepLabCut Network
-
-
-
-Select the `DeepLabCut` dropdown menu, and click `Add DLC`. This will bring up a new window to choose a name for the DeepLabCut configuration, choose the path to the exported DeepLabCut model, and set DeepLabCut-live settings, such as the cropping or resize parameters. Once configured, click `Update` to add this DeepLabCut configuration to the dropdown menu. You can edit the settings at any time by clicking `Edit DLC Settings`. Once configured, you can load the network and start performing inference by clicking `Start DLC`. If you would like to view the DeepLabCut pose estimation in real-time, select `Display DLC Keypoints`. You can edit the keypoint display settings (the color scheme, size of points, and the likelihood threshold for display) by selecting `Edit DLC Display Settings`.
-
-If you want to stop performing inference at any time, just click `Stop DLC`, and if you want to remove a DeepLabCut configuration from the dropdown menu, click `Remove DLC`.
+```json
+{
+ "camera": {
+ "index": 0,
+ "backend": "basler",
+ "properties": {
+ "serial": "40123456",
+ "exposure": 15000,
+ "gain": 6.0
+ }
+ }
+}
+```
-#### Set Up Session
+If optional dependencies are missing, the GUI will show the backend as unavailable in the drop-down
+but you can still configure it for a system where the drivers are present.
-Sessions are defined by the subject name, the date, and an attempt number. Within the GUI, select a `Subject` from the dropdown menu, or to add a new subject, type the new subject name in to the entry box and click `Add Subject`. Next, select an `Attempt` from the dropdown menu. Then, select the directory that you would like to save data to from the `Directory` dropdown menu. To add a new directory to the dropdown menu, click `Browse`. Finally, click `Set Up Session` to initiate a new recording. This will prepare the GUI to save data. Once you click `Set Up Session`, the `Ready` button should turn blue, indicating a session is ready to record.
+## Development
-#### Controlling Recording
+The core modules of the package are organised as follows:
-If the `Ready` button is selected, you can now start a recording by clicking `On`. The `On` button will then turn green indicating a recording is active. To stop a recording, click `Off`. This will cause the `Ready` button to be selected again, as the GUI is prepared to restart the recording and to save the data to the same file. If you're session is complete, click `Save Video` to save all files: the video recording (as .avi file), a numpy file with timestamps for each recorded frame, the DeepLabCut poses as a pandas data frame (hdf5 file) that includes the time of each frame used for pose estimation and the time that each pose was obtained, and if applicable, files saved by the `Processor` in use. These files will be saved into a new directory at `{YOUR_SAVE_DIRECTORY}/{CAMERA NAME}_{SUBJECT}_{DATE}_{ATTEMPT}`
+- `dlclivegui.config` – dataclasses for loading, storing, and saving application settings.
+- `dlclivegui.cameras` – modular camera backends (OpenCV, Basler, GenTL) and factory helpers.
+- `dlclivegui.camera_controller` – camera capture worker running in a dedicated `QThread`.
+- `dlclivegui.video_recorder` – wrapper around `WriteGear` for video output.
+- `dlclivegui.dlc_processor` – asynchronous DLCLive inference with optional pose overlay.
+- `dlclivegui.gui` – PyQt6 user interface and application entry point.
-- YOUR_SAVE_DIRECTORY : the directory chosen from the `Directory` dropdown menu.
-- CAMERA NAME : the name of selected camera (from the `Camera` dropdown menu).
-- SUBJECT : the subject chosen from the `Subject` drowdown menu.
-- DATE : the current date of the experiment.
-- ATTEMPT : the attempt number chosen from the `Attempt` dropdown.
+Run a quick syntax check with:
-If you would not like to save the data from the session, please click `Delete Video`, and all data will be discarded. After you click `Save Video` or `Delete Video`, the `Off` button will be selected, indicating you can now set up a new session.
+```bash
+python -m compileall dlclivegui
+```
-#### References:
+## License
-If you use this code we kindly ask you to you please [cite Kane et al, eLife 2020](https://elifesciences.org/articles/61909). The preprint is available here: https://www.biorxiv.org/content/10.1101/2020.08.04.236422v2
+This project is licensed under the GNU Lesser General Public License v3.0. See the `LICENSE` file for
+more information.
diff --git a/dlclivegui/__init__.py b/dlclivegui/__init__.py
index 1583156..1408486 100644
--- a/dlclivegui/__init__.py
+++ b/dlclivegui/__init__.py
@@ -1,4 +1,17 @@
-from dlclivegui.camera_process import CameraProcess
-from dlclivegui.pose_process import CameraPoseProcess
-from dlclivegui.video import create_labeled_video
-from dlclivegui.dlclivegui import DLCLiveGUI
+"""DeepLabCut Live GUI package."""
+from .config import (
+ ApplicationSettings,
+ CameraSettings,
+ DLCProcessorSettings,
+ RecordingSettings,
+)
+from .gui import MainWindow, main
+
+__all__ = [
+ "ApplicationSettings",
+ "CameraSettings",
+ "DLCProcessorSettings",
+ "RecordingSettings",
+ "MainWindow",
+ "main",
+]
diff --git a/dlclivegui/camera/__init__.py b/dlclivegui/camera/__init__.py
deleted file mode 100644
index 2368198..0000000
--- a/dlclivegui/camera/__init__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-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, CameraError
-from dlclivegui.camera.opencv import OpenCVCam
-
-if platform.system() == "Windows":
- try:
- from dlclivegui.camera.tiscamera_windows import TISCam
- except Exception as e:
- pass
-
-if platform.system() == "Linux":
- 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"]:
- try:
- from dlclivegui.camera.aravis import AravisCam
- except Exception as e:
- pass
- # print(f"Error importing AravisCam: f{e}")
-
-if platform.system() == "Darwin":
- try:
- from dlclivegui.camera.pseye import PSEyeCam
- except Exception as e:
- pass
-
-try:
- from dlclivegui.camera.basler import BaslerCam
-except Exception as e:
- pass
diff --git a/dlclivegui/camera/aravis.py b/dlclivegui/camera/aravis.py
deleted file mode 100644
index 92662e1..0000000
--- a/dlclivegui/camera/aravis.py
+++ /dev/null
@@ -1,128 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-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
-
-
-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=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):
-
- self.cam = Aravis.Camera.new(self.id)
- self.no_auto()
- self.set_exposure(self.exposure)
- self.set_crop(self.crop)
- self.cam.set_frame_rate(self.fps)
-
- self.stream = self.cam.create_stream()
- self.stream.push_buffer(Aravis.Buffer.new_allocate(self.cam.get_payload()))
- self.cam.start_acquisition()
-
- 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)
-
- def set_crop(self, crop):
-
- if crop:
- left = crop[0]
- width = crop[1] - left
- top = crop[3]
- 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
- while buffer is None:
- buffer = self.stream.try_pop_buffer()
-
- frame = self._convert_image_to_numpy(buffer)
- self.stream.push_buffer(buffer)
-
- return frame, time.time()
-
- def _convert_image_to_numpy(self, buffer):
- """ from https://github.com/SintefManufacturing/python-aravis """
-
- pixel_format = buffer.get_image_pixel_format()
- bits_per_pixel = pixel_format >> 16 & 0xFF
-
- if bits_per_pixel == 8:
- INTP = ctypes.POINTER(ctypes.c_uint8)
- else:
- INTP = ctypes.POINTER(ctypes.c_uint16)
-
- addr = buffer.get_data()
- ptr = ctypes.cast(addr, INTP)
-
- 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()
diff --git a/dlclivegui/camera/basler.py b/dlclivegui/camera/basler.py
deleted file mode 100644
index 1706208..0000000
--- a/dlclivegui/camera/basler.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-#import pypylon as pylon
-from pypylon import pylon
-from imutils import rotate_bound
-import time
-
-from dlclivegui.camera import Camera, CameraError
-TIMEOUT = 100
-
-def get_devices():
- tlFactory = pylon.TlFactory.GetInstance()
- devices = tlFactory.EnumerateDevices()
- return devices
-
-class BaslerCam(Camera):
- @staticmethod
- def arg_restrictions():
- """ Returns a dictionary of arguments restrictions for DLCLiveGUI
- """
- devices = get_devices()
- device_ids = list(range(len(devices)))
- return {"device": device_ids, "display": [True, False]}
-
- def __init__(
- self,
- device=0,
- resolution=[640, 480],
- exposure=15000,
- rotate=0,
- crop=None,
- gain=0.0,
- fps=30,
- display=True,
- display_resize=1.0,
- ):
-
- super().__init__(
- device,
- resolution=resolution,
- exposure=exposure,
- rotate=rotate,
- crop=crop,
- gain=gain,
- fps=fps,
- use_tk_display=display,
- display_resize=display_resize,
- )
-
- self.display = display
-
- def set_capture_device(self):
-
- devices = get_devices()
- self.cam = pylon.InstantCamera(
- pylon.TlFactory.GetInstance().CreateDevice(devices[self.id])
- )
- self.cam.Open()
-
- self.cam.Gain.SetValue(self.gain)
- self.cam.ExposureTime.SetValue(self.exposure)
- self.cam.Width.SetValue(self.im_size[0])
- self.cam.Height.SetValue(self.im_size[1])
-
- self.cam.StartGrabbing(pylon.GrabStrategy_LatestImageOnly)
- self.converter = pylon.ImageFormatConverter()
- self.converter.OutputPixelFormat = pylon.PixelType_BGR8packed
- self.converter.OutputBitAlignment = pylon.OutputBitAlignment_MsbAligned
-
- return True
-
- def get_image(self):
- grabResult = self.cam.RetrieveResult(
- TIMEOUT, pylon.TimeoutHandling_ThrowException)
-
- frame = None
-
- if grabResult.GrabSucceeded():
-
- image = self.converter.Convert(grabResult)
- frame = image.GetArray()
-
- 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]]
-
- else:
-
- raise CameraError("Basler Camera did not return an image!")
-
- grabResult.Release()
-
- return frame
-
- def close_capture_device(self):
-
- self.cam.StopGrabbing()
diff --git a/dlclivegui/camera/camera.py b/dlclivegui/camera/camera.py
deleted file mode 100644
index e81442f..0000000
--- a/dlclivegui/camera/camera.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import cv2
-import time
-
-
-class CameraError(Exception):
- """
- Exception for incorrect use of cameras
- """
-
- pass
-
-
-class Camera(object):
- """ Base camera class. Controls image capture, writing images to video, pose estimation and image display.
-
- Parameters
- ----------
- id : [type]
- camera id
- exposure : int, optional
- exposure time in microseconds, by default None
- gain : int, optional
- gain value, by default None
- rotate : [type], optional
- [description], by default None
- crop : list, optional
- camera cropping parameters: [left, right, top, bottom], by default None
- fps : float, optional
- frame rate in frames per second, by default None
- use_tk_display : bool, optional
- flag to use tk image display (if using GUI), by default False
- display_resize : float, optional
- 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,
- ):
- """ Constructor method
- """
-
- self.id = id
- self.exposure = exposure
- self.gain = gain
- self.rotate = rotate
- self.crop = [int(c) for c in crop] if crop else None
- self.set_im_size(resolution)
- 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):
- """[summary]
-
- Parameters
- ----------
- default : [, optional
- [description], by default None
-
- Raises
- ------
- DLCLiveCameraError
- throws error if resolution is not set
- """
-
- 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])
- )
-
- 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).
-
- Returns
- -------
- `np.ndarray`
- image as a numpy array
- float
- timestamp at which frame was taken, obtained from :func:`time.time`
- """
-
- frame = None
- while frame is None:
- cur_time = time.time()
- 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
- )
-
- 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 --git a/dlclivegui/camera/opencv.py b/dlclivegui/camera/opencv.py
deleted file mode 100644
index 7ac96b2..0000000
--- a/dlclivegui/camera/opencv.py
+++ /dev/null
@@ -1,155 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import cv2
-from tkinter import filedialog
-from imutils import rotate_bound
-import time
-import platform
-
-from dlclivegui.camera import Camera, CameraError
-
-
-class OpenCVCam(Camera):
- @staticmethod
- def arg_restrictions():
- """ Returns a dictionary of arguments restrictions for DLCLiveGUI
- """
-
- cap = cv2.VideoCapture()
- devs = [-1]
- avail = True
- while avail:
- cur_index = devs[-1] + 1
- avail = cap.open(cur_index)
- if avail:
- 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,
- ):
-
- 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."
- )
-
- self.video = False
- id = int(device)
-
- else:
- if not file:
- 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."
- )
-
- self.video = True
- cap = cv2.VideoCapture(file)
- 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,
- )
- 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)
- )
- ret, frame = self.cap.read()
-
- if self.im_size:
- self.cap.set(cv2.CAP_PROP_FRAME_WIDTH, self.im_size[0])
- self.cap.set(cv2.CAP_PROP_FRAME_HEIGHT, self.im_size[1])
- if self.auto_exposure:
- self.cap.set(cv2.CAP_PROP_AUTO_EXPOSURE, self.auto_exposure)
- if self.exposure:
- self.cap.set(cv2.CAP_PROP_EXPOSURE, self.exposure)
- if self.gain:
- self.cap.set(cv2.CAP_PROP_GAIN, self.gain)
- if self.fps:
- self.cap.set(cv2.CAP_PROP_FPS, self.fps)
-
- else:
-
- self.cap = cv2.VideoCapture(self.id)
-
- # self.im_size = (self.cap.get(cv2.CAP_PROP_FRAME_WIDTH), self.cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
- # self.fps = self.cap.get(cv2.CAP_PROP_FPS)
- self.last_cap_read = 0
-
- self.cv2_color = self.cap.get(cv2.CAP_PROP_MODE)
-
- 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):
- 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]]
-
- 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()
diff --git a/dlclivegui/camera/pseye.py b/dlclivegui/camera/pseye.py
deleted file mode 100644
index 4c79065..0000000
--- a/dlclivegui/camera/pseye.py
+++ /dev/null
@@ -1,101 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import cv2
-from imutils import rotate_bound
-import numpy as np
-import pseyepy
-
-from dlclivegui.camera import Camera, CameraError
-
-
-class PSEyeCam(Camera):
- @staticmethod
- def arg_restrictions():
-
- return {
- "device": [i for i in range(pseyepy.cam_count())],
- "resolution": [[320, 240], [640, 480]],
- "fps": [30, 40, 50, 60, 75, 100, 125],
- "colour": [True, False],
- "auto_whitebalance": [True, False],
- }
-
- def __init__(
- self,
- device=0,
- resolution=[320, 240],
- exposure=100,
- gain=20,
- rotate=0,
- crop=None,
- fps=60,
- colour=False,
- auto_whitebalance=False,
- red_balance=125,
- blue_balance=125,
- green_balance=125,
- display=True,
- display_resize=1.0,
- ):
-
- super().__init__(
- device,
- resolution=resolution,
- exposure=exposure,
- gain=gain,
- rotate=rotate,
- crop=crop,
- fps=fps,
- use_tk_display=display,
- display_resize=display_resize,
- )
- self.colour = colour
- self.auto_whitebalance = auto_whitebalance
- self.red_balance = red_balance
- self.blue_balance = blue_balance
- self.green_balance = green_balance
-
- def set_capture_device(self):
-
- if self.im_size[0] == 320:
- res = pseyepy.Camera.RES_SMALL
- elif self.im_size[0] == 640:
- res = pseyepy.Camera.RES_LARGE
- else:
- raise CameraError(f"pseye resolution {self.im_size} not supported")
-
- self.cap = pseyepy.Camera(
- self.id,
- fps=self.fps,
- resolution=res,
- exposure=self.exposure,
- gain=self.gain,
- colour=self.colour,
- auto_whitebalance=self.auto_whitebalance,
- red_balance=self.red_balance,
- blue_balance=self.blue_balance,
- green_balance=self.green_balance,
- )
-
- return True
-
- def get_image_on_time(self):
-
- frame, _ = self.cap.read()
-
- if self.rotate != 0:
- frame = rotate_bound(frame, self.rotate)
- if self.crop:
- frame = frame[self.crop[2] : self.crop[3], self.crop[0] : self.crop[1]]
-
- return frame
-
- def close_capture_device(self):
-
- self.cap.end()
diff --git a/dlclivegui/camera/tiscamera_linux.py b/dlclivegui/camera/tiscamera_linux.py
deleted file mode 100644
index 5f0afd8..0000000
--- a/dlclivegui/camera/tiscamera_linux.py
+++ /dev/null
@@ -1,204 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import warnings
-import numpy as np
-import time
-
-import gi
-
-gi.require_version("Tcam", "0.1")
-gi.require_version("Gst", "1.0")
-from gi.repository import Tcam, Gst, GLib, GObject
-
-from dlclivegui.camera import Camera
-
-
-class TISCam(Camera):
-
- FRAME_RATE_OPTIONS = [15, 30, 60, 120, 240, 480]
- FRAME_RATE_FRACTIONS = ["15/1", "30/1", "60/1", "120/1", "5000000/20833", "480/1"]
- IM_FORMAT = (720, 540)
- ROTATE_OPTIONS = ["identity", "90r", "180", "90l", "horiz", "vert"]
-
- @staticmethod
- def arg_restrictions():
-
- if not Gst.is_initialized():
- Gst.init()
-
- source = Gst.ElementFactory.make("tcambin")
- return {
- "serial_number": source.get_device_serials(),
- "fps": TISCam.FRAME_RATE_OPTIONS,
- "rotate": TISCam.ROTATE_OPTIONS,
- "color": [True, False],
- "display": [True, False],
- }
-
- def __init__(
- self,
- serial_number="",
- resolution=[720, 540],
- exposure=0.005,
- rotate="identity",
- crop=None,
- fps=120,
- color=False,
- display=True,
- tk_resize=1.0,
- ):
-
- super().__init__(
- serial_number,
- resolution=resolution,
- exposure=exposure,
- rotate=rotate,
- crop=crop,
- fps=fps,
- use_tk_display=(not display),
- display_resize=tk_resize,
- )
- self.color = color
- self.display = display
- self.sample_locked = False
- self.new_sample = False
-
- def no_auto(self):
-
- self.cam.set_tcam_property("Exposure Auto", GObject.Value(bool, False))
-
- def set_exposure(self, val):
-
- val = 1 if val > 1 else val
- val = 0 if val < 0 else val
- self.cam.set_tcam_property("Exposure", val * 1e6)
-
- def set_crop(self, crop):
-
- if crop:
- self.gst_crop = self.gst_pipeline.get_by_name("crop")
- self.gst_crop.set_property("left", crop[0])
- self.gst_crop.set_property("right", TISCam.IM_FORMAT[0] - crop[1])
- self.gst_crop.set_property("top", crop[2])
- self.gst_crop.set_property("bottom", TISCam.IM_FORMAT[1] - crop[3])
- self.im_size = (crop[3] - crop[2], crop[1] - crop[0])
-
- def set_rotation(self, val):
-
- if val:
- self.gst_rotate = self.gst_pipeline.get_by_name("rotate")
- self.gst_rotate.set_property("video-direction", val)
-
- def set_sink(self):
-
- self.gst_sink = self.gst_pipeline.get_by_name("sink")
- self.gst_sink.set_property("max-buffers", 1)
- self.gst_sink.set_property("drop", 1)
- self.gst_sink.set_property("emit-signals", True)
- self.gst_sink.connect("new-sample", self.get_image)
-
- def setup_gst(self, serial_number, fps):
-
- if not Gst.is_initialized():
- Gst.init()
-
- fps_index = np.where(
- [int(fps) == int(opt) for opt in TISCam.FRAME_RATE_OPTIONS]
- )[0][0]
- fps_frac = TISCam.FRAME_RATE_FRACTIONS[fps_index]
- fmat = "BGRx" if self.color else "GRAY8"
-
- pipeline = (
- "tcambin name=cam "
- "! videocrop name=crop "
- "! videoflip name=rotate "
- "! video/x-raw,format={},framerate={} ".format(fmat, fps_frac)
- )
-
- if self.display:
- pipe_sink = (
- "! tee name=t "
- "t. ! queue ! videoconvert ! ximagesink "
- "t. ! queue ! appsink name=sink"
- )
- else:
- pipe_sink = "! appsink name=sink"
-
- pipeline += pipe_sink
-
- self.gst_pipeline = Gst.parse_launch(pipeline)
-
- self.cam = self.gst_pipeline.get_by_name("cam")
- self.cam.set_property("serial", serial_number)
-
- self.set_exposure(self.exposure)
- self.set_crop(self.crop)
- self.set_rotation(self.rotate)
- self.set_sink()
-
- def set_capture_device(self):
-
- self.setup_gst(self.id, self.fps)
- self.gst_pipeline.set_state(Gst.State.PLAYING)
-
- return True
-
- def get_image(self, sink):
-
- # wait for sample to unlock
- while self.sample_locked:
- pass
-
- try:
-
- self.sample = sink.get_property("last-sample")
- self._convert_image_to_numpy()
-
- except GLib.Error as e:
-
- warnings.warn("Error reading image :: {}".format(e))
-
- finally:
-
- return 0
-
- def _convert_image_to_numpy(self):
-
- self.sample_locked = True
-
- buffer = self.sample.get_buffer()
- struct = self.sample.get_caps().get_structure(0)
-
- height = struct.get_value("height")
- width = struct.get_value("width")
- fmat = struct.get_value("format")
- dtype = np.uint16 if fmat == "GRAY16_LE" else np.uint8
- ncolors = 1 if "GRAY" in fmat else 4
-
- self.frame = np.ndarray(
- shape=(height, width, ncolors),
- buffer=buffer.extract_dup(0, buffer.get_size()),
- dtype=dtype,
- )
-
- self.sample_locked = False
- self.new_sample = True
-
- def get_image_on_time(self):
-
- # wait for new sample
- while not self.new_sample:
- pass
- self.new_sample = False
-
- return self.frame, time.time()
-
- def close_capture_device(self):
-
- self.gst_pipeline.set_state(Gst.State.NULL)
diff --git a/dlclivegui/camera/tiscamera_windows.py b/dlclivegui/camera/tiscamera_windows.py
deleted file mode 100644
index bac6359..0000000
--- a/dlclivegui/camera/tiscamera_windows.py
+++ /dev/null
@@ -1,129 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-import time
-import cv2
-
-from dlclivegui.camera import Camera, CameraError
-from dlclivegui.camera.tisgrabber_windows import TIS_CAM
-
-
-class TISCam(Camera):
- @staticmethod
- def arg_restrictions():
-
- return {"serial_number": TIS_CAM().GetDevices(), "rotate": [0, 90, 180, 270]}
-
- def __init__(
- self,
- serial_number="",
- resolution=[720, 540],
- exposure=0.005,
- rotate=0,
- crop=None,
- fps=100,
- display=True,
- display_resize=1.0,
- ):
- """
- Params
- ------
- serial_number = string; serial number for imaging source camera
- crop = dict; contains ints named top, left, height, width for cropping
- default = None, uses default parameters specific to camera
- """
-
- 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 = self.exposure
- val = 1 if val > 1 else val
- val = 0 if val < 0 else val
- self.cam.SetPropertyAbsoluteValue("Exposure", "Value", val)
-
- def get_exposure(self):
-
- exposure = [0]
- self.cam.GetPropertyAbsoluteValue("Exposure", "Value", exposure)
- return round(exposure[0], 3)
-
- # def set_crop(self):
-
- # crop = self.crop
-
- # if crop:
- # top = int(crop[0])
- # left = int(crop[2])
- # height = int(crop[1]-top)
- # width = int(crop[3]-left)
-
- # 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):
-
- 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", self.rotate
- )
-
- def set_fps(self):
-
- self.cam.SetFrameRate(self.fps)
-
- def set_capture_device(self):
-
- self.cam = TIS_CAM()
- self.crop_filter = None
- self.rotation_filter = None
- self.set_rotation()
- # self.set_crop()
- self.set_fps()
- self.next_frame = time.time()
-
- self.cam.open(self.id)
- self.cam.SetContinuousMode(0)
- self.cam.StartLive(0)
-
- self.set_exposure()
-
- return True
-
- 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()
diff --git a/dlclivegui/camera/tisgrabber_windows.py b/dlclivegui/camera/tisgrabber_windows.py
deleted file mode 100644
index 194e18e..0000000
--- a/dlclivegui/camera/tisgrabber_windows.py
+++ /dev/null
@@ -1,781 +0,0 @@
-"""
-Created on Mon Nov 21 09:44:40 2016
-
-@author: Daniel Vassmer, Stefan_Geissler
-From: https://github.com/TheImagingSource/IC-Imaging-Control-Samples/tree/master/Python
-
-modified 10/3/2019 by Gary Kane - https://github.com/gkane26
-"""
-
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-from enum import Enum
-
-import ctypes as C
-import os
-import sys
-import numpy as np
-
-
-class SinkFormats(Enum):
- Y800 = 0
- RGB24 = 1
- RGB32 = 2
- UYVY = 3
- Y16 = 4
-
-
-ImageFileTypes = {"BMP": 0, "JPEG": 1}
-
-
-class GrabberHandle(C.Structure):
- pass
-
-
-GrabberHandle._fields_ = [("unused", C.c_int)]
-
-##############################################################################
-
-### GK Additions from: https://github.com/morefigs/py-ic-imaging-control
-
-
-class FilterParameter(C.Structure):
- pass
-
-
-FilterParameter._fields_ = [("Name", C.c_char * 30), ("Type", C.c_int)]
-
-
-class FrameFilterHandle(C.Structure):
- pass
-
-
-FrameFilterHandle._fields_ = [
- ("pFilter", C.c_void_p),
- ("bHasDialog", C.c_int),
- ("ParameterCount", C.c_int),
- ("Parameters", C.POINTER(FilterParameter)),
-]
-
-##############################################################################
-
-
-class TIS_GrabberDLL(object):
- if sys.maxsize > 2 ** 32:
- __tisgrabber = C.windll.LoadLibrary("tisgrabber_x64.dll")
- else:
- __tisgrabber = C.windll.LoadLibrary("tisgrabber.dll")
-
- def __init__(self, **keyargs):
- """Initialize the Albatross from the keyword arguments."""
- self.__dict__.update(keyargs)
-
- GrabberHandlePtr = C.POINTER(GrabberHandle)
-
- ####################################
-
- # Initialize the ICImagingControl class library. This function must be called
- # only once before any other functions of this library are called.
- # @param szLicenseKey IC Imaging Control license key or NULL if only a trial version is available.
- # @retval IC_SUCCESS on success.
- # @retval IC_ERROR on wrong license key or other errors.
- # @sa IC_CloseLibrary
- InitLibrary = __tisgrabber.IC_InitLibrary(None)
-
- # Get the number of the currently available devices. This function creates an
- # internal array of all connected video capture devices. With each call to this
- # function, this array is rebuild. The name and the unique name can be retrieved
- # from the internal array using the functions IC_GetDevice() and IC_GetUniqueNamefromList.
- # They are usefull for retrieving device names for opening devices.
- #
- # @retval >= 0 Success, count of found devices.
- # @retval IC_NO_HANDLE Internal Error.
- #
- # @sa IC_GetDevice
- # @sa IC_GetUniqueNamefromList
- get_devicecount = __tisgrabber.IC_GetDeviceCount
- get_devicecount.restype = C.c_int
- get_devicecount.argtypes = None
-
- # Get unique device name of a device specified by iIndex. The unique device name
- # consist from the device name and its serial number. It allows to differ between
- # more then one device of the same type connected to the computer. The unique device name
- # is passed to the function IC_OpenDevByUniqueName
- #
- # @param iIndex The number of the device whose name is to be returned. It must be
- # in the range from 0 to IC_GetDeviceCount(),
- # @return Returns the string representation of the device on success, NULL
- # otherwise.
- #
- # @sa IC_GetDeviceCount
- # @sa IC_GetUniqueNamefromList
- # @sa IC_OpenDevByUniqueName
-
- get_unique_name_from_list = __tisgrabber.IC_GetUniqueNamefromList
- get_unique_name_from_list.restype = C.c_char_p
- get_unique_name_from_list.argtypes = (C.c_int,)
-
- # Creates a new grabber handle and returns it. A new created grabber should be
- # release with a call to IC_ReleaseGrabber if it is no longer needed.
- # @sa IC_ReleaseGrabber
- create_grabber = __tisgrabber.IC_CreateGrabber
- create_grabber.restype = GrabberHandlePtr
- create_grabber.argtypes = None
-
- # Open a video capture by using its UniqueName. Use IC_GetUniqueName() to
- # retrieve the unique name of a camera.
- #
- # @param hGrabber Handle to a grabber object
- # @param szDisplayName Memory that will take the display name.
- #
- # @sa IC_GetUniqueName
- # @sa IC_ReleaseGrabber
- open_device_by_unique_name = __tisgrabber.IC_OpenDevByUniqueName
- open_device_by_unique_name.restype = C.c_int
- open_device_by_unique_name.argtypes = (GrabberHandlePtr, C.c_char_p)
-
- set_videoformat = __tisgrabber.IC_SetVideoFormat
- set_videoformat.restype = C.c_int
- set_videoformat.argtypes = (GrabberHandlePtr, C.c_char_p)
-
- set_framerate = __tisgrabber.IC_SetFrameRate
- set_framerate.restype = C.c_int
- set_framerate.argtypes = (GrabberHandlePtr, C.c_float)
-
- # Returns the width of the video format.
- get_video_format_width = __tisgrabber.IC_GetVideoFormatWidth
- get_video_format_width.restype = C.c_int
- get_video_format_width.argtypes = (GrabberHandlePtr,)
-
- # returns the height of the video format.
- get_video_format_height = __tisgrabber.IC_GetVideoFormatHeight
- get_video_format_height.restype = C.c_int
- get_video_format_height.argtypes = (GrabberHandlePtr,)
-
- # Get the number of the available video formats for the current device.
- # A video capture device must have been opened before this call.
- #
- # @param hGrabber The handle to the grabber object.
- #
- # @retval >= 0 Success
- # @retval IC_NO_DEVICE No video capture device selected.
- # @retval IC_NO_HANDLE No handle to the grabber object.
- #
- # @sa IC_GetVideoFormat
- GetVideoFormatCount = __tisgrabber.IC_GetVideoFormatCount
- GetVideoFormatCount.restype = C.c_int
- GetVideoFormatCount.argtypes = (GrabberHandlePtr,)
-
- # Get a string representation of the video format specified by iIndex.
- # iIndex must be between 0 and IC_GetVideoFormatCount().
- # IC_GetVideoFormatCount() must have been called before this function,
- # otherwise it will always fail.
- #
- # @param hGrabber The handle to the grabber object.
- # @param iIndex Number of the video format to be used.
- #
- # @retval Nonnull The name of the specified video format.
- # @retval NULL An error occured.
- # @sa IC_GetVideoFormatCount
- GetVideoFormat = __tisgrabber.IC_GetVideoFormat
- GetVideoFormat.restype = C.c_char_p
- GetVideoFormat.argtypes = (GrabberHandlePtr, C.c_int)
-
- # Get the number of the available input channels for the current device.
- # A video capture device must have been opened before this call.
- #
- # @param hGrabber The handle to the grabber object.
- #
- # @retval >= 0 Success
- # @retval IC_NO_DEVICE No video capture device selected.
- # @retval IC_NO_HANDLE No handle to the grabber object.
- #
- # @sa IC_GetInputChannel
- GetInputChannelCount = __tisgrabber.IC_GetInputChannelCount
- GetInputChannelCount.restype = C.c_int
- GetInputChannelCount.argtypes = (GrabberHandlePtr,)
-
- # Get a string representation of the input channel specified by iIndex.
- # iIndex must be between 0 and IC_GetInputChannelCount().
- # IC_GetInputChannelCount() must have been called before this function,
- # otherwise it will always fail.
- # @param hGrabber The handle to the grabber object.
- # @param iIndex Number of the input channel to be used..
- #
- # @retval Nonnull The name of the specified input channel
- # @retval NULL An error occured.
- # @sa IC_GetInputChannelCount
- GetInputChannel = __tisgrabber.IC_GetInputChannel
- GetInputChannel.restype = C.c_char_p
- GetInputChannel.argtypes = (GrabberHandlePtr, C.c_int)
-
- # Get the number of the available video norms for the current device.
- # A video capture device must have been opened before this call.
- #
- # @param hGrabber The handle to the grabber object.
- #
- # @retval >= 0 Success
- # @retval IC_NO_DEVICE No video capture device selected.
- # @retval IC_NO_HANDLE No handle to the grabber object.
- #
- # @sa IC_GetVideoNorm
- GetVideoNormCount = __tisgrabber.IC_GetVideoNormCount
- GetVideoNormCount.restype = C.c_int
- GetVideoNormCount.argtypes = (GrabberHandlePtr,)
-
- # Get a string representation of the video norm specified by iIndex.
- # iIndex must be between 0 and IC_GetVideoNormCount().
- # IC_GetVideoNormCount() must have been called before this function,
- # otherwise it will always fail.
- #
- # @param hGrabber The handle to the grabber object.
- # @param iIndex Number of the video norm to be used.
- #
- # @retval Nonnull The name of the specified video norm.
- # @retval NULL An error occured.
- # @sa IC_GetVideoNormCount
- GetVideoNorm = __tisgrabber.IC_GetVideoNorm
- GetVideoNorm.restype = C.c_char_p
- GetVideoNorm.argtypes = (GrabberHandlePtr, C.c_int)
-
- SetFormat = __tisgrabber.IC_SetFormat
- SetFormat.restype = C.c_int
- SetFormat.argtypes = (GrabberHandlePtr, C.c_int)
- GetFormat = __tisgrabber.IC_GetFormat
- GetFormat.restype = C.c_int
- GetFormat.argtypes = (GrabberHandlePtr,)
-
- # Start the live video.
- # @param hGrabber The handle to the grabber object.
- # @param iShow The parameter indicates: @li 1 : Show the video @li 0 : Do not show the video, but deliver frames. (For callbacks etc.)
- # @retval IC_SUCCESS on success
- # @retval IC_ERROR if something went wrong.
- # @sa IC_StopLive
-
- StartLive = __tisgrabber.IC_StartLive
- StartLive.restype = C.c_int
- StartLive.argtypes = (GrabberHandlePtr, C.c_int)
-
- StopLive = __tisgrabber.IC_StopLive
- StopLive.restype = C.c_int
- StopLive.argtypes = (GrabberHandlePtr,)
-
- SetHWND = __tisgrabber.IC_SetHWnd
- SetHWND.restype = C.c_int
- SetHWND.argtypes = (GrabberHandlePtr, C.c_int)
-
- # Snaps an image. The video capture device must be set to live mode and a
- # sink type has to be set before this call. The format of the snapped images depend on
- # the selected sink type.
- #
- # @param hGrabber The handle to the grabber object.
- # @param iTimeOutMillisek The Timeout time is passed in milli seconds. A value of -1 indicates, that
- # no time out is set.
- #
- #
- # @retval IC_SUCCESS if an image has been snapped
- # @retval IC_ERROR if something went wrong.
- # @retval IC_NOT_IN_LIVEMODE if the live video has not been started.
- #
- # @sa IC_StartLive
- # @sa IC_SetFormat
-
- SnapImage = __tisgrabber.IC_SnapImage
- SnapImage.restype = C.c_int
- SnapImage.argtypes = (GrabberHandlePtr, C.c_int)
-
- # Retrieve the properties of the current video format and sink type
- # @param hGrabber The handle to the grabber object.
- # @param *lWidth This recieves the width of the image buffer.
- # @param *lHeight This recieves the height of the image buffer.
- # @param *iBitsPerPixel This recieves the count of bits per pixel.
- # @param *format This recieves the current color format.
- # @retval IC_SUCCESS on success
- # @retval IC_ERROR if something went wrong.
-
- GetImageDescription = __tisgrabber.IC_GetImageDescription
- GetImageDescription.restype = C.c_int
- GetImageDescription.argtypes = (
- GrabberHandlePtr,
- C.POINTER(C.c_long),
- C.POINTER(C.c_long),
- C.POINTER(C.c_int),
- C.POINTER(C.c_int),
- )
-
- GetImagePtr = __tisgrabber.IC_GetImagePtr
- GetImagePtr.restype = C.c_void_p
- GetImagePtr.argtypes = (GrabberHandlePtr,)
-
- # ############################################################################
- ShowDeviceSelectionDialog = __tisgrabber.IC_ShowDeviceSelectionDialog
- ShowDeviceSelectionDialog.restype = GrabberHandlePtr
- ShowDeviceSelectionDialog.argtypes = (GrabberHandlePtr,)
-
- # ############################################################################
-
- ShowPropertyDialog = __tisgrabber.IC_ShowPropertyDialog
- ShowPropertyDialog.restype = GrabberHandlePtr
- ShowPropertyDialog.argtypes = (GrabberHandlePtr,)
-
- # ############################################################################
- IsDevValid = __tisgrabber.IC_IsDevValid
- IsDevValid.restype = C.c_int
- IsDevValid.argtypes = (GrabberHandlePtr,)
-
- # ############################################################################
-
- LoadDeviceStateFromFile = __tisgrabber.IC_LoadDeviceStateFromFile
- LoadDeviceStateFromFile.restype = GrabberHandlePtr
- LoadDeviceStateFromFile.argtypes = (GrabberHandlePtr, C.c_char_p)
-
- # ############################################################################
- SaveDeviceStateToFile = __tisgrabber.IC_SaveDeviceStateToFile
- SaveDeviceStateToFile.restype = C.c_int
- SaveDeviceStateToFile.argtypes = (GrabberHandlePtr, C.c_char_p)
-
- GetCameraProperty = __tisgrabber.IC_GetCameraProperty
- GetCameraProperty.restype = C.c_int
- GetCameraProperty.argtypes = (GrabberHandlePtr, C.c_int, C.POINTER(C.c_long))
-
- SetCameraProperty = __tisgrabber.IC_SetCameraProperty
- SetCameraProperty.restype = C.c_int
- SetCameraProperty.argtypes = (GrabberHandlePtr, C.c_int, C.c_long)
-
- SetPropertyValue = __tisgrabber.IC_SetPropertyValue
- SetPropertyValue.restype = C.c_int
- SetPropertyValue.argtypes = (GrabberHandlePtr, C.c_char_p, C.c_char_p, C.c_int)
-
- GetPropertyValue = __tisgrabber.IC_GetPropertyValue
- GetPropertyValue.restype = C.c_int
- GetPropertyValue.argtypes = (
- GrabberHandlePtr,
- C.c_char_p,
- C.c_char_p,
- C.POINTER(C.c_long),
- )
-
- # ############################################################################
- SetPropertySwitch = __tisgrabber.IC_SetPropertySwitch
- SetPropertySwitch.restype = C.c_int
- SetPropertySwitch.argtypes = (GrabberHandlePtr, C.c_char_p, C.c_char_p, C.c_int)
-
- GetPropertySwitch = __tisgrabber.IC_GetPropertySwitch
- GetPropertySwitch.restype = C.c_int
- GetPropertySwitch.argtypes = (
- GrabberHandlePtr,
- C.c_char_p,
- C.c_char_p,
- C.POINTER(C.c_long),
- )
- # ############################################################################
-
- IsPropertyAvailable = __tisgrabber.IC_IsPropertyAvailable
- IsPropertyAvailable.restype = C.c_int
- IsPropertyAvailable.argtypes = (GrabberHandlePtr, C.c_char_p, C.c_char_p)
-
- PropertyOnePush = __tisgrabber.IC_PropertyOnePush
- PropertyOnePush.restype = C.c_int
- PropertyOnePush.argtypes = (GrabberHandlePtr, C.c_char_p, C.c_char_p)
-
- SetPropertyAbsoluteValue = __tisgrabber.IC_SetPropertyAbsoluteValue
- SetPropertyAbsoluteValue.restype = C.c_int
- SetPropertyAbsoluteValue.argtypes = (
- GrabberHandlePtr,
- C.c_char_p,
- C.c_char_p,
- C.c_float,
- )
-
- GetPropertyAbsoluteValue = __tisgrabber.IC_GetPropertyAbsoluteValue
- GetPropertyAbsoluteValue.restype = C.c_int
- GetPropertyAbsoluteValue.argtypes = (
- GrabberHandlePtr,
- C.c_char_p,
- C.c_char_p,
- C.POINTER(C.c_float),
- )
-
- # definition of the frameready callback
- FRAMEREADYCALLBACK = C.CFUNCTYPE(
- C.c_void_p, C.c_int, C.POINTER(C.c_ubyte), C.c_ulong, C.py_object
- )
-
- # set callback function
- SetFrameReadyCallback = __tisgrabber.IC_SetFrameReadyCallback
- SetFrameReadyCallback.restype = C.c_int
- SetFrameReadyCallback.argtypes = [GrabberHandlePtr, FRAMEREADYCALLBACK, C.py_object]
-
- SetContinuousMode = __tisgrabber.IC_SetContinuousMode
-
- SaveImage = __tisgrabber.IC_SaveImage
- SaveImage.restype = C.c_int
- SaveImage.argtypes = [C.c_void_p, C.c_char_p, C.c_int, C.c_int]
-
- OpenVideoCaptureDevice = __tisgrabber.IC_OpenVideoCaptureDevice
- OpenVideoCaptureDevice.restype = C.c_int
- OpenVideoCaptureDevice.argtypes = [C.c_void_p, C.c_char_p]
-
- # ############################################################################
-
- ### GK Additions - adding frame filters. Pieces copied from: https://github.com/morefigs/py-ic-imaging-control
-
- CreateFrameFilter = __tisgrabber.IC_CreateFrameFilter
- CreateFrameFilter.restype = C.c_int
- CreateFrameFilter.argtypes = (C.c_char_p, C.POINTER(FrameFilterHandle))
-
- AddFrameFilter = __tisgrabber.IC_AddFrameFilterToDevice
- AddFrameFilter.restype = C.c_int
- AddFrameFilter.argtypes = (GrabberHandlePtr, C.POINTER(FrameFilterHandle))
-
- FilterGetParameter = __tisgrabber.IC_FrameFilterGetParameter
- FilterGetParameter.restype = C.c_int
- FilterGetParameter.argtypes = (C.POINTER(FrameFilterHandle), C.c_char_p, C.c_void_p)
-
- FilterSetParameter = __tisgrabber.IC_FrameFilterSetParameterInt
- FilterSetParameter.restype = C.c_int
- FilterSetParameter.argtypes = (C.POINTER(FrameFilterHandle), C.c_char_p, C.c_int)
-
-
-# ############################################################################
-
-
-class TIS_CAM(object):
- @property
- def callback_registered(self):
- return self._callback_registered
-
- def __init__(self):
-
- self._handle = C.POINTER(GrabberHandle)
- self._handle = TIS_GrabberDLL.create_grabber()
- self._callback_registered = False
- self._frame = {"num": -1, "ready": False}
-
- def s(self, strin):
- if sys.version[0] == "2":
- return strin
- if type(strin) == "byte":
- return strin
- return strin.encode("utf-8")
-
- def SetFrameReadyCallback(self, CallbackFunction, data):
- """ Set a callback function, which is called, when a new frame arrives.
-
- CallbackFunction : The callback function
-
- data : a self defined class with user data.
- """
- return TIS_GrabberDLL.SetFrameReadyCallback(
- self._handle, CallbackFunction, data
- )
-
- def SetContinuousMode(self, Mode):
- """ Determines, whether new frames are automatically copied into memory.
-
- :param Mode: If 0, all frames are copied automatically into memory. This is recommened, if the camera runs in trigger mode.
- If 1, then snapImages must be called to get a frame into memory.
- :return: None
- """
- return TIS_GrabberDLL.SetContinuousMode(self._handle, Mode)
-
- def open(self, unique_device_name):
- """ Open a device
-
- unique_device_name : The name and serial number of the device to be opened. The device name and serial number are separated by a space.
- """
- test = TIS_GrabberDLL.open_device_by_unique_name(
- self._handle, self.s(unique_device_name)
- )
-
- return test
-
- def close(self):
- TIS_GrabberDLL.close_device(self._handle)
-
- def ShowDeviceSelectionDialog(self):
- self._handle = TIS_GrabberDLL.ShowDeviceSelectionDialog(self._handle)
-
- def ShowPropertyDialog(self):
- self._handle = TIS_GrabberDLL.ShowPropertyDialog(self._handle)
-
- def IsDevValid(self):
- return TIS_GrabberDLL.IsDevValid(self._handle)
-
- def SetHWND(self, Hwnd):
- return TIS_GrabberDLL.SetHWND(self._handle, Hwnd)
-
- def SaveDeviceStateToFile(self, FileName):
- return TIS_GrabberDLL.SaveDeviceStateToFile(self._handle, self.s(FileName))
-
- def LoadDeviceStateFromFile(self, FileName):
- self._handle = TIS_GrabberDLL.LoadDeviceStateFromFile(
- self._handle, self.s(FileName)
- )
-
- def SetVideoFormat(self, Format):
- return TIS_GrabberDLL.set_videoformat(self._handle, self.s(Format))
-
- def SetFrameRate(self, FPS):
- return TIS_GrabberDLL.set_framerate(self._handle, FPS)
-
- def get_video_format_width(self):
- return TIS_GrabberDLL.get_video_format_width(self._handle)
-
- def get_video_format_height(self):
- return TIS_GrabberDLL.get_video_format_height(self._handle)
-
- def GetDevices(self):
- self._Devices = []
- iDevices = TIS_GrabberDLL.get_devicecount()
- for i in range(iDevices):
- self._Devices.append(TIS_GrabberDLL.get_unique_name_from_list(i))
- return self._Devices
-
- def GetVideoFormats(self):
- self._Properties = []
- iVideoFormats = TIS_GrabberDLL.GetVideoFormatCount(self._handle)
- for i in range(iVideoFormats):
- self._Properties.append(TIS_GrabberDLL.GetVideoFormat(self._handle, i))
- return self._Properties
-
- def GetInputChannels(self):
- self.InputChannels = []
- InputChannelscount = TIS_GrabberDLL.GetInputChannelCount(self._handle)
- for i in range(InputChannelscount):
- self.InputChannels.append(TIS_GrabberDLL.GetInputChannel(self._handle, i))
- return self.InputChannels
-
- def GetVideoNormCount(self):
- self.GetVideoNorm = []
- GetVideoNorm_Count = TIS_GrabberDLL.GetVideoNormCount(self._handle)
- for i in range(GetVideoNorm_Count):
- self.GetVideoNorm.append(TIS_GrabberDLL.GetVideoNorm(self._handle, i))
- return self.GetVideoNorm
-
- def SetFormat(self, Format):
- """ SetFormat
- Sets the pixel format in memory
- @param Format Sinkformat enumeration
- """
- TIS_GrabberDLL.SetFormat(self._handle, Format.value)
-
- def GetFormat(self):
- val = TIS_GrabberDLL.GetFormat(self._handle)
- if val == 0:
- return SinkFormats.Y800
- if val == 2:
- return SinkFormats.RGB32
- if val == 1:
- return SinkFormats.RGB24
- if val == 3:
- return SinkFormats.UYVY
- if val == 4:
- return SinkFormats.Y16
- return SinkFormats.RGB24
-
- def StartLive(self, showlive=1):
- """
- Start the live video stream.
-
- showlive: 1 : a live video is shown, 0 : the live video is not shown.
- """
- Error = TIS_GrabberDLL.StartLive(self._handle, showlive)
- return Error
-
- def StopLive(self):
- """
- Stop the live video.
- """
- Error = TIS_GrabberDLL.StopLive(self._handle)
- return Error
-
- def SnapImage(self):
- Error = TIS_GrabberDLL.SnapImage(self._handle, 2000)
- return Error
-
- def GetImageDescription(self):
- lWidth = C.c_long()
- lHeight = C.c_long()
- iBitsPerPixel = C.c_int()
- COLORFORMAT = C.c_int()
-
- Error = TIS_GrabberDLL.GetImageDescription(
- self._handle, lWidth, lHeight, iBitsPerPixel, COLORFORMAT
- )
- return (lWidth.value, lHeight.value, iBitsPerPixel.value, COLORFORMAT.value)
-
- def GetImagePtr(self):
- ImagePtr = TIS_GrabberDLL.GetImagePtr(self._handle)
-
- return ImagePtr
-
- def GetImage(self):
- BildDaten = self.GetImageDescription()[:4]
- lWidth = BildDaten[0]
- lHeight = BildDaten[1]
- iBitsPerPixel = BildDaten[2] // 8
-
- buffer_size = lWidth * lHeight * iBitsPerPixel * C.sizeof(C.c_uint8)
- img_ptr = self.GetImagePtr()
-
- Bild = C.cast(img_ptr, C.POINTER(C.c_ubyte * buffer_size))
-
- img = np.ndarray(
- buffer=Bild.contents, dtype=np.uint8, shape=(lHeight, lWidth, iBitsPerPixel)
- )
- return img
-
- def GetImageEx(self):
- """ Return a numpy array with the image data tyes
- If the sink is Y16 or RGB64 (not supported yet), the dtype in the array is uint16, othereise it is uint8
- """
- BildDaten = self.GetImageDescription()[:4]
- lWidth = BildDaten[0]
- lHeight = BildDaten[1]
- iBytesPerPixel = BildDaten[2] // 8
-
- buffer_size = lWidth * lHeight * iBytesPerPixel * C.sizeof(C.c_uint8)
- img_ptr = self.GetImagePtr()
-
- Bild = C.cast(img_ptr, C.POINTER(C.c_ubyte * buffer_size))
-
- pixeltype = np.uint8
-
- if BildDaten[3] == 4: # SinkFormats.Y16:
- pixeltype = np.uint16
- iBytesPerPixel = 1
-
- img = np.ndarray(
- buffer=Bild.contents,
- dtype=pixeltype,
- shape=(lHeight, lWidth, iBytesPerPixel),
- )
- return img
-
- def GetCameraProperty(self, iProperty):
- lFocusPos = C.c_long()
- Error = TIS_GrabberDLL.GetCameraProperty(self._handle, iProperty, lFocusPos)
- return lFocusPos.value
-
- def SetCameraProperty(self, iProperty, iValue):
- Error = TIS_GrabberDLL.SetCameraProperty(self._handle, iProperty, iValue)
- return Error
-
- def SetPropertyValue(self, Property, Element, Value):
- error = TIS_GrabberDLL.SetPropertyValue(
- self._handle, self.s(Property), self.s(Element), Value
- )
- return error
-
- def GetPropertyValue(self, Property, Element):
- Value = C.c_long()
- error = TIS_GrabberDLL.GetPropertyValue(
- self._handle, self.s(Property), self.s(Element), Value
- )
- return Value.value
-
- def PropertyAvailable(self, Property):
- Null = None
- error = TIS_GrabberDLL.IsPropertyAvailable(self._handle, self.s(Property), Null)
- return error
-
- def SetPropertySwitch(self, Property, Element, Value):
- error = TIS_GrabberDLL.SetPropertySwitch(
- self._handle, self.s(Property), self.s(Element), Value
- )
- return error
-
- def GetPropertySwitch(self, Property, Element, Value):
- lValue = C.c_long()
- error = TIS_GrabberDLL.GetPropertySwitch(
- self._handle, self.s(Property), self.s(Element), lValue
- )
- Value[0] = lValue.value
- return error
-
- def PropertyOnePush(self, Property, Element):
- error = TIS_GrabberDLL.PropertyOnePush(
- self._handle, self.s(Property), self.s(Element)
- )
- return error
-
- def SetPropertyAbsoluteValue(self, Property, Element, Value):
- error = TIS_GrabberDLL.SetPropertyAbsoluteValue(
- self._handle, self.s(Property), self.s(Element), Value
- )
- return error
-
- def GetPropertyAbsoluteValue(self, Property, Element, Value):
- """ Get a property value of absolute values interface, e.g. seconds or dB.
- Example code:
- ExposureTime=[0]
- Camera.GetPropertyAbsoluteValue("Exposure","Value", ExposureTime)
- print("Exposure time in secods: ", ExposureTime[0])
-
- :param Property: Name of the property, e.g. Gain, Exposure
- :param Element: Name of the element, e.g. "Value"
- :param Value: Object, that receives the value of the property
- :returns: 0 on success
- """
- lValue = C.c_float()
- error = TIS_GrabberDLL.GetPropertyAbsoluteValue(
- self._handle, self.s(Property), self.s(Element), lValue
- )
- Value[0] = lValue.value
- return error
-
- def SaveImage(self, FileName, FileType, Quality=75):
- """ Saves the last snapped image. Can by of type BMP or JPEG.
- :param FileName : Name of the mage file
- :param FileType : Determines file type, can be "JPEG" or "BMP"
- :param Quality : If file typ is JPEG, the qualitly can be given from 1 to 100.
- :return: Error code
- """
- return TIS_GrabberDLL.SaveImage(
- self._handle, self.s(FileName), IC.ImageFileTypes[self.s(FileType)], Quality
- )
-
- def openVideoCaptureDevice(self, DeviceName):
- """ Open the device specified by DeviceName
- :param DeviceName: Name of the device , e.g. "DFK 72AUC02"
- :returns: 1 on success, 0 otherwise.
- """
- return TIS_GrabberDLL.OpenVideoCaptureDevice(self._handle, self.s(DeviceName))
-
- def CreateFrameFilter(self, name):
- frame_filter_handle = FrameFilterHandle()
-
- err = TIS_GrabberDLL.CreateFrameFilter(
- C.c_char_p(name), C.byref(frame_filter_handle)
- )
- if err != 1:
- raise Exception("ERROR CREATING FILTER")
- return frame_filter_handle
-
- def AddFrameFilter(self, frame_filter_handle):
- err = TIS_GrabberDLL.AddFrameFilter(self._handle, frame_filter_handle)
- return err
-
- 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 data.value
-
- def FilterSetParameter(self, frame_filter_handle, parameter_name, data):
- if type(data) is int:
- err = TIS_GrabberDLL.FilterSetParameter(
- frame_filter_handle, C.c_char_p(parameter_name), C.c_int(data)
- )
- return err
- else:
- raise Exception("Unknown set parameter type")
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
new file mode 100644
index 0000000..3398566
--- /dev/null
+++ b/dlclivegui/camera_controller.py
@@ -0,0 +1,120 @@
+"""Camera management for the DLC Live GUI."""
+from __future__ import annotations
+
+import time
+from dataclasses import dataclass
+from typing import Optional
+
+import numpy as np
+from PyQt6.QtCore import QMetaObject, QObject, QThread, Qt, pyqtSignal, pyqtSlot
+
+from .cameras import CameraFactory
+from .cameras.base import CameraBackend
+from .config import CameraSettings
+
+
+@dataclass
+class FrameData:
+ """Container for a captured frame."""
+
+ image: np.ndarray
+ timestamp: float
+
+
+class CameraWorker(QObject):
+ """Worker object running inside a :class:`QThread`."""
+
+ frame_captured = pyqtSignal(object)
+ error_occurred = pyqtSignal(str)
+ finished = pyqtSignal()
+
+ def __init__(self, settings: CameraSettings):
+ super().__init__()
+ self._settings = settings
+ self._running = False
+ self._backend: Optional[CameraBackend] = None
+
+ @pyqtSlot()
+ def run(self) -> None:
+ self._running = True
+ try:
+ self._backend = CameraFactory.create(self._settings)
+ self._backend.open()
+ except Exception as exc: # pragma: no cover - device specific
+ self.error_occurred.emit(str(exc))
+ self.finished.emit()
+ return
+
+ while self._running:
+ try:
+ frame, timestamp = self._backend.read()
+ except Exception as exc: # pragma: no cover - device specific
+ self.error_occurred.emit(str(exc))
+ break
+ self.frame_captured.emit(FrameData(frame, timestamp))
+
+ if self._backend is not None:
+ try:
+ self._backend.close()
+ except Exception as exc: # pragma: no cover - device specific
+ self.error_occurred.emit(str(exc))
+ self._backend = None
+ self.finished.emit()
+
+ @pyqtSlot()
+ def stop(self) -> None:
+ self._running = False
+ if self._backend is not None:
+ try:
+ self._backend.stop()
+ except Exception:
+ pass
+
+
+class CameraController(QObject):
+ """High level controller that manages a camera worker thread."""
+
+ frame_ready = pyqtSignal(object)
+ started = pyqtSignal(CameraSettings)
+ stopped = pyqtSignal()
+ error = pyqtSignal(str)
+
+ def __init__(self) -> None:
+ super().__init__()
+ self._thread: Optional[QThread] = None
+ self._worker: Optional[CameraWorker] = None
+
+ def is_running(self) -> bool:
+ return self._thread is not None and self._thread.isRunning()
+
+ def start(self, settings: CameraSettings) -> None:
+ if self.is_running():
+ self.stop()
+ self._thread = QThread()
+ self._worker = CameraWorker(settings)
+ self._worker.moveToThread(self._thread)
+ self._thread.started.connect(self._worker.run)
+ self._worker.frame_captured.connect(self.frame_ready)
+ self._worker.error_occurred.connect(self.error)
+ self._worker.finished.connect(self._thread.quit)
+ self._worker.finished.connect(self._worker.deleteLater)
+ self._thread.finished.connect(self._cleanup)
+ self._thread.start()
+ self.started.emit(settings)
+
+ def stop(self) -> None:
+ if not self.is_running():
+ return
+ assert self._worker is not None
+ QMetaObject.invokeMethod(
+ self._worker, "stop", Qt.ConnectionType.QueuedConnection
+ )
+ assert self._thread is not None
+ self._thread.quit()
+ self._thread.wait()
+
+ @pyqtSlot()
+ def _cleanup(self) -> None:
+ self._thread = None
+ self._worker = None
+ self.stopped.emit()
diff --git a/dlclivegui/camera_process.py b/dlclivegui/camera_process.py
deleted file mode 100644
index 324c8e7..0000000
--- a/dlclivegui/camera_process.py
+++ /dev/null
@@ -1,338 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import time
-import multiprocess as mp
-import ctypes
-from dlclivegui.queue import ClearableQueue, ClearableMPQueue
-import threading
-import cv2
-import numpy as np
-import os
-
-
-class CameraProcessError(Exception):
- """
- Exception for incorrect use of Cameras
- """
-
- pass
-
-
-class CameraProcess(object):
- """ Camera Process Manager class. Controls image capture and writing images to a video file in a background process.
-
- Parameters
- ----------
- device : :class:`cameracontrol.Camera`
- a camera object
- ctx : :class:`multiprocess.Context`
- multiprocessing context
- """
-
- def __init__(self, device, ctx=mp.get_context("spawn")):
- """ Constructor method
- """
-
- self.device = device
- self.ctx = ctx
-
- res = self.device.im_size
- self.frame_shared = mp.Array(ctypes.c_uint8, res[1] * res[0] * 3)
- self.frame = np.frombuffer(self.frame_shared.get_obj(), dtype="uint8").reshape(
- res[1], res[0], 3
- )
- self.frame_time_shared = mp.Array(ctypes.c_double, 1)
- self.frame_time = np.frombuffer(self.frame_time_shared.get_obj(), dtype="d")
-
- self.q_to_process = ClearableMPQueue(ctx=self.ctx)
- self.q_from_process = ClearableMPQueue(ctx=self.ctx)
- self.write_frame_queue = ClearableMPQueue(ctx=self.ctx)
-
- self.capture_process = None
- self.writer_process = None
-
- def start_capture_process(self, timeout=60):
-
- cmds = self.q_to_process.read(clear=True, position="all")
- if cmds is not None:
- for c in cmds:
- if c[1] != "capture":
- self.q_to_process.write(c)
-
- self.capture_process = self.ctx.Process(
- target=self._run_capture,
- args=(self.frame_shared, self.frame_time_shared),
- daemon=True,
- )
- self.capture_process.start()
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "capture") and (cmd[1] == "start"):
- return cmd[2]
- else:
- self.q_to_process.write(cmd)
-
- return True
-
- def _run_capture(self, frame_shared, frame_time):
-
- res = self.device.im_size
- self.frame = np.frombuffer(frame_shared.get_obj(), dtype="uint8").reshape(
- res[1], res[0], 3
- )
- self.frame_time = np.frombuffer(frame_time.get_obj(), dtype="d")
-
- ret = self.device.set_capture_device()
- if not ret:
- raise CameraProcessError("Could not start capture device.")
- self.q_from_process.write(("capture", "start", ret))
-
- self._capture_loop()
-
- self.device.close_capture_device()
- self.q_from_process.write(("capture", "end", True))
-
- def _capture_loop(self):
- """ Acquires frames from frame capture device in a loop
- """
-
- run = True
- write = False
- last_frame_time = time.time()
-
- while run:
-
- start_capture = time.time()
-
- frame, frame_time = self.device.get_image_on_time()
-
- write_capture = time.time()
-
- np.copyto(self.frame, frame)
- self.frame_time[0] = frame_time
-
- if write:
- ret = self.write_frame_queue.write((frame, frame_time))
-
- end_capture = time.time()
-
- # print("read frame = %0.6f // write to queues = %0.6f" % (write_capture-start_capture, end_capture-write_capture))
- # print("capture rate = %d" % (int(1 / (time.time()-last_frame_time))))
- # print("\n")
-
- last_frame_time = time.time()
-
- ### read commands
- cmd = self.q_to_process.read()
- if cmd is not None:
- if cmd[0] == "capture":
- if cmd[1] == "write":
- write = cmd[2]
- self.q_from_process.write(cmd)
- elif cmd[1] == "end":
- run = False
- else:
- self.q_to_process.write(cmd)
-
- def stop_capture_process(self):
-
- ret = True
- if self.capture_process is not None:
- if self.capture_process.is_alive():
- self.q_to_process.write(("capture", "end"))
-
- while True:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if cmd[0] == "capture":
- if cmd[1] == "end":
- break
- else:
- self.q_from_process.write(cmd)
-
- self.capture_process.join(5)
- if self.capture_process.is_alive():
- self.capture_process.terminate()
-
- return True
-
- def start_writer_process(self, filename, timeout=60):
-
- cmds = self.q_to_process.read(clear=True, position="all")
- if cmds is not None:
- for c in cmds:
- if c[1] != "writer":
- self.q_to_process.write(c)
-
- self.writer_process = self.ctx.Process(
- target=self._run_writer, args=(filename,), daemon=True
- )
- self.writer_process.start()
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "writer") and (cmd[1] == "start"):
- return cmd[2]
- else:
- self.q_to_process.write(cmd)
-
- return True
-
- def _run_writer(self, filename):
-
- ret = self._create_writer(filename)
- self.q_from_process.write(("writer", "start", ret))
-
- save = self._write_loop()
-
- ret = self._save_video(not save)
- self.q_from_process.write(("writer", "end", ret))
-
- def _create_writer(self, filename):
-
- self.filename = filename
- self.video_file = f"{self.filename}_VIDEO.avi"
- self.timestamp_file = f"{self.filename}_TS.npy"
-
- self.video_writer = cv2.VideoWriter(
- self.video_file,
- cv2.VideoWriter_fourcc(*"DIVX"),
- self.device.fps,
- self.device.im_size,
- )
- self.write_frame_ts = []
-
- return True
-
- def _write_loop(self):
- """ read frames from write_frame_queue and write to file
- """
-
- run = True
- new_frame = None
-
- while run or (new_frame is not None):
-
- new_frame = self.write_frame_queue.read()
- if new_frame is not None:
- frame, ts = new_frame
- if frame.shape[2] == 1:
- frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
- self.video_writer.write(frame)
- self.write_frame_ts.append(ts)
-
- cmd = self.q_to_process.read()
- if cmd is not None:
- if cmd[0] == "writer":
- if cmd[1] == "end":
- run = False
- save = cmd[2]
- else:
- self.q_to_process.write(cmd)
-
- return save
-
- def _save_video(self, delete=False):
-
- ret = False
-
- self.video_writer.release()
-
- if (not delete) and (len(self.write_frame_ts) > 0):
- np.save(self.timestamp_file, self.write_frame_ts)
- ret = True
- else:
- os.remove(self.video_file)
- if os.path.isfile(self.timestamp_file):
- os.remove(self.timestamp_file)
-
- return ret
-
- def stop_writer_process(self, save=True):
-
- ret = False
- if self.writer_process is not None:
- if self.writer_process.is_alive():
- self.q_to_process.write(("writer", "end", save))
-
- while True:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if cmd[0] == "writer":
- if cmd[1] == "end":
- ret = cmd[2]
- break
- else:
- self.q_from_process.write(cmd)
-
- self.writer_process.join(5)
- if self.writer_process.is_alive():
- self.writer_process.terminate()
-
- return ret
-
- def start_record(self, timeout=5):
-
- ret = False
-
- if (self.capture_process is not None) and (self.writer_process is not None):
- if self.capture_process.is_alive() and self.writer_process.is_alive():
- self.q_to_process.write(("capture", "write", True))
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "capture") and (cmd[1] == "write"):
- ret = cmd[2]
- break
- else:
- self.q_from_process.write(cmd)
-
- return ret
-
- def stop_record(self, timeout=5):
-
- ret = False
-
- if (self.capture_process is not None) and (self.writer_process is not None):
- if (self.capture_process.is_alive()) and (self.writer_process.is_alive()):
- self.q_to_process.write(("capture", "write", False))
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "capture") and (cmd[1] == "write"):
- ret = not cmd[2]
- break
- else:
- self.q_from_process.write(cmd)
-
- return ret
-
- def get_display_frame(self):
-
- frame = self.frame.copy()
- if frame is not None:
- if self.device.display_resize != 1:
- frame = cv2.resize(
- frame,
- (
- int(frame.shape[1] * self.device.display_resize),
- int(frame.shape[0] * self.device.display_resize),
- ),
- )
-
- return frame
diff --git a/dlclivegui/cameras/__init__.py b/dlclivegui/cameras/__init__.py
new file mode 100644
index 0000000..cf7f488
--- /dev/null
+++ b/dlclivegui/cameras/__init__.py
@@ -0,0 +1,6 @@
+"""Camera backend implementations and factory helpers."""
+from __future__ import annotations
+
+from .factory import CameraFactory
+
+__all__ = ["CameraFactory"]
diff --git a/dlclivegui/cameras/base.py b/dlclivegui/cameras/base.py
new file mode 100644
index 0000000..6ae79dc
--- /dev/null
+++ b/dlclivegui/cameras/base.py
@@ -0,0 +1,46 @@
+"""Abstract camera backend definitions."""
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import Tuple
+
+import numpy as np
+
+from ..config import CameraSettings
+
+
+class CameraBackend(ABC):
+ """Abstract base class for camera backends."""
+
+ def __init__(self, settings: CameraSettings):
+ self.settings = settings
+
+ @classmethod
+ def name(cls) -> str:
+ """Return the backend identifier."""
+
+ return cls.__name__.lower()
+
+ @classmethod
+ def is_available(cls) -> bool:
+ """Return whether the backend can be used on this system."""
+
+ return True
+
+ def stop(self) -> None:
+ """Request a graceful stop."""
+
+ # Most backends do not require additional handling, but subclasses may
+ # override when they need to interrupt blocking reads.
+
+ @abstractmethod
+ def open(self) -> None:
+ """Open the capture device."""
+
+ @abstractmethod
+ def read(self) -> Tuple[np.ndarray, float]:
+ """Read a frame and return the image with a timestamp."""
+
+ @abstractmethod
+ def close(self) -> None:
+ """Release the capture device."""
diff --git a/dlclivegui/cameras/basler_backend.py b/dlclivegui/cameras/basler_backend.py
new file mode 100644
index 0000000..f9e2a15
--- /dev/null
+++ b/dlclivegui/cameras/basler_backend.py
@@ -0,0 +1,132 @@
+"""Basler camera backend implemented with :mod:`pypylon`."""
+from __future__ import annotations
+
+import time
+from typing import Optional, Tuple
+
+import numpy as np
+
+from .base import CameraBackend
+
+try: # pragma: no cover - optional dependency
+ from pypylon import pylon
+except Exception: # pragma: no cover - optional dependency
+ pylon = None # type: ignore
+
+
+class BaslerCameraBackend(CameraBackend):
+ """Capture frames from Basler cameras using the Pylon SDK."""
+
+ def __init__(self, settings):
+ super().__init__(settings)
+ self._camera: Optional["pylon.InstantCamera"] = None
+ self._converter: Optional["pylon.ImageFormatConverter"] = None
+
+ @classmethod
+ def is_available(cls) -> bool:
+ return pylon is not None
+
+ def open(self) -> None:
+ if pylon is None: # pragma: no cover - optional dependency
+ raise RuntimeError(
+ "pypylon is required for the Basler backend but is not installed"
+ )
+ devices = self._enumerate_devices()
+ if not devices:
+ raise RuntimeError("No Basler cameras detected")
+ device = self._select_device(devices)
+ self._camera = pylon.InstantCamera(pylon.TlFactory.GetInstance().CreateDevice(device))
+ self._camera.Open()
+
+ exposure = self._settings_value("exposure", self.settings.properties)
+ if exposure is not None:
+ self._camera.ExposureTime.SetValue(float(exposure))
+ gain = self._settings_value("gain", self.settings.properties)
+ if gain is not None:
+ self._camera.Gain.SetValue(float(gain))
+ width = int(self.settings.properties.get("width", self.settings.width))
+ height = int(self.settings.properties.get("height", self.settings.height))
+ self._camera.Width.SetValue(width)
+ self._camera.Height.SetValue(height)
+ fps = self._settings_value("fps", self.settings.properties, fallback=self.settings.fps)
+ if fps is not None:
+ try:
+ self._camera.AcquisitionFrameRateEnable.SetValue(True)
+ self._camera.AcquisitionFrameRate.SetValue(float(fps))
+ except Exception:
+ # Some cameras expose different frame-rate features; ignore errors.
+ pass
+
+ self._camera.StartGrabbing(pylon.GrabStrategy_LatestImageOnly)
+ self._converter = pylon.ImageFormatConverter()
+ self._converter.OutputPixelFormat = pylon.PixelType_BGR8packed
+ self._converter.OutputBitAlignment = pylon.OutputBitAlignment_MsbAligned
+
+ def read(self) -> Tuple[np.ndarray, float]:
+ if self._camera is None or self._converter is None:
+ raise RuntimeError("Basler camera not opened")
+ try:
+ grab_result = self._camera.RetrieveResult(100, pylon.TimeoutHandling_ThrowException)
+ except Exception as exc:
+ raise RuntimeError(f"Failed to retrieve image from Basler camera: {exc}")
+ if not grab_result.GrabSucceeded():
+ grab_result.Release()
+ raise RuntimeError("Basler camera did not return an image")
+ image = self._converter.Convert(grab_result)
+ frame = image.GetArray()
+ grab_result.Release()
+ rotate = self._settings_value("rotate", self.settings.properties)
+ if rotate:
+ frame = self._rotate(frame, float(rotate))
+ crop = self.settings.properties.get("crop")
+ if isinstance(crop, (list, tuple)) and len(crop) == 4:
+ left, right, top, bottom = map(int, crop)
+ frame = frame[top:bottom, left:right]
+ return frame, time.time()
+
+ def close(self) -> None:
+ if self._camera is not None:
+ if self._camera.IsGrabbing():
+ self._camera.StopGrabbing()
+ if self._camera.IsOpen():
+ self._camera.Close()
+ self._camera = None
+ self._converter = None
+
+ def stop(self) -> None:
+ if self._camera is not None and self._camera.IsGrabbing():
+ try:
+ self._camera.StopGrabbing()
+ except Exception:
+ pass
+
+ def _enumerate_devices(self):
+ factory = pylon.TlFactory.GetInstance()
+ return factory.EnumerateDevices()
+
+ def _select_device(self, devices):
+ serial = self.settings.properties.get("serial") or self.settings.properties.get("serial_number")
+ if serial:
+ for device in devices:
+ if getattr(device, "GetSerialNumber", None) and device.GetSerialNumber() == serial:
+ return device
+ index = int(self.settings.index)
+ if index < 0 or index >= len(devices):
+ raise RuntimeError(
+ f"Camera index {index} out of range for {len(devices)} Basler device(s)"
+ )
+ return devices[index]
+
+ def _rotate(self, frame: np.ndarray, angle: float) -> np.ndarray:
+ try:
+ from imutils import rotate_bound # pragma: no cover - optional
+ except Exception as exc: # pragma: no cover - optional dependency
+ raise RuntimeError(
+ "Rotation requested for Basler camera but imutils is not installed"
+ ) from exc
+ return rotate_bound(frame, angle)
+
+ @staticmethod
+ def _settings_value(key: str, source: dict, fallback: Optional[float] = None):
+ value = source.get(key, fallback)
+ return None if value is None else value
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
new file mode 100644
index 0000000..e9704ef
--- /dev/null
+++ b/dlclivegui/cameras/factory.py
@@ -0,0 +1,70 @@
+"""Backend discovery and construction utilities."""
+from __future__ import annotations
+
+import importlib
+from typing import Dict, Iterable, Tuple, Type
+
+from ..config import CameraSettings
+from .base import CameraBackend
+
+
+_BACKENDS: Dict[str, Tuple[str, str]] = {
+ "opencv": ("dlclivegui.cameras.opencv_backend", "OpenCVCameraBackend"),
+ "basler": ("dlclivegui.cameras.basler_backend", "BaslerCameraBackend"),
+ "gentl": ("dlclivegui.cameras.gentl_backend", "GenTLCameraBackend"),
+}
+
+
+class CameraFactory:
+ """Create camera backend instances based on configuration."""
+
+ @staticmethod
+ def backend_names() -> Iterable[str]:
+ """Return the identifiers of all known backends."""
+
+ return tuple(_BACKENDS.keys())
+
+ @staticmethod
+ def available_backends() -> Dict[str, bool]:
+ """Return a mapping of backend names to availability flags."""
+
+ availability: Dict[str, bool] = {}
+ for name in _BACKENDS:
+ try:
+ backend_cls = CameraFactory._resolve_backend(name)
+ except RuntimeError:
+ availability[name] = False
+ continue
+ availability[name] = backend_cls.is_available()
+ return availability
+
+ @staticmethod
+ def create(settings: CameraSettings) -> CameraBackend:
+ """Instantiate a backend for ``settings``."""
+
+ backend_name = (settings.backend or "opencv").lower()
+ try:
+ backend_cls = CameraFactory._resolve_backend(backend_name)
+ except RuntimeError as exc: # pragma: no cover - runtime configuration
+ raise RuntimeError(f"Unknown camera backend '{backend_name}': {exc}") from exc
+ if not backend_cls.is_available():
+ raise RuntimeError(
+ f"Camera backend '{backend_name}' is not available. "
+ "Ensure the required drivers and Python packages are installed."
+ )
+ return backend_cls(settings)
+
+ @staticmethod
+ def _resolve_backend(name: str) -> Type[CameraBackend]:
+ try:
+ module_name, class_name = _BACKENDS[name]
+ except KeyError as exc:
+ raise RuntimeError("backend not registered") from exc
+ try:
+ module = importlib.import_module(module_name)
+ except ImportError as exc:
+ raise RuntimeError(str(exc)) from exc
+ backend_cls = getattr(module, class_name)
+ if not issubclass(backend_cls, CameraBackend): # pragma: no cover - safety
+ raise RuntimeError(f"Backend '{name}' does not implement CameraBackend")
+ return backend_cls
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
new file mode 100644
index 0000000..0d81294
--- /dev/null
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -0,0 +1,130 @@
+"""Generic GenTL backend implemented with Aravis."""
+from __future__ import annotations
+
+import ctypes
+import time
+from typing import Optional, Tuple
+
+import numpy as np
+
+from .base import CameraBackend
+
+try: # pragma: no cover - optional dependency
+ import gi
+
+ gi.require_version("Aravis", "0.6")
+ from gi.repository import Aravis
+except Exception: # pragma: no cover - optional dependency
+ gi = None # type: ignore
+ Aravis = None # type: ignore
+
+
+class GenTLCameraBackend(CameraBackend):
+ """Capture frames from cameras that expose a GenTL interface."""
+
+ def __init__(self, settings):
+ super().__init__(settings)
+ self._camera = None
+ self._stream = None
+ self._payload: Optional[int] = None
+
+ @classmethod
+ def is_available(cls) -> bool:
+ return Aravis is not None
+
+ def open(self) -> None:
+ if Aravis is None: # pragma: no cover - optional dependency
+ raise RuntimeError(
+ "Aravis (python-gi bindings) are required for the GenTL backend"
+ )
+ Aravis.update_device_list()
+ num_devices = Aravis.get_n_devices()
+ if num_devices == 0:
+ raise RuntimeError("No GenTL cameras detected")
+ device_id = self._select_device_id(num_devices)
+ self._camera = Aravis.Camera.new(device_id)
+ self._camera.set_exposure_time_auto(0)
+ self._camera.set_gain_auto(0)
+ exposure = self.settings.properties.get("exposure")
+ if exposure is not None:
+ self._set_exposure(float(exposure))
+ crop = self.settings.properties.get("crop")
+ if isinstance(crop, (list, tuple)) and len(crop) == 4:
+ self._set_crop(crop)
+ if self.settings.fps:
+ try:
+ self._camera.set_frame_rate(float(self.settings.fps))
+ except Exception:
+ pass
+ self._stream = self._camera.create_stream()
+ self._payload = self._camera.get_payload()
+ self._stream.push_buffer(Aravis.Buffer.new_allocate(self._payload))
+ self._camera.start_acquisition()
+
+ def read(self) -> Tuple[np.ndarray, float]:
+ if self._stream is None:
+ raise RuntimeError("GenTL stream not initialised")
+ buffer = None
+ while buffer is None:
+ buffer = self._stream.try_pop_buffer()
+ if buffer is None:
+ time.sleep(0.01)
+ frame = self._buffer_to_numpy(buffer)
+ self._stream.push_buffer(buffer)
+ return frame, time.time()
+
+ def close(self) -> None:
+ if self._camera is not None:
+ try:
+ self._camera.stop_acquisition()
+ except Exception:
+ pass
+ self._camera = None
+ self._stream = None
+ self._payload = None
+
+ def stop(self) -> None:
+ if self._camera is not None:
+ try:
+ self._camera.stop_acquisition()
+ except Exception:
+ pass
+
+ def _select_device_id(self, num_devices: int) -> str:
+ index = int(self.settings.index)
+ if index < 0 or index >= num_devices:
+ raise RuntimeError(
+ f"Camera index {index} out of range for {num_devices} GenTL device(s)"
+ )
+ return Aravis.get_device_id(index)
+
+ def _set_exposure(self, exposure: float) -> None:
+ if self._camera is None:
+ return
+ exposure = max(0.0, min(exposure, 1.0))
+ self._camera.set_exposure_time(exposure * 1e6)
+
+ def _set_crop(self, crop) -> None:
+ if self._camera is None:
+ return
+ left, right, top, bottom = map(int, crop)
+ width = right - left
+ height = bottom - top
+ self._camera.set_region(left, top, width, height)
+
+ def _buffer_to_numpy(self, buffer) -> np.ndarray:
+ pixel_format = buffer.get_image_pixel_format()
+ bits_per_pixel = (pixel_format >> 16) & 0xFF
+ if bits_per_pixel == 8:
+ int_pointer = ctypes.POINTER(ctypes.c_uint8)
+ else:
+ int_pointer = ctypes.POINTER(ctypes.c_uint16)
+ addr = buffer.get_data()
+ ptr = ctypes.cast(addr, int_pointer)
+ frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
+ frame = frame.copy()
+ if frame.ndim < 3:
+ import cv2
+
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
+ return frame
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
new file mode 100644
index 0000000..a64e3f1
--- /dev/null
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -0,0 +1,61 @@
+"""OpenCV based camera backend."""
+from __future__ import annotations
+
+import time
+from typing import Tuple
+
+import cv2
+import numpy as np
+
+from .base import CameraBackend
+
+
+class OpenCVCameraBackend(CameraBackend):
+ """Fallback backend using :mod:`cv2.VideoCapture`."""
+
+ def __init__(self, settings):
+ super().__init__(settings)
+ self._capture: cv2.VideoCapture | None = None
+
+ def open(self) -> None:
+ backend_flag = self._resolve_backend(self.settings.properties.get("api"))
+ self._capture = cv2.VideoCapture(int(self.settings.index), backend_flag)
+ if not self._capture.isOpened():
+ raise RuntimeError(
+ f"Unable to open camera index {self.settings.index} with OpenCV"
+ )
+ self._configure_capture()
+
+ def read(self) -> Tuple[np.ndarray, float]:
+ if self._capture is None:
+ raise RuntimeError("Camera has not been opened")
+ success, frame = self._capture.read()
+ if not success:
+ raise RuntimeError("Failed to read frame from OpenCV camera")
+ return frame, time.time()
+
+ def close(self) -> None:
+ if self._capture is not None:
+ self._capture.release()
+ self._capture = None
+
+ def _configure_capture(self) -> None:
+ if self._capture is None:
+ return
+ self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(self.settings.width))
+ self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(self.settings.height))
+ self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
+ for prop, value in self.settings.properties.items():
+ if prop == "api":
+ continue
+ try:
+ prop_id = int(prop)
+ except (TypeError, ValueError):
+ continue
+ self._capture.set(prop_id, float(value))
+
+ def _resolve_backend(self, backend: str | None) -> int:
+ if backend is None:
+ return cv2.CAP_ANY
+ key = backend.upper()
+ return getattr(cv2, f"CAP_{key}", cv2.CAP_ANY)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
new file mode 100644
index 0000000..da00c5f
--- /dev/null
+++ b/dlclivegui/config.py
@@ -0,0 +1,112 @@
+"""Configuration helpers for the DLC Live GUI."""
+from __future__ import annotations
+
+from dataclasses import asdict, dataclass, field
+from pathlib import Path
+from typing import Any, Dict, Optional
+import json
+
+
+@dataclass
+class CameraSettings:
+ """Configuration for a single camera device."""
+
+ name: str = "Camera 0"
+ index: int = 0
+ width: int = 640
+ height: int = 480
+ fps: float = 30.0
+ backend: str = "opencv"
+ properties: Dict[str, Any] = field(default_factory=dict)
+
+ def apply_defaults(self) -> "CameraSettings":
+ """Ensure width, height and fps are positive numbers."""
+
+ self.width = int(self.width) if self.width else 640
+ self.height = int(self.height) if self.height else 480
+ self.fps = float(self.fps) if self.fps else 30.0
+ return self
+
+
+@dataclass
+class DLCProcessorSettings:
+ """Configuration for DLCLive processing."""
+
+ model_path: str = ""
+ shuffle: Optional[int] = None
+ trainingsetindex: Optional[int] = None
+ processor: str = "cpu"
+ processor_args: Dict[str, Any] = field(default_factory=dict)
+ additional_options: Dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass
+class RecordingSettings:
+ """Configuration for video recording."""
+
+ enabled: bool = False
+ directory: str = str(Path.home() / "Videos" / "deeplabcut-live")
+ filename: str = "session.mp4"
+ container: str = "mp4"
+ options: Dict[str, Any] = field(default_factory=dict)
+
+ def output_path(self) -> Path:
+ """Return the absolute output path for recordings."""
+
+ directory = Path(self.directory).expanduser().resolve()
+ directory.mkdir(parents=True, exist_ok=True)
+ name = Path(self.filename)
+ if name.suffix:
+ filename = name
+ else:
+ filename = name.with_suffix(f".{self.container}")
+ return directory / filename
+
+
+@dataclass
+class ApplicationSettings:
+ """Top level application configuration."""
+
+ camera: CameraSettings = field(default_factory=CameraSettings)
+ dlc: DLCProcessorSettings = field(default_factory=DLCProcessorSettings)
+ recording: RecordingSettings = field(default_factory=RecordingSettings)
+
+ @classmethod
+ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
+ """Create an :class:`ApplicationSettings` from a dictionary."""
+
+ camera = CameraSettings(**data.get("camera", {})).apply_defaults()
+ dlc = DLCProcessorSettings(**data.get("dlc", {}))
+ recording = RecordingSettings(**data.get("recording", {}))
+ return cls(camera=camera, dlc=dlc, recording=recording)
+
+ def to_dict(self) -> Dict[str, Any]:
+ """Serialise the configuration to a dictionary."""
+
+ return {
+ "camera": asdict(self.camera),
+ "dlc": asdict(self.dlc),
+ "recording": asdict(self.recording),
+ }
+
+ @classmethod
+ def load(cls, path: Path | str) -> "ApplicationSettings":
+ """Load configuration from ``path``."""
+
+ file_path = Path(path).expanduser()
+ if not file_path.exists():
+ raise FileNotFoundError(f"Configuration file not found: {file_path}")
+ with file_path.open("r", encoding="utf-8") as handle:
+ data = json.load(handle)
+ return cls.from_dict(data)
+
+ def save(self, path: Path | str) -> None:
+ """Persist configuration to ``path``."""
+
+ file_path = Path(path).expanduser()
+ file_path.parent.mkdir(parents=True, exist_ok=True)
+ with file_path.open("w", encoding="utf-8") as handle:
+ json.dump(self.to_dict(), handle, indent=2)
+
+
+DEFAULT_CONFIG = ApplicationSettings()
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
new file mode 100644
index 0000000..5c199b8
--- /dev/null
+++ b/dlclivegui/dlc_processor.py
@@ -0,0 +1,123 @@
+"""DLCLive integration helpers."""
+from __future__ import annotations
+
+import logging
+import threading
+from concurrent.futures import Future, ThreadPoolExecutor
+from dataclasses import dataclass
+from typing import Any, Optional
+
+import numpy as np
+from PyQt6.QtCore import QObject, pyqtSignal
+
+from .config import DLCProcessorSettings
+
+LOGGER = logging.getLogger(__name__)
+
+try: # pragma: no cover - optional dependency
+ from dlclive import DLCLive # type: ignore
+except Exception: # pragma: no cover - handled gracefully
+ DLCLive = None # type: ignore[assignment]
+
+
+@dataclass
+class PoseResult:
+ pose: Optional[np.ndarray]
+ timestamp: float
+
+
+class DLCLiveProcessor(QObject):
+ """Background pose estimation using DLCLive."""
+
+ pose_ready = pyqtSignal(object)
+ error = pyqtSignal(str)
+ initialized = pyqtSignal(bool)
+
+ def __init__(self) -> None:
+ super().__init__()
+ self._settings = DLCProcessorSettings()
+ self._executor = ThreadPoolExecutor(max_workers=1)
+ self._dlc: Optional[DLCLive] = None
+ self._init_future: Optional[Future[Any]] = None
+ self._pending: Optional[Future[Any]] = None
+ self._lock = threading.Lock()
+
+ def configure(self, settings: DLCProcessorSettings) -> None:
+ self._settings = settings
+
+ def shutdown(self) -> None:
+ with self._lock:
+ if self._pending is not None:
+ self._pending.cancel()
+ self._pending = None
+ if self._init_future is not None:
+ self._init_future.cancel()
+ self._init_future = None
+ self._executor.shutdown(wait=False, cancel_futures=True)
+ self._dlc = None
+
+ def enqueue_frame(self, frame: np.ndarray, timestamp: float) -> None:
+ with self._lock:
+ if self._dlc is None and self._init_future is None:
+ self._init_future = self._executor.submit(
+ self._initialise_model, frame.copy(), timestamp
+ )
+ self._init_future.add_done_callback(self._on_initialised)
+ return
+ if self._dlc is None:
+ return
+ if self._pending is not None and not self._pending.done():
+ return
+ self._pending = self._executor.submit(
+ self._run_inference, frame.copy(), timestamp
+ )
+ self._pending.add_done_callback(self._on_pose_ready)
+
+ def _initialise_model(self, frame: np.ndarray, timestamp: float) -> bool:
+ if DLCLive is None:
+ raise RuntimeError(
+ "The 'dlclive' package is required for pose estimation. Install it to enable DLCLive support."
+ )
+ if not self._settings.model_path:
+ raise RuntimeError("No DLCLive model path configured.")
+ options = {
+ "model_path": self._settings.model_path,
+ "processor": self._settings.processor,
+ }
+ options.update(self._settings.additional_options)
+ if self._settings.shuffle is not None:
+ options["shuffle"] = self._settings.shuffle
+ if self._settings.trainingsetindex is not None:
+ options["trainingsetindex"] = self._settings.trainingsetindex
+ if self._settings.processor_args:
+ options["processor_config"] = {
+ "object": self._settings.processor,
+ **self._settings.processor_args,
+ }
+ model = DLCLive(**options)
+ model.init_inference(frame, frame_time=timestamp, record=False)
+ self._dlc = model
+ return True
+
+ def _on_initialised(self, future: Future[Any]) -> None:
+ try:
+ result = future.result()
+ self.initialized.emit(bool(result))
+ except Exception as exc: # pragma: no cover - runtime behaviour
+ LOGGER.exception("Failed to initialise DLCLive", exc_info=exc)
+ self.error.emit(str(exc))
+
+ def _run_inference(self, frame: np.ndarray, timestamp: float) -> PoseResult:
+ if self._dlc is None:
+ raise RuntimeError("DLCLive model not initialised")
+ pose = self._dlc.get_pose(frame, frame_time=timestamp, record=False)
+ return PoseResult(pose=pose, timestamp=timestamp)
+
+ def _on_pose_ready(self, future: Future[Any]) -> None:
+ try:
+ result = future.result()
+ except Exception as exc: # pragma: no cover - runtime behaviour
+ LOGGER.exception("Pose inference failed", exc_info=exc)
+ self.error.emit(str(exc))
+ return
+ self.pose_ready.emit(result)
diff --git a/dlclivegui/dlclivegui.py b/dlclivegui/dlclivegui.py
deleted file mode 100644
index 2a29d7d..0000000
--- a/dlclivegui/dlclivegui.py
+++ /dev/null
@@ -1,1498 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-from tkinter import (
- Tk,
- Toplevel,
- Label,
- Entry,
- Button,
- Radiobutton,
- Checkbutton,
- StringVar,
- IntVar,
- BooleanVar,
- filedialog,
- messagebox,
- simpledialog,
-)
-from tkinter.ttk import Combobox
-import os
-import sys
-import glob
-import json
-import datetime
-import inspect
-import importlib
-
-from PIL import Image, ImageTk, ImageDraw
-import colorcet as cc
-
-from dlclivegui import CameraPoseProcess
-from dlclivegui import processor
-from dlclivegui import camera
-from dlclivegui.tkutil import SettingsWindow
-
-
-class DLCLiveGUI(object):
- """ GUI to run DLC Live experiment
- """
-
- def __init__(self):
- """ Constructor method
- """
-
- ### check if documents path exists
-
- if not os.path.isdir(self.get_docs_path()):
- os.mkdir(self.get_docs_path())
- if not os.path.isdir(os.path.dirname(self.get_config_path(""))):
- os.mkdir(os.path.dirname(self.get_config_path("")))
-
- ### get configuration ###
-
- self.cfg_list = [
- os.path.splitext(os.path.basename(f))[0]
- for f in glob.glob(os.path.dirname(self.get_config_path("")) + "/*.json")
- ]
-
- ### initialize variables
-
- self.cam_pose_proc = None
- self.dlc_proc_params = None
-
- self.display_window = None
- self.display_cmap = None
- self.display_colors = None
- self.display_radius = None
- self.display_lik_thresh = None
-
- ### create GUI window ###
-
- self.createGUI()
-
- def get_docs_path(self):
- """ Get path to documents folder
-
- Returns
- -------
- str
- path to documents folder
- """
-
- return os.path.normpath(os.path.expanduser("~/Documents/DeepLabCut-live-GUI"))
-
- def get_config_path(self, cfg_name):
- """ Get path to configuration foler
-
- Parameters
- ----------
- cfg_name : str
- name of config file
-
- Returns
- -------
- str
- path to configuration file
- """
-
- return os.path.normpath(self.get_docs_path() + "/config/" + cfg_name + ".json")
-
- def get_config(self, cfg_name):
- """ Read configuration
-
- Parameters
- ----------
- cfg_name : str
- name of configuration
- """
-
- ### read configuration file ###
-
- self.cfg_file = self.get_config_path(cfg_name)
- if os.path.isfile(self.cfg_file):
- cfg = json.load(open(self.cfg_file))
- else:
- cfg = {}
-
- ### check config ###
-
- cfg["cameras"] = {} if "cameras" not in cfg else cfg["cameras"]
- cfg["processor_dir"] = (
- [] if "processor_dir" not in cfg else cfg["processor_dir"]
- )
- cfg["processor_args"] = (
- {} if "processor_args" not in cfg else cfg["processor_args"]
- )
- cfg["dlc_options"] = {} if "dlc_options" not in cfg else cfg["dlc_options"]
- cfg["dlc_display_options"] = (
- {} if "dlc_display_options" not in cfg else cfg["dlc_display_options"]
- )
- cfg["subjects"] = [] if "subjects" not in cfg else cfg["subjects"]
- cfg["directories"] = [] if "directories" not in cfg else cfg["directories"]
-
- self.cfg = cfg
-
- def change_config(self, event=None):
- """ Change configuration, update GUI menus
-
- Parameters
- ----------
- event : tkinter event, optional
- event , by default None
- """
-
- if self.cfg_name.get() == "Create New Config":
- new_name = simpledialog.askstring(
- "", "Please enter a name (no special characters).", parent=self.window
- )
- self.cfg_name.set(new_name)
- self.get_config(self.cfg_name.get())
-
- self.camera_entry["values"] = tuple(self.cfg["cameras"].keys()) + (
- "Add Camera",
- )
- self.camera_name.set("")
- self.dlc_proc_dir_entry["values"] = tuple(self.cfg["processor_dir"])
- self.dlc_proc_dir.set("")
- self.dlc_proc_name_entry["values"] = tuple()
- self.dlc_proc_name.set("")
- self.dlc_options_entry["values"] = tuple(self.cfg["dlc_options"].keys()) + (
- "Add DLC",
- )
- self.dlc_option.set("")
- self.subject_entry["values"] = tuple(self.cfg["subjects"])
- self.subject.set("")
- self.directory_entry["values"] = tuple(self.cfg["directories"])
- self.directory.set("")
-
- def remove_config(self):
- """ Remove configuration
- """
-
- cfg_name = self.cfg_name.get()
- delete_setup = messagebox.askyesnocancel(
- "Delete Config Permanently?",
- "Would you like to delete the configuration {} permanently (yes),\nremove the setup from the list for this session (no),\nor neither (cancel).".format(
- cfg_name
- ),
- parent=self.window,
- )
- if delete_setup is not None:
- if delete_setup:
- os.remove(self.get_config_path(cfg_name))
- self.cfg_list.remove(cfg_name)
- self.cfg_entry["values"] = tuple(self.cfg_list) + ("Create New Setup",)
- self.cfg_name.set("")
-
- def get_camera_names(self):
- """ Get camera names from configuration as a tuple
- """
-
- return tuple(self.cfg["cameras"].keys())
-
- def init_cam(self):
- """ Initialize camera
- """
-
- if self.cam_pose_proc is not None:
- messagebox.showerror(
- "Camera Exists",
- "Camera already exists! Please close current camera before initializing a new one.",
- )
- return
-
- this_cam = self.get_current_camera()
-
- if not this_cam:
-
- messagebox.showerror(
- "No Camera",
- "No camera selected. Please select a camera before initializing.",
- parent=self.window,
- )
-
- else:
-
- if this_cam["type"] == "Add Camera":
-
- self.add_camera_window()
- return
-
- else:
-
- self.cam_setup_window = Toplevel(self.window)
- self.cam_setup_window.title("Setting up camera...")
- Label(
- self.cam_setup_window, text="Setting up camera, please wait..."
- ).pack()
- self.cam_setup_window.update()
-
- cam_obj = getattr(camera, this_cam["type"])
- cam = cam_obj(**this_cam["params"])
- self.cam_pose_proc = CameraPoseProcess(cam)
- ret = self.cam_pose_proc.start_capture_process()
-
- if cam.use_tk_display:
- self.set_display_window()
-
- self.cam_setup_window.destroy()
-
- def get_current_camera(self):
- """ Get dictionary of the current camera
- """
-
- if self.camera_name.get():
- if self.camera_name.get() == "Add Camera":
- return {"type": "Add Camera"}
- else:
- return self.cfg["cameras"][self.camera_name.get()]
-
- def set_camera_param(self, key, value):
- """ Set a camera parameter
- """
-
- self.cfg["cameras"][self.camera_name.get()]["params"][key] = value
-
- def add_camera_window(self):
- """ Create gui to add a camera
- """
-
- add_cam = Tk()
- cur_row = 0
-
- Label(add_cam, text="Type: ").grid(sticky="w", row=cur_row, column=0)
- self.cam_type = StringVar(add_cam)
-
- cam_types = [c[0] for c in inspect.getmembers(camera, inspect.isclass)]
- cam_types = [c for c in cam_types if (c != "Camera") & ("Error" not in c)]
-
- type_entry = Combobox(add_cam, textvariable=self.cam_type, state="readonly")
- type_entry["values"] = tuple(cam_types)
- type_entry.current(0)
- type_entry.grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
-
- Label(add_cam, text="Name: ").grid(sticky="w", row=cur_row, column=0)
- self.new_cam_name = StringVar(add_cam)
- Entry(add_cam, textvariable=self.new_cam_name).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 1
-
- Button(
- add_cam, text="Add Camera", command=lambda: self.add_cam_to_list(add_cam)
- ).grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
-
- Button(add_cam, text="Cancel", command=add_cam.destroy).grid(
- sticky="nsew", row=cur_row, column=1
- )
-
- add_cam.mainloop()
-
- def add_cam_to_list(self, gui):
- """ Add new camera to the camera list
- """
-
- self.cfg["cameras"][self.new_cam_name.get()] = {
- "type": self.cam_type.get(),
- "params": {},
- }
- self.camera_name.set(self.new_cam_name.get())
- self.camera_entry["values"] = self.get_camera_names() + ("Add Camera",)
- self.save_config()
- # messagebox.showinfo("Camera Added", "Camera has been added to the dropdown menu. Please edit camera settings before initializing the new camera.", parent=gui)
- gui.destroy()
-
- def edit_cam_settings(self):
- """ GUI window to edit camera settings
- """
-
- arg_names, arg_vals, arg_dtypes, arg_restrict = self.get_cam_args()
-
- settings_window = Toplevel(self.window)
- settings_window.title("Camera Settings")
- cur_row = 0
- combobox_width = 15
-
- entry_vars = []
- for n, v in zip(arg_names, arg_vals):
-
- Label(settings_window, text=n + ": ").grid(row=cur_row, column=0)
-
- if type(v) is list:
- v = [str(x) if x is not None else "" for x in v]
- v = ", ".join(v)
- else:
- v = v if v is not None else ""
- entry_vars.append(StringVar(settings_window, value=str(v)))
-
- if n in arg_restrict.keys():
- restrict_vals = arg_restrict[n]
- if type(restrict_vals[0]) is list:
- restrict_vals = [
- ", ".join([str(i) for i in rv]) for rv in restrict_vals
- ]
- Combobox(
- settings_window,
- textvariable=entry_vars[-1],
- values=restrict_vals,
- state="readonly",
- width=combobox_width,
- ).grid(sticky="nsew", row=cur_row, column=1)
- else:
- Entry(settings_window, textvariable=entry_vars[-1]).grid(
- sticky="nsew", row=cur_row, column=1
- )
-
- cur_row += 1
-
- cur_row += 1
- Button(
- settings_window,
- text="Update",
- command=lambda: self.update_camera_settings(
- arg_names, entry_vars, arg_dtypes, settings_window
- ),
- ).grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
- Button(settings_window, text="Cancel", command=settings_window.destroy).grid(
- sticky="nsew", row=cur_row, column=1
- )
-
- _, row_count = settings_window.grid_size()
- for r in range(row_count):
- settings_window.grid_rowconfigure(r, minsize=20)
-
- settings_window.mainloop()
-
- def get_cam_args(self):
- """ Get arguments for the new camera
- """
-
- this_cam = self.get_current_camera()
- cam_obj = getattr(camera, this_cam["type"])
- arg_restrict = cam_obj.arg_restrictions()
-
- cam_args = inspect.getfullargspec(cam_obj)
- n_args = len(cam_args[0][1:])
- n_vals = len(cam_args[3])
- arg_names = []
- arg_vals = []
- arg_dtype = []
- for i in range(n_args):
- arg_names.append(cam_args[0][i + 1])
-
- if arg_names[i] in this_cam["params"].keys():
- val = this_cam["params"][arg_names[i]]
- else:
- val = None if i < n_args - n_vals else cam_args[3][n_vals - n_args + i]
- arg_vals.append(val)
-
- dt_val = val if i < n_args - n_vals else cam_args[3][n_vals - n_args + i]
- dt = type(dt_val) if type(dt_val) is not list else type(dt_val[0])
- arg_dtype.append(dt)
-
- return arg_names, arg_vals, arg_dtype, arg_restrict
-
- def update_camera_settings(self, names, entries, dtypes, gui):
- """ Update camera settings from values input in settings GUI
- """
-
- gui.destroy()
-
- for name, entry, dt in zip(names, entries, dtypes):
- val = entry.get()
- val = val.split(",")
- val = [v.strip() for v in val]
- try:
- if dt is bool:
- val = [True if v == "True" else False for v in val]
- else:
- val = [dt(v) if v else None for v in val]
- except TypeError:
- pass
- val = val if len(val) > 1 else val[0]
- self.set_camera_param(name, val)
-
- self.save_config()
-
- def set_display_window(self):
- """ Create a video display window
- """
-
- self.display_window = Toplevel(self.window)
- self.display_frame_label = Label(self.display_window)
- self.display_frame_label.pack()
- self.display_frame()
-
- def set_display_colors(self, bodyparts):
- """ Set colors for keypoints
-
- Parameters
- ----------
- bodyparts : int
- the number of keypoints
- """
-
- all_colors = getattr(cc, self.display_cmap)
- self.display_colors = all_colors[:: int(len(all_colors) / bodyparts)]
-
- def display_frame(self):
- """ Display a frame in display window
- """
-
- if self.cam_pose_proc and self.display_window:
-
- frame = self.cam_pose_proc.get_display_frame()
-
- if frame is not None:
-
- img = Image.fromarray(frame)
- if frame.ndim == 3:
- b, g, r = img.split()
- img = Image.merge("RGB", (r, g, b))
-
- pose = (
- self.cam_pose_proc.get_display_pose()
- if self.display_keypoints.get()
- else None
- )
-
- if pose is not None:
-
- im_size = (frame.shape[1], frame.shape[0])
-
- if not self.display_colors:
- self.set_display_colors(pose.shape[0])
-
- img_draw = ImageDraw.Draw(img)
-
- for i in range(pose.shape[0]):
- if pose[i, 2] > self.display_lik_thresh:
- try:
- x0 = (
- pose[i, 0] - self.display_radius
- if pose[i, 0] - self.display_radius > 0
- else 0
- )
- x1 = (
- pose[i, 0] + self.display_radius
- if pose[i, 0] + self.display_radius < im_size[1]
- else im_size[1]
- )
- y0 = (
- pose[i, 1] - self.display_radius
- if pose[i, 1] - self.display_radius > 0
- else 0
- )
- y1 = (
- pose[i, 1] + self.display_radius
- if pose[i, 1] + self.display_radius < im_size[0]
- else im_size[0]
- )
- coords = [x0, y0, x1, y1]
- img_draw.ellipse(
- coords,
- fill=self.display_colors[i],
- outline=self.display_colors[i],
- )
- except Exception as e:
- print(e)
-
- imgtk = ImageTk.PhotoImage(image=img)
- self.display_frame_label.imgtk = imgtk
- self.display_frame_label.configure(image=imgtk)
-
- self.display_frame_label.after(10, self.display_frame)
-
- def change_display_keypoints(self):
- """ Toggle display keypoints. If turning on, set display options. If turning off, destroy display window
- """
-
- if self.display_keypoints.get():
-
- display_options = self.cfg["dlc_display_options"][
- self.dlc_option.get()
- ].copy()
- self.display_cmap = display_options["cmap"]
- self.display_radius = display_options["radius"]
- self.display_lik_thresh = display_options["lik_thresh"]
-
- if not self.display_window:
- self.set_display_window()
-
- else:
-
- if self.cam_pose_proc is not None:
- if not self.cam_pose_proc.device.use_tk_display:
- if self.display_window:
- self.display_window.destroy()
- self.display_window = None
- self.display_colors = None
-
- def edit_dlc_display(self):
-
- display_options = self.cfg["dlc_display_options"][self.dlc_option.get()]
-
- dlc_display_settings = {
- "color map": {
- "value": display_options["cmap"],
- "dtype": str,
- "restriction": ["bgy", "kbc", "bmw", "bmy", "kgy", "fire"],
- },
- "radius": {"value": display_options["radius"], "dtype": int},
- "likelihood threshold": {
- "value": display_options["lik_thresh"],
- "dtype": float,
- },
- }
-
- dlc_display_gui = SettingsWindow(
- title="Edit DLC Display Settings",
- settings=dlc_display_settings,
- parent=self.window,
- )
-
- dlc_display_gui.mainloop()
- display_settings = dlc_display_gui.get_values()
-
- display_options["cmap"] = display_settings["color map"]
- display_options["radius"] = display_settings["radius"]
- display_options["lik_thresh"] = display_settings["likelihood threshold"]
-
- self.display_cmap = display_options["cmap"]
- self.display_radius = display_options["radius"]
- self.display_lik_thresh = display_options["lik_thresh"]
-
- self.cfg["dlc_display_options"][self.dlc_option.get()] = display_options
- self.save_config()
-
- def close_camera(self):
- """ Close capture process and display
- """
-
- if self.cam_pose_proc:
- if self.display_window is not None:
- self.display_window.destroy()
- self.display_window = None
- ret = self.cam_pose_proc.stop_capture_process()
-
- self.cam_pose_proc = None
-
- def change_dlc_option(self, event=None):
-
- if self.dlc_option.get() == "Add DLC":
- self.edit_dlc_settings(True)
-
- def edit_dlc_settings(self, new=False):
-
- if new:
- cur_set = self.empty_dlc_settings()
- else:
- cur_set = self.cfg["dlc_options"][self.dlc_option.get()].copy()
- cur_set["name"] = self.dlc_option.get()
- cur_set["cropping"] = (
- ", ".join([str(c) for c in cur_set["cropping"]])
- if cur_set["cropping"]
- else ""
- )
- cur_set["dynamic"] = ", ".join([str(d) for d in cur_set["dynamic"]])
- cur_set["mode"] = (
- "Optimize Latency" if "mode" not in cur_set else cur_set["mode"]
- )
-
- self.dlc_settings_window = Toplevel(self.window)
- self.dlc_settings_window.title("DLC Settings")
- cur_row = 0
-
- Label(self.dlc_settings_window, text="Name: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_name = StringVar(
- self.dlc_settings_window, value=cur_set["name"]
- )
- Entry(self.dlc_settings_window, textvariable=self.dlc_settings_name).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Model Path: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_model_path = StringVar(
- self.dlc_settings_window, value=cur_set["model_path"]
- )
- Entry(self.dlc_settings_window, textvariable=self.dlc_settings_model_path).grid(
- sticky="nsew", row=cur_row, column=1
- )
- Button(
- self.dlc_settings_window, text="Browse", command=self.browse_dlc_path
- ).grid(sticky="nsew", row=cur_row, column=2)
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Model Type: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_model_type = StringVar(
- self.dlc_settings_window, value=cur_set["model_type"]
- )
- Combobox(
- self.dlc_settings_window,
- textvariable=self.dlc_settings_model_type,
- value=["base", "tensorrt", "tflite"],
- state="readonly",
- ).grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Precision: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_precision = StringVar(
- self.dlc_settings_window, value=cur_set["precision"]
- )
- Combobox(
- self.dlc_settings_window,
- textvariable=self.dlc_settings_precision,
- value=["FP32", "FP16", "INT8"],
- state="readonly",
- ).grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Cropping: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_cropping = StringVar(
- self.dlc_settings_window, value=cur_set["cropping"]
- )
- Entry(self.dlc_settings_window, textvariable=self.dlc_settings_cropping).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Dynamic: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_dynamic = StringVar(
- self.dlc_settings_window, value=cur_set["dynamic"]
- )
- Entry(self.dlc_settings_window, textvariable=self.dlc_settings_dynamic).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Resize: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_resize = StringVar(
- self.dlc_settings_window, value=cur_set["resize"]
- )
- Entry(self.dlc_settings_window, textvariable=self.dlc_settings_resize).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 1
-
- Label(self.dlc_settings_window, text="Mode: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_settings_mode = StringVar(
- self.dlc_settings_window, value=cur_set["mode"]
- )
- Combobox(
- self.dlc_settings_window,
- textvariable=self.dlc_settings_mode,
- state="readonly",
- values=["Optimize Latency", "Optimize Rate"],
- ).grid(sticky="nsew", row=cur_row, column=1)
- cur_row += 1
-
- Button(
- self.dlc_settings_window, text="Update", command=self.update_dlc_settings
- ).grid(sticky="nsew", row=cur_row, column=1)
- Button(
- self.dlc_settings_window,
- text="Cancel",
- command=self.dlc_settings_window.destroy,
- ).grid(sticky="nsew", row=cur_row, column=2)
-
- def empty_dlc_settings(self):
-
- return {
- "name": "",
- "model_path": "",
- "model_type": "base",
- "precision": "FP32",
- "cropping": "",
- "dynamic": "False, 0.5, 10",
- "resize": "1.0",
- "mode": "Optimize Latency",
- }
-
- def browse_dlc_path(self):
- """ Open file browser to select DLC exported model directory
- """
-
- new_dlc_path = filedialog.askdirectory(parent=self.dlc_settings_window)
- if new_dlc_path:
- self.dlc_settings_model_path.set(new_dlc_path)
-
- def update_dlc_settings(self):
- """ Update DLC settings for the current dlc option from DLC Settings GUI
- """
-
- precision = (
- self.dlc_settings_precision.get()
- if self.dlc_settings_precision.get()
- else "FP32"
- )
-
- crop_warn = False
- dlc_crop = self.dlc_settings_cropping.get()
- if dlc_crop:
- try:
- dlc_crop = dlc_crop.split(",")
- assert len(dlc_crop) == 4
- dlc_crop = [int(c) for c in dlc_crop]
- except Exception:
- crop_warn = True
- dlc_crop = None
- else:
- dlc_crop = None
-
- try:
- dlc_dynamic = self.dlc_settings_dynamic.get().replace(" ", "")
- dlc_dynamic = dlc_dynamic.split(",")
- dlc_dynamic[0] = True if dlc_dynamic[0] == "True" else False
- dlc_dynamic[1] = float(dlc_dynamic[1])
- dlc_dynamic[2] = int(dlc_dynamic[2])
- dlc_dynamic = tuple(dlc_dynamic)
- dyn_warn = False
- except Exception:
- dyn_warn = True
- dlc_dynamic = (False, 0.5, 10)
-
- dlc_resize = (
- float(self.dlc_settings_resize.get())
- if self.dlc_settings_resize.get()
- else None
- )
- dlc_mode = self.dlc_settings_mode.get()
-
- warn_msg = ""
- if crop_warn:
- warn_msg += "DLC Cropping was not set properly. Using default cropping parameters...\n"
- if dyn_warn:
- warn_msg += "DLC Dynamic Cropping was not set properly. Using default dynamic cropping parameters..."
- if warn_msg:
- messagebox.showerror(
- "DLC Settings Error", warn_msg, parent=self.dlc_settings_window
- )
-
- self.cfg["dlc_options"][self.dlc_settings_name.get()] = {
- "model_path": self.dlc_settings_model_path.get(),
- "model_type": self.dlc_settings_model_type.get(),
- "precision": precision,
- "cropping": dlc_crop,
- "dynamic": dlc_dynamic,
- "resize": dlc_resize,
- "mode": dlc_mode,
- }
-
- if self.dlc_settings_name.get() not in self.cfg["dlc_display_options"]:
- self.cfg["dlc_display_options"][self.dlc_settings_name.get()] = {
- "cmap": "bgy",
- "radius": 3,
- "lik_thresh": 0.5,
- }
-
- self.save_config()
- self.dlc_options_entry["values"] = tuple(self.cfg["dlc_options"].keys()) + (
- "Add DLC",
- )
- self.dlc_option.set(self.dlc_settings_name.get())
- self.dlc_settings_window.destroy()
-
- def remove_dlc_option(self):
- """ Delete DLC Option from config
- """
-
- del self.cfg["dlc_options"][self.dlc_option.get()]
- del self.cfg["dlc_display_options"][self.dlc_option.get()]
- self.dlc_options_entry["values"] = tuple(self.cfg["dlc_options"].keys()) + (
- "Add DLC",
- )
- self.dlc_option.set("")
- self.save_config()
-
- def init_dlc(self):
- """ Initialize DLC Live object
- """
-
- self.stop_pose()
-
- self.dlc_setup_window = Toplevel(self.window)
- self.dlc_setup_window.title("Setting up DLC...")
- Label(self.dlc_setup_window, text="Setting up DLC, please wait...").pack()
- self.dlc_setup_window.after(10, self.start_pose)
- self.dlc_setup_window.mainloop()
-
- def start_pose(self):
-
- dlc_params = self.cfg["dlc_options"][self.dlc_option.get()].copy()
- dlc_params["processor"] = self.dlc_proc_params
- ret = self.cam_pose_proc.start_pose_process(dlc_params)
- self.dlc_setup_window.destroy()
-
- def stop_pose(self):
- """ Stop pose process
- """
-
- if self.cam_pose_proc:
- ret = self.cam_pose_proc.stop_pose_process()
-
- def add_subject(self):
- new_sub = self.subject.get()
- if new_sub:
- if new_sub not in self.cfg["subjects"]:
- self.cfg["subjects"].append(new_sub)
- self.subject_entry["values"] = tuple(self.cfg["subjects"])
- self.save_config()
-
- def remove_subject(self):
-
- self.cfg["subjects"].remove(self.subject.get())
- self.subject_entry["values"] = self.cfg["subjects"]
- self.save_config()
- self.subject.set("")
-
- def browse_directory(self):
-
- new_dir = filedialog.askdirectory(parent=self.window)
- if new_dir:
- self.directory.set(new_dir)
- ask_add_dir = Tk()
- Label(
- ask_add_dir,
- text="Would you like to add this directory to dropdown list?",
- ).pack()
- Button(
- ask_add_dir, text="Yes", command=lambda: self.add_directory(ask_add_dir)
- ).pack()
- Button(ask_add_dir, text="No", command=ask_add_dir.destroy).pack()
-
- def add_directory(self, window):
-
- window.destroy()
- if self.directory.get() not in self.cfg["directories"]:
- self.cfg["directories"].append(self.directory.get())
- self.directory_entry["values"] = self.cfg["directories"]
- self.save_config()
-
- def save_config(self, notify=False):
-
- json.dump(self.cfg, open(self.cfg_file, "w"))
- if notify:
- messagebox.showinfo(
- title="Config file saved",
- message="Configuration file has been saved...",
- parent=self.window,
- )
-
- def remove_cam_cfg(self):
-
- if self.camera_name.get() != "Add Camera":
- delete = messagebox.askyesno(
- title="Delete Camera?",
- message="Are you sure you want to delete '%s'?"
- % self.camera_name.get(),
- parent=self.window,
- )
- if delete:
- del self.cfg["cameras"][self.camera_name.get()]
- self.camera_entry["values"] = self.get_camera_names() + ("Add Camera",)
- self.camera_name.set("")
- self.save_config()
-
- def browse_dlc_processor(self):
-
- new_dir = filedialog.askdirectory(parent=self.window)
- if new_dir:
- self.dlc_proc_dir.set(new_dir)
- self.update_dlc_proc_list()
-
- if new_dir not in self.cfg["processor_dir"]:
- if messagebox.askyesno(
- "Add to dropdown",
- "Would you like to add this directory to dropdown list?",
- ):
- self.cfg["processor_dir"].append(new_dir)
- self.dlc_proc_dir_entry["values"] = tuple(self.cfg["processor_dir"])
- self.save_config()
-
- def rem_dlc_proc_dir(self):
-
- if self.dlc_proc_dir.get() in self.cfg["processor_dir"]:
- self.cfg["processor_dir"].remove(self.dlc_proc_dir.get())
- self.save_config()
- self.dlc_proc_dir_entry["values"] = tuple(self.cfg["processor_dir"])
- self.dlc_proc_dir.set("")
-
- def update_dlc_proc_list(self, event=None):
-
- ### if dlc proc module already initialized, delete module and remove from path ###
-
- self.processor_list = []
-
- if self.dlc_proc_dir.get():
-
- if hasattr(self, "dlc_proc_module"):
- sys.path.remove(sys.path[0])
-
- new_path = os.path.normpath(os.path.dirname(self.dlc_proc_dir.get()))
- if new_path not in sys.path:
- sys.path.insert(0, new_path)
-
- new_mod = os.path.basename(self.dlc_proc_dir.get())
- if new_mod in sys.modules:
- del sys.modules[new_mod]
-
- ### load new module ###
-
- processor_spec = importlib.util.find_spec(
- os.path.basename(self.dlc_proc_dir.get())
- )
- try:
- self.dlc_proc_module = importlib.util.module_from_spec(processor_spec)
- processor_spec.loader.exec_module(self.dlc_proc_module)
- # self.processor_list = inspect.getmembers(self.dlc_proc_module, inspect.isclass)
- self.processor_list = [
- proc for proc in dir(self.dlc_proc_module) if "__" not in proc
- ]
- except AttributeError:
- if hasattr(self, "window"):
- messagebox.showerror(
- "Failed to load processors!",
- "Failed to load processors from directory = "
- + self.dlc_proc_dir.get()
- + ".\nPlease select a different directory.",
- parent=self.window,
- )
-
- self.dlc_proc_name_entry["values"] = tuple(self.processor_list)
-
- def set_proc(self):
-
- # proc_param_dict = {}
- # for i in range(1, len(self.proc_param_names)):
- # proc_param_dict[self.proc_param_names[i]] = self.proc_param_default_types[i](self.proc_param_values[i-1].get())
-
- # if self.dlc_proc_dir.get() not in self.cfg['processor_args']:
- # self.cfg['processor_args'][self.dlc_proc_dir.get()] = {}
- # self.cfg['processor_args'][self.dlc_proc_dir.get()][self.dlc_proc_name.get()] = proc_param_dict
- # self.save_config()
-
- # self.dlc_proc = self.proc_object(**proc_param_dict)
- proc_object = getattr(self.dlc_proc_module, self.dlc_proc_name.get())
- self.dlc_proc_params = {"object": proc_object}
- self.dlc_proc_params.update(
- self.cfg["processor_args"][self.dlc_proc_dir.get()][
- self.dlc_proc_name.get()
- ]
- )
-
- def clear_proc(self):
-
- self.dlc_proc_params = None
-
- def edit_proc(self):
-
- ### get default args: load module and read arguments ###
-
- self.proc_object = getattr(self.dlc_proc_module, self.dlc_proc_name.get())
- def_args = inspect.getargspec(self.proc_object)
- self.proc_param_names = def_args[0]
- self.proc_param_default_values = def_args[3]
- self.proc_param_default_types = [
- type(v) if type(v) is not list else [type(v[0])] for v in def_args[3]
- ]
- for i in range(len(def_args[0]) - len(def_args[3])):
- self.proc_param_default_values = ("",) + self.proc_param_default_values
- self.proc_param_default_types = [str] + self.proc_param_default_types
-
- ### check for existing settings in config ###
-
- old_args = {}
- if self.dlc_proc_dir.get() in self.cfg["processor_args"]:
- if (
- self.dlc_proc_name.get()
- in self.cfg["processor_args"][self.dlc_proc_dir.get()]
- ):
- old_args = self.cfg["processor_args"][self.dlc_proc_dir.get()][
- self.dlc_proc_name.get()
- ].copy()
- else:
- self.cfg["processor_args"][self.dlc_proc_dir.get()] = {}
-
- ### get dictionary of arguments ###
-
- proc_args_dict = {}
- for i in range(1, len(self.proc_param_names)):
-
- if self.proc_param_names[i] in old_args:
- this_value = old_args[self.proc_param_names[i]]
- else:
- this_value = self.proc_param_default_values[i]
-
- proc_args_dict[self.proc_param_names[i]] = {
- "value": this_value,
- "dtype": self.proc_param_default_types[i],
- }
-
- proc_args_gui = SettingsWindow(
- title="DLC Processor Settings", settings=proc_args_dict, parent=self.window
- )
- proc_args_gui.mainloop()
-
- self.cfg["processor_args"][self.dlc_proc_dir.get()][
- self.dlc_proc_name.get()
- ] = proc_args_gui.get_values()
- self.save_config()
-
- def init_session(self):
-
- ### check if video is currently open ###
-
- if self.record_on.get() > -1:
- messagebox.showerror(
- "Session Open",
- "Session is currently open! Please release the current video (click 'Save Video' of 'Delete Video', even if no frames have been recorded) before setting up a new one.",
- parent=self.window,
- )
- return
-
- ### check if camera is already set up ###
-
- if not self.cam_pose_proc:
- messagebox.showerror(
- "No Camera",
- "No camera is found! Please initialize a camera before setting up the video.",
- parent=self.window,
- )
- return
-
- ### set up session window
-
- self.session_setup_window = Toplevel(self.window)
- self.session_setup_window.title("Setting up session...")
- Label(
- self.session_setup_window, text="Setting up session, please wait..."
- ).pack()
- self.session_setup_window.after(10, self.start_writer)
- self.session_setup_window.mainloop()
-
- def start_writer(self):
-
- ### set up file name (get date and create directory)
-
- dt = datetime.datetime.now()
- date = f"{dt.year:04d}-{dt.month:02d}-{dt.day:02d}"
- self.out_dir = self.directory.get()
- if not os.path.isdir(os.path.normpath(self.out_dir)):
- os.makedirs(os.path.normpath(self.out_dir))
-
- ### create output file names
-
- self.base_name = os.path.normpath(
- f"{self.out_dir}/{self.camera_name.get().replace(' ', '')}_{self.subject.get()}_{date}_{self.attempt.get()}"
- )
- # self.vid_file = os.path.normpath(self.out_dir + '/VIDEO_' + self.base_name + '.avi')
- # self.ts_file = os.path.normpath(self.out_dir + '/TIMESTAMPS_' + self.base_name + '.pickle')
- # self.dlc_file = os.path.normpath(self.out_dir + '/DLC_' + self.base_name + '.h5')
- # self.proc_file = os.path.normpath(self.out_dir + '/PROC_' + self.base_name + '.pickle')
-
- ### check if files already exist
-
- fs = glob.glob(f"{self.base_name}*")
- if len(fs) > 0:
- overwrite = messagebox.askyesno(
- "Files Exist",
- "Files already exist with attempt number = {}. Would you like to overwrite the file?".format(
- self.attempt.get()
- ),
- parent=self.session_setup_window,
- )
- if not overwrite:
- return
-
- ### start writer
-
- ret = self.cam_pose_proc.start_writer_process(self.base_name)
-
- self.session_setup_window.destroy()
-
- ### set GUI to Ready
-
- self.record_on.set(0)
-
- def start_record(self):
- """ Issues command to start recording frames and poses
- """
-
- ret = False
- if self.cam_pose_proc is not None:
- ret = self.cam_pose_proc.start_record()
-
- if not ret:
- messagebox.showerror(
- "Recording Not Ready",
- "Recording has not been set up. Please make sure a camera and session have been initialized.",
- parent=self.window,
- )
- self.record_on.set(-1)
-
- def stop_record(self):
- """ Issues command to stop recording frames and poses
- """
-
- if self.cam_pose_proc is not None:
- ret = self.cam_pose_proc.stop_record()
- self.record_on.set(0)
-
- def save_vid(self, delete=False):
- """ Saves video, timestamp, and DLC files
-
- Parameters
- ----------
- delete : bool, optional
- flag to delete created files, by default False
- """
-
- ### perform checks ###
-
- if self.cam_pose_proc is None:
- messagebox.showwarning(
- "No Camera",
- "Camera has not yet been initialized, no video recorded.",
- parent=self.window,
- )
- return
-
- elif self.record_on.get() == -1:
- messagebox.showwarning(
- "No Video File",
- "Video was not set up, no video recorded.",
- parent=self.window,
- )
- return
-
- elif self.record_on.get() == 1:
- messagebox.showwarning(
- "Active Recording",
- "You are currently recording a video. Please stop the video before saving.",
- parent=self.window,
- )
- return
-
- elif delete:
- delete = messagebox.askokcancel(
- "Delete Video?", "Do you wish to delete the video?", parent=self.window
- )
-
- ### save or delete video ###
-
- if delete:
- ret = self.cam_pose_proc.stop_writer_process(save=False)
- messagebox.showinfo(
- "Video Deleted",
- "Video and timestamp files have been deleted.",
- parent=self.window,
- )
- else:
- ret = self.cam_pose_proc.stop_writer_process(save=True)
- ret_pose = self.cam_pose_proc.save_pose(self.base_name)
- if ret:
- if ret_pose:
- messagebox.showinfo(
- "Files Saved",
- "Video, timestamp, and DLC Files have been saved.",
- )
- else:
- messagebox.showinfo(
- "Files Saved", "Video and timestamp files have been saved."
- )
- else:
- messagebox.showwarning(
- "No Frames Recorded",
- "No frames were recorded, video was deleted",
- parent=self.window,
- )
-
- self.record_on.set(-1)
-
- def closeGUI(self):
-
- if self.cam_pose_proc:
- ret = self.cam_pose_proc.stop_writer_process()
- ret = self.cam_pose_proc.stop_pose_process()
- ret = self.cam_pose_proc.stop_capture_process()
-
- self.window.destroy()
-
- def createGUI(self):
-
- ### initialize window ###
-
- self.window = Tk()
- self.window.title("DeepLabCut Live")
- cur_row = 0
- combobox_width = 15
-
- ### select cfg file
- if len(self.cfg_list) > 0:
- initial_cfg = self.cfg_list[0]
- else:
- initial_cfg = ""
-
- Label(self.window, text="Config: ").grid(sticky="w", row=cur_row, column=0)
- self.cfg_name = StringVar(self.window, value=initial_cfg)
- self.cfg_entry = Combobox(
- self.window, textvariable=self.cfg_name, width=combobox_width
- )
- self.cfg_entry["values"] = tuple(self.cfg_list) + ("Create New Config",)
- self.cfg_entry.bind("<>", self.change_config)
- self.cfg_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Remove Config", command=self.remove_config).grid(
- sticky="nsew", row=cur_row, column=2
- )
-
- self.get_config(initial_cfg)
-
- cur_row += 2
-
- ### select camera ###
-
- # camera entry
- Label(self.window, text="Camera: ").grid(sticky="w", row=cur_row, column=0)
- self.camera_name = StringVar(self.window)
- self.camera_entry = Combobox(self.window, textvariable=self.camera_name)
- cam_names = self.get_camera_names()
- self.camera_entry["values"] = cam_names + ("Add Camera",)
- if cam_names:
- self.camera_entry.current(0)
- self.camera_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Init Cam", command=self.init_cam).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- Button(
- self.window, text="Edit Camera Settings", command=self.edit_cam_settings
- ).grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Close Camera", command=self.close_camera).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
- Button(self.window, text="Remove Camera", command=self.remove_cam_cfg).grid(
- sticky="nsew", row=cur_row, column=2
- )
-
- cur_row += 2
-
- ### set up proc ###
-
- Label(self.window, text="Processor Dir: ").grid(
- sticky="w", row=cur_row, column=0
- )
- self.dlc_proc_dir = StringVar(self.window)
- self.dlc_proc_dir_entry = Combobox(self.window, textvariable=self.dlc_proc_dir)
- self.dlc_proc_dir_entry["values"] = tuple(self.cfg["processor_dir"])
- if len(self.cfg["processor_dir"]) > 0:
- self.dlc_proc_dir_entry.current(0)
- self.dlc_proc_dir_entry.bind("<>", self.update_dlc_proc_list)
- self.dlc_proc_dir_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Browse", command=self.browse_dlc_processor).grid(
- sticky="nsew", row=cur_row, column=2
- )
- Button(self.window, text="Remove Proc Dir", command=self.rem_dlc_proc_dir).grid(
- sticky="nsew", row=cur_row + 1, column=2
- )
- cur_row += 2
-
- Label(self.window, text="Processor: ").grid(sticky="w", row=cur_row, column=0)
- self.dlc_proc_name = StringVar(self.window)
- self.dlc_proc_name_entry = Combobox(
- self.window, textvariable=self.dlc_proc_name
- )
- self.update_dlc_proc_list()
- # self.dlc_proc_name_entry['values'] = tuple(self.processor_list) # tuple([c[0] for c in inspect.getmembers(processor, inspect.isclass)])
- if len(self.processor_list) > 0:
- self.dlc_proc_name_entry.current(0)
- self.dlc_proc_name_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Set Proc", command=self.set_proc).grid(
- sticky="nsew", row=cur_row, column=2
- )
- Button(self.window, text="Edit Proc Settings", command=self.edit_proc).grid(
- sticky="nsew", row=cur_row + 1, column=1
- )
- Button(self.window, text="Clear Proc", command=self.clear_proc).grid(
- sticky="nsew", row=cur_row + 1, column=2
- )
-
- cur_row += 3
-
- ### set up dlc live ###
-
- Label(self.window, text="DeepLabCut: ").grid(sticky="w", row=cur_row, column=0)
- self.dlc_option = StringVar(self.window)
- self.dlc_options_entry = Combobox(self.window, textvariable=self.dlc_option)
- self.dlc_options_entry["values"] = tuple(self.cfg["dlc_options"].keys()) + (
- "Add DLC",
- )
- self.dlc_options_entry.bind("<>", self.change_dlc_option)
- self.dlc_options_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Init DLC", command=self.init_dlc).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- Button(
- self.window, text="Edit DLC Settings", command=self.edit_dlc_settings
- ).grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Stop DLC", command=self.stop_pose).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- self.display_keypoints = BooleanVar(self.window, value=False)
- Checkbutton(
- self.window,
- text="Display DLC Keypoints",
- variable=self.display_keypoints,
- indicatoron=0,
- command=self.change_display_keypoints,
- ).grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Remove DLC", command=self.remove_dlc_option).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- Button(
- self.window, text="Edit DLC Display Settings", command=self.edit_dlc_display
- ).grid(sticky="nsew", row=cur_row, column=1)
-
- cur_row += 2
-
- ### set up session ###
-
- # subject
- Label(self.window, text="Subject: ").grid(sticky="w", row=cur_row, column=0)
- self.subject = StringVar(self.window)
- self.subject_entry = Combobox(self.window, textvariable=self.subject)
- self.subject_entry["values"] = self.cfg["subjects"]
- self.subject_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Add Subject", command=self.add_subject).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- # attempt
- Label(self.window, text="Attempt: ").grid(sticky="w", row=cur_row, column=0)
- self.attempt = StringVar(self.window)
- self.attempt_entry = Combobox(self.window, textvariable=self.attempt)
- self.attempt_entry["values"] = tuple(range(1, 10))
- self.attempt_entry.current(0)
- self.attempt_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Remove Subject", command=self.remove_subject).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- # out directory
- Label(self.window, text="Directory: ").grid(sticky="w", row=cur_row, column=0)
- self.directory = StringVar(self.window)
- self.directory_entry = Combobox(self.window, textvariable=self.directory)
- if self.cfg["directories"]:
- self.directory_entry["values"] = self.cfg["directories"]
- self.directory_entry.current(0)
- self.directory_entry.grid(sticky="nsew", row=cur_row, column=1)
- Button(self.window, text="Browse", command=self.browse_directory).grid(
- sticky="nsew", row=cur_row, column=2
- )
- cur_row += 1
-
- # set up session
- Button(self.window, text="Set Up Session", command=self.init_session).grid(
- sticky="nsew", row=cur_row, column=1
- )
- cur_row += 2
-
- ### control recording ###
-
- Label(self.window, text="Record: ").grid(sticky="w", row=cur_row, column=0)
- self.record_on = IntVar(value=-1)
- Radiobutton(
- self.window,
- text="Ready",
- selectcolor="blue",
- indicatoron=0,
- variable=self.record_on,
- value=0,
- state="disabled",
- ).grid(stick="nsew", row=cur_row, column=1)
- Radiobutton(
- self.window,
- text="On",
- selectcolor="green",
- indicatoron=0,
- variable=self.record_on,
- value=1,
- command=self.start_record,
- ).grid(sticky="nsew", row=cur_row + 1, column=1)
- Radiobutton(
- self.window,
- text="Off",
- selectcolor="red",
- indicatoron=0,
- variable=self.record_on,
- value=-1,
- command=self.stop_record,
- ).grid(sticky="nsew", row=cur_row + 2, column=1)
- Button(self.window, text="Save Video", command=lambda: self.save_vid()).grid(
- sticky="nsew", row=cur_row + 1, column=2
- )
- Button(
- self.window, text="Delete Video", command=lambda: self.save_vid(delete=True)
- ).grid(sticky="nsew", row=cur_row + 2, column=2)
-
- cur_row += 4
-
- ### close program ###
-
- Button(self.window, text="Close", command=self.closeGUI).grid(
- sticky="nsew", row=cur_row, column=0, columnspan=2
- )
-
- ### configure size of empty rows
-
- _, row_count = self.window.grid_size()
- for r in range(row_count):
- self.window.grid_rowconfigure(r, minsize=20)
-
- def run(self):
-
- self.window.mainloop()
-
-
-def main():
-
- # import multiprocess as mp
- # mp.set_start_method("spawn")
-
- dlc_live_gui = DLCLiveGUI()
- dlc_live_gui.run()
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
new file mode 100644
index 0000000..4eb3971
--- /dev/null
+++ b/dlclivegui/gui.py
@@ -0,0 +1,542 @@
+"""PyQt6 based GUI for DeepLabCut Live."""
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+from typing import Optional
+
+import cv2
+import numpy as np
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QAction, QCloseEvent, QImage, QPixmap
+from PyQt6.QtWidgets import (
+ QApplication,
+ QCheckBox,
+ QComboBox,
+ QFileDialog,
+ QFormLayout,
+ QGroupBox,
+ QHBoxLayout,
+ QLabel,
+ QLineEdit,
+ QMainWindow,
+ QMessageBox,
+ QPlainTextEdit,
+ QPushButton,
+ QSpinBox,
+ QDoubleSpinBox,
+ QStatusBar,
+ QVBoxLayout,
+ QWidget,
+)
+
+from .camera_controller import CameraController, FrameData
+from .cameras import CameraFactory
+from .config import (
+ ApplicationSettings,
+ CameraSettings,
+ DLCProcessorSettings,
+ RecordingSettings,
+ DEFAULT_CONFIG,
+)
+from .dlc_processor import DLCLiveProcessor, PoseResult
+from .video_recorder import VideoRecorder
+
+
+class MainWindow(QMainWindow):
+ """Main application window."""
+
+ def __init__(self, config: Optional[ApplicationSettings] = None):
+ super().__init__()
+ self.setWindowTitle("DeepLabCut Live GUI")
+ self._config = config or DEFAULT_CONFIG
+ self._config_path: Optional[Path] = None
+ self._current_frame: Optional[np.ndarray] = None
+ self._last_pose: Optional[PoseResult] = None
+ self._video_recorder: Optional[VideoRecorder] = None
+
+ self.camera_controller = CameraController()
+ self.dlc_processor = DLCLiveProcessor()
+
+ self._setup_ui()
+ self._connect_signals()
+ self._apply_config(self._config)
+
+ # ------------------------------------------------------------------ UI
+ def _setup_ui(self) -> None:
+ central = QWidget()
+ layout = QVBoxLayout(central)
+
+ self.video_label = QLabel("Camera preview not started")
+ self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.video_label.setMinimumSize(640, 360)
+ layout.addWidget(self.video_label)
+
+ layout.addWidget(self._build_camera_group())
+ layout.addWidget(self._build_dlc_group())
+ layout.addWidget(self._build_recording_group())
+
+ button_bar = QHBoxLayout()
+ self.preview_button = QPushButton("Start Preview")
+ self.stop_preview_button = QPushButton("Stop Preview")
+ self.stop_preview_button.setEnabled(False)
+ button_bar.addWidget(self.preview_button)
+ button_bar.addWidget(self.stop_preview_button)
+ layout.addLayout(button_bar)
+
+ self.setCentralWidget(central)
+ self.setStatusBar(QStatusBar())
+ self._build_menus()
+
+ def _build_menus(self) -> None:
+ file_menu = self.menuBar().addMenu("&File")
+
+ load_action = QAction("Load configuration…", self)
+ load_action.triggered.connect(self._action_load_config)
+ file_menu.addAction(load_action)
+
+ save_action = QAction("Save configuration", self)
+ save_action.triggered.connect(self._action_save_config)
+ file_menu.addAction(save_action)
+
+ save_as_action = QAction("Save configuration as…", self)
+ save_as_action.triggered.connect(self._action_save_config_as)
+ file_menu.addAction(save_as_action)
+
+ file_menu.addSeparator()
+ exit_action = QAction("Exit", self)
+ exit_action.triggered.connect(self.close)
+ file_menu.addAction(exit_action)
+
+ def _build_camera_group(self) -> QGroupBox:
+ group = QGroupBox("Camera settings")
+ form = QFormLayout(group)
+
+ self.camera_index = QComboBox()
+ self.camera_index.setEditable(True)
+ self.camera_index.addItems([str(i) for i in range(5)])
+ form.addRow("Camera index", self.camera_index)
+
+ self.camera_width = QSpinBox()
+ self.camera_width.setRange(1, 7680)
+ form.addRow("Width", self.camera_width)
+
+ self.camera_height = QSpinBox()
+ self.camera_height.setRange(1, 4320)
+ form.addRow("Height", self.camera_height)
+
+ self.camera_fps = QDoubleSpinBox()
+ self.camera_fps.setRange(1.0, 240.0)
+ self.camera_fps.setDecimals(2)
+ form.addRow("Frame rate", self.camera_fps)
+
+ self.camera_backend = QComboBox()
+ self.camera_backend.setEditable(True)
+ availability = CameraFactory.available_backends()
+ for backend in CameraFactory.backend_names():
+ label = backend
+ if not availability.get(backend, True):
+ label = f"{backend} (unavailable)"
+ self.camera_backend.addItem(label, backend)
+ form.addRow("Backend", self.camera_backend)
+
+ self.camera_properties_edit = QPlainTextEdit()
+ self.camera_properties_edit.setPlaceholderText(
+ '{"exposure": 15000, "gain": 0.5, "serial": "123456"}'
+ )
+ self.camera_properties_edit.setFixedHeight(60)
+ form.addRow("Advanced properties", self.camera_properties_edit)
+
+ return group
+
+ def _build_dlc_group(self) -> QGroupBox:
+ group = QGroupBox("DLCLive settings")
+ form = QFormLayout(group)
+
+ path_layout = QHBoxLayout()
+ self.model_path_edit = QLineEdit()
+ path_layout.addWidget(self.model_path_edit)
+ browse_model = QPushButton("Browse…")
+ browse_model.clicked.connect(self._action_browse_model)
+ path_layout.addWidget(browse_model)
+ form.addRow("Model path", path_layout)
+
+ self.shuffle_edit = QLineEdit()
+ self.shuffle_edit.setPlaceholderText("Optional integer")
+ form.addRow("Shuffle", self.shuffle_edit)
+
+ self.training_edit = QLineEdit()
+ self.training_edit.setPlaceholderText("Optional integer")
+ form.addRow("Training set index", self.training_edit)
+
+ self.processor_combo = QComboBox()
+ self.processor_combo.setEditable(True)
+ self.processor_combo.addItems(["cpu", "gpu", "tensorrt"])
+ form.addRow("Processor", self.processor_combo)
+
+ self.processor_args_edit = QPlainTextEdit()
+ self.processor_args_edit.setPlaceholderText('{"device": 0}')
+ self.processor_args_edit.setFixedHeight(60)
+ form.addRow("Processor args", self.processor_args_edit)
+
+ self.additional_options_edit = QPlainTextEdit()
+ self.additional_options_edit.setPlaceholderText('{"allow_growth": true}')
+ self.additional_options_edit.setFixedHeight(60)
+ form.addRow("Additional options", self.additional_options_edit)
+
+ self.enable_dlc_checkbox = QCheckBox("Enable pose estimation")
+ self.enable_dlc_checkbox.setChecked(True)
+ form.addRow(self.enable_dlc_checkbox)
+
+ return group
+
+ def _build_recording_group(self) -> QGroupBox:
+ group = QGroupBox("Recording")
+ form = QFormLayout(group)
+
+ self.recording_enabled_checkbox = QCheckBox("Record video while running")
+ form.addRow(self.recording_enabled_checkbox)
+
+ dir_layout = QHBoxLayout()
+ self.output_directory_edit = QLineEdit()
+ dir_layout.addWidget(self.output_directory_edit)
+ browse_dir = QPushButton("Browse…")
+ browse_dir.clicked.connect(self._action_browse_directory)
+ dir_layout.addWidget(browse_dir)
+ form.addRow("Output directory", dir_layout)
+
+ self.filename_edit = QLineEdit()
+ form.addRow("Filename", self.filename_edit)
+
+ self.container_combo = QComboBox()
+ self.container_combo.setEditable(True)
+ self.container_combo.addItems(["mp4", "avi", "mov"])
+ form.addRow("Container", self.container_combo)
+
+ self.recording_options_edit = QPlainTextEdit()
+ self.recording_options_edit.setPlaceholderText('{"compression_mode": "mp4"}')
+ self.recording_options_edit.setFixedHeight(60)
+ form.addRow("WriteGear options", self.recording_options_edit)
+
+ self.start_record_button = QPushButton("Start recording")
+ self.stop_record_button = QPushButton("Stop recording")
+ self.stop_record_button.setEnabled(False)
+
+ buttons = QHBoxLayout()
+ buttons.addWidget(self.start_record_button)
+ buttons.addWidget(self.stop_record_button)
+ form.addRow(buttons)
+
+ return group
+
+ # ------------------------------------------------------------------ signals
+ def _connect_signals(self) -> None:
+ self.preview_button.clicked.connect(self._start_preview)
+ self.stop_preview_button.clicked.connect(self._stop_preview)
+ self.start_record_button.clicked.connect(self._start_recording)
+ self.stop_record_button.clicked.connect(self._stop_recording)
+
+ self.camera_controller.frame_ready.connect(self._on_frame_ready)
+ self.camera_controller.error.connect(self._show_error)
+ self.camera_controller.stopped.connect(self._on_camera_stopped)
+
+ self.dlc_processor.pose_ready.connect(self._on_pose_ready)
+ self.dlc_processor.error.connect(self._show_error)
+ self.dlc_processor.initialized.connect(self._on_dlc_initialised)
+
+ # ------------------------------------------------------------------ config
+ def _apply_config(self, config: ApplicationSettings) -> None:
+ camera = config.camera
+ self.camera_index.setCurrentText(str(camera.index))
+ self.camera_width.setValue(int(camera.width))
+ self.camera_height.setValue(int(camera.height))
+ self.camera_fps.setValue(float(camera.fps))
+ backend_name = camera.backend or "opencv"
+ index = self.camera_backend.findData(backend_name)
+ if index >= 0:
+ self.camera_backend.setCurrentIndex(index)
+ else:
+ self.camera_backend.setEditText(backend_name)
+ self.camera_properties_edit.setPlainText(
+ json.dumps(camera.properties, indent=2) if camera.properties else ""
+ )
+
+ dlc = config.dlc
+ self.model_path_edit.setText(dlc.model_path)
+ self.shuffle_edit.setText("" if dlc.shuffle is None else str(dlc.shuffle))
+ self.training_edit.setText(
+ "" if dlc.trainingsetindex is None else str(dlc.trainingsetindex)
+ )
+ self.processor_combo.setCurrentText(dlc.processor or "cpu")
+ self.processor_args_edit.setPlainText(json.dumps(dlc.processor_args, indent=2))
+ self.additional_options_edit.setPlainText(
+ json.dumps(dlc.additional_options, indent=2)
+ )
+
+ recording = config.recording
+ self.recording_enabled_checkbox.setChecked(recording.enabled)
+ self.output_directory_edit.setText(recording.directory)
+ self.filename_edit.setText(recording.filename)
+ self.container_combo.setCurrentText(recording.container)
+ self.recording_options_edit.setPlainText(json.dumps(recording.options, indent=2))
+
+ def _current_config(self) -> ApplicationSettings:
+ return ApplicationSettings(
+ camera=self._camera_settings_from_ui(),
+ dlc=self._dlc_settings_from_ui(),
+ recording=self._recording_settings_from_ui(),
+ )
+
+ def _camera_settings_from_ui(self) -> CameraSettings:
+ index_text = self.camera_index.currentText().strip() or "0"
+ try:
+ index = int(index_text)
+ except ValueError:
+ raise ValueError("Camera index must be an integer") from None
+ backend_data = self.camera_backend.currentData()
+ backend_text = (
+ backend_data
+ if isinstance(backend_data, str) and backend_data
+ else self.camera_backend.currentText().strip()
+ )
+ properties = self._parse_json(self.camera_properties_edit.toPlainText())
+ return CameraSettings(
+ name=f"Camera {index}",
+ index=index,
+ width=self.camera_width.value(),
+ height=self.camera_height.value(),
+ fps=self.camera_fps.value(),
+ backend=backend_text or "opencv",
+ properties=properties,
+ )
+
+ def _parse_optional_int(self, value: str) -> Optional[int]:
+ text = value.strip()
+ if not text:
+ return None
+ return int(text)
+
+ def _parse_json(self, value: str) -> dict:
+ text = value.strip()
+ if not text:
+ return {}
+ return json.loads(text)
+
+ def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
+ return DLCProcessorSettings(
+ model_path=self.model_path_edit.text().strip(),
+ shuffle=self._parse_optional_int(self.shuffle_edit.text()),
+ trainingsetindex=self._parse_optional_int(self.training_edit.text()),
+ processor=self.processor_combo.currentText().strip() or "cpu",
+ processor_args=self._parse_json(self.processor_args_edit.toPlainText()),
+ additional_options=self._parse_json(
+ self.additional_options_edit.toPlainText()
+ ),
+ )
+
+ def _recording_settings_from_ui(self) -> RecordingSettings:
+ return RecordingSettings(
+ enabled=self.recording_enabled_checkbox.isChecked(),
+ directory=self.output_directory_edit.text().strip(),
+ filename=self.filename_edit.text().strip() or "session.mp4",
+ container=self.container_combo.currentText().strip() or "mp4",
+ options=self._parse_json(self.recording_options_edit.toPlainText()),
+ )
+
+ # ------------------------------------------------------------------ actions
+ def _action_load_config(self) -> None:
+ file_name, _ = QFileDialog.getOpenFileName(
+ self, "Load configuration", str(Path.home()), "JSON files (*.json)"
+ )
+ if not file_name:
+ return
+ try:
+ config = ApplicationSettings.load(file_name)
+ except Exception as exc: # pragma: no cover - GUI interaction
+ self._show_error(str(exc))
+ return
+ self._config = config
+ self._config_path = Path(file_name)
+ self._apply_config(config)
+ self.statusBar().showMessage(f"Loaded configuration: {file_name}", 5000)
+
+ def _action_save_config(self) -> None:
+ if self._config_path is None:
+ self._action_save_config_as()
+ return
+ self._save_config_to_path(self._config_path)
+
+ def _action_save_config_as(self) -> None:
+ file_name, _ = QFileDialog.getSaveFileName(
+ self, "Save configuration", str(Path.home()), "JSON files (*.json)"
+ )
+ if not file_name:
+ return
+ path = Path(file_name)
+ if path.suffix.lower() != ".json":
+ path = path.with_suffix(".json")
+ self._config_path = path
+ self._save_config_to_path(path)
+
+ def _save_config_to_path(self, path: Path) -> None:
+ try:
+ config = self._current_config()
+ config.save(path)
+ except Exception as exc: # pragma: no cover - GUI interaction
+ self._show_error(str(exc))
+ return
+ self.statusBar().showMessage(f"Saved configuration to {path}", 5000)
+
+ def _action_browse_model(self) -> None:
+ file_name, _ = QFileDialog.getOpenFileName(
+ self, "Select DLCLive model", str(Path.home()), "All files (*.*)"
+ )
+ if file_name:
+ self.model_path_edit.setText(file_name)
+
+ def _action_browse_directory(self) -> None:
+ directory = QFileDialog.getExistingDirectory(
+ self, "Select output directory", str(Path.home())
+ )
+ if directory:
+ self.output_directory_edit.setText(directory)
+
+ # ------------------------------------------------------------------ camera control
+ def _start_preview(self) -> None:
+ try:
+ settings = self._camera_settings_from_ui()
+ except ValueError as exc:
+ self._show_error(str(exc))
+ return
+ self.camera_controller.start(settings)
+ self.preview_button.setEnabled(False)
+ self.stop_preview_button.setEnabled(True)
+ self.statusBar().showMessage("Camera preview started", 3000)
+ if self.enable_dlc_checkbox.isChecked():
+ self._configure_dlc()
+ else:
+ self._last_pose = None
+
+ def _stop_preview(self) -> None:
+ self.camera_controller.stop()
+ self.preview_button.setEnabled(True)
+ self.stop_preview_button.setEnabled(False)
+ self._current_frame = None
+ self._last_pose = None
+ self.video_label.setPixmap(QPixmap())
+ self.video_label.setText("Camera preview not started")
+ self.statusBar().showMessage("Camera preview stopped", 3000)
+
+ def _on_camera_stopped(self) -> None:
+ self.preview_button.setEnabled(True)
+ self.stop_preview_button.setEnabled(False)
+
+ def _configure_dlc(self) -> None:
+ try:
+ settings = self._dlc_settings_from_ui()
+ except (ValueError, json.JSONDecodeError) as exc:
+ self._show_error(f"Invalid DLCLive settings: {exc}")
+ self.enable_dlc_checkbox.setChecked(False)
+ return
+ self.dlc_processor.configure(settings)
+
+ # ------------------------------------------------------------------ recording
+ def _start_recording(self) -> None:
+ if self._video_recorder and self._video_recorder.is_running:
+ return
+ try:
+ recording = self._recording_settings_from_ui()
+ except json.JSONDecodeError as exc:
+ self._show_error(f"Invalid recording options: {exc}")
+ return
+ if not recording.enabled:
+ self._show_error("Recording is disabled in the configuration.")
+ return
+ output_path = recording.output_path()
+ self._video_recorder = VideoRecorder(output_path, recording.options)
+ try:
+ self._video_recorder.start()
+ except Exception as exc: # pragma: no cover - runtime error
+ self._show_error(str(exc))
+ self._video_recorder = None
+ return
+ self.start_record_button.setEnabled(False)
+ self.stop_record_button.setEnabled(True)
+ self.statusBar().showMessage(f"Recording to {output_path}", 5000)
+
+ def _stop_recording(self) -> None:
+ if not self._video_recorder:
+ return
+ self._video_recorder.stop()
+ self._video_recorder = None
+ self.start_record_button.setEnabled(True)
+ self.stop_record_button.setEnabled(False)
+ self.statusBar().showMessage("Recording stopped", 3000)
+
+ # ------------------------------------------------------------------ frame handling
+ def _on_frame_ready(self, frame_data: FrameData) -> None:
+ frame = frame_data.image
+ self._current_frame = frame
+ if self._video_recorder and self._video_recorder.is_running:
+ self._video_recorder.write(frame)
+ if self.enable_dlc_checkbox.isChecked():
+ self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
+ self._update_video_display(frame)
+
+ def _on_pose_ready(self, result: PoseResult) -> None:
+ self._last_pose = result
+ if self._current_frame is not None:
+ self._update_video_display(self._current_frame)
+
+ def _update_video_display(self, frame: np.ndarray) -> None:
+ display_frame = frame
+ if self._last_pose and self._last_pose.pose is not None:
+ display_frame = self._draw_pose(frame, self._last_pose.pose)
+ rgb = cv2.cvtColor(display_frame, cv2.COLOR_BGR2RGB)
+ h, w, ch = rgb.shape
+ bytes_per_line = ch * w
+ image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
+ self.video_label.setPixmap(QPixmap.fromImage(image))
+
+ def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
+ overlay = frame.copy()
+ for keypoint in np.asarray(pose):
+ if len(keypoint) < 2:
+ continue
+ x, y = keypoint[:2]
+ if np.isnan(x) or np.isnan(y):
+ continue
+ cv2.circle(overlay, (int(x), int(y)), 4, (0, 255, 0), -1)
+ return overlay
+
+ def _on_dlc_initialised(self, success: bool) -> None:
+ if success:
+ self.statusBar().showMessage("DLCLive initialised", 3000)
+ else:
+ self.statusBar().showMessage("DLCLive initialisation failed", 3000)
+
+ # ------------------------------------------------------------------ helpers
+ def _show_error(self, message: str) -> None:
+ self.statusBar().showMessage(message, 5000)
+ QMessageBox.critical(self, "Error", message)
+
+ # ------------------------------------------------------------------ Qt overrides
+ def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
+ if self.camera_controller.is_running():
+ self.camera_controller.stop()
+ if self._video_recorder and self._video_recorder.is_running:
+ self._video_recorder.stop()
+ self.dlc_processor.shutdown()
+ super().closeEvent(event)
+
+
+def main() -> None:
+ app = QApplication(sys.argv)
+ window = MainWindow()
+ window.show()
+ sys.exit(app.exec())
+
+
+if __name__ == "__main__": # pragma: no cover - manual start
+ main()
diff --git a/dlclivegui/pose_process.py b/dlclivegui/pose_process.py
deleted file mode 100644
index 7ae4809..0000000
--- a/dlclivegui/pose_process.py
+++ /dev/null
@@ -1,273 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import multiprocess as mp
-import threading
-import time
-import pandas as pd
-import numpy as np
-
-from dlclivegui import CameraProcess
-from dlclivegui.queue import ClearableQueue, ClearableMPQueue
-
-
-class DLCLiveProcessError(Exception):
- """
- Exception for incorrect use of DLC-live-GUI Process Manager
- """
-
- pass
-
-
-class CameraPoseProcess(CameraProcess):
- """ Camera Process Manager class. Controls image capture, pose estimation and writing images to a video file in a background process.
-
- Parameters
- ----------
- device : :class:`cameracontrol.Camera`
- a camera object
- ctx : :class:`multiprocess.Context`
- multiprocessing context
- """
-
- def __init__(self, device, ctx=mp.get_context("spawn")):
- """ Constructor method
- """
-
- super().__init__(device, ctx)
- self.display_pose = None
- self.display_pose_queue = ClearableMPQueue(2, ctx=self.ctx)
- self.pose_process = None
-
- def start_pose_process(self, dlc_params, timeout=300):
-
- self.pose_process = self.ctx.Process(
- target=self._run_pose,
- args=(self.frame_shared, self.frame_time_shared, dlc_params),
- daemon=True,
- )
- self.pose_process.start()
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "pose") and (cmd[1] == "start"):
- return cmd[2]
- else:
- self.q_to_process.write(cmd)
-
- def _run_pose(self, frame_shared, frame_time, dlc_params):
-
- res = self.device.im_size
- self.frame = np.frombuffer(frame_shared.get_obj(), dtype="uint8").reshape(
- res[1], res[0], 3
- )
- self.frame_time = np.frombuffer(frame_time.get_obj(), dtype="d")
-
- ret = self._open_dlc_live(dlc_params)
- self.q_from_process.write(("pose", "start", ret))
-
- self._pose_loop()
- self.q_from_process.write(("pose", "end"))
-
- def _open_dlc_live(self, dlc_params):
-
- from dlclive import DLCLive
-
- ret = False
-
- self.opt_rate = True if dlc_params.pop("mode") == "Optimize Rate" else False
-
- proc_params = dlc_params.pop("processor")
- if proc_params is not None:
- proc_obj = proc_params.pop("object", None)
- if proc_obj is not None:
- dlc_params["processor"] = proc_obj(**proc_params)
-
- self.dlc = DLCLive(**dlc_params)
- if self.frame is not None:
- self.dlc.init_inference(
- self.frame, frame_time=self.frame_time[0], record=False
- )
- self.poses = []
- self.pose_times = []
- self.pose_frame_times = []
- ret = True
-
- return ret
-
- def _pose_loop(self):
- """ Conduct pose estimation using deeplabcut-live in loop
- """
-
- run = True
- write = False
- frame_time = 0
- pose_time = 0
- end_time = time.time()
-
- while run:
-
- ref_time = frame_time if self.opt_rate else end_time
-
- if self.frame_time[0] > ref_time:
-
- frame = self.frame
- frame_time = self.frame_time[0]
- pose = self.dlc.get_pose(frame, frame_time=frame_time, record=write)
- pose_time = time.time()
-
- self.display_pose_queue.write(pose, clear=True)
-
- if write:
- self.poses.append(pose)
- self.pose_times.append(pose_time)
- self.pose_frame_times.append(frame_time)
-
- cmd = self.q_to_process.read()
- if cmd is not None:
- if cmd[0] == "pose":
- if cmd[1] == "write":
- write = cmd[2]
- self.q_from_process.write(cmd)
- elif cmd[1] == "save":
- ret = self._save_pose(cmd[2])
- self.q_from_process.write(cmd + (ret,))
- elif cmd[1] == "end":
- run = False
- else:
- self.q_to_process.write(cmd)
-
- def start_record(self, timeout=5):
-
- ret = super().start_record(timeout=timeout)
-
- if (self.pose_process is not None) and (self.writer_process is not None):
- if (self.pose_process.is_alive()) and (self.writer_process.is_alive()):
- self.q_to_process.write(("pose", "write", True))
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "pose") and (cmd[1] == "write"):
- ret = cmd[2]
- break
- else:
- self.q_from_process.write(cmd)
-
- return ret
-
- def stop_record(self, timeout=5):
-
- ret = super().stop_record(timeout=timeout)
-
- if (self.pose_process is not None) and (self.writer_process is not None):
- if (self.pose_process.is_alive()) and (self.writer_process.is_alive()):
- self.q_to_process.write(("pose", "write", False))
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "pose") and (cmd[1] == "write"):
- ret = not cmd[2]
- break
- else:
- self.q_from_process.write(cmd)
-
- return ret
-
- def stop_pose_process(self):
-
- ret = True
- if self.pose_process is not None:
- if self.pose_process.is_alive():
- self.q_to_process.write(("pose", "end"))
-
- while True:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if cmd[0] == "pose":
- if cmd[1] == "end":
- break
- else:
- self.q_from_process.write(cmd)
-
- self.pose_process.join(5)
- if self.pose_process.is_alive():
- self.pose_process.terminate()
-
- return True
-
- def save_pose(self, filename, timeout=60):
-
- ret = False
- if self.pose_process is not None:
- if self.pose_process.is_alive():
- self.q_to_process.write(("pose", "save", filename))
-
- stime = time.time()
- while time.time() - stime < timeout:
- cmd = self.q_from_process.read()
- if cmd is not None:
- if (cmd[0] == "pose") and (cmd[1] == "save"):
- ret = cmd[3]
- break
- else:
- self.q_from_process.write(cmd)
- return ret
-
- def _save_pose(self, filename):
- """ Saves a pandas data frame with pose data collected while recording video
-
- Returns
- -------
- bool
- a logical flag indicating whether save was successful
- """
-
- ret = False
-
- if len(self.pose_times) > 0:
-
- dlc_file = f"{filename}_DLC.hdf5"
- proc_file = f"{filename}_PROC"
-
- bodyparts = self.dlc.cfg["all_joints_names"]
- poses = np.array(self.poses)
- poses = poses.reshape((poses.shape[0], poses.shape[1] * poses.shape[2]))
- pdindex = pd.MultiIndex.from_product(
- [bodyparts, ["x", "y", "likelihood"]], names=["bodyparts", "coords"]
- )
- pose_df = pd.DataFrame(poses, columns=pdindex)
- pose_df["frame_time"] = self.pose_frame_times
- pose_df["pose_time"] = self.pose_times
-
- pose_df.to_hdf(dlc_file, key="df_with_missing", mode="w")
- if self.dlc.processor is not None:
- self.dlc.processor.save(proc_file)
-
- self.poses = []
- self.pose_times = []
- self.pose_frame_times = []
-
- ret = True
-
- return ret
-
- def get_display_pose(self):
-
- pose = self.display_pose_queue.read(clear=True)
- if pose is not None:
- self.display_pose = pose
- if self.device.display_resize != 1:
- self.display_pose[:, :2] *= self.device.display_resize
-
- return self.display_pose
diff --git a/dlclivegui/processor/__init__.py b/dlclivegui/processor/__init__.py
deleted file mode 100644
index b97a9cc..0000000
--- a/dlclivegui/processor/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .teensy_laser.teensy_laser import TeensyLaser
diff --git a/dlclivegui/processor/processor.py b/dlclivegui/processor/processor.py
deleted file mode 100644
index 05eb7a8..0000000
--- a/dlclivegui/processor/processor.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-"""
-Default processor class. Processors must contain two methods:
-i) process: takes in a pose, performs operations, and returns a pose
-ii) save: saves any internal data generated by the processor (such as timestamps for commands to external hardware)
-"""
-
-
-class Processor(object):
- def __init__(self):
- pass
-
- def process(self, pose):
- return pose
-
- def save(self, file=""):
- return 0
diff --git a/dlclivegui/processor/teensy_laser/__init__.py b/dlclivegui/processor/teensy_laser/__init__.py
deleted file mode 100644
index d2f10ca..0000000
--- a/dlclivegui/processor/teensy_laser/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .teensy_laser import *
diff --git a/dlclivegui/processor/teensy_laser/teensy_laser.ino b/dlclivegui/processor/teensy_laser/teensy_laser.ino
deleted file mode 100644
index 76a470b..0000000
--- a/dlclivegui/processor/teensy_laser/teensy_laser.ino
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Commands:
- * O = opto on; command = O, frequency, width, duration
- * X = opto off
- * R = reboot
- */
-
-
-const int opto_pin = 0;
-unsigned int opto_start = 0,
- opto_duty_cycle = 0,
- opto_freq = 0,
- opto_width = 0,
- opto_dur = 0;
-
-unsigned int read_int16() {
- union u_tag {
- byte b[2];
- unsigned int val;
- } par;
- for (int i=0; i<2; i++){
- if ((Serial.available() > 0))
- par.b[i] = Serial.read();
- else
- par.b[i] = 0;
- }
- return par.val;
-}
-
-void setup() {
- Serial.begin(115200);
- pinMode(opto_pin, OUTPUT);
-}
-
-void loop() {
-
- unsigned int curr_time = millis();
-
- while (Serial.available() > 0) {
-
- unsigned int cmd = Serial.read();
-
- if(cmd == 'O') {
-
- opto_start = curr_time;
- opto_freq = read_int16();
- opto_width = read_int16();
- opto_dur = read_int16();
- if (opto_dur == 0)
- opto_dur = 65355;
- opto_duty_cycle = opto_width * opto_freq * 4096 / 1000;
- analogWriteFrequency(opto_pin, opto_freq);
- analogWrite(opto_pin, opto_duty_cycle);
-
- Serial.print(opto_freq);
- Serial.print(',');
- Serial.print(opto_width);
- Serial.print(',');
- Serial.print(opto_dur);
- Serial.print('\n');
- Serial.flush();
-
- } else if(cmd == 'X') {
-
- analogWrite(opto_pin, 0);
-
- } else if(cmd == 'R') {
-
- _reboot_Teensyduino_();
-
- }
- }
-
- if (curr_time > opto_start + opto_dur)
- analogWrite(opto_pin, 0);
-
-}
diff --git a/dlclivegui/processor/teensy_laser/teensy_laser.py b/dlclivegui/processor/teensy_laser/teensy_laser.py
deleted file mode 100644
index 4535d55..0000000
--- a/dlclivegui/processor/teensy_laser/teensy_laser.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from ..processor import Processor
-import serial
-import struct
-import time
-
-
-class TeensyLaser(Processor):
- def __init__(
- self, com, baudrate=115200, pulse_freq=50, pulse_width=5, max_stim_dur=0
- ):
-
- super().__init__()
- self.ser = serial.Serial(com, baudrate)
- self.pulse_freq = pulse_freq
- self.pulse_width = pulse_width
- self.max_stim_dur = (
- max_stim_dur if (max_stim_dur >= 0) and (max_stim_dur < 65356) else 0
- )
- self.stim_on = False
- self.stim_on_time = []
- self.stim_off_time = []
-
- def close_serial(self):
-
- self.ser.close()
-
- def stimulate_on(self):
-
- # command to activate PWM signal to laser is the letter 'O' followed by three 16 bit integers -- pulse frequency, pulse width, and max stim duration
- if not self.stim_on:
- self.ser.write(
- b"O"
- + struct.pack(
- "HHH", self.pulse_freq, self.pulse_width, self.max_stim_dur
- )
- )
- self.stim_on = True
- self.stim_on_time.append(time.time())
-
- def stim_off(self):
-
- # command to turn off PWM signal to laser is the letter 'X'
- if self.stim_on:
- self.ser.write(b"X")
- self.stim_on = False
- self.stim_off_time.append(time.time())
-
- def process(self, pose):
-
- # define criteria to stimulate (e.g. if first point is in a corner of the video)
- box = [[0, 100], [0, 100]]
- if (
- (pose[0][0] > box[0][0])
- and (pose[0][0] < box[0][1])
- and (pose[0][1] > box[1][0])
- and (pose[0][1] < box[1][1])
- ):
- self.stimulate_on()
- else:
- self.stim_off()
-
- return pose
-
- def save(self, file=None):
-
- ### save stim on and stim off times
- save_code = 0
- if file:
- try:
- pickle.dump(
- {"stim_on": self.stim_on_time, "stim_off": self.stim_off_time},
- open(file, "wb"),
- )
- save_code = 1
- except Exception:
- save_code = -1
- return save_code
diff --git a/dlclivegui/queue.py b/dlclivegui/queue.py
deleted file mode 100644
index 59bc43c..0000000
--- a/dlclivegui/queue.py
+++ /dev/null
@@ -1,208 +0,0 @@
-import multiprocess as mp
-from multiprocess import queues
-from queue import Queue, Empty, Full
-
-
-class QueuePositionError(Exception):
- """ Error in position argument of queue read """
-
- pass
-
-
-class ClearableQueue(Queue):
- """ A Queue that provides safe methods for writing to a full queue, reading to an empty queue, and a method to clear the queue """
-
- def __init__(self, maxsize=0):
-
- super().__init__(maxsize)
-
- def clear(self):
- """ Clears queue, returns all objects in a list
-
- Returns
- -------
- list
- list of objects from the queue
- """
-
- objs = []
-
- try:
- while True:
- objs.append(self.get_nowait())
- except Empty:
- pass
-
- return objs
-
- def write(self, obj, clear=False):
- """ Puts an object in the queue, with an option to clear queue before writing.
-
- Parameters
- ----------
- obj : [type]
- An object to put in the queue
- clear : bool, optional
- flag to clear queue before putting, by default False
-
- Returns
- -------
- bool
- if write was sucessful, returns True
- """
-
- if clear:
- self.clear()
-
- try:
- self.put_nowait(obj)
- success = True
- except Full:
- success = False
-
- return success
-
- def read(self, clear=False, position="last"):
- """ Gets an object in the queue, with the option to clear the queue and return the first element, last element, or all elements
-
- Parameters
- ----------
- clear : bool, optional
- flag to clear queue before putting, by default False
- position : str, optional
- If clear is True, returned object depends on position.
- If position = "last", returns last object.
- If position = "first", returns first object.
- If position = "all", returns all objects from the queue.
-
- Returns
- -------
- object
- object retrieved from the queue
- """
-
- obj = None
-
- if clear:
-
- objs = self.clear()
-
- if len(objs) > 0:
- if position == "first":
- obj = objs[0]
- elif position == "last":
- obj = objs[-1]
- elif position == "all":
- obj = objs
- else:
- raise QueuePositionError(
- "Queue read position should be one of 'first', 'last', or 'all'"
- )
- else:
-
- try:
- obj = self.get_nowait()
- except Empty:
- pass
-
- return obj
-
-
-class ClearableMPQueue(mp.queues.Queue):
- """ A multiprocess Queue that provides safe methods for writing to a full queue, reading to an empty queue, and a method to clear the queue """
-
- def __init__(self, maxsize=0, ctx=mp.get_context("spawn")):
-
- super().__init__(maxsize, ctx=ctx)
-
- def clear(self):
- """ Clears queue, returns all objects in a list
-
- Returns
- -------
- list
- list of objects from the queue
- """
-
- objs = []
-
- try:
- while True:
- objs.append(self.get_nowait())
- except Empty:
- pass
-
- return objs
-
- def write(self, obj, clear=False):
- """ Puts an object in the queue, with an option to clear queue before writing.
-
- Parameters
- ----------
- obj : [type]
- An object to put in the queue
- clear : bool, optional
- flag to clear queue before putting, by default False
-
- Returns
- -------
- bool
- if write was sucessful, returns True
- """
-
- if clear:
- self.clear()
-
- try:
- self.put_nowait(obj)
- success = True
- except Full:
- success = False
-
- return success
-
- def read(self, clear=False, position="last"):
- """ Gets an object in the queue, with the option to clear the queue and return the first element, last element, or all elements
-
- Parameters
- ----------
- clear : bool, optional
- flag to clear queue before putting, by default False
- position : str, optional
- If clear is True, returned object depends on position.
- If position = "last", returns last object.
- If position = "first", returns first object.
- If position = "all", returns all objects from the queue.
-
- Returns
- -------
- object
- object retrieved from the queue
- """
-
- obj = None
-
- if clear:
-
- objs = self.clear()
-
- if len(objs) > 0:
- if position == "first":
- obj = objs[0]
- elif position == "last":
- obj = objs[-1]
- elif position == "all":
- obj = objs
- else:
- raise QueuePositionError(
- "Queue read position should be one of 'first', 'last', or 'all'"
- )
-
- else:
-
- try:
- obj = self.get_nowait()
- except Empty:
- pass
-
- return obj
diff --git a/dlclivegui/tkutil.py b/dlclivegui/tkutil.py
deleted file mode 100644
index 3a5837e..0000000
--- a/dlclivegui/tkutil.py
+++ /dev/null
@@ -1,195 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import tkinter as tk
-from tkinter import ttk
-from distutils.util import strtobool
-
-
-class SettingsWindow(tk.Toplevel):
- def __init__(
- self,
- title="Edit Settings",
- settings={},
- names=None,
- vals=None,
- dtypes=None,
- restrictions=None,
- parent=None,
- ):
- """ Create a tkinter settings window
-
- Parameters
- ----------
- title : str, optional
- title for window
- settings : dict, optional
- dictionary of settings with keys = setting names.
- The value for each setting should be a dictionary with three keys:
- value (a default value),
- dtype (the data type for the setting),
- restriction (a list of possible values the parameter can take on)
- names : list, optional
- list of setting names, by default None
- vals : list, optional
- list of default values, by default None
- dtypes : list, optional
- list of setting data types, by default None
- restrictions : dict, optional
- dictionary of setting value restrictions, with keys = setting name and value = list of restrictions, by default {}
- parent : :class:`tkinter.Tk`, optional
- parent window, by default None
-
- Raises
- ------
- ValueError
- throws error if neither settings dictionary nor setting names are provided
- """
-
- super().__init__(parent)
- self.title(title)
-
- if settings:
- self.settings = settings
- elif not names:
- raise ValueError(
- "No argument names or settings dictionary. One must be provided to create a SettingsWindow."
- )
- else:
- self.settings = self.create_settings_dict(names, vals, dtypes, restrictions)
-
- self.cur_row = 0
- self.combobox_width = 15
-
- self.create_window()
-
- def create_settings_dict(self, names, vals=None, dtypes=None, restrictions=None):
- """Create dictionary of settings from names, vals, dtypes, and restrictions
-
- Parameters
- ----------
- names : list
- list of setting names
- vals : list
- list of default setting values
- dtypes : list
- list of setting dtype
- restrictions : dict
- dictionary of settting restrictions
-
- Returns
- -------
- dict
- settings dictionary with keys = names and value = dictionary with value, dtype, restrictions
- """
-
- set_dict = {}
- for i in range(len(names)):
-
- dt = dtypes[i] if dtypes is not None else None
-
- if vals is not None:
- val = dt(val) if type(dt) is type else [dt[0](v) for v in val]
- else:
- val = None
-
- restrict = restrictions[names[i]] if restrictions is not None else None
-
- set_dict[names[i]] = {"value": val, "dtype": dt, "restriction": restrict}
-
- return set_dict
-
- def create_window(self):
- """ Create settings GUI widgets
- """
-
- self.entry_vars = []
- names = tuple(self.settings.keys())
- for i in range(len(names)):
-
- this_setting = self.settings[names[i]]
-
- tk.Label(self, text=names[i] + ": ").grid(row=self.cur_row, column=0)
-
- v = this_setting["value"]
- if type(this_setting["dtype"]) is list:
- v = [str(x) if x is not None else "" for x in v]
- v = ", ".join(v)
- else:
- v = str(v) if v is not None else ""
- self.entry_vars.append(tk.StringVar(self, value=v))
-
- use_restriction = False
- if "restriction" in this_setting:
- if this_setting["restriction"] is not None:
- use_restriction = True
-
- if use_restriction:
- ttk.Combobox(
- self,
- textvariable=self.entry_vars[-1],
- values=this_setting["restriction"],
- state="readonly",
- width=self.combobox_width,
- ).grid(sticky="nsew", row=self.cur_row, column=1)
- else:
- tk.Entry(self, textvariable=self.entry_vars[-1]).grid(
- sticky="nsew", row=self.cur_row, column=1
- )
-
- self.cur_row += 1
-
- self.cur_row += 1
- tk.Button(self, text="Update", command=self.update_vals).grid(
- sticky="nsew", row=self.cur_row, column=1
- )
- self.cur_row += 1
- tk.Button(self, text="Cancel", command=self.destroy).grid(
- sticky="nsew", row=self.cur_row, column=1
- )
-
- _, row_count = self.grid_size()
- for r in range(row_count):
- self.grid_rowconfigure(r, minsize=20)
-
- def update_vals(self):
-
- names = tuple(self.settings.keys())
-
- for i in range(len(self.entry_vars)):
-
- name = names[i]
- val = self.entry_vars[i].get()
- dt = (
- self.settings[name]["dtype"] if "dtype" in self.settings[name] else None
- )
-
- val = [v.strip() for v in val.split(",")]
- use_dt = dt if type(dt) is type else dt[0]
- use_dt = strtobool if use_dt is bool else use_dt
-
- try:
- val = [use_dt(v) if v else None for v in val]
- except TypeError:
- pass
-
- val = val if type(dt) is list else val[0]
-
- self.settings[name]["value"] = val
-
- self.quit()
- self.destroy()
-
- def get_values(self):
-
- val_dict = {}
- names = tuple(self.settings.keys())
- for i in range(len(self.settings)):
- val_dict[names[i]] = self.settings[names[i]]["value"]
-
- return val_dict
diff --git a/dlclivegui/video.py b/dlclivegui/video.py
deleted file mode 100644
index d05f5b8..0000000
--- a/dlclivegui/video.py
+++ /dev/null
@@ -1,274 +0,0 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
-
-import os
-import numpy as np
-import pandas as pd
-import cv2
-import colorcet as cc
-from PIL import ImageColor
-from tqdm import tqdm
-
-
-def create_labeled_video(
- data_dir,
- out_dir=None,
- dlc_online=True,
- save_images=False,
- cut=(0, np.Inf),
- crop=None,
- cmap="bmy",
- radius=3,
- lik_thresh=0.5,
- write_ts=False,
- write_scale=2,
- write_pos="bottom-left",
- write_ts_offset=0,
- display=False,
- progress=True,
- label=True,
-):
- """ Create a labeled video from DeepLabCut-live-GUI recording
-
- Parameters
- ----------
- data_dir : str
- path to data directory
- dlc_online : bool, optional
- flag indicating dlc keypoints from online tracking, using DeepLabCut-live-GUI, or offline tracking, using :func:`dlclive.benchmark_videos`
- out_file : str, optional
- path for output file. If None, output file will be "'video_file'_LABELED.avi". by default None. If NOn
- save_images : bool, optional
- boolean flag to save still images in a folder
- cut : tuple, optional
- time of video to use. Will only save labeled video for time after cut[0] and before cut[1], by default (0, np.Inf)
- cmap : str, optional
- a :package:`colorcet` colormap, by default 'bmy'
- radius : int, optional
- radius for keypoints, by default 3
- lik_thresh : float, optional
- likelihood threshold to plot keypoints, by default 0.5
- display : bool, optional
- boolean flag to display images as video is written, by default False
- progress : bool, optional
- boolean flag to display progress bar
-
- Raises
- ------
- Exception
- if frames cannot be read from the video file
- """
-
- base_dir = os.path.basename(data_dir)
- video_file = os.path.normpath(f"{data_dir}/{base_dir}_VIDEO.avi")
- ts_file = os.path.normpath(f"{data_dir}/{base_dir}_TS.npy")
- dlc_file = (
- os.path.normpath(f"{data_dir}/{base_dir}_DLC.hdf5")
- if dlc_online
- else os.path.normpath(f"{data_dir}/{base_dir}_VIDEO_DLCLIVE_POSES.h5")
- )
-
- cap = cv2.VideoCapture(video_file)
- cam_frame_times = np.load(ts_file)
- n_frames = cam_frame_times.size
-
- lab = "LABELED" if label else "UNLABELED"
- if out_dir:
- out_file = (
- f"{out_dir}/{os.path.splitext(os.path.basename(video_file))[0]}_{lab}.avi"
- )
- out_times_file = (
- f"{out_dir}/{os.path.splitext(os.path.basename(ts_file))[0]}_{lab}.npy"
- )
- else:
- out_file = f"{os.path.splitext(video_file)[0]}_{lab}.avi"
- out_times_file = f"{os.path.splitext(ts_file)[0]}_{lab}.npy"
-
- os.makedirs(os.path.normpath(os.path.dirname(out_file)), exist_ok=True)
-
- if save_images:
- im_dir = os.path.splitext(out_file)[0]
- os.makedirs(im_dir, exist_ok=True)
-
- im_size = (
- int(cap.get(cv2.CAP_PROP_FRAME_WIDTH)),
- int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT)),
- )
- if crop is not None:
- crop[0] = crop[0] if crop[0] > 0 else 0
- crop[1] = crop[1] if crop[1] > 0 else im_size[1]
- crop[2] = crop[2] if crop[2] > 0 else 0
- crop[3] = crop[3] if crop[3] > 0 else im_size[0]
- im_size = (crop[3] - crop[2], crop[1] - crop[0])
-
- fourcc = cv2.VideoWriter_fourcc(*"DIVX")
- fps = cap.get(cv2.CAP_PROP_FPS)
- vwriter = cv2.VideoWriter(out_file, fourcc, fps, im_size)
- label_times = []
-
- if write_ts:
- ts_font = cv2.FONT_HERSHEY_PLAIN
-
- if "left" in write_pos:
- ts_w = 0
- else:
- ts_w = (
- im_size[0] if crop is None else (crop[3] - crop[2]) - (55 * write_scale)
- )
-
- if "bottom" in write_pos:
- ts_h = im_size[1] if crop is None else (crop[1] - crop[0])
- else:
- ts_h = 0 if crop is None else crop[0] + (12 * write_scale)
-
- ts_coord = (ts_w, ts_h)
- ts_color = (255, 255, 255)
- ts_size = 2
-
- poses = pd.read_hdf(dlc_file)
- if dlc_online:
- pose_times = poses["pose_time"]
- else:
- poses["frame_time"] = cam_frame_times
- poses["pose_time"] = cam_frame_times
- poses = poses.melt(id_vars=["frame_time", "pose_time"])
- bodyparts = poses["bodyparts"].unique()
-
- all_colors = getattr(cc, cmap)
- colors = [
- ImageColor.getcolor(c, "RGB")[::-1]
- for c in all_colors[:: int(len(all_colors) / bodyparts.size)]
- ]
-
- ind = 0
- vid_time = 0
- while vid_time < cut[0]:
-
- cur_time = cam_frame_times[ind]
- vid_time = cur_time - cam_frame_times[0]
- ret, frame = cap.read()
- ind += 1
-
- if not ret:
- raise Exception(
- f"Could not read frame = {ind+1} at time = {cur_time-cam_frame_times[0]}."
- )
-
- frame_times_sub = cam_frame_times[
- (cam_frame_times - cam_frame_times[0] > cut[0])
- & (cam_frame_times - cam_frame_times[0] < cut[1])
- ]
- iterator = (
- tqdm(range(ind, ind + frame_times_sub.size))
- if progress
- else range(ind, ind + frame_times_sub.size)
- )
- this_pose = np.zeros((bodyparts.size, 3))
-
- for i in iterator:
-
- cur_time = cam_frame_times[i]
- vid_time = cur_time - cam_frame_times[0]
- ret, frame = cap.read()
-
- if not ret:
- raise Exception(
- f"Could not read frame = {i+1} at time = {cur_time-cam_frame_times[0]}."
- )
-
- if dlc_online:
- poses_before_index = np.where(pose_times < cur_time)[0]
- if poses_before_index.size > 0:
- cur_pose_time = pose_times[poses_before_index[-1]]
- this_pose = poses[poses["pose_time"] == cur_pose_time]
- else:
- this_pose = poses[poses["frame_time"] == cur_time]
-
- if label:
- for j in range(bodyparts.size):
- this_bp = this_pose[this_pose["bodyparts"] == bodyparts[j]][
- "value"
- ].values
- if this_bp[2] > lik_thresh:
- x = int(this_bp[0])
- y = int(this_bp[1])
- frame = cv2.circle(frame, (x, y), radius, colors[j], thickness=-1)
-
- if crop is not None:
- frame = frame[crop[0] : crop[1], crop[2] : crop[3]]
-
- if write_ts:
- frame = cv2.putText(
- frame,
- f"{(vid_time-write_ts_offset):0.3f}",
- ts_coord,
- ts_font,
- write_scale,
- ts_color,
- ts_size,
- )
-
- if display:
- cv2.imshow("DLC Live Labeled Video", frame)
- cv2.waitKey(1)
-
- vwriter.write(frame)
- label_times.append(cur_time)
- if save_images:
- new_file = f"{im_dir}/frame_{i}.png"
- cv2.imwrite(new_file, frame)
-
- if display:
- cv2.destroyAllWindows()
-
- vwriter.release()
- np.save(out_times_file, label_times)
-
-
-def main():
-
- import argparse
- import os
-
- parser = argparse.ArgumentParser()
- parser.add_argument("dir", type=str)
- parser.add_argument("-o", "--out-dir", type=str, default=None)
- parser.add_argument("--dlc-offline", action="store_true")
- parser.add_argument("-s", "--save-images", action="store_true")
- parser.add_argument("-u", "--cut", nargs="+", type=float, default=[0, np.Inf])
- parser.add_argument("-c", "--crop", nargs="+", type=int, default=None)
- parser.add_argument("-m", "--cmap", type=str, default="bmy")
- parser.add_argument("-r", "--radius", type=int, default=3)
- parser.add_argument("-l", "--lik-thresh", type=float, default=0.5)
- parser.add_argument("-w", "--write-ts", action="store_true")
- parser.add_argument("--write-scale", type=int, default=2)
- parser.add_argument("--write-pos", type=str, default="bottom-left")
- parser.add_argument("--write-ts-offset", type=float, default=0.0)
- parser.add_argument("-d", "--display", action="store_true")
- parser.add_argument("--no-progress", action="store_false")
- parser.add_argument("--no-label", action="store_false")
- args = parser.parse_args()
-
- create_labeled_video(
- args.dir,
- out_dir=args.out_dir,
- dlc_online=(not args.dlc_offline),
- save_images=args.save_images,
- cut=tuple(args.cut),
- crop=args.crop,
- cmap=args.cmap,
- radius=args.radius,
- lik_thresh=args.lik_thresh,
- write_ts=args.write_ts,
- write_scale=args.write_scale,
- write_pos=args.write_pos,
- write_ts_offset=args.write_ts_offset,
- display=args.display,
- progress=args.no_progress,
- label=args.no_label,
- )
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
new file mode 100644
index 0000000..e0e3706
--- /dev/null
+++ b/dlclivegui/video_recorder.py
@@ -0,0 +1,46 @@
+"""Video recording support using the vidgear library."""
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any, Dict, Optional
+
+import numpy as np
+
+try:
+ from vidgear.gears import WriteGear
+except ImportError: # pragma: no cover - handled at runtime
+ WriteGear = None # type: ignore[assignment]
+
+
+class VideoRecorder:
+ """Thin wrapper around :class:`vidgear.gears.WriteGear`."""
+
+ def __init__(self, output: Path | str, options: Optional[Dict[str, Any]] = None):
+ self._output = Path(output)
+ self._options = options or {}
+ self._writer: Optional[WriteGear] = None
+
+ @property
+ def is_running(self) -> bool:
+ return self._writer is not None
+
+ def start(self) -> None:
+ if WriteGear is None:
+ raise RuntimeError(
+ "vidgear is required for video recording. Install it with 'pip install vidgear'."
+ )
+ if self._writer is not None:
+ return
+ self._output.parent.mkdir(parents=True, exist_ok=True)
+ self._writer = WriteGear(output_filename=str(self._output), logging=False, **self._options)
+
+ def write(self, frame: np.ndarray) -> None:
+ if self._writer is None:
+ return
+ self._writer.write(frame)
+
+ def stop(self) -> None:
+ if self._writer is None:
+ return
+ self._writer.close()
+ self._writer = None
diff --git a/setup.py b/setup.py
index 28eb6cc..163f8f0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,36 +1,32 @@
-"""
-DeepLabCut Toolbox (deeplabcut.org)
-© A. & M. Mathis Labs
-
-Licensed under GNU Lesser General Public License v3.0
-"""
-
+"""Setup configuration for the DeepLabCut Live GUI."""
+from __future__ import annotations
import setuptools
-with open("README.md", "r") as fh:
+with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()
setuptools.setup(
name="deeplabcut-live-gui",
- version="1.0",
+ version="2.0",
author="A. & M. Mathis Labs",
author_email="adim@deeplabcut.org",
- description="GUI to run real time deeplabcut experiments",
+ description="PyQt-based GUI to run real time DeepLabCut experiments",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/DeepLabCut/DeepLabCut-live-GUI",
- python_requires=">=3.5, <3.11",
+ python_requires=">=3.11",
install_requires=[
"deeplabcut-live",
- "pyserial",
- "pandas",
- "tables",
- "multiprocess",
- "imutils",
- "pillow",
- "tqdm",
+ "PyQt6",
+ "numpy",
+ "opencv-python",
+ "vidgear[core]",
],
+ extras_require={
+ "basler": ["pypylon"],
+ "gentl": ["pygobject"],
+ },
packages=setuptools.find_packages(),
include_package_data=True,
classifiers=(
@@ -40,8 +36,7 @@
),
entry_points={
"console_scripts": [
- "dlclivegui=dlclivegui.dlclivegui:main",
- "dlclivegui-video=dlclivegui.video:main",
+ "dlclivegui=dlclivegui.gui:main",
]
},
)
From 893b28ad3e01bf1b29613886b9527b6777e9f22a Mon Sep 17 00:00:00 2001
From: Artur <35294812+arturoptophys@users.noreply.github.com>
Date: Tue, 21 Oct 2025 14:55:15 +0200
Subject: [PATCH 002/132] Rearrange UI and improve camera controls
---
dlclivegui/camera_controller.py | 17 +-
dlclivegui/cameras/base.py | 5 +
dlclivegui/cameras/factory.py | 62 ++++++-
dlclivegui/cameras/opencv_backend.py | 16 ++
dlclivegui/dlc_processor.py | 20 +++
dlclivegui/gui.py | 255 +++++++++++++++++++++++----
dlclivegui/video_recorder.py | 2 +-
7 files changed, 330 insertions(+), 47 deletions(-)
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 3398566..c8a5aaf 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -1,12 +1,12 @@
"""Camera management for the DLC Live GUI."""
from __future__ import annotations
-import time
from dataclasses import dataclass
+from threading import Event
from typing import Optional
import numpy as np
-from PyQt6.QtCore import QMetaObject, QObject, QThread, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtCore import QObject, QThread, pyqtSignal, pyqtSlot
from .cameras import CameraFactory
from .cameras.base import CameraBackend
@@ -31,12 +31,12 @@ class CameraWorker(QObject):
def __init__(self, settings: CameraSettings):
super().__init__()
self._settings = settings
- self._running = False
+ self._stop_event = Event()
self._backend: Optional[CameraBackend] = None
@pyqtSlot()
def run(self) -> None:
- self._running = True
+ self._stop_event.clear()
try:
self._backend = CameraFactory.create(self._settings)
self._backend.open()
@@ -45,7 +45,7 @@ def run(self) -> None:
self.finished.emit()
return
- while self._running:
+ while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
except Exception as exc: # pragma: no cover - device specific
@@ -63,7 +63,7 @@ def run(self) -> None:
@pyqtSlot()
def stop(self) -> None:
- self._running = False
+ self._stop_event.set()
if self._backend is not None:
try:
self._backend.stop()
@@ -106,11 +106,8 @@ def stop(self) -> None:
if not self.is_running():
return
assert self._worker is not None
- QMetaObject.invokeMethod(
- self._worker, "stop", Qt.ConnectionType.QueuedConnection
- )
+ self._worker.stop()
assert self._thread is not None
- self._thread.quit()
self._thread.wait()
@pyqtSlot()
diff --git a/dlclivegui/cameras/base.py b/dlclivegui/cameras/base.py
index 6ae79dc..910331c 100644
--- a/dlclivegui/cameras/base.py
+++ b/dlclivegui/cameras/base.py
@@ -33,6 +33,11 @@ def stop(self) -> None:
# Most backends do not require additional handling, but subclasses may
# override when they need to interrupt blocking reads.
+ def device_name(self) -> str:
+ """Return a human readable name for the device currently in use."""
+
+ return self.settings.name
+
@abstractmethod
def open(self) -> None:
"""Open the capture device."""
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index e9704ef..c67f7bd 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -2,12 +2,21 @@
from __future__ import annotations
import importlib
-from typing import Dict, Iterable, Tuple, Type
+from dataclasses import dataclass
+from typing import Dict, Iterable, List, Tuple, Type
from ..config import CameraSettings
from .base import CameraBackend
+@dataclass
+class DetectedCamera:
+ """Information about a camera discovered during probing."""
+
+ index: int
+ label: str
+
+
_BACKENDS: Dict[str, Tuple[str, str]] = {
"opencv": ("dlclivegui.cameras.opencv_backend", "OpenCVCameraBackend"),
"basler": ("dlclivegui.cameras.basler_backend", "BaslerCameraBackend"),
@@ -38,6 +47,57 @@ def available_backends() -> Dict[str, bool]:
availability[name] = backend_cls.is_available()
return availability
+ @staticmethod
+ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
+ """Probe ``backend`` for available cameras.
+
+ Parameters
+ ----------
+ backend:
+ The backend identifier, e.g. ``"opencv"``.
+ max_devices:
+ Upper bound for the indices that should be probed.
+
+ Returns
+ -------
+ list of :class:`DetectedCamera`
+ Sorted list of detected cameras with human readable labels.
+ """
+
+ try:
+ backend_cls = CameraFactory._resolve_backend(backend)
+ except RuntimeError:
+ return []
+ if not backend_cls.is_available():
+ return []
+
+ detected: List[DetectedCamera] = []
+ for index in range(max_devices):
+ settings = CameraSettings(
+ name=f"Probe {index}",
+ index=index,
+ width=640,
+ height=480,
+ fps=30.0,
+ backend=backend,
+ properties={},
+ )
+ backend_instance = backend_cls(settings)
+ try:
+ backend_instance.open()
+ except Exception:
+ continue
+ else:
+ label = backend_instance.device_name()
+ detected.append(DetectedCamera(index=index, label=label))
+ finally:
+ try:
+ backend_instance.close()
+ except Exception:
+ pass
+ detected.sort(key=lambda camera: camera.index)
+ return detected
+
@staticmethod
def create(settings: CameraSettings) -> CameraBackend:
"""Instantiate a backend for ``settings``."""
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index a64e3f1..8497bfa 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -39,6 +39,22 @@ def close(self) -> None:
self._capture.release()
self._capture = None
+ def stop(self) -> None:
+ if self._capture is not None:
+ self._capture.release()
+ self._capture = None
+
+ def device_name(self) -> str:
+ base_name = "OpenCV"
+ if self._capture is not None and hasattr(self._capture, "getBackendName"):
+ try:
+ backend_name = self._capture.getBackendName()
+ except Exception: # pragma: no cover - backend specific
+ backend_name = ""
+ if backend_name:
+ base_name = backend_name
+ return f"{base_name} camera #{self.settings.index}"
+
def _configure_capture(self) -> None:
if self._capture is None:
return
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 5c199b8..0e1ef3e 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -45,6 +45,18 @@ def __init__(self) -> None:
def configure(self, settings: DLCProcessorSettings) -> None:
self._settings = settings
+ def reset(self) -> None:
+ """Cancel pending work and drop the current DLCLive instance."""
+
+ with self._lock:
+ if self._pending is not None and not self._pending.done():
+ self._pending.cancel()
+ self._pending = None
+ if self._init_future is not None and not self._init_future.done():
+ self._init_future.cancel()
+ self._init_future = None
+ self._dlc = None
+
def shutdown(self) -> None:
with self._lock:
if self._pending is not None:
@@ -106,6 +118,10 @@ def _on_initialised(self, future: Future[Any]) -> None:
except Exception as exc: # pragma: no cover - runtime behaviour
LOGGER.exception("Failed to initialise DLCLive", exc_info=exc)
self.error.emit(str(exc))
+ finally:
+ with self._lock:
+ if self._init_future is future:
+ self._init_future = None
def _run_inference(self, frame: np.ndarray, timestamp: float) -> PoseResult:
if self._dlc is None:
@@ -120,4 +136,8 @@ def _on_pose_ready(self, future: Future[Any]) -> None:
LOGGER.exception("Pose inference failed", exc_info=exc)
self.error.emit(str(exc))
return
+ finally:
+ with self._lock:
+ if self._pending is future:
+ self._pending = None
self.pose_ready.emit(result)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 4eb3971..7f6bbff 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -24,6 +24,7 @@
QMessageBox,
QPlainTextEdit,
QPushButton,
+ QSizePolicy,
QSpinBox,
QDoubleSpinBox,
QStatusBar,
@@ -33,6 +34,7 @@
from .camera_controller import CameraController, FrameData
from .cameras import CameraFactory
+from .cameras.factory import DetectedCamera
from .config import (
ApplicationSettings,
CameraSettings,
@@ -53,8 +55,12 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._config = config or DEFAULT_CONFIG
self._config_path: Optional[Path] = None
self._current_frame: Optional[np.ndarray] = None
+ self._raw_frame: Optional[np.ndarray] = None
self._last_pose: Optional[PoseResult] = None
+ self._dlc_active: bool = False
self._video_recorder: Optional[VideoRecorder] = None
+ self._rotation_degrees: int = 0
+ self._detected_cameras: list[DetectedCamera] = []
self.camera_controller = CameraController()
self.dlc_processor = DLCLiveProcessor()
@@ -62,20 +68,25 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._setup_ui()
self._connect_signals()
self._apply_config(self._config)
+ self._update_inference_buttons()
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
central = QWidget()
- layout = QVBoxLayout(central)
+ layout = QHBoxLayout(central)
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
- layout.addWidget(self.video_label)
+ self.video_label.setSizePolicy(
+ QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
+ )
- layout.addWidget(self._build_camera_group())
- layout.addWidget(self._build_dlc_group())
- layout.addWidget(self._build_recording_group())
+ controls_widget = QWidget()
+ controls_layout = QVBoxLayout(controls_widget)
+ controls_layout.addWidget(self._build_camera_group())
+ controls_layout.addWidget(self._build_dlc_group())
+ controls_layout.addWidget(self._build_recording_group())
button_bar = QHBoxLayout()
self.preview_button = QPushButton("Start Preview")
@@ -83,7 +94,15 @@ def _setup_ui(self) -> None:
self.stop_preview_button.setEnabled(False)
button_bar.addWidget(self.preview_button)
button_bar.addWidget(self.stop_preview_button)
- layout.addLayout(button_bar)
+ controls_layout.addLayout(button_bar)
+ controls_layout.addStretch(1)
+
+ preview_layout = QVBoxLayout()
+ preview_layout.addWidget(self.video_label)
+ preview_layout.addStretch(1)
+
+ layout.addWidget(controls_widget)
+ layout.addLayout(preview_layout, stretch=1)
self.setCentralWidget(central)
self.setStatusBar(QStatusBar())
@@ -113,10 +132,13 @@ def _build_camera_group(self) -> QGroupBox:
group = QGroupBox("Camera settings")
form = QFormLayout(group)
+ index_layout = QHBoxLayout()
self.camera_index = QComboBox()
self.camera_index.setEditable(True)
- self.camera_index.addItems([str(i) for i in range(5)])
- form.addRow("Camera index", self.camera_index)
+ index_layout.addWidget(self.camera_index)
+ self.refresh_cameras_button = QPushButton("Refresh")
+ index_layout.addWidget(self.refresh_cameras_button)
+ form.addRow("Camera", index_layout)
self.camera_width = QSpinBox()
self.camera_width.setRange(1, 7680)
@@ -148,6 +170,13 @@ def _build_camera_group(self) -> QGroupBox:
self.camera_properties_edit.setFixedHeight(60)
form.addRow("Advanced properties", self.camera_properties_edit)
+ self.rotation_combo = QComboBox()
+ self.rotation_combo.addItem("0° (default)", 0)
+ self.rotation_combo.addItem("90°", 90)
+ self.rotation_combo.addItem("180°", 180)
+ self.rotation_combo.addItem("270°", 270)
+ form.addRow("Rotation", self.rotation_combo)
+
return group
def _build_dlc_group(self) -> QGroupBox:
@@ -185,9 +214,18 @@ def _build_dlc_group(self) -> QGroupBox:
self.additional_options_edit.setFixedHeight(60)
form.addRow("Additional options", self.additional_options_edit)
- self.enable_dlc_checkbox = QCheckBox("Enable pose estimation")
- self.enable_dlc_checkbox.setChecked(True)
- form.addRow(self.enable_dlc_checkbox)
+ inference_buttons = QHBoxLayout()
+ self.start_inference_button = QPushButton("Start pose inference")
+ self.start_inference_button.setEnabled(False)
+ inference_buttons.addWidget(self.start_inference_button)
+ self.stop_inference_button = QPushButton("Stop pose inference")
+ self.stop_inference_button.setEnabled(False)
+ inference_buttons.addWidget(self.stop_inference_button)
+ form.addRow(inference_buttons)
+
+ self.show_predictions_checkbox = QCheckBox("Display pose predictions")
+ self.show_predictions_checkbox.setChecked(True)
+ form.addRow(self.show_predictions_checkbox)
return group
@@ -236,19 +274,29 @@ def _connect_signals(self) -> None:
self.stop_preview_button.clicked.connect(self._stop_preview)
self.start_record_button.clicked.connect(self._start_recording)
self.stop_record_button.clicked.connect(self._stop_recording)
+ self.refresh_cameras_button.clicked.connect(
+ lambda: self._refresh_camera_indices(keep_current=True)
+ )
+ self.camera_backend.currentIndexChanged.connect(self._on_backend_changed)
+ self.camera_backend.editTextChanged.connect(self._on_backend_changed)
+ self.rotation_combo.currentIndexChanged.connect(self._on_rotation_changed)
+ self.start_inference_button.clicked.connect(self._start_inference)
+ self.stop_inference_button.clicked.connect(lambda: self._stop_inference())
+ self.show_predictions_checkbox.stateChanged.connect(
+ self._on_show_predictions_changed
+ )
self.camera_controller.frame_ready.connect(self._on_frame_ready)
self.camera_controller.error.connect(self._show_error)
self.camera_controller.stopped.connect(self._on_camera_stopped)
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
- self.dlc_processor.error.connect(self._show_error)
+ self.dlc_processor.error.connect(self._on_dlc_error)
self.dlc_processor.initialized.connect(self._on_dlc_initialised)
# ------------------------------------------------------------------ config
def _apply_config(self, config: ApplicationSettings) -> None:
camera = config.camera
- self.camera_index.setCurrentText(str(camera.index))
self.camera_width.setValue(int(camera.width))
self.camera_height.setValue(int(camera.height))
self.camera_fps.setValue(float(camera.fps))
@@ -258,6 +306,10 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.camera_backend.setCurrentIndex(index)
else:
self.camera_backend.setEditText(backend_name)
+ self._refresh_camera_indices(keep_current=False)
+ self._select_camera_by_index(
+ camera.index, fallback_text=camera.name or str(camera.index)
+ )
self.camera_properties_edit.setPlainText(
json.dumps(camera.properties, indent=2) if camera.properties else ""
)
@@ -289,20 +341,14 @@ def _current_config(self) -> ApplicationSettings:
)
def _camera_settings_from_ui(self) -> CameraSettings:
- index_text = self.camera_index.currentText().strip() or "0"
- try:
- index = int(index_text)
- except ValueError:
- raise ValueError("Camera index must be an integer") from None
- backend_data = self.camera_backend.currentData()
- backend_text = (
- backend_data
- if isinstance(backend_data, str) and backend_data
- else self.camera_backend.currentText().strip()
- )
+ index = self._current_camera_index_value()
+ if index is None:
+ raise ValueError("Camera selection must provide a numeric index")
+ backend_text = self._current_backend_name()
properties = self._parse_json(self.camera_properties_edit.toPlainText())
+ name_text = self.camera_index.currentText().strip()
return CameraSettings(
- name=f"Camera {index}",
+ name=name_text or f"Camera {index}",
index=index,
width=self.camera_width.value(),
height=self.camera_height.value(),
@@ -311,6 +357,65 @@ def _camera_settings_from_ui(self) -> CameraSettings:
properties=properties,
)
+ def _current_backend_name(self) -> str:
+ backend_data = self.camera_backend.currentData()
+ if isinstance(backend_data, str) and backend_data:
+ return backend_data
+ text = self.camera_backend.currentText().strip()
+ return text or "opencv"
+
+ def _refresh_camera_indices(
+ self, *_args: object, keep_current: bool = True
+ ) -> None:
+ backend = self._current_backend_name()
+ detected = CameraFactory.detect_cameras(backend)
+ debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
+ print(
+ f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
+ )
+ self._detected_cameras = detected
+ previous_index = self._current_camera_index_value()
+ previous_text = self.camera_index.currentText()
+ self.camera_index.blockSignals(True)
+ self.camera_index.clear()
+ for camera in detected:
+ self.camera_index.addItem(camera.label, camera.index)
+ if keep_current and previous_index is not None:
+ self._select_camera_by_index(previous_index, fallback_text=previous_text)
+ elif detected:
+ self.camera_index.setCurrentIndex(0)
+ else:
+ if keep_current and previous_text:
+ self.camera_index.setEditText(previous_text)
+ else:
+ self.camera_index.setEditText("")
+ self.camera_index.blockSignals(False)
+
+ def _select_camera_by_index(
+ self, index: int, fallback_text: Optional[str] = None
+ ) -> None:
+ self.camera_index.blockSignals(True)
+ for row in range(self.camera_index.count()):
+ if self.camera_index.itemData(row) == index:
+ self.camera_index.setCurrentIndex(row)
+ break
+ else:
+ text = fallback_text if fallback_text is not None else str(index)
+ self.camera_index.setEditText(text)
+ self.camera_index.blockSignals(False)
+
+ def _current_camera_index_value(self) -> Optional[int]:
+ data = self.camera_index.currentData()
+ if isinstance(data, int):
+ return data
+ text = self.camera_index.currentText().strip()
+ if not text:
+ return None
+ try:
+ return int(text)
+ except ValueError:
+ return None
+
def _parse_optional_int(self, value: str) -> Optional[int]:
text = value.strip()
if not text:
@@ -402,6 +507,18 @@ def _action_browse_directory(self) -> None:
if directory:
self.output_directory_edit.setText(directory)
+ def _on_backend_changed(self, *_args: object) -> None:
+ self._refresh_camera_indices(keep_current=False)
+
+ def _on_rotation_changed(self, _index: int) -> None:
+ data = self.rotation_combo.currentData()
+ self._rotation_degrees = int(data) if isinstance(data, int) else 0
+ if self._raw_frame is not None:
+ rotated = self._apply_rotation(self._raw_frame)
+ self._current_frame = rotated
+ self._last_pose = None
+ self._update_video_display(rotated)
+
# ------------------------------------------------------------------ camera control
def _start_preview(self) -> None:
try:
@@ -412,34 +529,77 @@ def _start_preview(self) -> None:
self.camera_controller.start(settings)
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(True)
+ self._current_frame = None
+ self._raw_frame = None
+ self._last_pose = None
+ self._dlc_active = False
self.statusBar().showMessage("Camera preview started", 3000)
- if self.enable_dlc_checkbox.isChecked():
- self._configure_dlc()
- else:
- self._last_pose = None
+ self._update_inference_buttons()
def _stop_preview(self) -> None:
self.camera_controller.stop()
+ self._stop_inference(show_message=False)
self.preview_button.setEnabled(True)
self.stop_preview_button.setEnabled(False)
self._current_frame = None
+ self._raw_frame = None
self._last_pose = None
self.video_label.setPixmap(QPixmap())
self.video_label.setText("Camera preview not started")
self.statusBar().showMessage("Camera preview stopped", 3000)
+ self._update_inference_buttons()
def _on_camera_stopped(self) -> None:
self.preview_button.setEnabled(True)
self.stop_preview_button.setEnabled(False)
+ self._stop_inference(show_message=False)
+ self._update_inference_buttons()
- def _configure_dlc(self) -> None:
+ def _configure_dlc(self) -> bool:
try:
settings = self._dlc_settings_from_ui()
except (ValueError, json.JSONDecodeError) as exc:
self._show_error(f"Invalid DLCLive settings: {exc}")
- self.enable_dlc_checkbox.setChecked(False)
- return
+ return False
+ if not settings.model_path:
+ self._show_error("Please select a DLCLive model before starting inference.")
+ return False
self.dlc_processor.configure(settings)
+ return True
+
+ def _update_inference_buttons(self) -> None:
+ preview_running = self.camera_controller.is_running()
+ self.start_inference_button.setEnabled(preview_running and not self._dlc_active)
+ self.stop_inference_button.setEnabled(preview_running and self._dlc_active)
+
+ def _start_inference(self) -> None:
+ if self._dlc_active:
+ self.statusBar().showMessage("Pose inference already running", 3000)
+ return
+ if not self.camera_controller.is_running():
+ self._show_error(
+ "Start the camera preview before running pose inference."
+ )
+ return
+ if not self._configure_dlc():
+ self._update_inference_buttons()
+ return
+ self.dlc_processor.reset()
+ self._last_pose = None
+ self._dlc_active = True
+ self.statusBar().showMessage("Starting pose inference…", 3000)
+ self._update_inference_buttons()
+
+ def _stop_inference(self, show_message: bool = True) -> None:
+ was_active = self._dlc_active
+ self._dlc_active = False
+ self.dlc_processor.reset()
+ self._last_pose = None
+ if self._current_frame is not None:
+ self._update_video_display(self._current_frame)
+ if was_active and show_message:
+ self.statusBar().showMessage("Pose inference stopped", 3000)
+ self._update_inference_buttons()
# ------------------------------------------------------------------ recording
def _start_recording(self) -> None:
@@ -476,22 +636,34 @@ def _stop_recording(self) -> None:
# ------------------------------------------------------------------ frame handling
def _on_frame_ready(self, frame_data: FrameData) -> None:
- frame = frame_data.image
+ raw_frame = frame_data.image
+ self._raw_frame = raw_frame
+ frame = self._apply_rotation(raw_frame)
self._current_frame = frame
if self._video_recorder and self._video_recorder.is_running:
self._video_recorder.write(frame)
- if self.enable_dlc_checkbox.isChecked():
+ if self._dlc_active:
self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
self._update_video_display(frame)
def _on_pose_ready(self, result: PoseResult) -> None:
+ if not self._dlc_active:
+ return
self._last_pose = result
if self._current_frame is not None:
self._update_video_display(self._current_frame)
+ def _on_dlc_error(self, message: str) -> None:
+ self._stop_inference(show_message=False)
+ self._show_error(message)
+
def _update_video_display(self, frame: np.ndarray) -> None:
display_frame = frame
- if self._last_pose and self._last_pose.pose is not None:
+ if (
+ self.show_predictions_checkbox.isChecked()
+ and self._last_pose
+ and self._last_pose.pose is not None
+ ):
display_frame = self._draw_pose(frame, self._last_pose.pose)
rgb = cv2.cvtColor(display_frame, cv2.COLOR_BGR2RGB)
h, w, ch = rgb.shape
@@ -499,6 +671,19 @@ def _update_video_display(self, frame: np.ndarray) -> None:
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
self.video_label.setPixmap(QPixmap.fromImage(image))
+ def _apply_rotation(self, frame: np.ndarray) -> np.ndarray:
+ if self._rotation_degrees == 90:
+ return cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
+ if self._rotation_degrees == 180:
+ return cv2.rotate(frame, cv2.ROTATE_180)
+ if self._rotation_degrees == 270:
+ return cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE)
+ return frame
+
+ def _on_show_predictions_changed(self, _state: int) -> None:
+ if self._current_frame is not None:
+ self._update_video_display(self._current_frame)
+
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
for keypoint in np.asarray(pose):
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index e0e3706..3d15b1c 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -32,7 +32,7 @@ def start(self) -> None:
if self._writer is not None:
return
self._output.parent.mkdir(parents=True, exist_ok=True)
- self._writer = WriteGear(output_filename=str(self._output), logging=False, **self._options)
+ self._writer = WriteGear(output=str(self._output), logging=False, **self._options)
def write(self, frame: np.ndarray) -> None:
if self._writer is None:
From 0b0ac3308e3d70d3a0f22353ed06cdc64d356448 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 21 Oct 2025 14:57:43 +0200
Subject: [PATCH 003/132] modifyed gentl_backend
---
dlclivegui/cameras/gentl_backend.py | 380 +++++++++++++++++++++-------
dlclivegui/gui.py | 10 +-
2 files changed, 294 insertions(+), 96 deletions(-)
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 0d81294..bdbc4e8 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -1,130 +1,328 @@
-"""Generic GenTL backend implemented with Aravis."""
+"""GenTL backend implemented using the Harvesters library."""
from __future__ import annotations
-import ctypes
+import glob
+import os
import time
-from typing import Optional, Tuple
+from typing import Iterable, List, Optional, Tuple
+import cv2
import numpy as np
from .base import CameraBackend
try: # pragma: no cover - optional dependency
- import gi
-
- gi.require_version("Aravis", "0.6")
- from gi.repository import Aravis
+ from harvesters.core import Harvester
except Exception: # pragma: no cover - optional dependency
- gi = None # type: ignore
- Aravis = None # type: ignore
+ Harvester = None # type: ignore
class GenTLCameraBackend(CameraBackend):
- """Capture frames from cameras that expose a GenTL interface."""
+ """Capture frames from GenTL-compatible devices via Harvesters."""
+
+ _DEFAULT_CTI_PATTERNS: Tuple[str, ...] = (
+ r"C:\\Program Files\\The Imaging Source Europe GmbH\\IC4 GenTL Driver for USB3Vision Devices *\\bin\\*.cti",
+ r"C:\\Program Files\\The Imaging Source Europe GmbH\\TIS Grabber\\bin\\win64_x64\\*.cti",
+ r"C:\\Program Files\\The Imaging Source Europe GmbH\\TIS Camera SDK\\bin\\win64_x64\\*.cti",
+ r"C:\\Program Files (x86)\\The Imaging Source Europe GmbH\\TIS Grabber\\bin\\win64_x64\\*.cti",
+ )
def __init__(self, settings):
super().__init__(settings)
- self._camera = None
- self._stream = None
- self._payload: Optional[int] = None
+ props = settings.properties
+ self._cti_file: Optional[str] = props.get("cti_file")
+ self._serial_number: Optional[str] = props.get("serial_number") or props.get("serial")
+ self._pixel_format: str = props.get("pixel_format", "Mono8")
+ self._rotate: int = int(props.get("rotate", 0)) % 360
+ self._crop: Optional[Tuple[int, int, int, int]] = self._parse_crop(props.get("crop"))
+ self._exposure: Optional[float] = props.get("exposure")
+ self._gain: Optional[float] = props.get("gain")
+ self._timeout: float = float(props.get("timeout", 2.0))
+ self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(props.get("cti_search_paths"))
+
+ self._harvester: Optional[Harvester] = None
+ self._acquirer = None
@classmethod
def is_available(cls) -> bool:
- return Aravis is not None
+ return Harvester is not None
def open(self) -> None:
- if Aravis is None: # pragma: no cover - optional dependency
+ if Harvester is None: # pragma: no cover - optional dependency
raise RuntimeError(
- "Aravis (python-gi bindings) are required for the GenTL backend"
+ "The 'harvesters' package is required for the GenTL backend. "
+ "Install it via 'pip install harvesters'."
)
- Aravis.update_device_list()
- num_devices = Aravis.get_n_devices()
- if num_devices == 0:
- raise RuntimeError("No GenTL cameras detected")
- device_id = self._select_device_id(num_devices)
- self._camera = Aravis.Camera.new(device_id)
- self._camera.set_exposure_time_auto(0)
- self._camera.set_gain_auto(0)
- exposure = self.settings.properties.get("exposure")
- if exposure is not None:
- self._set_exposure(float(exposure))
- crop = self.settings.properties.get("crop")
- if isinstance(crop, (list, tuple)) and len(crop) == 4:
- self._set_crop(crop)
- if self.settings.fps:
- try:
- self._camera.set_frame_rate(float(self.settings.fps))
- except Exception:
- pass
- self._stream = self._camera.create_stream()
- self._payload = self._camera.get_payload()
- self._stream.push_buffer(Aravis.Buffer.new_allocate(self._payload))
- self._camera.start_acquisition()
+
+ self._harvester = Harvester()
+ cti_file = self._cti_file or self._find_cti_file()
+ self._harvester.add_file(cti_file)
+ self._harvester.update()
+
+ if not self._harvester.device_info_list:
+ raise RuntimeError("No GenTL cameras detected via Harvesters")
+
+ serial = self._serial_number
+ index = int(self.settings.index or 0)
+ if serial:
+ available = self._available_serials()
+ matches = [s for s in available if serial in s]
+ if not matches:
+ raise RuntimeError(
+ f"Camera with serial '{serial}' not found. Available cameras: {available}"
+ )
+ serial = matches[0]
+ else:
+ device_count = len(self._harvester.device_info_list)
+ if index < 0 or index >= device_count:
+ raise RuntimeError(
+ f"Camera index {index} out of range for {device_count} GenTL device(s)"
+ )
+
+ self._acquirer = self._create_acquirer(serial, index)
+
+ remote = self._acquirer.remote_device
+ node_map = remote.node_map
+
+ self._configure_pixel_format(node_map)
+ self._configure_resolution(node_map)
+ self._configure_exposure(node_map)
+ self._configure_gain(node_map)
+ self._configure_frame_rate(node_map)
+
+ self._acquirer.start()
def read(self) -> Tuple[np.ndarray, float]:
- if self._stream is None:
- raise RuntimeError("GenTL stream not initialised")
- buffer = None
- while buffer is None:
- buffer = self._stream.try_pop_buffer()
- if buffer is None:
- time.sleep(0.01)
- frame = self._buffer_to_numpy(buffer)
- self._stream.push_buffer(buffer)
- return frame, time.time()
+ if self._acquirer is None:
+ raise RuntimeError("GenTL image acquirer not initialised")
- def close(self) -> None:
- if self._camera is not None:
+ with self._acquirer.fetch(timeout=self._timeout) as buffer:
+ component = buffer.payload.components[0]
+ channels = 3 if self._pixel_format in {"RGB8", "BGR8"} else 1
+ if channels > 1:
+ frame = component.data.reshape(
+ component.height, component.width, channels
+ ).copy()
+ else:
+ frame = component.data.reshape(component.height, component.width).copy()
+
+ frame = self._convert_frame(frame)
+ timestamp = time.time()
+ return frame, timestamp
+
+ def stop(self) -> None:
+ if self._acquirer is not None:
try:
- self._camera.stop_acquisition()
+ self._acquirer.stop()
except Exception:
pass
- self._camera = None
- self._stream = None
- self._payload = None
- def stop(self) -> None:
- if self._camera is not None:
+ def close(self) -> None:
+ if self._acquirer is not None:
try:
- self._camera.stop_acquisition()
+ self._acquirer.stop()
except Exception:
pass
+ try:
+ destroy = getattr(self._acquirer, "destroy", None)
+ if destroy is not None:
+ destroy()
+ finally:
+ self._acquirer = None
- def _select_device_id(self, num_devices: int) -> str:
- index = int(self.settings.index)
- if index < 0 or index >= num_devices:
- raise RuntimeError(
- f"Camera index {index} out of range for {num_devices} GenTL device(s)"
+ if self._harvester is not None:
+ try:
+ self._harvester.reset()
+ finally:
+ self._harvester = None
+
+ # ------------------------------------------------------------------
+ # Helpers
+ # ------------------------------------------------------------------
+
+ def _parse_cti_paths(self, value) -> Tuple[str, ...]:
+ if value is None:
+ return self._DEFAULT_CTI_PATTERNS
+ if isinstance(value, str):
+ return (value,)
+ if isinstance(value, Iterable):
+ return tuple(str(item) for item in value)
+ return self._DEFAULT_CTI_PATTERNS
+
+ def _parse_crop(self, crop) -> Optional[Tuple[int, int, int, int]]:
+ if isinstance(crop, (list, tuple)) and len(crop) == 4:
+ return tuple(int(v) for v in crop)
+ return None
+
+ def _find_cti_file(self) -> str:
+ patterns: List[str] = list(self._cti_search_paths)
+ for pattern in patterns:
+ for file_path in glob.glob(pattern):
+ if os.path.isfile(file_path):
+ return file_path
+ raise RuntimeError(
+ "Could not locate a GenTL producer (.cti) file. Set 'cti_file' in "
+ "camera.properties or provide search paths via 'cti_search_paths'."
+ )
+
+ def _available_serials(self) -> List[str]:
+ assert self._harvester is not None
+ serials: List[str] = []
+ for info in self._harvester.device_info_list:
+ serial = getattr(info, "serial_number", "")
+ if serial:
+ serials.append(serial)
+ return serials
+
+ def _create_acquirer(self, serial: Optional[str], index: int):
+ assert self._harvester is not None
+ methods = [
+ getattr(self._harvester, "create_image_acquirer", None),
+ getattr(self._harvester, "create", None),
+ ]
+ methods = [m for m in methods if m is not None]
+ errors: List[str] = []
+ device_info = None
+ if not serial:
+ device_list = self._harvester.device_info_list
+ if 0 <= index < len(device_list):
+ device_info = device_list[index]
+ for create in methods:
+ try:
+ if serial:
+ return create({"serial_number": serial})
+ except Exception as exc:
+ errors.append(f"{create.__name__} serial: {exc}")
+ for create in methods:
+ try:
+ return create(index=index)
+ except TypeError:
+ try:
+ return create(index)
+ except Exception as exc:
+ errors.append(f"{create.__name__} index positional: {exc}")
+ except Exception as exc:
+ errors.append(f"{create.__name__} index: {exc}")
+ if device_info is not None:
+ for create in methods:
+ try:
+ return create(device_info)
+ except Exception as exc:
+ errors.append(f"{create.__name__} device_info: {exc}")
+ if not serial and index == 0:
+ for create in methods:
+ try:
+ return create()
+ except Exception as exc:
+ errors.append(f"{create.__name__} default: {exc}")
+ joined = "; ".join(errors) or "no creation methods available"
+ raise RuntimeError(f"Failed to initialise GenTL image acquirer ({joined})")
+
+ def _configure_pixel_format(self, node_map) -> None:
+ try:
+ if self._pixel_format in node_map.PixelFormat.symbolics:
+ node_map.PixelFormat.value = self._pixel_format
+ except Exception:
+ pass
+
+ def _configure_resolution(self, node_map) -> None:
+ width = int(self.settings.width)
+ height = int(self.settings.height)
+ if self._rotate in (90, 270):
+ width, height = height, width
+ try:
+ node_map.Width.value = self._adjust_to_increment(
+ width, node_map.Width.min, node_map.Width.max, node_map.Width.inc
)
- return Aravis.get_device_id(index)
+ except Exception:
+ pass
+ try:
+ node_map.Height.value = self._adjust_to_increment(
+ height, node_map.Height.min, node_map.Height.max, node_map.Height.inc
+ )
+ except Exception:
+ pass
- def _set_exposure(self, exposure: float) -> None:
- if self._camera is None:
+ def _configure_exposure(self, node_map) -> None:
+ if self._exposure is None:
return
- exposure = max(0.0, min(exposure, 1.0))
- self._camera.set_exposure_time(exposure * 1e6)
+ for attr in ("ExposureAuto", "ExposureTime", "Exposure"):
+ try:
+ node = getattr(node_map, attr)
+ except AttributeError:
+ continue
+ try:
+ if attr == "ExposureAuto":
+ node.value = "Off"
+ else:
+ node.value = float(self._exposure)
+ return
+ except Exception:
+ continue
- def _set_crop(self, crop) -> None:
- if self._camera is None:
+ def _configure_gain(self, node_map) -> None:
+ if self._gain is None:
return
- left, right, top, bottom = map(int, crop)
- width = right - left
- height = bottom - top
- self._camera.set_region(left, top, width, height)
-
- def _buffer_to_numpy(self, buffer) -> np.ndarray:
- pixel_format = buffer.get_image_pixel_format()
- bits_per_pixel = (pixel_format >> 16) & 0xFF
- if bits_per_pixel == 8:
- int_pointer = ctypes.POINTER(ctypes.c_uint8)
- else:
- int_pointer = ctypes.POINTER(ctypes.c_uint16)
- addr = buffer.get_data()
- ptr = ctypes.cast(addr, int_pointer)
- frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
- frame = frame.copy()
- if frame.ndim < 3:
- import cv2
-
- frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
- return frame
+ for attr in ("GainAuto", "Gain"):
+ try:
+ node = getattr(node_map, attr)
+ except AttributeError:
+ continue
+ try:
+ if attr == "GainAuto":
+ node.value = "Off"
+ else:
+ node.value = float(self._gain)
+ return
+ except Exception:
+ continue
+
+ def _configure_frame_rate(self, node_map) -> None:
+ if not self.settings.fps:
+ return
+ try:
+ node_map.AcquisitionFrameRateEnable.value = True
+ except Exception:
+ pass
+ try:
+ node_map.AcquisitionFrameRate.value = float(self.settings.fps)
+ except Exception:
+ pass
+
+ @staticmethod
+ def _adjust_to_increment(value: int, minimum: int, maximum: int, increment: int) -> int:
+ value = max(minimum, min(maximum, value))
+ if increment <= 0:
+ return value
+ return minimum + ((value - minimum) // increment) * increment
+
+ def _convert_frame(self, frame: np.ndarray) -> np.ndarray:
+ result = frame.astype(np.float32 if frame.dtype == np.float64 else frame.dtype)
+ if result.dtype != np.uint8:
+ max_val = np.max(result)
+ if max_val > 0:
+ result = (result / max_val * 255.0).astype(np.uint8)
+ else:
+ result = np.zeros_like(result, dtype=np.uint8)
+ if result.ndim == 2:
+ result = cv2.cvtColor(result, cv2.COLOR_GRAY2BGR)
+ elif result.ndim == 3 and result.shape[2] == 3 and self._pixel_format == "RGB8":
+ result = cv2.cvtColor(result, cv2.COLOR_RGB2BGR)
+
+ if self._rotate == 90:
+ result = cv2.rotate(result, cv2.ROTATE_90_CLOCKWISE)
+ elif self._rotate == 180:
+ result = cv2.rotate(result, cv2.ROTATE_180)
+ elif self._rotate == 270:
+ result = cv2.rotate(result, cv2.ROTATE_90_COUNTERCLOCKWISE)
+
+ if self._crop is not None:
+ top, bottom, left, right = self._crop
+ height, width = result.shape[:2]
+ top = max(0, min(height, top))
+ bottom = max(top, min(height, bottom))
+ left = max(0, min(width, left))
+ right = max(left, min(width, right))
+ result = result[top:bottom, left:right]
+
+ return result.copy()
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 4eb3971..67baded 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -31,17 +31,17 @@
QWidget,
)
-from .camera_controller import CameraController, FrameData
-from .cameras import CameraFactory
-from .config import (
+from dlclivegui.camera_controller import CameraController, FrameData
+from dlclivegui.cameras import CameraFactory
+from dlclivegui.config import (
ApplicationSettings,
CameraSettings,
DLCProcessorSettings,
RecordingSettings,
DEFAULT_CONFIG,
)
-from .dlc_processor import DLCLiveProcessor, PoseResult
-from .video_recorder import VideoRecorder
+from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult
+from dlclivegui.video_recorder import VideoRecorder
class MainWindow(QMainWindow):
From 8110085653a1e998939712459ab0961c6ce2174b Mon Sep 17 00:00:00 2001
From: Artur <35294812+arturoptophys@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:12:25 +0200
Subject: [PATCH 004/132] Improve camera control flow and recording alignment
---
dlclivegui/camera_controller.py | 18 +-
dlclivegui/cameras/base.py | 5 +
dlclivegui/cameras/factory.py | 62 ++++-
dlclivegui/cameras/opencv_backend.py | 16 ++
dlclivegui/dlc_processor.py | 20 ++
dlclivegui/gui.py | 338 +++++++++++++++++++++++----
dlclivegui/video_recorder.py | 25 +-
7 files changed, 425 insertions(+), 59 deletions(-)
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 3398566..2fb706e 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -1,12 +1,12 @@
"""Camera management for the DLC Live GUI."""
from __future__ import annotations
-import time
from dataclasses import dataclass
+from threading import Event
from typing import Optional
import numpy as np
-from PyQt6.QtCore import QMetaObject, QObject, QThread, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtCore import QObject, QThread, QMetaObject, Qt, pyqtSignal, pyqtSlot
from .cameras import CameraFactory
from .cameras.base import CameraBackend
@@ -31,12 +31,12 @@ class CameraWorker(QObject):
def __init__(self, settings: CameraSettings):
super().__init__()
self._settings = settings
- self._running = False
+ self._stop_event = Event()
self._backend: Optional[CameraBackend] = None
@pyqtSlot()
def run(self) -> None:
- self._running = True
+ self._stop_event.clear()
try:
self._backend = CameraFactory.create(self._settings)
self._backend.open()
@@ -45,7 +45,7 @@ def run(self) -> None:
self.finished.emit()
return
- while self._running:
+ while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
except Exception as exc: # pragma: no cover - device specific
@@ -63,7 +63,7 @@ def run(self) -> None:
@pyqtSlot()
def stop(self) -> None:
- self._running = False
+ self._stop_event.set()
if self._backend is not None:
try:
self._backend.stop()
@@ -106,10 +106,12 @@ def stop(self) -> None:
if not self.is_running():
return
assert self._worker is not None
+ assert self._thread is not None
QMetaObject.invokeMethod(
- self._worker, "stop", Qt.ConnectionType.QueuedConnection
+ self._worker,
+ "stop",
+ Qt.ConnectionType.QueuedConnection,
)
- assert self._thread is not None
self._thread.quit()
self._thread.wait()
diff --git a/dlclivegui/cameras/base.py b/dlclivegui/cameras/base.py
index 6ae79dc..910331c 100644
--- a/dlclivegui/cameras/base.py
+++ b/dlclivegui/cameras/base.py
@@ -33,6 +33,11 @@ def stop(self) -> None:
# Most backends do not require additional handling, but subclasses may
# override when they need to interrupt blocking reads.
+ def device_name(self) -> str:
+ """Return a human readable name for the device currently in use."""
+
+ return self.settings.name
+
@abstractmethod
def open(self) -> None:
"""Open the capture device."""
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index e9704ef..c67f7bd 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -2,12 +2,21 @@
from __future__ import annotations
import importlib
-from typing import Dict, Iterable, Tuple, Type
+from dataclasses import dataclass
+from typing import Dict, Iterable, List, Tuple, Type
from ..config import CameraSettings
from .base import CameraBackend
+@dataclass
+class DetectedCamera:
+ """Information about a camera discovered during probing."""
+
+ index: int
+ label: str
+
+
_BACKENDS: Dict[str, Tuple[str, str]] = {
"opencv": ("dlclivegui.cameras.opencv_backend", "OpenCVCameraBackend"),
"basler": ("dlclivegui.cameras.basler_backend", "BaslerCameraBackend"),
@@ -38,6 +47,57 @@ def available_backends() -> Dict[str, bool]:
availability[name] = backend_cls.is_available()
return availability
+ @staticmethod
+ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
+ """Probe ``backend`` for available cameras.
+
+ Parameters
+ ----------
+ backend:
+ The backend identifier, e.g. ``"opencv"``.
+ max_devices:
+ Upper bound for the indices that should be probed.
+
+ Returns
+ -------
+ list of :class:`DetectedCamera`
+ Sorted list of detected cameras with human readable labels.
+ """
+
+ try:
+ backend_cls = CameraFactory._resolve_backend(backend)
+ except RuntimeError:
+ return []
+ if not backend_cls.is_available():
+ return []
+
+ detected: List[DetectedCamera] = []
+ for index in range(max_devices):
+ settings = CameraSettings(
+ name=f"Probe {index}",
+ index=index,
+ width=640,
+ height=480,
+ fps=30.0,
+ backend=backend,
+ properties={},
+ )
+ backend_instance = backend_cls(settings)
+ try:
+ backend_instance.open()
+ except Exception:
+ continue
+ else:
+ label = backend_instance.device_name()
+ detected.append(DetectedCamera(index=index, label=label))
+ finally:
+ try:
+ backend_instance.close()
+ except Exception:
+ pass
+ detected.sort(key=lambda camera: camera.index)
+ return detected
+
@staticmethod
def create(settings: CameraSettings) -> CameraBackend:
"""Instantiate a backend for ``settings``."""
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index a64e3f1..8497bfa 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -39,6 +39,22 @@ def close(self) -> None:
self._capture.release()
self._capture = None
+ def stop(self) -> None:
+ if self._capture is not None:
+ self._capture.release()
+ self._capture = None
+
+ def device_name(self) -> str:
+ base_name = "OpenCV"
+ if self._capture is not None and hasattr(self._capture, "getBackendName"):
+ try:
+ backend_name = self._capture.getBackendName()
+ except Exception: # pragma: no cover - backend specific
+ backend_name = ""
+ if backend_name:
+ base_name = backend_name
+ return f"{base_name} camera #{self.settings.index}"
+
def _configure_capture(self) -> None:
if self._capture is None:
return
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 5c199b8..0e1ef3e 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -45,6 +45,18 @@ def __init__(self) -> None:
def configure(self, settings: DLCProcessorSettings) -> None:
self._settings = settings
+ def reset(self) -> None:
+ """Cancel pending work and drop the current DLCLive instance."""
+
+ with self._lock:
+ if self._pending is not None and not self._pending.done():
+ self._pending.cancel()
+ self._pending = None
+ if self._init_future is not None and not self._init_future.done():
+ self._init_future.cancel()
+ self._init_future = None
+ self._dlc = None
+
def shutdown(self) -> None:
with self._lock:
if self._pending is not None:
@@ -106,6 +118,10 @@ def _on_initialised(self, future: Future[Any]) -> None:
except Exception as exc: # pragma: no cover - runtime behaviour
LOGGER.exception("Failed to initialise DLCLive", exc_info=exc)
self.error.emit(str(exc))
+ finally:
+ with self._lock:
+ if self._init_future is future:
+ self._init_future = None
def _run_inference(self, frame: np.ndarray, timestamp: float) -> PoseResult:
if self._dlc is None:
@@ -120,4 +136,8 @@ def _on_pose_ready(self, future: Future[Any]) -> None:
LOGGER.exception("Pose inference failed", exc_info=exc)
self.error.emit(str(exc))
return
+ finally:
+ with self._lock:
+ if self._pending is future:
+ self._pending = None
self.pose_ready.emit(result)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 4eb3971..507b199 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -24,6 +24,7 @@
QMessageBox,
QPlainTextEdit,
QPushButton,
+ QSizePolicy,
QSpinBox,
QDoubleSpinBox,
QStatusBar,
@@ -33,6 +34,7 @@
from .camera_controller import CameraController, FrameData
from .cameras import CameraFactory
+from .cameras.factory import DetectedCamera
from .config import (
ApplicationSettings,
CameraSettings,
@@ -53,8 +55,13 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._config = config or DEFAULT_CONFIG
self._config_path: Optional[Path] = None
self._current_frame: Optional[np.ndarray] = None
+ self._raw_frame: Optional[np.ndarray] = None
self._last_pose: Optional[PoseResult] = None
+ self._dlc_active: bool = False
self._video_recorder: Optional[VideoRecorder] = None
+ self._rotation_degrees: int = 0
+ self._detected_cameras: list[DetectedCamera] = []
+ self._active_camera_settings: Optional[CameraSettings] = None
self.camera_controller = CameraController()
self.dlc_processor = DLCLiveProcessor()
@@ -62,20 +69,26 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._setup_ui()
self._connect_signals()
self._apply_config(self._config)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
central = QWidget()
- layout = QVBoxLayout(central)
+ layout = QHBoxLayout(central)
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
- layout.addWidget(self.video_label)
+ self.video_label.setSizePolicy(
+ QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
+ )
- layout.addWidget(self._build_camera_group())
- layout.addWidget(self._build_dlc_group())
- layout.addWidget(self._build_recording_group())
+ controls_widget = QWidget()
+ controls_layout = QVBoxLayout(controls_widget)
+ controls_layout.addWidget(self._build_camera_group())
+ controls_layout.addWidget(self._build_dlc_group())
+ controls_layout.addWidget(self._build_recording_group())
button_bar = QHBoxLayout()
self.preview_button = QPushButton("Start Preview")
@@ -83,7 +96,15 @@ def _setup_ui(self) -> None:
self.stop_preview_button.setEnabled(False)
button_bar.addWidget(self.preview_button)
button_bar.addWidget(self.stop_preview_button)
- layout.addLayout(button_bar)
+ controls_layout.addLayout(button_bar)
+ controls_layout.addStretch(1)
+
+ preview_layout = QVBoxLayout()
+ preview_layout.addWidget(self.video_label)
+ preview_layout.addStretch(1)
+
+ layout.addWidget(controls_widget)
+ layout.addLayout(preview_layout, stretch=1)
self.setCentralWidget(central)
self.setStatusBar(QStatusBar())
@@ -113,10 +134,23 @@ def _build_camera_group(self) -> QGroupBox:
group = QGroupBox("Camera settings")
form = QFormLayout(group)
+ self.camera_backend = QComboBox()
+ self.camera_backend.setEditable(True)
+ availability = CameraFactory.available_backends()
+ for backend in CameraFactory.backend_names():
+ label = backend
+ if not availability.get(backend, True):
+ label = f"{backend} (unavailable)"
+ self.camera_backend.addItem(label, backend)
+ form.addRow("Backend", self.camera_backend)
+
+ index_layout = QHBoxLayout()
self.camera_index = QComboBox()
self.camera_index.setEditable(True)
- self.camera_index.addItems([str(i) for i in range(5)])
- form.addRow("Camera index", self.camera_index)
+ index_layout.addWidget(self.camera_index)
+ self.refresh_cameras_button = QPushButton("Refresh")
+ index_layout.addWidget(self.refresh_cameras_button)
+ form.addRow("Camera", index_layout)
self.camera_width = QSpinBox()
self.camera_width.setRange(1, 7680)
@@ -131,16 +165,6 @@ def _build_camera_group(self) -> QGroupBox:
self.camera_fps.setDecimals(2)
form.addRow("Frame rate", self.camera_fps)
- self.camera_backend = QComboBox()
- self.camera_backend.setEditable(True)
- availability = CameraFactory.available_backends()
- for backend in CameraFactory.backend_names():
- label = backend
- if not availability.get(backend, True):
- label = f"{backend} (unavailable)"
- self.camera_backend.addItem(label, backend)
- form.addRow("Backend", self.camera_backend)
-
self.camera_properties_edit = QPlainTextEdit()
self.camera_properties_edit.setPlaceholderText(
'{"exposure": 15000, "gain": 0.5, "serial": "123456"}'
@@ -148,6 +172,13 @@ def _build_camera_group(self) -> QGroupBox:
self.camera_properties_edit.setFixedHeight(60)
form.addRow("Advanced properties", self.camera_properties_edit)
+ self.rotation_combo = QComboBox()
+ self.rotation_combo.addItem("0° (default)", 0)
+ self.rotation_combo.addItem("90°", 90)
+ self.rotation_combo.addItem("180°", 180)
+ self.rotation_combo.addItem("270°", 270)
+ form.addRow("Rotation", self.rotation_combo)
+
return group
def _build_dlc_group(self) -> QGroupBox:
@@ -185,9 +216,18 @@ def _build_dlc_group(self) -> QGroupBox:
self.additional_options_edit.setFixedHeight(60)
form.addRow("Additional options", self.additional_options_edit)
- self.enable_dlc_checkbox = QCheckBox("Enable pose estimation")
- self.enable_dlc_checkbox.setChecked(True)
- form.addRow(self.enable_dlc_checkbox)
+ inference_buttons = QHBoxLayout()
+ self.start_inference_button = QPushButton("Start pose inference")
+ self.start_inference_button.setEnabled(False)
+ inference_buttons.addWidget(self.start_inference_button)
+ self.stop_inference_button = QPushButton("Stop pose inference")
+ self.stop_inference_button.setEnabled(False)
+ inference_buttons.addWidget(self.stop_inference_button)
+ form.addRow(inference_buttons)
+
+ self.show_predictions_checkbox = QCheckBox("Display pose predictions")
+ self.show_predictions_checkbox.setChecked(True)
+ form.addRow(self.show_predictions_checkbox)
return group
@@ -236,19 +276,29 @@ def _connect_signals(self) -> None:
self.stop_preview_button.clicked.connect(self._stop_preview)
self.start_record_button.clicked.connect(self._start_recording)
self.stop_record_button.clicked.connect(self._stop_recording)
+ self.refresh_cameras_button.clicked.connect(
+ lambda: self._refresh_camera_indices(keep_current=True)
+ )
+ self.camera_backend.currentIndexChanged.connect(self._on_backend_changed)
+ self.camera_backend.editTextChanged.connect(self._on_backend_changed)
+ self.rotation_combo.currentIndexChanged.connect(self._on_rotation_changed)
+ self.start_inference_button.clicked.connect(self._start_inference)
+ self.stop_inference_button.clicked.connect(lambda: self._stop_inference())
+ self.show_predictions_checkbox.stateChanged.connect(
+ self._on_show_predictions_changed
+ )
self.camera_controller.frame_ready.connect(self._on_frame_ready)
self.camera_controller.error.connect(self._show_error)
self.camera_controller.stopped.connect(self._on_camera_stopped)
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
- self.dlc_processor.error.connect(self._show_error)
+ self.dlc_processor.error.connect(self._on_dlc_error)
self.dlc_processor.initialized.connect(self._on_dlc_initialised)
# ------------------------------------------------------------------ config
def _apply_config(self, config: ApplicationSettings) -> None:
camera = config.camera
- self.camera_index.setCurrentText(str(camera.index))
self.camera_width.setValue(int(camera.width))
self.camera_height.setValue(int(camera.height))
self.camera_fps.setValue(float(camera.fps))
@@ -258,9 +308,14 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.camera_backend.setCurrentIndex(index)
else:
self.camera_backend.setEditText(backend_name)
+ self._refresh_camera_indices(keep_current=False)
+ self._select_camera_by_index(
+ camera.index, fallback_text=camera.name or str(camera.index)
+ )
self.camera_properties_edit.setPlainText(
json.dumps(camera.properties, indent=2) if camera.properties else ""
)
+ self._active_camera_settings = None
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
@@ -289,20 +344,14 @@ def _current_config(self) -> ApplicationSettings:
)
def _camera_settings_from_ui(self) -> CameraSettings:
- index_text = self.camera_index.currentText().strip() or "0"
- try:
- index = int(index_text)
- except ValueError:
- raise ValueError("Camera index must be an integer") from None
- backend_data = self.camera_backend.currentData()
- backend_text = (
- backend_data
- if isinstance(backend_data, str) and backend_data
- else self.camera_backend.currentText().strip()
- )
+ index = self._current_camera_index_value()
+ if index is None:
+ raise ValueError("Camera selection must provide a numeric index")
+ backend_text = self._current_backend_name()
properties = self._parse_json(self.camera_properties_edit.toPlainText())
- return CameraSettings(
- name=f"Camera {index}",
+ name_text = self.camera_index.currentText().strip()
+ settings = CameraSettings(
+ name=name_text or f"Camera {index}",
index=index,
width=self.camera_width.value(),
height=self.camera_height.value(),
@@ -310,6 +359,66 @@ def _camera_settings_from_ui(self) -> CameraSettings:
backend=backend_text or "opencv",
properties=properties,
)
+ return settings.apply_defaults()
+
+ def _current_backend_name(self) -> str:
+ backend_data = self.camera_backend.currentData()
+ if isinstance(backend_data, str) and backend_data:
+ return backend_data
+ text = self.camera_backend.currentText().strip()
+ return text or "opencv"
+
+ def _refresh_camera_indices(
+ self, *_args: object, keep_current: bool = True
+ ) -> None:
+ backend = self._current_backend_name()
+ detected = CameraFactory.detect_cameras(backend)
+ debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
+ print(
+ f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
+ )
+ self._detected_cameras = detected
+ previous_index = self._current_camera_index_value()
+ previous_text = self.camera_index.currentText()
+ self.camera_index.blockSignals(True)
+ self.camera_index.clear()
+ for camera in detected:
+ self.camera_index.addItem(camera.label, camera.index)
+ if keep_current and previous_index is not None:
+ self._select_camera_by_index(previous_index, fallback_text=previous_text)
+ elif detected:
+ self.camera_index.setCurrentIndex(0)
+ else:
+ if keep_current and previous_text:
+ self.camera_index.setEditText(previous_text)
+ else:
+ self.camera_index.setEditText("")
+ self.camera_index.blockSignals(False)
+
+ def _select_camera_by_index(
+ self, index: int, fallback_text: Optional[str] = None
+ ) -> None:
+ self.camera_index.blockSignals(True)
+ for row in range(self.camera_index.count()):
+ if self.camera_index.itemData(row) == index:
+ self.camera_index.setCurrentIndex(row)
+ break
+ else:
+ text = fallback_text if fallback_text is not None else str(index)
+ self.camera_index.setEditText(text)
+ self.camera_index.blockSignals(False)
+
+ def _current_camera_index_value(self) -> Optional[int]:
+ data = self.camera_index.currentData()
+ if isinstance(data, int):
+ return data
+ text = self.camera_index.currentText().strip()
+ if not text:
+ return None
+ try:
+ return int(text)
+ except ValueError:
+ return None
def _parse_optional_int(self, value: str) -> Optional[int]:
text = value.strip()
@@ -402,6 +511,18 @@ def _action_browse_directory(self) -> None:
if directory:
self.output_directory_edit.setText(directory)
+ def _on_backend_changed(self, *_args: object) -> None:
+ self._refresh_camera_indices(keep_current=False)
+
+ def _on_rotation_changed(self, _index: int) -> None:
+ data = self.rotation_combo.currentData()
+ self._rotation_degrees = int(data) if isinstance(data, int) else 0
+ if self._raw_frame is not None:
+ rotated = self._apply_rotation(self._raw_frame)
+ self._current_frame = rotated
+ self._last_pose = None
+ self._update_video_display(rotated)
+
# ------------------------------------------------------------------ camera control
def _start_preview(self) -> None:
try:
@@ -409,42 +530,121 @@ def _start_preview(self) -> None:
except ValueError as exc:
self._show_error(str(exc))
return
+ self._active_camera_settings = settings
self.camera_controller.start(settings)
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(True)
+ self._current_frame = None
+ self._raw_frame = None
+ self._last_pose = None
+ self._dlc_active = False
self.statusBar().showMessage("Camera preview started", 3000)
- if self.enable_dlc_checkbox.isChecked():
- self._configure_dlc()
- else:
- self._last_pose = None
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
def _stop_preview(self) -> None:
self.camera_controller.stop()
+ self._stop_inference(show_message=False)
self.preview_button.setEnabled(True)
self.stop_preview_button.setEnabled(False)
self._current_frame = None
+ self._raw_frame = None
self._last_pose = None
+ self._active_camera_settings = None
self.video_label.setPixmap(QPixmap())
self.video_label.setText("Camera preview not started")
self.statusBar().showMessage("Camera preview stopped", 3000)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
def _on_camera_stopped(self) -> None:
self.preview_button.setEnabled(True)
self.stop_preview_button.setEnabled(False)
+ self._stop_inference(show_message=False)
+ self._update_inference_buttons()
+ self._active_camera_settings = None
+ self._update_camera_controls_enabled()
- def _configure_dlc(self) -> None:
+ def _configure_dlc(self) -> bool:
try:
settings = self._dlc_settings_from_ui()
except (ValueError, json.JSONDecodeError) as exc:
self._show_error(f"Invalid DLCLive settings: {exc}")
- self.enable_dlc_checkbox.setChecked(False)
- return
+ return False
+ if not settings.model_path:
+ self._show_error("Please select a DLCLive model before starting inference.")
+ return False
self.dlc_processor.configure(settings)
+ return True
+
+ def _update_inference_buttons(self) -> None:
+ preview_running = self.camera_controller.is_running()
+ self.start_inference_button.setEnabled(preview_running and not self._dlc_active)
+ self.stop_inference_button.setEnabled(preview_running and self._dlc_active)
+
+ def _update_camera_controls_enabled(self) -> None:
+ recording_active = (
+ self._video_recorder is not None and self._video_recorder.is_running
+ )
+ allow_changes = (
+ not self.camera_controller.is_running()
+ and not self._dlc_active
+ and not recording_active
+ )
+ widgets = [
+ self.camera_backend,
+ self.camera_index,
+ self.refresh_cameras_button,
+ self.camera_width,
+ self.camera_height,
+ self.camera_fps,
+ self.camera_properties_edit,
+ self.rotation_combo,
+ ]
+ for widget in widgets:
+ widget.setEnabled(allow_changes)
+
+ def _start_inference(self) -> None:
+ if self._dlc_active:
+ self.statusBar().showMessage("Pose inference already running", 3000)
+ return
+ if not self.camera_controller.is_running():
+ self._show_error(
+ "Start the camera preview before running pose inference."
+ )
+ return
+ if not self._configure_dlc():
+ self._update_inference_buttons()
+ return
+ self.dlc_processor.reset()
+ self._last_pose = None
+ self._dlc_active = True
+ self.statusBar().showMessage("Starting pose inference…", 3000)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
+
+ def _stop_inference(self, show_message: bool = True) -> None:
+ was_active = self._dlc_active
+ self._dlc_active = False
+ self.dlc_processor.reset()
+ self._last_pose = None
+ if self._current_frame is not None:
+ self._update_video_display(self._current_frame)
+ if was_active and show_message:
+ self.statusBar().showMessage("Pose inference stopped", 3000)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
# ------------------------------------------------------------------ recording
def _start_recording(self) -> None:
if self._video_recorder and self._video_recorder.is_running:
return
+ if not self.camera_controller.is_running():
+ self._show_error("Start the camera preview before recording.")
+ return
+ if self._current_frame is None:
+ self._show_error("Wait for the first preview frame before recording.")
+ return
try:
recording = self._recording_settings_from_ui()
except json.JSONDecodeError as exc:
@@ -453,8 +653,21 @@ def _start_recording(self) -> None:
if not recording.enabled:
self._show_error("Recording is disabled in the configuration.")
return
+ frame = self._current_frame
+ assert frame is not None
+ height, width = frame.shape[:2]
+ frame_rate = (
+ self._active_camera_settings.fps
+ if self._active_camera_settings is not None
+ else self.camera_fps.value()
+ )
output_path = recording.output_path()
- self._video_recorder = VideoRecorder(output_path, recording.options)
+ self._video_recorder = VideoRecorder(
+ output_path,
+ recording.options,
+ frame_size=(int(width), int(height)),
+ frame_rate=float(frame_rate),
+ )
try:
self._video_recorder.start()
except Exception as exc: # pragma: no cover - runtime error
@@ -464,6 +677,7 @@ def _start_recording(self) -> None:
self.start_record_button.setEnabled(False)
self.stop_record_button.setEnabled(True)
self.statusBar().showMessage(f"Recording to {output_path}", 5000)
+ self._update_camera_controls_enabled()
def _stop_recording(self) -> None:
if not self._video_recorder:
@@ -473,25 +687,42 @@ def _stop_recording(self) -> None:
self.start_record_button.setEnabled(True)
self.stop_record_button.setEnabled(False)
self.statusBar().showMessage("Recording stopped", 3000)
+ self._update_camera_controls_enabled()
# ------------------------------------------------------------------ frame handling
def _on_frame_ready(self, frame_data: FrameData) -> None:
- frame = frame_data.image
+ raw_frame = frame_data.image
+ self._raw_frame = raw_frame
+ frame = self._apply_rotation(raw_frame)
self._current_frame = frame
+ if self._active_camera_settings is not None:
+ height, width = frame.shape[:2]
+ self._active_camera_settings.width = int(width)
+ self._active_camera_settings.height = int(height)
if self._video_recorder and self._video_recorder.is_running:
self._video_recorder.write(frame)
- if self.enable_dlc_checkbox.isChecked():
+ if self._dlc_active:
self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
self._update_video_display(frame)
def _on_pose_ready(self, result: PoseResult) -> None:
+ if not self._dlc_active:
+ return
self._last_pose = result
if self._current_frame is not None:
self._update_video_display(self._current_frame)
+ def _on_dlc_error(self, message: str) -> None:
+ self._stop_inference(show_message=False)
+ self._show_error(message)
+
def _update_video_display(self, frame: np.ndarray) -> None:
display_frame = frame
- if self._last_pose and self._last_pose.pose is not None:
+ if (
+ self.show_predictions_checkbox.isChecked()
+ and self._last_pose
+ and self._last_pose.pose is not None
+ ):
display_frame = self._draw_pose(frame, self._last_pose.pose)
rgb = cv2.cvtColor(display_frame, cv2.COLOR_BGR2RGB)
h, w, ch = rgb.shape
@@ -499,6 +730,19 @@ def _update_video_display(self, frame: np.ndarray) -> None:
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
self.video_label.setPixmap(QPixmap.fromImage(image))
+ def _apply_rotation(self, frame: np.ndarray) -> np.ndarray:
+ if self._rotation_degrees == 90:
+ return cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
+ if self._rotation_degrees == 180:
+ return cv2.rotate(frame, cv2.ROTATE_180)
+ if self._rotation_degrees == 270:
+ return cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE)
+ return frame
+
+ def _on_show_predictions_changed(self, _state: int) -> None:
+ if self._current_frame is not None:
+ self._update_video_display(self._current_frame)
+
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
for keypoint in np.asarray(pose):
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index e0e3706..c554318 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -2,7 +2,7 @@
from __future__ import annotations
from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Tuple
import numpy as np
@@ -15,10 +15,18 @@
class VideoRecorder:
"""Thin wrapper around :class:`vidgear.gears.WriteGear`."""
- def __init__(self, output: Path | str, options: Optional[Dict[str, Any]] = None):
+ def __init__(
+ self,
+ output: Path | str,
+ options: Optional[Dict[str, Any]] = None,
+ frame_size: Optional[Tuple[int, int]] = None,
+ frame_rate: Optional[float] = None,
+ ):
self._output = Path(output)
self._options = options or {}
self._writer: Optional[WriteGear] = None
+ self._frame_size = frame_size
+ self._frame_rate = frame_rate
@property
def is_running(self) -> bool:
@@ -31,8 +39,19 @@ def start(self) -> None:
)
if self._writer is not None:
return
+ options = dict(self._options)
+ if self._frame_size and "resolution" not in options:
+ options["resolution"] = tuple(int(x) for x in self._frame_size)
+ if self._frame_rate and "frame_rate" not in options:
+ options["frame_rate"] = float(self._frame_rate)
self._output.parent.mkdir(parents=True, exist_ok=True)
- self._writer = WriteGear(output_filename=str(self._output), logging=False, **self._options)
+ self._writer = WriteGear(output=str(self._output), logging=False, **options)
+
+ def configure_stream(
+ self, frame_size: Tuple[int, int], frame_rate: Optional[float]
+ ) -> None:
+ self._frame_size = frame_size
+ self._frame_rate = frame_rate
def write(self, frame: np.ndarray) -> None:
if self._writer is None:
From efda9d31bd3ccf78a0b66c30b7b077d4268376aa Mon Sep 17 00:00:00 2001
From: Artur <35294812+arturoptophys@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:55:13 +0200
Subject: [PATCH 005/132] Improve camera stop flow and parameter propagation
---
dlclivegui/camera_controller.py | 49 ++++++++++++++++++---------
dlclivegui/cameras/basler_backend.py | 9 +++++
dlclivegui/cameras/gentl_backend.py | 5 +++
dlclivegui/cameras/opencv_backend.py | 9 +++++
dlclivegui/gui.py | 50 ++++++++++++++++++++++------
5 files changed, 97 insertions(+), 25 deletions(-)
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 2fb706e..5ebb976 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -25,6 +25,7 @@ class CameraWorker(QObject):
"""Worker object running inside a :class:`QThread`."""
frame_captured = pyqtSignal(object)
+ started = pyqtSignal(object)
error_occurred = pyqtSignal(str)
finished = pyqtSignal()
@@ -45,6 +46,8 @@ def run(self) -> None:
self.finished.emit()
return
+ self.started.emit(self._settings)
+
while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
@@ -75,7 +78,7 @@ class CameraController(QObject):
"""High level controller that manages a camera worker thread."""
frame_ready = pyqtSignal(object)
- started = pyqtSignal(CameraSettings)
+ started = pyqtSignal(object)
stopped = pyqtSignal()
error = pyqtSignal(str)
@@ -83,40 +86,56 @@ def __init__(self) -> None:
super().__init__()
self._thread: Optional[QThread] = None
self._worker: Optional[CameraWorker] = None
+ self._pending_settings: Optional[CameraSettings] = None
def is_running(self) -> bool:
return self._thread is not None and self._thread.isRunning()
def start(self, settings: CameraSettings) -> None:
if self.is_running():
- self.stop()
- self._thread = QThread()
- self._worker = CameraWorker(settings)
- self._worker.moveToThread(self._thread)
- self._thread.started.connect(self._worker.run)
- self._worker.frame_captured.connect(self.frame_ready)
- self._worker.error_occurred.connect(self.error)
- self._worker.finished.connect(self._thread.quit)
- self._worker.finished.connect(self._worker.deleteLater)
- self._thread.finished.connect(self._cleanup)
- self._thread.start()
- self.started.emit(settings)
+ self._pending_settings = settings
+ self.stop(preserve_pending=True)
+ return
+ self._pending_settings = None
+ self._start_worker(settings)
- def stop(self) -> None:
+ def stop(self, wait: bool = False, *, preserve_pending: bool = False) -> None:
if not self.is_running():
+ if not preserve_pending:
+ self._pending_settings = None
return
assert self._worker is not None
assert self._thread is not None
+ if not preserve_pending:
+ self._pending_settings = None
QMetaObject.invokeMethod(
self._worker,
"stop",
Qt.ConnectionType.QueuedConnection,
)
self._thread.quit()
- self._thread.wait()
+ if wait:
+ self._thread.wait()
+
+ def _start_worker(self, settings: CameraSettings) -> None:
+ self._thread = QThread()
+ self._worker = CameraWorker(settings)
+ self._worker.moveToThread(self._thread)
+ self._thread.started.connect(self._worker.run)
+ self._worker.frame_captured.connect(self.frame_ready)
+ self._worker.started.connect(self.started)
+ self._worker.error_occurred.connect(self.error)
+ self._worker.finished.connect(self._thread.quit)
+ self._worker.finished.connect(self._worker.deleteLater)
+ self._thread.finished.connect(self._cleanup)
+ self._thread.start()
@pyqtSlot()
def _cleanup(self) -> None:
self._thread = None
self._worker = None
self.stopped.emit()
+ if self._pending_settings is not None:
+ pending = self._pending_settings
+ self._pending_settings = None
+ self.start(pending)
diff --git a/dlclivegui/cameras/basler_backend.py b/dlclivegui/cameras/basler_backend.py
index f9e2a15..e83185a 100644
--- a/dlclivegui/cameras/basler_backend.py
+++ b/dlclivegui/cameras/basler_backend.py
@@ -61,6 +61,15 @@ def open(self) -> None:
self._converter = pylon.ImageFormatConverter()
self._converter.OutputPixelFormat = pylon.PixelType_BGR8packed
self._converter.OutputBitAlignment = pylon.OutputBitAlignment_MsbAligned
+ try:
+ self.settings.width = int(self._camera.Width.GetValue())
+ self.settings.height = int(self._camera.Height.GetValue())
+ except Exception:
+ pass
+ try:
+ self.settings.fps = float(self._camera.ResultingFrameRateAbs.GetValue())
+ except Exception:
+ pass
def read(self) -> Tuple[np.ndarray, float]:
if self._camera is None or self._converter is None:
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 0d81294..3f6e579 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -123,6 +123,11 @@ def _buffer_to_numpy(self, buffer) -> np.ndarray:
ptr = ctypes.cast(addr, int_pointer)
frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
frame = frame.copy()
+ try:
+ self.settings.width = int(buffer.get_image_width())
+ self.settings.height = int(buffer.get_image_height())
+ except Exception:
+ pass
if frame.ndim < 3:
import cv2
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 8497bfa..cbadf73 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -69,6 +69,15 @@ def _configure_capture(self) -> None:
except (TypeError, ValueError):
continue
self._capture.set(prop_id, float(value))
+ actual_width = self._capture.get(cv2.CAP_PROP_FRAME_WIDTH)
+ actual_height = self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT)
+ actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
+ if actual_width:
+ self.settings.width = int(actual_width)
+ if actual_height:
+ self.settings.height = int(actual_height)
+ if actual_fps:
+ self.settings.fps = float(actual_fps)
def _resolve_backend(self, backend: str | None) -> int:
if backend is None:
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 507b199..ff2408e 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -289,6 +289,7 @@ def _connect_signals(self) -> None:
)
self.camera_controller.frame_ready.connect(self._on_frame_ready)
+ self.camera_controller.started.connect(self._on_camera_started)
self.camera_controller.error.connect(self._show_error)
self.camera_controller.stopped.connect(self._on_camera_stopped)
@@ -538,15 +539,52 @@ def _start_preview(self) -> None:
self._raw_frame = None
self._last_pose = None
self._dlc_active = False
- self.statusBar().showMessage("Camera preview started", 3000)
+ self.statusBar().showMessage("Starting camera preview…", 3000)
self._update_inference_buttons()
self._update_camera_controls_enabled()
def _stop_preview(self) -> None:
+ if not self.camera_controller.is_running():
+ return
+ self.preview_button.setEnabled(False)
+ self.stop_preview_button.setEnabled(False)
+ self.start_inference_button.setEnabled(False)
+ self.stop_inference_button.setEnabled(False)
+ self.statusBar().showMessage("Stopping camera preview…", 3000)
self.camera_controller.stop()
self._stop_inference(show_message=False)
+
+ def _on_camera_started(self, settings: CameraSettings) -> None:
+ self._active_camera_settings = settings
+ self.preview_button.setEnabled(False)
+ self.stop_preview_button.setEnabled(True)
+ self.camera_width.blockSignals(True)
+ self.camera_width.setValue(int(settings.width))
+ self.camera_width.blockSignals(False)
+ self.camera_height.blockSignals(True)
+ self.camera_height.setValue(int(settings.height))
+ self.camera_height.blockSignals(False)
+ if getattr(settings, "fps", None):
+ self.camera_fps.blockSignals(True)
+ self.camera_fps.setValue(float(settings.fps))
+ self.camera_fps.blockSignals(False)
+ resolution = f"{int(settings.width)}×{int(settings.height)}"
+ if getattr(settings, "fps", None):
+ fps_text = f"{float(settings.fps):.2f} FPS"
+ else:
+ fps_text = "unknown FPS"
+ self.statusBar().showMessage(
+ f"Camera preview started: {resolution} @ {fps_text}", 5000
+ )
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
+
+ def _on_camera_stopped(self) -> None:
+ if self._video_recorder and self._video_recorder.is_running:
+ self._stop_recording()
self.preview_button.setEnabled(True)
self.stop_preview_button.setEnabled(False)
+ self._stop_inference(show_message=False)
self._current_frame = None
self._raw_frame = None
self._last_pose = None
@@ -557,14 +595,6 @@ def _stop_preview(self) -> None:
self._update_inference_buttons()
self._update_camera_controls_enabled()
- def _on_camera_stopped(self) -> None:
- self.preview_button.setEnabled(True)
- self.stop_preview_button.setEnabled(False)
- self._stop_inference(show_message=False)
- self._update_inference_buttons()
- self._active_camera_settings = None
- self._update_camera_controls_enabled()
-
def _configure_dlc(self) -> bool:
try:
settings = self._dlc_settings_from_ui()
@@ -768,7 +798,7 @@ def _show_error(self, message: str) -> None:
# ------------------------------------------------------------------ Qt overrides
def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
if self.camera_controller.is_running():
- self.camera_controller.stop()
+ self.camera_controller.stop(wait=True)
if self._video_recorder and self._video_recorder.is_running:
self._video_recorder.stop()
self.dlc_processor.shutdown()
From f39c4c466968692a75a71e88dcf50c9c71e6eecd Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Wed, 22 Oct 2025 11:56:53 +0200
Subject: [PATCH 006/132] fixed video recordings (roughly)
---
dlclivegui/camera_controller.py | 25 +++--
dlclivegui/cameras/factory.py | 2 +
dlclivegui/cameras/gentl_backend.py | 144 +++++++++++++++++++++-------
dlclivegui/config.py | 21 +++-
dlclivegui/gui.py | 42 +++++---
dlclivegui/video_recorder.py | 46 +++++++--
6 files changed, 210 insertions(+), 70 deletions(-)
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 4965dc7..821a252 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -8,9 +8,9 @@
import numpy as np
from PyQt6.QtCore import QObject, QThread, QMetaObject, Qt, pyqtSignal, pyqtSlot
-from .cameras import CameraFactory
-from .cameras.base import CameraBackend
-from .config import CameraSettings
+from dlclivegui.cameras import CameraFactory
+from dlclivegui.cameras.base import CameraBackend
+from dlclivegui.config import CameraSettings
@dataclass
@@ -51,8 +51,15 @@ def run(self) -> None:
while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
+ except TimeoutError:
+ if self._stop_event.is_set():
+ break
+ continue
except Exception as exc: # pragma: no cover - device specific
- self.error_occurred.emit(str(exc))
+ if not self._stop_event.is_set():
+ self.error_occurred.emit(str(exc))
+ break
+ if self._stop_event.is_set():
break
self.frame_captured.emit(FrameData(frame, timestamp))
@@ -113,6 +120,7 @@ def stop(self, wait: bool = False, *, preserve_pending: bool = False) -> None:
"stop",
Qt.ConnectionType.QueuedConnection,
)
+ self._worker.stop()
self._thread.quit()
if wait:
self._thread.wait()
@@ -129,15 +137,6 @@ def _start_worker(self, settings: CameraSettings) -> None:
self._worker.finished.connect(self._worker.deleteLater)
self._thread.finished.connect(self._cleanup)
self._thread.start()
- self.started.emit(settings)
-
- def stop(self) -> None:
- if not self.is_running():
- return
- assert self._worker is not None
- self._worker.stop()
- assert self._thread is not None
- self._thread.wait()
@pyqtSlot()
def _cleanup(self) -> None:
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index c67f7bd..1dc33d8 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -89,6 +89,8 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
continue
else:
label = backend_instance.device_name()
+ if not label:
+ label = f"{backend.title()} #{index}"
detected.append(DetectedCamera(index=index, label=label))
finally:
try:
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 7a15333..dc6ce7e 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -13,8 +13,13 @@
try: # pragma: no cover - optional dependency
from harvesters.core import Harvester
+ try:
+ from harvesters.core import HarvesterTimeoutError # type: ignore
+ except Exception: # pragma: no cover - optional dependency
+ HarvesterTimeoutError = TimeoutError # type: ignore
except Exception: # pragma: no cover - optional dependency
Harvester = None # type: ignore
+ HarvesterTimeoutError = TimeoutError # type: ignore
class GenTLCameraBackend(CameraBackend):
@@ -40,8 +45,9 @@ def __init__(self, settings):
self._timeout: float = float(props.get("timeout", 2.0))
self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(props.get("cti_search_paths"))
- self._harvester: Optional[Harvester] = None
+ self._harvester = None
self._acquirer = None
+ self._device_label: Optional[str] = None
@classmethod
def is_available(cls) -> bool:
@@ -84,6 +90,8 @@ def open(self) -> None:
remote = self._acquirer.remote_device
node_map = remote.node_map
+ self._device_label = self._resolve_device_label(node_map)
+
self._configure_pixel_format(node_map)
self._configure_resolution(node_map)
self._configure_exposure(node_map)
@@ -96,15 +104,23 @@ def read(self) -> Tuple[np.ndarray, float]:
if self._acquirer is None:
raise RuntimeError("GenTL image acquirer not initialised")
- with self._acquirer.fetch(timeout=self._timeout) as buffer:
- component = buffer.payload.components[0]
- channels = 3 if self._pixel_format in {"RGB8", "BGR8"} else 1
- if channels > 1:
- frame = component.data.reshape(
- component.height, component.width, channels
- ).copy()
- else:
- frame = component.data.reshape(component.height, component.width).copy()
+ try:
+ with self._acquirer.fetch(timeout=self._timeout) as buffer:
+ component = buffer.payload.components[0]
+ channels = 3 if self._pixel_format in {"RGB8", "BGR8"} else 1
+ array = np.asarray(component.data)
+ expected = component.height * component.width * channels
+ if array.size != expected:
+ array = np.frombuffer(bytes(component.data), dtype=array.dtype)
+ try:
+ if channels > 1:
+ frame = array.reshape(component.height, component.width, channels).copy()
+ else:
+ frame = array.reshape(component.height, component.width).copy()
+ except ValueError:
+ frame = array.copy()
+ except HarvesterTimeoutError as exc:
+ raise TimeoutError(str(exc)) from exc
frame = self._convert_frame(frame)
timestamp = time.time()
@@ -136,6 +152,8 @@ def close(self) -> None:
finally:
self._harvester = None
+ self._device_label = None
+
# ------------------------------------------------------------------
# Helpers
# ------------------------------------------------------------------
@@ -177,8 +195,8 @@ def _available_serials(self) -> List[str]:
def _create_acquirer(self, serial: Optional[str], index: int):
assert self._harvester is not None
methods = [
- getattr(self._harvester, "create_image_acquirer", None),
getattr(self._harvester, "create", None),
+ getattr(self._harvester, "create_image_acquirer", None),
]
methods = [m for m in methods if m is not None]
errors: List[str] = []
@@ -280,24 +298,86 @@ def _configure_gain(self, node_map) -> None:
def _configure_frame_rate(self, node_map) -> None:
if not self.settings.fps:
return
- left, right, top, bottom = map(int, crop)
- width = right - left
- height = bottom - top
- self._camera.set_region(left, top, width, height)
-
- def _buffer_to_numpy(self, buffer) -> np.ndarray:
- pixel_format = buffer.get_image_pixel_format()
- bits_per_pixel = (pixel_format >> 16) & 0xFF
- if bits_per_pixel == 8:
- int_pointer = ctypes.POINTER(ctypes.c_uint8)
- else:
- int_pointer = ctypes.POINTER(ctypes.c_uint16)
- addr = buffer.get_data()
- ptr = ctypes.cast(addr, int_pointer)
- frame = np.ctypeslib.as_array(ptr, (buffer.get_image_height(), buffer.get_image_width()))
- frame = frame.copy()
- if frame.ndim < 3:
- import cv2
-
- frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
- return frame
+
+ target = float(self.settings.fps)
+ for attr in ("AcquisitionFrameRateEnable", "AcquisitionFrameRateControlEnable"):
+ try:
+ getattr(node_map, attr).value = True
+ except Exception:
+ continue
+
+ for attr in ("AcquisitionFrameRate", "ResultingFrameRate", "AcquisitionFrameRateAbs"):
+ try:
+ node = getattr(node_map, attr)
+ except AttributeError:
+ continue
+ try:
+ node.value = target
+ return
+ except Exception:
+ continue
+
+ def _convert_frame(self, frame: np.ndarray) -> np.ndarray:
+ if frame.dtype != np.uint8:
+ max_val = float(frame.max()) if frame.size else 0.0
+ scale = 255.0 / max_val if max_val > 0.0 else 1.0
+ frame = np.clip(frame * scale, 0, 255).astype(np.uint8)
+
+ if frame.ndim == 2:
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+ elif frame.ndim == 3 and frame.shape[2] == 3 and self._pixel_format == "RGB8":
+ frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+
+ if self._crop is not None:
+ top, bottom, left, right = (int(v) for v in self._crop)
+ top = max(0, top)
+ left = max(0, left)
+ bottom = bottom if bottom > 0 else frame.shape[0]
+ right = right if right > 0 else frame.shape[1]
+ bottom = min(frame.shape[0], bottom)
+ right = min(frame.shape[1], right)
+ frame = frame[top:bottom, left:right]
+
+ if self._rotate in (90, 180, 270):
+ rotations = {
+ 90: cv2.ROTATE_90_CLOCKWISE,
+ 180: cv2.ROTATE_180,
+ 270: cv2.ROTATE_90_COUNTERCLOCKWISE,
+ }
+ frame = cv2.rotate(frame, rotations[self._rotate])
+
+ return frame.copy()
+
+ def _resolve_device_label(self, node_map) -> Optional[str]:
+ candidates = [
+ ("DeviceModelName", "DeviceSerialNumber"),
+ ("DeviceDisplayName", "DeviceSerialNumber"),
+ ]
+ for name_attr, serial_attr in candidates:
+ try:
+ model = getattr(node_map, name_attr).value
+ except AttributeError:
+ continue
+ serial = None
+ try:
+ serial = getattr(node_map, serial_attr).value
+ except AttributeError:
+ pass
+ if model:
+ model_str = str(model)
+ serial_str = str(serial) if serial else None
+ return f"{model_str} ({serial_str})" if serial_str else model_str
+ return None
+
+ def _adjust_to_increment(self, value: int, minimum: int, maximum: int, increment: int) -> int:
+ value = max(minimum, min(maximum, int(value)))
+ if increment <= 0:
+ return value
+ offset = value - minimum
+ steps = offset // increment
+ return minimum + steps * increment
+
+ def device_name(self) -> str:
+ if self._device_label:
+ return self._device_label
+ return super().device_name()
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index da00c5f..d57a145 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -16,7 +16,7 @@ class CameraSettings:
width: int = 640
height: int = 480
fps: float = 30.0
- backend: str = "opencv"
+ backend: str = "gentl"
properties: Dict[str, Any] = field(default_factory=dict)
def apply_defaults(self) -> "CameraSettings":
@@ -48,7 +48,8 @@ class RecordingSettings:
directory: str = str(Path.home() / "Videos" / "deeplabcut-live")
filename: str = "session.mp4"
container: str = "mp4"
- options: Dict[str, Any] = field(default_factory=dict)
+ codec: str = "libx264"
+ crf: int = 23
def output_path(self) -> Path:
"""Return the absolute output path for recordings."""
@@ -62,6 +63,18 @@ def output_path(self) -> Path:
filename = name.with_suffix(f".{self.container}")
return directory / filename
+ def writegear_options(self, fps: float) -> Dict[str, Any]:
+ """Return compression parameters for WriteGear."""
+
+ fps_value = float(fps) if fps else 30.0
+ codec_value = (self.codec or "libx264").strip() or "libx264"
+ crf_value = int(self.crf) if self.crf is not None else 23
+ return {
+ "-input_framerate": f"{fps_value:.6f}",
+ "-vcodec": codec_value,
+ "-crf": str(crf_value),
+ }
+
@dataclass
class ApplicationSettings:
@@ -77,7 +90,9 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
camera = CameraSettings(**data.get("camera", {})).apply_defaults()
dlc = DLCProcessorSettings(**data.get("dlc", {}))
- recording = RecordingSettings(**data.get("recording", {}))
+ recording_data = dict(data.get("recording", {}))
+ recording_data.pop("options", None)
+ recording = RecordingSettings(**recording_data)
return cls(camera=camera, dlc=dlc, recording=recording)
def to_dict(self) -> Dict[str, Any]:
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index ffa31ec..a6aaae8 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -254,10 +254,15 @@ def _build_recording_group(self) -> QGroupBox:
self.container_combo.addItems(["mp4", "avi", "mov"])
form.addRow("Container", self.container_combo)
- self.recording_options_edit = QPlainTextEdit()
- self.recording_options_edit.setPlaceholderText('{"compression_mode": "mp4"}')
- self.recording_options_edit.setFixedHeight(60)
- form.addRow("WriteGear options", self.recording_options_edit)
+ self.codec_combo = QComboBox()
+ self.codec_combo.addItems(["h264_nvenc", "libx264"])
+ self.codec_combo.setCurrentText("libx264")
+ form.addRow("Codec", self.codec_combo)
+
+ self.crf_spin = QSpinBox()
+ self.crf_spin.setRange(0, 51)
+ self.crf_spin.setValue(23)
+ form.addRow("CRF", self.crf_spin)
self.start_record_button = QPushButton("Start recording")
self.stop_record_button = QPushButton("Stop recording")
@@ -335,7 +340,13 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.output_directory_edit.setText(recording.directory)
self.filename_edit.setText(recording.filename)
self.container_combo.setCurrentText(recording.container)
- self.recording_options_edit.setPlainText(json.dumps(recording.options, indent=2))
+ codec_index = self.codec_combo.findText(recording.codec)
+ if codec_index >= 0:
+ self.codec_combo.setCurrentIndex(codec_index)
+ else:
+ self.codec_combo.addItem(recording.codec)
+ self.codec_combo.setCurrentIndex(self.codec_combo.count() - 1)
+ self.crf_spin.setValue(int(recording.crf))
def _current_config(self) -> ApplicationSettings:
return ApplicationSettings(
@@ -510,7 +521,8 @@ def _recording_settings_from_ui(self) -> RecordingSettings:
directory=self.output_directory_edit.text().strip(),
filename=self.filename_edit.text().strip() or "session.mp4",
container=self.container_combo.currentText().strip() or "mp4",
- options=self._parse_json(self.recording_options_edit.toPlainText()),
+ codec=self.codec_combo.currentText().strip() or "libx264",
+ crf=int(self.crf_spin.value()),
)
# ------------------------------------------------------------------ actions
@@ -701,6 +713,8 @@ def _update_camera_controls_enabled(self) -> None:
self.camera_fps,
self.camera_properties_edit,
self.rotation_combo,
+ self.codec_combo,
+ self.crf_spin,
]
for widget in widgets:
widget.setEnabled(allow_changes)
@@ -746,11 +760,7 @@ def _start_recording(self) -> None:
if self._current_frame is None:
self._show_error("Wait for the first preview frame before recording.")
return
- try:
- recording = self._recording_settings_from_ui()
- except json.JSONDecodeError as exc:
- self._show_error(f"Invalid recording options: {exc}")
- return
+ recording = self._recording_settings_from_ui()
if not recording.enabled:
self._show_error("Recording is disabled in the configuration.")
return
@@ -765,9 +775,10 @@ def _start_recording(self) -> None:
output_path = recording.output_path()
self._video_recorder = VideoRecorder(
output_path,
- recording.options,
frame_size=(int(width), int(height)),
frame_rate=float(frame_rate),
+ codec=recording.codec,
+ crf=recording.crf,
)
try:
self._video_recorder.start()
@@ -795,13 +806,18 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
raw_frame = frame_data.image
self._raw_frame = raw_frame
frame = self._apply_rotation(raw_frame)
+ frame = np.ascontiguousarray(frame)
self._current_frame = frame
if self._active_camera_settings is not None:
height, width = frame.shape[:2]
self._active_camera_settings.width = int(width)
self._active_camera_settings.height = int(height)
if self._video_recorder and self._video_recorder.is_running:
- self._video_recorder.write(frame)
+ try:
+ self._video_recorder.write(frame)
+ except RuntimeError as exc:
+ self._show_error(str(exc))
+ self._stop_recording()
if self._dlc_active:
self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
self._update_video_display(frame)
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index c554318..ff52fdb 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -18,15 +18,17 @@ class VideoRecorder:
def __init__(
self,
output: Path | str,
- options: Optional[Dict[str, Any]] = None,
frame_size: Optional[Tuple[int, int]] = None,
frame_rate: Optional[float] = None,
+ codec: str = "libx264",
+ crf: int = 23,
):
self._output = Path(output)
- self._options = options or {}
self._writer: Optional[WriteGear] = None
self._frame_size = frame_size
self._frame_rate = frame_rate
+ self._codec = codec
+ self._crf = int(crf)
@property
def is_running(self) -> bool:
@@ -39,13 +41,19 @@ def start(self) -> None:
)
if self._writer is not None:
return
- options = dict(self._options)
- if self._frame_size and "resolution" not in options:
- options["resolution"] = tuple(int(x) for x in self._frame_size)
- if self._frame_rate and "frame_rate" not in options:
- options["frame_rate"] = float(self._frame_rate)
+ fps_value = float(self._frame_rate) if self._frame_rate else 30.0
+
+ writer_kwargs: Dict[str, Any] = {
+ "compression_mode": True,
+ "logging": True,
+ "-input_framerate": fps_value,
+ "-vcodec": (self._codec or "libx264").strip() or "libx264",
+ "-crf": int(self._crf),
+ }
+ # TODO deal with pixel format
+
self._output.parent.mkdir(parents=True, exist_ok=True)
- self._writer = WriteGear(output=str(self._output), logging=False, **options)
+ self._writer = WriteGear(output=str(self._output), **writer_kwargs)
def configure_stream(
self, frame_size: Tuple[int, int], frame_rate: Optional[float]
@@ -56,7 +64,27 @@ def configure_stream(
def write(self, frame: np.ndarray) -> None:
if self._writer is None:
return
- self._writer.write(frame)
+ if frame.dtype != np.uint8:
+ frame_float = frame.astype(np.float32, copy=False)
+ max_val = float(frame_float.max()) if frame_float.size else 0.0
+ scale = 1.0
+ if max_val > 0:
+ scale = 255.0 / max_val if max_val > 255.0 else (255.0 if max_val <= 1.0 else 1.0)
+ frame = np.clip(frame_float * scale, 0.0, 255.0).astype(np.uint8)
+ if frame.ndim == 2:
+ frame = np.repeat(frame[:, :, None], 3, axis=2)
+ frame = np.ascontiguousarray(frame)
+ try:
+ self._writer.write(frame)
+ except OSError as exc:
+ writer = self._writer
+ self._writer = None
+ if writer is not None:
+ try:
+ writer.close()
+ except Exception:
+ pass
+ raise RuntimeError(f"Video encoding failed: {exc}") from exc
def stop(self) -> None:
if self._writer is None:
From 7e7e3b6f8e6218cd40e3410aefeac487aa0b70b2 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 23 Oct 2025 14:45:00 +0200
Subject: [PATCH 007/132] updates
---
dlclivegui/config.py | 17 +-
dlclivegui/dlc_processor.py | 282 ++++++++++++++++++++----------
dlclivegui/gui.py | 324 +++++++++++++++++++++++++++--------
dlclivegui/video_recorder.py | 212 +++++++++++++++++++++--
setup.py | 4 +-
5 files changed, 654 insertions(+), 185 deletions(-)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index d57a145..72e3f80 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -15,8 +15,10 @@ class CameraSettings:
index: int = 0
width: int = 640
height: int = 480
- fps: float = 30.0
+ fps: float = 25.0
backend: str = "gentl"
+ exposure: int = 500 # 0 = auto, otherwise microseconds
+ gain: float = 10 # 0.0 = auto, otherwise gain value
properties: Dict[str, Any] = field(default_factory=dict)
def apply_defaults(self) -> "CameraSettings":
@@ -25,6 +27,8 @@ def apply_defaults(self) -> "CameraSettings":
self.width = int(self.width) if self.width else 640
self.height = int(self.height) if self.height else 480
self.fps = float(self.fps) if self.fps else 30.0
+ self.exposure = int(self.exposure) if self.exposure else 0
+ self.gain = float(self.gain) if self.gain else 0.0
return self
@@ -33,11 +37,8 @@ class DLCProcessorSettings:
"""Configuration for DLCLive processing."""
model_path: str = ""
- shuffle: Optional[int] = None
- trainingsetindex: Optional[int] = None
- processor: str = "cpu"
- processor_args: Dict[str, Any] = field(default_factory=dict)
additional_options: Dict[str, Any] = field(default_factory=dict)
+ model_type: Optional[str] = "base"
@dataclass
@@ -89,7 +90,11 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
"""Create an :class:`ApplicationSettings` from a dictionary."""
camera = CameraSettings(**data.get("camera", {})).apply_defaults()
- dlc = DLCProcessorSettings(**data.get("dlc", {}))
+ dlc_data = dict(data.get("dlc", {}))
+ dlc = DLCProcessorSettings(
+ model_path=str(dlc_data.get("model_path", "")),
+ additional_options=dict(dlc_data.get("additional_options", {})),
+ )
recording_data = dict(data.get("recording", {}))
recording_data.pop("options", None)
recording = RecordingSettings(**recording_data)
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 0e1ef3e..201f53c 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -2,15 +2,17 @@
from __future__ import annotations
import logging
+import queue
import threading
-from concurrent.futures import Future, ThreadPoolExecutor
-from dataclasses import dataclass
+import time
+from collections import deque
+from dataclasses import dataclass, field
from typing import Any, Optional
import numpy as np
from PyQt6.QtCore import QObject, pyqtSignal
-from .config import DLCProcessorSettings
+from dlclivegui.config import DLCProcessorSettings
LOGGER = logging.getLogger(__name__)
@@ -26,8 +28,23 @@ class PoseResult:
timestamp: float
+@dataclass
+class ProcessorStats:
+ """Statistics for DLC processor performance."""
+ frames_enqueued: int = 0
+ frames_processed: int = 0
+ frames_dropped: int = 0
+ queue_size: int = 0
+ processing_fps: float = 0.0
+ average_latency: float = 0.0
+ last_latency: float = 0.0
+
+
+_SENTINEL = object()
+
+
class DLCLiveProcessor(QObject):
- """Background pose estimation using DLCLive."""
+ """Background pose estimation using DLCLive with queue-based threading."""
pose_ready = pyqtSignal(object)
error = pyqtSignal(str)
@@ -36,108 +53,187 @@ class DLCLiveProcessor(QObject):
def __init__(self) -> None:
super().__init__()
self._settings = DLCProcessorSettings()
- self._executor = ThreadPoolExecutor(max_workers=1)
- self._dlc: Optional[DLCLive] = None
- self._init_future: Optional[Future[Any]] = None
- self._pending: Optional[Future[Any]] = None
- self._lock = threading.Lock()
+ self._dlc: Optional[Any] = None
+ self._queue: Optional[queue.Queue[Any]] = None
+ self._worker_thread: Optional[threading.Thread] = None
+ self._stop_event = threading.Event()
+ self._initialized = False
+
+ # Statistics tracking
+ self._frames_enqueued = 0
+ self._frames_processed = 0
+ self._frames_dropped = 0
+ self._latencies: deque[float] = deque(maxlen=60)
+ self._processing_times: deque[float] = deque(maxlen=60)
+ self._stats_lock = threading.Lock()
def configure(self, settings: DLCProcessorSettings) -> None:
self._settings = settings
def reset(self) -> None:
- """Cancel pending work and drop the current DLCLive instance."""
-
- with self._lock:
- if self._pending is not None and not self._pending.done():
- self._pending.cancel()
- self._pending = None
- if self._init_future is not None and not self._init_future.done():
- self._init_future.cancel()
- self._init_future = None
- self._dlc = None
+ """Stop the worker thread and drop the current DLCLive instance."""
+ self._stop_worker()
+ self._dlc = None
+ self._initialized = False
+ with self._stats_lock:
+ self._frames_enqueued = 0
+ self._frames_processed = 0
+ self._frames_dropped = 0
+ self._latencies.clear()
+ self._processing_times.clear()
def shutdown(self) -> None:
- with self._lock:
- if self._pending is not None:
- self._pending.cancel()
- self._pending = None
- if self._init_future is not None:
- self._init_future.cancel()
- self._init_future = None
- self._executor.shutdown(wait=False, cancel_futures=True)
+ self._stop_worker()
self._dlc = None
+ self._initialized = False
def enqueue_frame(self, frame: np.ndarray, timestamp: float) -> None:
- with self._lock:
- if self._dlc is None and self._init_future is None:
- self._init_future = self._executor.submit(
- self._initialise_model, frame.copy(), timestamp
- )
- self._init_future.add_done_callback(self._on_initialised)
- return
- if self._dlc is None:
- return
- if self._pending is not None and not self._pending.done():
- return
- self._pending = self._executor.submit(
- self._run_inference, frame.copy(), timestamp
+ if not self._initialized and self._worker_thread is None:
+ # Start worker thread with initialization
+ self._start_worker(frame.copy(), timestamp)
+ return
+
+ if self._queue is not None:
+ try:
+ # Non-blocking put - drop frame if queue is full
+ self._queue.put_nowait((frame.copy(), timestamp, time.perf_counter()))
+ with self._stats_lock:
+ self._frames_enqueued += 1
+ except queue.Full:
+ LOGGER.debug("DLC queue full, dropping frame")
+ with self._stats_lock:
+ self._frames_dropped += 1
+
+ def get_stats(self) -> ProcessorStats:
+ """Get current processing statistics."""
+ queue_size = self._queue.qsize() if self._queue is not None else 0
+
+ with self._stats_lock:
+ avg_latency = (
+ sum(self._latencies) / len(self._latencies)
+ if self._latencies
+ else 0.0
)
- self._pending.add_done_callback(self._on_pose_ready)
-
- def _initialise_model(self, frame: np.ndarray, timestamp: float) -> bool:
- if DLCLive is None:
- raise RuntimeError(
- "The 'dlclive' package is required for pose estimation. Install it to enable DLCLive support."
+ last_latency = self._latencies[-1] if self._latencies else 0.0
+
+ # Compute processing FPS from processing times
+ if len(self._processing_times) >= 2:
+ duration = self._processing_times[-1] - self._processing_times[0]
+ processing_fps = (len(self._processing_times) - 1) / duration if duration > 0 else 0.0
+ else:
+ processing_fps = 0.0
+
+ return ProcessorStats(
+ frames_enqueued=self._frames_enqueued,
+ frames_processed=self._frames_processed,
+ frames_dropped=self._frames_dropped,
+ queue_size=queue_size,
+ processing_fps=processing_fps,
+ average_latency=avg_latency,
+ last_latency=last_latency,
)
- if not self._settings.model_path:
- raise RuntimeError("No DLCLive model path configured.")
- options = {
- "model_path": self._settings.model_path,
- "processor": self._settings.processor,
- }
- options.update(self._settings.additional_options)
- if self._settings.shuffle is not None:
- options["shuffle"] = self._settings.shuffle
- if self._settings.trainingsetindex is not None:
- options["trainingsetindex"] = self._settings.trainingsetindex
- if self._settings.processor_args:
- options["processor_config"] = {
- "object": self._settings.processor,
- **self._settings.processor_args,
- }
- model = DLCLive(**options)
- model.init_inference(frame, frame_time=timestamp, record=False)
- self._dlc = model
- return True
- def _on_initialised(self, future: Future[Any]) -> None:
- try:
- result = future.result()
- self.initialized.emit(bool(result))
- except Exception as exc: # pragma: no cover - runtime behaviour
- LOGGER.exception("Failed to initialise DLCLive", exc_info=exc)
- self.error.emit(str(exc))
- finally:
- with self._lock:
- if self._init_future is future:
- self._init_future = None
-
- def _run_inference(self, frame: np.ndarray, timestamp: float) -> PoseResult:
- if self._dlc is None:
- raise RuntimeError("DLCLive model not initialised")
- pose = self._dlc.get_pose(frame, frame_time=timestamp, record=False)
- return PoseResult(pose=pose, timestamp=timestamp)
-
- def _on_pose_ready(self, future: Future[Any]) -> None:
+ def _start_worker(self, init_frame: np.ndarray, init_timestamp: float) -> None:
+ if self._worker_thread is not None and self._worker_thread.is_alive():
+ return
+
+ self._queue = queue.Queue(maxsize=5)
+ self._stop_event.clear()
+ self._worker_thread = threading.Thread(
+ target=self._worker_loop,
+ args=(init_frame, init_timestamp),
+ name="DLCLiveWorker",
+ daemon=True,
+ )
+ self._worker_thread.start()
+
+ def _stop_worker(self) -> None:
+ if self._worker_thread is None:
+ return
+
+ self._stop_event.set()
+ if self._queue is not None:
+ try:
+ self._queue.put_nowait(_SENTINEL)
+ except queue.Full:
+ pass
+
+ self._worker_thread.join(timeout=2.0)
+ if self._worker_thread.is_alive():
+ LOGGER.warning("DLC worker thread did not terminate cleanly")
+
+ self._worker_thread = None
+ self._queue = None
+
+ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
try:
- result = future.result()
- except Exception as exc: # pragma: no cover - runtime behaviour
- LOGGER.exception("Pose inference failed", exc_info=exc)
+ # Initialize model
+ if DLCLive is None:
+ raise RuntimeError(
+ "The 'dlclive' package is required for pose estimation."
+ )
+ if not self._settings.model_path:
+ raise RuntimeError("No DLCLive model path configured.")
+
+ options = {
+ "model_path": self._settings.model_path,
+ "model_type": self._settings.model_type,
+ "processor": None,
+ "dynamic": [False,0.5,10],
+ "resize": 1.0,
+ }
+ self._dlc = DLCLive(**options)
+ self._dlc.init_inference(init_frame)
+ self._initialized = True
+ self.initialized.emit(True)
+ LOGGER.info("DLCLive model initialized successfully")
+
+ # Process the initialization frame
+ enqueue_time = time.perf_counter()
+ pose = self._dlc.get_pose(init_frame, frame_time=init_timestamp)
+ process_time = time.perf_counter()
+
+ with self._stats_lock:
+ self._frames_enqueued += 1
+ self._frames_processed += 1
+ self._processing_times.append(process_time)
+
+ self.pose_ready.emit(PoseResult(pose=pose, timestamp=init_timestamp))
+
+ except Exception as exc:
+ LOGGER.exception("Failed to initialize DLCLive", exc_info=exc)
self.error.emit(str(exc))
+ self.initialized.emit(False)
return
- finally:
- with self._lock:
- if self._pending is future:
- self._pending = None
- self.pose_ready.emit(result)
+
+ # Main processing loop
+ while not self._stop_event.is_set():
+ try:
+ item = self._queue.get(timeout=0.1)
+ except queue.Empty:
+ continue
+
+ if item is _SENTINEL:
+ break
+
+ frame, timestamp, enqueue_time = item
+ try:
+ start_process = time.perf_counter()
+ pose = self._dlc.get_pose(frame, frame_time=timestamp)
+ end_process = time.perf_counter()
+
+ latency = end_process - enqueue_time
+
+ with self._stats_lock:
+ self._frames_processed += 1
+ self._latencies.append(latency)
+ self._processing_times.append(end_process)
+
+ self.pose_ready.emit(PoseResult(pose=pose, timestamp=timestamp))
+ except Exception as exc:
+ LOGGER.exception("Pose inference failed", exc_info=exc)
+ self.error.emit(str(exc))
+ finally:
+ self._queue.task_done()
+
+ LOGGER.info("DLC worker thread exiting")
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index a6aaae8..0328222 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -1,14 +1,18 @@
"""PyQt6 based GUI for DeepLabCut Live."""
from __future__ import annotations
+import os
import json
import sys
+import time
+import logging
+from collections import deque
from pathlib import Path
from typing import Optional
import cv2
import numpy as np
-from PyQt6.QtCore import Qt
+from PyQt6.QtCore import Qt, QTimer
from PyQt6.QtGui import QAction, QCloseEvent, QImage, QPixmap
from PyQt6.QtWidgets import (
QApplication,
@@ -42,10 +46,14 @@
RecordingSettings,
DEFAULT_CONFIG,
)
-from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult
-from dlclivegui.video_recorder import VideoRecorder
+from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
+from dlclivegui.video_recorder import RecorderStats, VideoRecorder
+os.environ["CUDA_VISIBLE_DEVICES"] = "0"
+logging.basicConfig(level=logging.INFO)
+
+PATH2MODELS = "C:\\Users\\User\\Repos\\DeepLabCut-live-GUI\\models"
class MainWindow(QMainWindow):
"""Main application window."""
@@ -62,6 +70,12 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._rotation_degrees: int = 0
self._detected_cameras: list[DetectedCamera] = []
self._active_camera_settings: Optional[CameraSettings] = None
+ self._camera_frame_times: deque[float] = deque(maxlen=240)
+ self._last_drop_warning = 0.0
+ self._last_recorder_summary = "Recorder idle"
+ self._display_interval = 1.0 / 25.0
+ self._last_display_time = 0.0
+ self._dlc_initialized = False
self.camera_controller = CameraController()
self.dlc_processor = DLCLiveProcessor()
@@ -71,6 +85,11 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._apply_config(self._config)
self._update_inference_buttons()
self._update_camera_controls_enabled()
+ self._metrics_timer = QTimer(self)
+ self._metrics_timer.setInterval(500)
+ self._metrics_timer.timeout.connect(self._update_metrics)
+ self._metrics_timer.start()
+ self._update_metrics()
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
@@ -165,9 +184,23 @@ def _build_camera_group(self) -> QGroupBox:
self.camera_fps.setDecimals(2)
form.addRow("Frame rate", self.camera_fps)
+ self.camera_exposure = QSpinBox()
+ self.camera_exposure.setRange(0, 1000000)
+ self.camera_exposure.setValue(0)
+ self.camera_exposure.setSpecialValueText("Auto")
+ self.camera_exposure.setSuffix(" μs")
+ form.addRow("Exposure", self.camera_exposure)
+
+ self.camera_gain = QDoubleSpinBox()
+ self.camera_gain.setRange(0.0, 100.0)
+ self.camera_gain.setValue(0.0)
+ self.camera_gain.setSpecialValueText("Auto")
+ self.camera_gain.setDecimals(2)
+ form.addRow("Gain", self.camera_gain)
+
self.camera_properties_edit = QPlainTextEdit()
self.camera_properties_edit.setPlaceholderText(
- '{"exposure": 15000, "gain": 0.5, "serial": "123456"}'
+ '{"other_property": "value"}'
)
self.camera_properties_edit.setFixedHeight(60)
form.addRow("Advanced properties", self.camera_properties_edit)
@@ -179,6 +212,9 @@ def _build_camera_group(self) -> QGroupBox:
self.rotation_combo.addItem("270°", 270)
form.addRow("Rotation", self.rotation_combo)
+ self.camera_stats_label = QLabel("Camera idle")
+ form.addRow("Throughput", self.camera_stats_label)
+
return group
def _build_dlc_group(self) -> QGroupBox:
@@ -187,32 +223,21 @@ def _build_dlc_group(self) -> QGroupBox:
path_layout = QHBoxLayout()
self.model_path_edit = QLineEdit()
+ self.model_path_edit.setPlaceholderText("/path/to/exported/model")
path_layout.addWidget(self.model_path_edit)
browse_model = QPushButton("Browse…")
browse_model.clicked.connect(self._action_browse_model)
path_layout.addWidget(browse_model)
- form.addRow("Model path", path_layout)
-
- self.shuffle_edit = QLineEdit()
- self.shuffle_edit.setPlaceholderText("Optional integer")
- form.addRow("Shuffle", self.shuffle_edit)
-
- self.training_edit = QLineEdit()
- self.training_edit.setPlaceholderText("Optional integer")
- form.addRow("Training set index", self.training_edit)
+ form.addRow("Model directory", path_layout)
- self.processor_combo = QComboBox()
- self.processor_combo.setEditable(True)
- self.processor_combo.addItems(["cpu", "gpu", "tensorrt"])
- form.addRow("Processor", self.processor_combo)
-
- self.processor_args_edit = QPlainTextEdit()
- self.processor_args_edit.setPlaceholderText('{"device": 0}')
- self.processor_args_edit.setFixedHeight(60)
- form.addRow("Processor args", self.processor_args_edit)
+ self.model_type_combo = QComboBox()
+ self.model_type_combo.addItem("Base (TensorFlow)", "base")
+ self.model_type_combo.addItem("PyTorch", "pytorch")
+ self.model_type_combo.setCurrentIndex(0) # Default to base
+ form.addRow("Model type", self.model_type_combo)
self.additional_options_edit = QPlainTextEdit()
- self.additional_options_edit.setPlaceholderText('{"allow_growth": true}')
+ self.additional_options_edit.setPlaceholderText('')
self.additional_options_edit.setFixedHeight(60)
form.addRow("Additional options", self.additional_options_edit)
@@ -229,6 +254,10 @@ def _build_dlc_group(self) -> QGroupBox:
self.show_predictions_checkbox.setChecked(True)
form.addRow(self.show_predictions_checkbox)
+ self.dlc_stats_label = QLabel("DLC processor idle")
+ self.dlc_stats_label.setWordWrap(True)
+ form.addRow("Performance", self.dlc_stats_label)
+
return group
def _build_recording_group(self) -> QGroupBox:
@@ -256,7 +285,7 @@ def _build_recording_group(self) -> QGroupBox:
self.codec_combo = QComboBox()
self.codec_combo.addItems(["h264_nvenc", "libx264"])
- self.codec_combo.setCurrentText("libx264")
+ self.codec_combo.setCurrentText("h264_nvenc")
form.addRow("Codec", self.codec_combo)
self.crf_spin = QSpinBox()
@@ -273,6 +302,10 @@ def _build_recording_group(self) -> QGroupBox:
buttons.addWidget(self.stop_record_button)
form.addRow(buttons)
+ self.recording_stats_label = QLabel(self._last_recorder_summary)
+ self.recording_stats_label.setWordWrap(True)
+ form.addRow("Performance", self.recording_stats_label)
+
return group
# ------------------------------------------------------------------ signals
@@ -308,6 +341,11 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.camera_width.setValue(int(camera.width))
self.camera_height.setValue(int(camera.height))
self.camera_fps.setValue(float(camera.fps))
+
+ # Set exposure and gain from config
+ self.camera_exposure.setValue(int(camera.exposure))
+ self.camera_gain.setValue(float(camera.gain))
+
backend_name = camera.backend or "opencv"
index = self.camera_backend.findData(backend_name)
if index >= 0:
@@ -318,19 +356,23 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self._select_camera_by_index(
camera.index, fallback_text=camera.name or str(camera.index)
)
+
+ # Set advanced properties (exposure and gain are now separate fields)
self.camera_properties_edit.setPlainText(
json.dumps(camera.properties, indent=2) if camera.properties else ""
)
+
self._active_camera_settings = None
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
- self.shuffle_edit.setText("" if dlc.shuffle is None else str(dlc.shuffle))
- self.training_edit.setText(
- "" if dlc.trainingsetindex is None else str(dlc.trainingsetindex)
- )
- self.processor_combo.setCurrentText(dlc.processor or "cpu")
- self.processor_args_edit.setPlainText(json.dumps(dlc.processor_args, indent=2))
+
+ # Set model type
+ model_type = dlc.model_type or "base"
+ model_type_index = self.model_type_combo.findData(model_type)
+ if model_type_index >= 0:
+ self.model_type_combo.setCurrentIndex(model_type_index)
+
self.additional_options_edit.setPlainText(
json.dumps(dlc.additional_options, indent=2)
)
@@ -361,6 +403,17 @@ def _camera_settings_from_ui(self) -> CameraSettings:
raise ValueError("Camera selection must provide a numeric index")
backend_text = self._current_backend_name()
properties = self._parse_json(self.camera_properties_edit.toPlainText())
+
+ # Get exposure and gain from explicit UI fields
+ exposure = self.camera_exposure.value()
+ gain = self.camera_gain.value()
+
+ # Also add to properties dict for backward compatibility with camera backends
+ if exposure > 0:
+ properties["exposure"] = exposure
+ if gain > 0.0:
+ properties["gain"] = gain
+
name_text = self.camera_index.currentText().strip()
settings = CameraSettings(
name=name_text or f"Camera {index}",
@@ -369,6 +422,8 @@ def _camera_settings_from_ui(self) -> CameraSettings:
height=self.camera_height.value(),
fps=self.camera_fps.value(),
backend=backend_text or "opencv",
+ exposure=exposure,
+ gain=gain,
properties=properties,
)
return settings.apply_defaults()
@@ -491,12 +546,6 @@ def _current_camera_index_value(self) -> Optional[int]:
except ValueError:
return None
- def _parse_optional_int(self, value: str) -> Optional[int]:
- text = value.strip()
- if not text:
- return None
- return int(text)
-
def _parse_json(self, value: str) -> dict:
text = value.strip()
if not text:
@@ -504,12 +553,13 @@ def _parse_json(self, value: str) -> dict:
return json.loads(text)
def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
+ model_type = self.model_type_combo.currentData()
+ if not isinstance(model_type, str):
+ model_type = "base"
+
return DLCProcessorSettings(
model_path=self.model_path_edit.text().strip(),
- shuffle=self._parse_optional_int(self.shuffle_edit.text()),
- trainingsetindex=self._parse_optional_int(self.training_edit.text()),
- processor=self.processor_combo.currentText().strip() or "cpu",
- processor_args=self._parse_json(self.processor_args_edit.toPlainText()),
+ model_type=model_type,
additional_options=self._parse_json(
self.additional_options_edit.toPlainText()
),
@@ -570,11 +620,11 @@ def _save_config_to_path(self, path: Path) -> None:
self.statusBar().showMessage(f"Saved configuration to {path}", 5000)
def _action_browse_model(self) -> None:
- file_name, _ = QFileDialog.getOpenFileName(
- self, "Select DLCLive model", str(Path.home()), "All files (*.*)"
+ directory = QFileDialog.getExistingDirectory(
+ self, "Select DLCLive model directory", PATH2MODELS
)
- if file_name:
- self.model_path_edit.setText(file_name)
+ if directory:
+ self.model_path_edit.setText(directory)
def _action_browse_directory(self) -> None:
directory = QFileDialog.getExistingDirectory(
@@ -593,19 +643,7 @@ def _on_rotation_changed(self, _index: int) -> None:
rotated = self._apply_rotation(self._raw_frame)
self._current_frame = rotated
self._last_pose = None
- self._update_video_display(rotated)
-
- def _on_backend_changed(self, *_args: object) -> None:
- self._refresh_camera_indices(keep_current=False)
-
- def _on_rotation_changed(self, _index: int) -> None:
- data = self.rotation_combo.currentData()
- self._rotation_degrees = int(data) if isinstance(data, int) else 0
- if self._raw_frame is not None:
- rotated = self._apply_rotation(self._raw_frame)
- self._current_frame = rotated
- self._last_pose = None
- self._update_video_display(rotated)
+ self._display_frame(rotated, force=False)
# ------------------------------------------------------------------ camera control
def _start_preview(self) -> None:
@@ -622,6 +660,10 @@ def _start_preview(self) -> None:
self._raw_frame = None
self._last_pose = None
self._dlc_active = False
+ self._camera_frame_times.clear()
+ self._last_display_time = 0.0
+ if hasattr(self, "camera_stats_label"):
+ self.camera_stats_label.setText("Camera starting…")
self.statusBar().showMessage("Starting camera preview…", 3000)
self._update_inference_buttons()
self._update_camera_controls_enabled()
@@ -636,6 +678,10 @@ def _stop_preview(self) -> None:
self.statusBar().showMessage("Stopping camera preview…", 3000)
self.camera_controller.stop()
self._stop_inference(show_message=False)
+ self._camera_frame_times.clear()
+ self._last_display_time = 0.0
+ if hasattr(self, "camera_stats_label"):
+ self.camera_stats_label.setText("Camera idle")
def _on_camera_started(self, settings: CameraSettings) -> None:
self._active_camera_settings = settings
@@ -675,6 +721,10 @@ def _on_camera_stopped(self) -> None:
self.video_label.setPixmap(QPixmap())
self.video_label.setText("Camera preview not started")
self.statusBar().showMessage("Camera preview stopped", 3000)
+ self._camera_frame_times.clear()
+ self._last_display_time = 0.0
+ if hasattr(self, "camera_stats_label"):
+ self.camera_stats_label.setText("Camera idle")
self._update_inference_buttons()
self._update_camera_controls_enabled()
@@ -711,6 +761,8 @@ def _update_camera_controls_enabled(self) -> None:
self.camera_width,
self.camera_height,
self.camera_fps,
+ self.camera_exposure,
+ self.camera_gain,
self.camera_properties_edit,
self.rotation_combo,
self.codec_combo,
@@ -719,6 +771,90 @@ def _update_camera_controls_enabled(self) -> None:
for widget in widgets:
widget.setEnabled(allow_changes)
+ def _track_camera_frame(self) -> None:
+ now = time.perf_counter()
+ self._camera_frame_times.append(now)
+ window_seconds = 5.0
+ while self._camera_frame_times and now - self._camera_frame_times[0] > window_seconds:
+ self._camera_frame_times.popleft()
+
+ def _display_frame(self, frame: np.ndarray, *, force: bool = False) -> None:
+ if frame is None:
+ return
+ now = time.perf_counter()
+ if not force and (now - self._last_display_time) < self._display_interval:
+ return
+ self._last_display_time = now
+ self._update_video_display(frame)
+
+ def _compute_fps(self, times: deque[float]) -> float:
+ if len(times) < 2:
+ return 0.0
+ duration = times[-1] - times[0]
+ if duration <= 0:
+ return 0.0
+ return (len(times) - 1) / duration
+
+ def _format_recorder_stats(self, stats: RecorderStats) -> str:
+ latency_ms = stats.last_latency * 1000.0
+ avg_ms = stats.average_latency * 1000.0
+ buffer_ms = stats.buffer_seconds * 1000.0
+ write_fps = stats.write_fps
+ enqueue = stats.frames_enqueued
+ written = stats.frames_written
+ dropped = stats.dropped_frames
+ return (
+ f"{written}/{enqueue} frames | write {write_fps:.1f} fps | "
+ f"latency {latency_ms:.1f} ms (avg {avg_ms:.1f} ms) | "
+ f"queue {stats.queue_size} (~{buffer_ms:.0f} ms) | dropped {dropped}"
+ )
+
+ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
+ """Format DLC processor statistics for display."""
+ latency_ms = stats.last_latency * 1000.0
+ avg_ms = stats.average_latency * 1000.0
+ processing_fps = stats.processing_fps
+ enqueue = stats.frames_enqueued
+ processed = stats.frames_processed
+ dropped = stats.frames_dropped
+ return (
+ f"{processed}/{enqueue} frames | inference {processing_fps:.1f} fps | "
+ f"latency {latency_ms:.1f} ms (avg {avg_ms:.1f} ms) | "
+ f"queue {stats.queue_size} | dropped {dropped}"
+ )
+
+ def _update_metrics(self) -> None:
+ if hasattr(self, "camera_stats_label"):
+ if self.camera_controller.is_running():
+ fps = self._compute_fps(self._camera_frame_times)
+ if fps > 0:
+ self.camera_stats_label.setText(f"{fps:.1f} fps (last 5 s)")
+ else:
+ self.camera_stats_label.setText("Measuring…")
+ else:
+ self.camera_stats_label.setText("Camera idle")
+
+ if hasattr(self, "dlc_stats_label"):
+ if self._dlc_active and self._dlc_initialized:
+ stats = self.dlc_processor.get_stats()
+ summary = self._format_dlc_stats(stats)
+ self.dlc_stats_label.setText(summary)
+ else:
+ self.dlc_stats_label.setText("DLC processor idle")
+
+ if hasattr(self, "recording_stats_label"):
+ if self._video_recorder is not None:
+ stats = self._video_recorder.get_stats()
+ if stats is not None:
+ summary = self._format_recorder_stats(stats)
+ self._last_recorder_summary = summary
+ self.recording_stats_label.setText(summary)
+ elif not self._video_recorder.is_running:
+ self._last_recorder_summary = "Recorder idle"
+ self.recording_stats_label.setText(self._last_recorder_summary)
+ else:
+ self.recording_stats_label.setText(self._last_recorder_summary)
+
def _start_inference(self) -> None:
if self._dlc_active:
self.statusBar().showMessage("Pose inference already running", 3000)
@@ -734,17 +870,30 @@ def _start_inference(self) -> None:
self.dlc_processor.reset()
self._last_pose = None
self._dlc_active = True
- self.statusBar().showMessage("Starting pose inference…", 3000)
- self._update_inference_buttons()
+ self._dlc_initialized = False
+
+ # Update button to show initializing state
+ self.start_inference_button.setText("Initializing DLCLive!")
+ self.start_inference_button.setStyleSheet("background-color: #4A90E2; color: white;")
+ self.start_inference_button.setEnabled(False)
+ self.stop_inference_button.setEnabled(True)
+
+ self.statusBar().showMessage("Initializing DLCLive…", 3000)
self._update_camera_controls_enabled()
def _stop_inference(self, show_message: bool = True) -> None:
was_active = self._dlc_active
self._dlc_active = False
+ self._dlc_initialized = False
self.dlc_processor.reset()
self._last_pose = None
+
+ # Reset button appearance
+ self.start_inference_button.setText("Start pose inference")
+ self.start_inference_button.setStyleSheet("")
+
if self._current_frame is not None:
- self._update_video_display(self._current_frame)
+ self._display_frame(self._current_frame, force=True)
if was_active and show_message:
self.statusBar().showMessage("Pose inference stopped", 3000)
self._update_inference_buttons()
@@ -780,6 +929,7 @@ def _start_recording(self) -> None:
codec=recording.codec,
crf=recording.crf,
)
+ self._last_drop_warning = 0.0
try:
self._video_recorder.start()
except Exception as exc: # pragma: no cover - runtime error
@@ -788,16 +938,35 @@ def _start_recording(self) -> None:
return
self.start_record_button.setEnabled(False)
self.stop_record_button.setEnabled(True)
+ if hasattr(self, "recording_stats_label"):
+ self._last_recorder_summary = "Recorder running…"
+ self.recording_stats_label.setText(self._last_recorder_summary)
self.statusBar().showMessage(f"Recording to {output_path}", 5000)
self._update_camera_controls_enabled()
def _stop_recording(self) -> None:
if not self._video_recorder:
return
- self._video_recorder.stop()
+ recorder = self._video_recorder
+ recorder.stop()
+ stats = recorder.get_stats() if recorder is not None else None
self._video_recorder = None
self.start_record_button.setEnabled(True)
self.stop_record_button.setEnabled(False)
+ if hasattr(self, "recording_stats_label"):
+ if stats is not None:
+ summary = self._format_recorder_stats(stats)
+ else:
+ summary = "Recorder idle"
+ self._last_recorder_summary = summary
+ self.recording_stats_label.setText(summary)
+ else:
+ self._last_recorder_summary = (
+ self._format_recorder_stats(stats)
+ if stats is not None
+ else "Recorder idle"
+ )
+ self._last_drop_warning = 0.0
self.statusBar().showMessage("Recording stopped", 3000)
self._update_camera_controls_enabled()
@@ -808,26 +977,35 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
frame = self._apply_rotation(raw_frame)
frame = np.ascontiguousarray(frame)
self._current_frame = frame
+ self._track_camera_frame()
if self._active_camera_settings is not None:
height, width = frame.shape[:2]
self._active_camera_settings.width = int(width)
self._active_camera_settings.height = int(height)
if self._video_recorder and self._video_recorder.is_running:
try:
- self._video_recorder.write(frame)
+ success = self._video_recorder.write(frame)
+ if not success:
+ now = time.perf_counter()
+ if now - self._last_drop_warning > 1.0:
+ self.statusBar().showMessage(
+ "Recorder backlog full; dropping frames", 2000
+ )
+ self._last_drop_warning = now
except RuntimeError as exc:
self._show_error(str(exc))
self._stop_recording()
if self._dlc_active:
self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
- self._update_video_display(frame)
+ self._display_frame(frame)
def _on_pose_ready(self, result: PoseResult) -> None:
if not self._dlc_active:
return
self._last_pose = result
+ logging.info(f"Pose result: {result.pose}, Timestamp: {result.timestamp}")
if self._current_frame is not None:
- self._update_video_display(self._current_frame)
+ self._display_frame(self._current_frame, force=True)
def _on_dlc_error(self, message: str) -> None:
self._stop_inference(show_message=False)
@@ -858,7 +1036,7 @@ def _apply_rotation(self, frame: np.ndarray) -> np.ndarray:
def _on_show_predictions_changed(self, _state: int) -> None:
if self._current_frame is not None:
- self._update_video_display(self._current_frame)
+ self._display_frame(self._current_frame, force=True)
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
@@ -873,9 +1051,19 @@ def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
def _on_dlc_initialised(self, success: bool) -> None:
if success:
- self.statusBar().showMessage("DLCLive initialised", 3000)
+ self._dlc_initialized = True
+ # Update button to show running state
+ self.start_inference_button.setText("DLCLive running!")
+ self.start_inference_button.setStyleSheet("background-color: #4CAF50; color: white;")
+ self.statusBar().showMessage("DLCLive initialized successfully", 3000)
else:
- self.statusBar().showMessage("DLCLive initialisation failed", 3000)
+ self._dlc_initialized = False
+ # Reset button on failure
+ self.start_inference_button.setText("Start pose inference")
+ self.start_inference_button.setStyleSheet("")
+ self.statusBar().showMessage("DLCLive initialization failed", 5000)
+ # Stop inference since initialization failed
+ self._stop_inference(show_message=False)
# ------------------------------------------------------------------ helpers
def _show_error(self, message: str) -> None:
@@ -889,6 +1077,8 @@ def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI beha
if self._video_recorder and self._video_recorder.is_running:
self._video_recorder.stop()
self.dlc_processor.shutdown()
+ if hasattr(self, "_metrics_timer"):
+ self._metrics_timer.stop()
super().closeEvent(event)
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index ff52fdb..d729b02 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -1,6 +1,12 @@
"""Video recording support using the vidgear library."""
from __future__ import annotations
+import logging
+import queue
+import threading
+import time
+from collections import deque
+from dataclasses import dataclass
from pathlib import Path
from typing import Any, Dict, Optional, Tuple
@@ -12,6 +18,26 @@
WriteGear = None # type: ignore[assignment]
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class RecorderStats:
+ """Snapshot of recorder throughput metrics."""
+
+ frames_enqueued: int
+ frames_written: int
+ dropped_frames: int
+ queue_size: int
+ average_latency: float
+ last_latency: float
+ write_fps: float
+ buffer_seconds: float
+
+
+_SENTINEL = object()
+
+
class VideoRecorder:
"""Thin wrapper around :class:`vidgear.gears.WriteGear`."""
@@ -22,17 +48,31 @@ def __init__(
frame_rate: Optional[float] = None,
codec: str = "libx264",
crf: int = 23,
+ buffer_size: int = 240,
):
self._output = Path(output)
- self._writer: Optional[WriteGear] = None
+ self._writer: Optional[Any] = None
self._frame_size = frame_size
self._frame_rate = frame_rate
self._codec = codec
self._crf = int(crf)
+ self._buffer_size = max(1, int(buffer_size))
+ self._queue: Optional[queue.Queue[Any]] = None
+ self._writer_thread: Optional[threading.Thread] = None
+ self._stop_event = threading.Event()
+ self._stats_lock = threading.Lock()
+ self._frames_enqueued = 0
+ self._frames_written = 0
+ self._dropped_frames = 0
+ self._total_latency = 0.0
+ self._last_latency = 0.0
+ self._written_times: deque[float] = deque(maxlen=600)
+ self._encode_error: Optional[Exception] = None
+ self._last_log_time = 0.0
@property
def is_running(self) -> bool:
- return self._writer is not None
+ return self._writer_thread is not None and self._writer_thread.is_alive()
def start(self) -> None:
if WriteGear is None:
@@ -54,6 +94,21 @@ def start(self) -> None:
self._output.parent.mkdir(parents=True, exist_ok=True)
self._writer = WriteGear(output=str(self._output), **writer_kwargs)
+ self._queue = queue.Queue(maxsize=self._buffer_size)
+ self._frames_enqueued = 0
+ self._frames_written = 0
+ self._dropped_frames = 0
+ self._total_latency = 0.0
+ self._last_latency = 0.0
+ self._written_times.clear()
+ self._encode_error = None
+ self._stop_event.clear()
+ self._writer_thread = threading.Thread(
+ target=self._writer_loop,
+ name="VideoRecorderWriter",
+ daemon=True,
+ )
+ self._writer_thread.start()
def configure_stream(
self, frame_size: Tuple[int, int], frame_rate: Optional[float]
@@ -61,9 +116,12 @@ def configure_stream(
self._frame_size = frame_size
self._frame_rate = frame_rate
- def write(self, frame: np.ndarray) -> None:
- if self._writer is None:
- return
+ def write(self, frame: np.ndarray) -> bool:
+ if not self.is_running or self._queue is None:
+ return False
+ error = self._current_error()
+ if error is not None:
+ raise RuntimeError(f"Video encoding failed: {error}") from error
if frame.dtype != np.uint8:
frame_float = frame.astype(np.float32, copy=False)
max_val = float(frame_float.max()) if frame_float.size else 0.0
@@ -75,19 +133,139 @@ def write(self, frame: np.ndarray) -> None:
frame = np.repeat(frame[:, :, None], 3, axis=2)
frame = np.ascontiguousarray(frame)
try:
- self._writer.write(frame)
- except OSError as exc:
- writer = self._writer
- self._writer = None
- if writer is not None:
- try:
- writer.close()
- except Exception:
- pass
- raise RuntimeError(f"Video encoding failed: {exc}") from exc
+ assert self._queue is not None
+ self._queue.put(frame, block=False)
+ except queue.Full:
+ with self._stats_lock:
+ self._dropped_frames += 1
+ queue_size = self._queue.qsize() if self._queue is not None else -1
+ logger.warning(
+ "Video recorder queue full; dropping frame. queue=%d buffer=%d",
+ queue_size,
+ self._buffer_size,
+ )
+ return False
+ with self._stats_lock:
+ self._frames_enqueued += 1
+ return True
def stop(self) -> None:
- if self._writer is None:
+ if self._writer is None and not self.is_running:
return
- self._writer.close()
+ self._stop_event.set()
+ if self._queue is not None:
+ try:
+ self._queue.put_nowait(_SENTINEL)
+ except queue.Full:
+ self._queue.put(_SENTINEL)
+ if self._writer_thread is not None:
+ self._writer_thread.join(timeout=5.0)
+ if self._writer_thread.is_alive():
+ logger.warning("Video recorder thread did not terminate cleanly")
+ if self._writer is not None:
+ try:
+ self._writer.close()
+ except Exception:
+ logger.exception("Failed to close WriteGear cleanly")
+ self._writer = None
+ self._writer_thread = None
+ self._queue = None
+
+ def get_stats(self) -> Optional[RecorderStats]:
+ if (
+ self._writer is None
+ and not self.is_running
+ and self._queue is None
+ and self._frames_enqueued == 0
+ and self._frames_written == 0
+ and self._dropped_frames == 0
+ ):
+ return None
+ queue_size = self._queue.qsize() if self._queue is not None else 0
+ with self._stats_lock:
+ frames_enqueued = self._frames_enqueued
+ frames_written = self._frames_written
+ dropped = self._dropped_frames
+ avg_latency = (
+ self._total_latency / self._frames_written
+ if self._frames_written
+ else 0.0
+ )
+ last_latency = self._last_latency
+ write_fps = self._compute_write_fps_locked()
+ buffer_seconds = queue_size * avg_latency if avg_latency > 0 else 0.0
+ return RecorderStats(
+ frames_enqueued=frames_enqueued,
+ frames_written=frames_written,
+ dropped_frames=dropped,
+ queue_size=queue_size,
+ average_latency=avg_latency,
+ last_latency=last_latency,
+ write_fps=write_fps,
+ buffer_seconds=buffer_seconds,
+ )
+
+ def _writer_loop(self) -> None:
+ assert self._queue is not None
+ while True:
+ try:
+ item = self._queue.get(timeout=0.1)
+ except queue.Empty:
+ if self._stop_event.is_set():
+ break
+ continue
+ if item is _SENTINEL:
+ self._queue.task_done()
+ break
+ frame = item
+ start = time.perf_counter()
+ try:
+ assert self._writer is not None
+ self._writer.write(frame)
+ except OSError as exc:
+ with self._stats_lock:
+ self._encode_error = exc
+ logger.exception("Video encoding failed while writing frame")
+ self._queue.task_done()
+ self._stop_event.set()
+ break
+ elapsed = time.perf_counter() - start
+ now = time.perf_counter()
+ with self._stats_lock:
+ self._frames_written += 1
+ self._total_latency += elapsed
+ self._last_latency = elapsed
+ self._written_times.append(now)
+ if now - self._last_log_time >= 1.0:
+ fps = self._compute_write_fps_locked()
+ queue_size = self._queue.qsize()
+ logger.info(
+ "Recorder throughput: %.2f fps, latency %.2f ms, queue=%d",
+ fps,
+ elapsed * 1000.0,
+ queue_size,
+ )
+ self._last_log_time = now
+ self._queue.task_done()
+ self._finalize_writer()
+
+ def _finalize_writer(self) -> None:
+ writer = self._writer
self._writer = None
+ if writer is not None:
+ try:
+ writer.close()
+ except Exception:
+ logger.exception("Failed to close WriteGear during finalisation")
+
+ def _compute_write_fps_locked(self) -> float:
+ if len(self._written_times) < 2:
+ return 0.0
+ duration = self._written_times[-1] - self._written_times[0]
+ if duration <= 0:
+ return 0.0
+ return (len(self._written_times) - 1) / duration
+
+ def _current_error(self) -> Optional[Exception]:
+ with self._stats_lock:
+ return self._encode_error
diff --git a/setup.py b/setup.py
index 163f8f0..a254101 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/DeepLabCut/DeepLabCut-live-GUI",
- python_requires=">=3.11",
+ python_requires=">=3.10",
install_requires=[
"deeplabcut-live",
"PyQt6",
@@ -25,7 +25,7 @@
],
extras_require={
"basler": ["pypylon"],
- "gentl": ["pygobject"],
+ "gentl": ["harvesters"],
},
packages=setuptools.find_packages(),
include_package_data=True,
From 6402566d540354cfb6cc894681a9ffee7af9db1a Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 23 Oct 2025 16:00:39 +0200
Subject: [PATCH 008/132] Added processors
---
dlclivegui/processors/PLUGIN_SYSTEM.md | 191 +++++++
dlclivegui/processors/dlc_processor_socket.py | 509 ++++++++++++++++++
dlclivegui/processors/processor_utils.py | 83 +++
3 files changed, 783 insertions(+)
create mode 100644 dlclivegui/processors/PLUGIN_SYSTEM.md
create mode 100644 dlclivegui/processors/dlc_processor_socket.py
create mode 100644 dlclivegui/processors/processor_utils.py
diff --git a/dlclivegui/processors/PLUGIN_SYSTEM.md b/dlclivegui/processors/PLUGIN_SYSTEM.md
new file mode 100644
index 0000000..b02402d
--- /dev/null
+++ b/dlclivegui/processors/PLUGIN_SYSTEM.md
@@ -0,0 +1,191 @@
+# DLC Processor Plugin System
+
+This folder contains a plugin-style architecture for DLC processors that allows GUI tools to discover and instantiate processors dynamically.
+
+## Architecture
+
+### 1. Processor Registry
+
+Each processor file should define a `PROCESSOR_REGISTRY` dictionary and helper functions:
+
+```python
+# Registry for GUI discovery
+PROCESSOR_REGISTRY = {}
+
+# At end of file, register your processors
+PROCESSOR_REGISTRY["MyProcessor_socket"] = MyProcessor_socket
+```
+
+### 2. Processor Metadata
+
+Each processor class should define metadata attributes for GUI discovery:
+
+```python
+class MyProcessor_socket(BaseProcessor_socket):
+ # Metadata for GUI discovery
+ PROCESSOR_NAME = "Mouse Pose Processor" # Human-readable name
+ PROCESSOR_DESCRIPTION = "Calculates mouse center, heading, and head angle"
+ PROCESSOR_PARAMS = {
+ "bind": {
+ "type": "tuple",
+ "default": ("0.0.0.0", 6000),
+ "description": "Server address (host, port)"
+ },
+ "use_filter": {
+ "type": "bool",
+ "default": False,
+ "description": "Apply One-Euro filter"
+ },
+ # ... more parameters
+ }
+```
+
+### 3. Discovery Functions
+
+Two helper functions enable GUI discovery:
+
+```python
+def get_available_processors():
+ """Returns dict of available processors with metadata."""
+
+def instantiate_processor(class_name, **kwargs):
+ """Instantiates a processor by name with given parameters."""
+```
+
+## GUI Integration
+
+### Simple Usage
+
+```python
+from dlc_processor_socket import get_available_processors, instantiate_processor
+
+# 1. Get available processors
+processors = get_available_processors()
+
+# 2. Display to user (e.g., in dropdown)
+for class_name, info in processors.items():
+ print(f"{info['name']} - {info['description']}")
+
+# 3. User selects "MyProcessor_socket"
+selected_class = "MyProcessor_socket"
+
+# 4. Show parameter form based on info['params']
+processor_info = processors[selected_class]
+for param_name, param_info in processor_info['params'].items():
+ # Create input widget for param_type and default value
+ pass
+
+# 5. Instantiate with user's values
+processor = instantiate_processor(
+ selected_class,
+ bind=("127.0.0.1", 7000),
+ use_filter=True
+)
+```
+
+### Scanning Multiple Files
+
+To scan a folder for processor files:
+
+```python
+import importlib.util
+from pathlib import Path
+
+def load_processors_from_file(file_path):
+ """Load processors from a single file."""
+ spec = importlib.util.spec_from_file_location("processors", file_path)
+ module = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(module)
+
+ if hasattr(module, 'get_available_processors'):
+ return module.get_available_processors()
+ return {}
+
+# Scan folder
+for py_file in Path("dlc_processors").glob("*.py"):
+ processors = load_processors_from_file(py_file)
+ # Display processors to user
+```
+
+## Examples
+
+### 1. Command-line Example
+
+```bash
+python example_gui_usage.py
+```
+
+This demonstrates:
+- Loading processors
+- Displaying metadata
+- Instantiating with default/custom parameters
+- Simulated GUI workflow
+
+### 2. tkinter GUI
+
+```bash
+python processor_gui_simple.py
+```
+
+This provides a full GUI with:
+- Dropdown to select processor
+- Auto-generated parameter form
+- Create/Stop buttons
+- Status display
+
+## Adding New Processors
+
+To make a new processor discoverable:
+
+1. **Define metadata attributes:**
+```python
+class MyNewProcessor(BaseProcessor_socket):
+ PROCESSOR_NAME = "My New Processor"
+ PROCESSOR_DESCRIPTION = "Does something cool"
+ PROCESSOR_PARAMS = {
+ "my_param": {
+ "type": "bool",
+ "default": True,
+ "description": "Enable cool feature"
+ }
+ }
+```
+
+2. **Register in PROCESSOR_REGISTRY:**
+```python
+PROCESSOR_REGISTRY["MyNewProcessor"] = MyNewProcessor
+```
+
+3. **Done!** GUI will automatically discover it.
+
+## Parameter Types
+
+Supported parameter types in `PROCESSOR_PARAMS`:
+
+- `"bool"` - Boolean checkbox
+- `"int"` - Integer input
+- `"float"` - Float input
+- `"str"` - String input
+- `"bytes"` - String that gets encoded to bytes
+- `"tuple"` - Tuple (e.g., `(host, port)`)
+- `"dict"` - Dictionary (e.g., filter parameters)
+- `"list"` - List
+
+## Benefits
+
+1. **No hardcoding** - GUI doesn't need to know about specific processors
+2. **Easy extension** - Add new processors without modifying GUI code
+3. **Self-documenting** - Parameters include descriptions
+4. **Type-safe** - Parameter metadata includes type information
+5. **Modular** - Each processor file can be independent
+
+## File Structure
+
+```
+dlc_processors/
+├── dlc_processor_socket.py # Base + MyProcessor with registry
+├── my_custom_processor.py # Your custom processor (with registry)
+├── example_gui_usage.py # Command-line example
+├── processor_gui_simple.py # tkinter GUI example
+└── PLUGIN_SYSTEM.md # This file
+```
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
new file mode 100644
index 0000000..bd183af
--- /dev/null
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -0,0 +1,509 @@
+import logging
+import pickle
+import time
+from collections import deque
+from math import acos, atan2, copysign, degrees, pi, sqrt
+from multiprocessing.connection import Listener
+from threading import Event, Thread
+
+import numpy as np
+from dlclive import Processor
+
+LOG = logging.getLogger("dlc_processor_socket")
+LOG.setLevel(logging.INFO)
+_handler = logging.StreamHandler()
+_handler.setFormatter(logging.Formatter("%(asctime)s [%(levelname)s] %(message)s"))
+LOG.addHandler(_handler)
+
+
+# Registry for GUI discovery
+PROCESSOR_REGISTRY = {}
+
+
+class OneEuroFilter:
+ def __init__(self, t0, x0, dx0=None, min_cutoff=1.0, beta=0.0, d_cutoff=1.0):
+ self.min_cutoff = min_cutoff
+ self.beta = beta
+ self.d_cutoff = d_cutoff
+ self.x_prev = x0
+ if dx0 is None:
+ dx0 = np.zeros_like(x0)
+ self.dx_prev = dx0
+ self.t_prev = t0
+
+ @staticmethod
+ def smoothing_factor(t_e, cutoff):
+ r = 2 * pi * cutoff * t_e
+ return r / (r + 1)
+
+ @staticmethod
+ def exponential_smoothing(alpha, x, x_prev):
+ return alpha * x + (1 - alpha) * x_prev
+
+ def __call__(self, t, x):
+ t_e = t - self.t_prev
+
+ a_d = self.smoothing_factor(t_e, self.d_cutoff)
+ dx = (x - self.x_prev) / t_e
+ dx_hat = self.exponential_smoothing(a_d, dx, self.dx_prev)
+
+ cutoff = self.min_cutoff + self.beta * abs(dx_hat)
+ a = self.smoothing_factor(t_e, cutoff)
+ x_hat = self.exponential_smoothing(a, x, self.x_prev)
+
+ self.x_prev = x_hat
+ self.dx_prev = dx_hat
+ self.t_prev = t
+
+ return x_hat
+
+
+class BaseProcessor_socket(Processor):
+ """
+ Base DLC Processor with multi-client broadcasting support.
+
+ Handles network connections, timing, and data logging.
+ Subclasses should implement custom pose processing logic.
+ """
+
+ # Metadata for GUI discovery
+ PROCESSOR_NAME = "Base Socket Processor"
+ PROCESSOR_DESCRIPTION = "Base class for socket-based processors with multi-client support"
+ PROCESSOR_PARAMS = {
+ "bind": {
+ "type": "tuple",
+ "default": ("0.0.0.0", 6000),
+ "description": "Server address (host, port)"
+ },
+ "authkey": {
+ "type": "bytes",
+ "default": b"secret password",
+ "description": "Authentication key for clients"
+ },
+ "use_perf_counter": {
+ "type": "bool",
+ "default": False,
+ "description": "Use time.perf_counter() instead of time.time()"
+ },
+ "save_original": {
+ "type": "bool",
+ "default": False,
+ "description": "Save raw pose arrays for analysis"
+ }
+ }
+
+ def __init__(
+ self,
+ bind=("0.0.0.0", 6000),
+ authkey=b"secret password",
+ use_perf_counter=False,
+ save_original=False,
+ ):
+ """
+ Initialize base processor with socket server.
+
+ Args:
+ bind: (host, port) tuple for server binding
+ authkey: Authentication key for client connections
+ use_perf_counter: If True, use time.perf_counter() instead of time.time()
+ save_original: If True, save raw pose arrays for analysis
+ """
+ super().__init__()
+
+ # Network setup
+ self.address = bind
+ self.authkey = authkey
+ self.listener = Listener(bind, authkey=authkey)
+ self._stop = Event()
+ self.conns = set()
+
+ # Start accept loop in background
+ Thread(target=self._accept_loop, name="DLCAccept", daemon=True).start()
+
+ # Timing function
+ self.timing_func = time.perf_counter if use_perf_counter else time.time
+ self.start_time = self.timing_func()
+
+ # Data storage
+ self.time_stamp = deque()
+ self.step = deque()
+ self.frame_time = deque()
+ self.pose_time = deque()
+ self.original_pose = deque()
+
+ # State
+ self.curr_step = 0
+ self.save_original = save_original
+
+ def _accept_loop(self):
+ """Background thread to accept new client connections."""
+ LOG.info(f"DLC Processor listening on {self.address[0]}:{self.address[1]}")
+ while not self._stop.is_set():
+ try:
+ c = self.listener.accept()
+ LOG.info(f"Client connected from {self.listener.last_accepted}")
+ self.conns.add(c)
+ # Start RX loop for this connection (in case clients send data)
+ Thread(target=self._rx_loop, args=(c,), name="DLCRX", daemon=True).start()
+ except (OSError, EOFError):
+ break
+
+ def _rx_loop(self, c):
+ """Background thread to handle receive from a client (detects disconnects)."""
+ while not self._stop.is_set():
+ try:
+ if c.poll(0.05):
+ msg = c.recv()
+ # Optional: handle client messages here
+ except (EOFError, OSError, BrokenPipeError):
+ break
+ try:
+ c.close()
+ except Exception:
+ pass
+ self.conns.discard(c)
+ LOG.info("Client disconnected")
+
+ def broadcast(self, payload):
+ """Send payload to all connected clients."""
+ dead = []
+ for c in list(self.conns):
+ try:
+ c.send(payload)
+ except (EOFError, OSError, BrokenPipeError):
+ dead.append(c)
+ for c in dead:
+ try:
+ c.close()
+ except Exception:
+ pass
+ self.conns.discard(c)
+
+ def process(self, pose, **kwargs):
+ """
+ Process pose and broadcast to clients.
+
+ This base implementation just saves original pose and broadcasts it.
+ Subclasses should override to add custom processing.
+
+ Args:
+ pose: DLC pose array (N_keypoints x 3) with [x, y, confidence]
+ **kwargs: Additional metadata (frame_time, pose_time, etc.)
+
+ Returns:
+ pose: Unmodified pose array
+ """
+ curr_time = self.timing_func()
+
+ # Save original pose if requested
+ if self.save_original:
+ self.original_pose.append(pose.copy())
+
+ # Update step counter
+ self.curr_step = self.curr_step + 1
+
+ # Store metadata
+ self.time_stamp.append(curr_time)
+ self.step.append(self.curr_step)
+ self.frame_time.append(kwargs.get("frame_time", -1))
+ if "pose_time" in kwargs:
+ self.pose_time.append(kwargs["pose_time"])
+
+ # Broadcast raw pose to all connected clients
+ payload = [curr_time, pose]
+ self.broadcast(payload)
+
+ return pose
+
+ def stop(self):
+ """Stop the processor and close all connections."""
+ self._stop.set()
+ try:
+ self.listener.close()
+ except Exception:
+ pass
+ for c in list(self.conns):
+ try:
+ c.close()
+ except Exception:
+ pass
+ self.conns.discard(c)
+ LOG.info("Processor stopped, all connections closed")
+
+ def save(self, file=None):
+ """Save logged data to file."""
+ save_code = 0
+ if file:
+ LOG.info(f"Saving data to {file}")
+ try:
+ save_dict = self.get_data()
+ pickle.dump(save_dict, open(file, "wb"))
+ save_code = 1
+ except Exception as e:
+ LOG.error(f"Save failed: {e}")
+ save_code = -1
+ return save_code
+
+ def get_data(self):
+ """Get logged data as dictionary."""
+ save_dict = dict()
+ if self.save_original:
+ save_dict["original_pose"] = np.array(self.original_pose)
+ save_dict["start_time"] = self.start_time
+ save_dict["time_stamp"] = np.array(self.time_stamp)
+ save_dict["step"] = np.array(self.step)
+ save_dict["frame_time"] = np.array(self.frame_time)
+ save_dict["pose_time"] = np.array(self.pose_time) if self.pose_time else None
+ save_dict["use_perf_counter"] = self.timing_func == time.perf_counter
+ return save_dict
+
+
+class MyProcessor_socket(BaseProcessor_socket):
+ """
+ DLC Processor with pose calculations (center, heading, head angle) and optional filtering.
+
+ Calculates:
+ - center: Weighted average of head keypoints
+ - heading: Body orientation (degrees)
+ - head_angle: Head rotation relative to body (radians)
+
+ Broadcasts: [timestamp, center_x, center_y, heading, head_angle]
+ """
+
+ # Metadata for GUI discovery
+ PROCESSOR_NAME = "Mouse Pose Processor"
+ PROCESSOR_DESCRIPTION = "Calculates mouse center, heading, and head angle with optional One-Euro filtering"
+ PROCESSOR_PARAMS = {
+ "bind": {
+ "type": "tuple",
+ "default": ("0.0.0.0", 6000),
+ "description": "Server address (host, port)"
+ },
+ "authkey": {
+ "type": "bytes",
+ "default": b"secret password",
+ "description": "Authentication key for clients"
+ },
+ "use_perf_counter": {
+ "type": "bool",
+ "default": False,
+ "description": "Use time.perf_counter() instead of time.time()"
+ },
+ "use_filter": {
+ "type": "bool",
+ "default": False,
+ "description": "Apply One-Euro filter to calculated values"
+ },
+ "filter_kwargs": {
+ "type": "dict",
+ "default": {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0},
+ "description": "One-Euro filter parameters (min_cutoff, beta, d_cutoff)"
+ },
+ "save_original": {
+ "type": "bool",
+ "default": False,
+ "description": "Save raw pose arrays for analysis"
+ }
+ }
+
+ def __init__(
+ self,
+ bind=("0.0.0.0", 6000),
+ authkey=b"secret password",
+ use_perf_counter=False,
+ use_filter=False,
+ filter_kwargs=None,
+ save_original=False,
+ ):
+ """
+ DLC Processor with multi-client broadcasting support.
+
+ Args:
+ bind: (host, port) tuple for server binding
+ authkey: Authentication key for client connections
+ use_perf_counter: If True, use time.perf_counter() instead of time.time()
+ use_filter: If True, apply One-Euro filter to pose data
+ filter_kwargs: Dict with OneEuroFilter parameters (min_cutoff, beta, d_cutoff)
+ save_original: If True, save raw pose arrays
+ """
+ super().__init__(
+ bind=bind,
+ authkey=authkey,
+ use_perf_counter=use_perf_counter,
+ save_original=save_original,
+ )
+
+ # Additional data storage for processed values
+ self.center_x = deque()
+ self.center_y = deque()
+ self.heading_direction = deque()
+ self.head_angle = deque()
+
+ # Filtering
+ self.use_filter = use_filter
+ self.filter_kwargs = filter_kwargs or {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0}
+ self.filters = None # Will be initialized on first pose
+
+ def _initialize_filters(self, vals):
+ """Initialize One-Euro filters for each output variable."""
+ t0 = self.timing_func()
+ self.filters = {
+ "center_x": OneEuroFilter(t0, vals[0], **self.filter_kwargs),
+ "center_y": OneEuroFilter(t0, vals[1], **self.filter_kwargs),
+ "heading": OneEuroFilter(t0, vals[2], **self.filter_kwargs),
+ "head_angle": OneEuroFilter(t0, vals[3], **self.filter_kwargs),
+ }
+ LOG.debug(f"Initialized One-Euro filters with parameters: {self.filter_kwargs}")
+
+ def process(self, pose, **kwargs):
+ """
+ Process pose: calculate center/heading/head_angle, optionally filter, and broadcast.
+
+ Args:
+ pose: DLC pose array (N_keypoints x 3) with [x, y, confidence]
+ **kwargs: Additional metadata (frame_time, pose_time, etc.)
+
+ Returns:
+ pose: Unmodified pose array
+ """
+ # Save original pose if requested (from base class)
+ if self.save_original:
+ self.original_pose.append(pose.copy())
+
+ # Extract keypoints and confidence
+ xy = pose[:, :2]
+ conf = pose[:, 2]
+
+ # Calculate weighted center from head keypoints
+ head_xy = xy[[0, 1, 2, 3, 4, 5, 6, 26], :]
+ head_conf = conf[[0, 1, 2, 3, 4, 5, 6, 26]]
+ center = np.average(head_xy, axis=0, weights=head_conf)
+
+ # Calculate body axis (tail_base -> neck)
+ body_axis = xy[7] - xy[13]
+ body_axis /= sqrt(np.sum(body_axis**2))
+
+ # Calculate head axis (neck -> nose)
+ head_axis = xy[0] - xy[7]
+ head_axis /= sqrt(np.sum(head_axis**2))
+
+ # Calculate head angle relative to body
+ cross = body_axis[0] * head_axis[1] - head_axis[0] * body_axis[1]
+ sign = copysign(1, cross) # Positive when looking left
+ try:
+ head_angle = acos(body_axis @ head_axis) * sign
+ except ValueError:
+ head_angle = 0
+
+ # Calculate heading (body orientation)
+ heading = atan2(body_axis[1], body_axis[0])
+ heading = degrees(heading)
+
+ # Raw values (heading unwrapped for filtering)
+ vals = [center[0], center[1], heading, head_angle]
+
+ # Apply filtering if enabled
+ curr_time = self.timing_func()
+ if self.use_filter:
+ if self.filters is None:
+ self._initialize_filters(vals)
+
+ # Filter each value (heading is filtered in unwrapped space)
+ filtered_vals = [
+ self.filters["center_x"](curr_time, vals[0]),
+ self.filters["center_y"](curr_time, vals[1]),
+ self.filters["heading"](curr_time, vals[2]),
+ self.filters["head_angle"](curr_time, vals[3]),
+ ]
+ vals = filtered_vals
+
+ # Wrap heading to [0, 360) after filtering
+ vals[2] = vals[2] % 360
+
+ # Update step counter
+ self.curr_step = self.curr_step + 1
+
+ # Store processed data
+ self.center_x.append(vals[0])
+ self.center_y.append(vals[1])
+ self.heading_direction.append(vals[2])
+ self.head_angle.append(vals[3])
+ self.time_stamp.append(curr_time)
+ self.step.append(self.curr_step)
+ self.frame_time.append(kwargs.get("frame_time", -1))
+ if "pose_time" in kwargs:
+ self.pose_time.append(kwargs["pose_time"])
+
+ # Broadcast processed values to all connected clients
+ payload = [curr_time, vals[0], vals[1], vals[2], vals[3]]
+ self.broadcast(payload)
+
+ return pose
+
+ def get_data(self):
+ """Get logged data including base class data and processed values."""
+ # Get base class data
+ save_dict = super().get_data()
+
+ # Add processed values
+ save_dict["x_pos"] = np.array(self.center_x)
+ save_dict["y_pos"] = np.array(self.center_y)
+ save_dict["heading_direction"] = np.array(self.heading_direction)
+ save_dict["head_angle"] = np.array(self.head_angle)
+ save_dict["use_filter"] = self.use_filter
+ save_dict["filter_kwargs"] = self.filter_kwargs
+
+ return save_dict
+
+
+# Register processors for GUI discovery
+PROCESSOR_REGISTRY["BaseProcessor_socket"] = BaseProcessor_socket
+PROCESSOR_REGISTRY["MyProcessor_socket"] = MyProcessor_socket
+
+
+def get_available_processors():
+ """
+ Get list of available processor classes.
+
+ Returns:
+ dict: Dictionary mapping class names to processor info:
+ {
+ "ClassName": {
+ "class": ProcessorClass,
+ "name": "Display Name",
+ "description": "Description text",
+ "params": {...}
+ }
+ }
+ """
+ processors = {}
+ for class_name, processor_class in PROCESSOR_REGISTRY.items():
+ processors[class_name] = {
+ "class": processor_class,
+ "name": getattr(processor_class, "PROCESSOR_NAME", class_name),
+ "description": getattr(processor_class, "PROCESSOR_DESCRIPTION", ""),
+ "params": getattr(processor_class, "PROCESSOR_PARAMS", {})
+ }
+ return processors
+
+
+def instantiate_processor(class_name, **kwargs):
+ """
+ Instantiate a processor by class name with given parameters.
+
+ Args:
+ class_name: Name of the processor class (e.g., "MyProcessor_socket")
+ **kwargs: Parameters to pass to the processor constructor
+
+ Returns:
+ Processor instance
+
+ Raises:
+ ValueError: If class_name is not in registry
+ """
+ if class_name not in PROCESSOR_REGISTRY:
+ available = ", ".join(PROCESSOR_REGISTRY.keys())
+ raise ValueError(f"Unknown processor '{class_name}'. Available: {available}")
+
+ processor_class = PROCESSOR_REGISTRY[class_name]
+ return processor_class(**kwargs)
diff --git a/dlclivegui/processors/processor_utils.py b/dlclivegui/processors/processor_utils.py
new file mode 100644
index 0000000..728ff87
--- /dev/null
+++ b/dlclivegui/processors/processor_utils.py
@@ -0,0 +1,83 @@
+
+import importlib.util
+import inspect
+from pathlib import Path
+
+
+def load_processors_from_file(file_path):
+ """
+ Load all processor classes from a Python file.
+
+ Args:
+ file_path: Path to Python file containing processors
+
+ Returns:
+ dict: Dictionary of available processors
+ """
+ # Load module from file
+ spec = importlib.util.spec_from_file_location("processors", file_path)
+ module = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(module)
+
+ # Check if module has get_available_processors function
+ if hasattr(module, 'get_available_processors'):
+ return module.get_available_processors()
+
+ # Fallback: scan for Processor subclasses
+ from dlclive import Processor
+ processors = {}
+ for name, obj in inspect.getmembers(module, inspect.isclass):
+ if issubclass(obj, Processor) and obj != Processor:
+ processors[name] = {
+ "class": obj,
+ "name": getattr(obj, "PROCESSOR_NAME", name),
+ "description": getattr(obj, "PROCESSOR_DESCRIPTION", ""),
+ "params": getattr(obj, "PROCESSOR_PARAMS", {})
+ }
+ return processors
+
+
+def scan_processor_folder(folder_path):
+ """
+ Scan a folder for all Python files with processor definitions.
+
+ Args:
+ folder_path: Path to folder containing processor files
+
+ Returns:
+ dict: Dictionary mapping file names to their processors
+ """
+ all_processors = {}
+ folder = Path(folder_path)
+
+ for py_file in folder.glob("*.py"):
+ if py_file.name.startswith("_"):
+ continue
+ elif py_file.name == "processor_utils.py":
+ continue
+ try:
+ processors = load_processors_from_file(py_file)
+ if processors:
+ all_processors[py_file.name] = processors
+ except Exception as e:
+ print(f"Error loading {py_file}: {e}")
+
+ return all_processors
+
+
+def display_processor_info(processors):
+ """Display processor information in a user-friendly format."""
+ print("\n" + "="*70)
+ print("AVAILABLE PROCESSORS")
+ print("="*70)
+
+ for idx, (class_name, info) in enumerate(processors.items(), 1):
+ print(f"\n[{idx}] {info['name']}")
+ print(f" Class: {class_name}")
+ print(f" Description: {info['description']}")
+ print(f" Parameters:")
+ for param_name, param_info in info['params'].items():
+ print(f" - {param_name} ({param_info['type']})")
+ print(f" Default: {param_info['default']}")
+ print(f" {param_info['description']}")
+
From c81e8972d3285241a36bb314b70191123c058c3b Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 23 Oct 2025 16:24:42 +0200
Subject: [PATCH 009/132] update processors
---
dlclivegui/processors/GUI_INTEGRATION.md | 167 +++++++++++++++++++++++
dlclivegui/processors/processor_utils.py | 56 +++++++-
2 files changed, 217 insertions(+), 6 deletions(-)
create mode 100644 dlclivegui/processors/GUI_INTEGRATION.md
diff --git a/dlclivegui/processors/GUI_INTEGRATION.md b/dlclivegui/processors/GUI_INTEGRATION.md
new file mode 100644
index 0000000..446232e
--- /dev/null
+++ b/dlclivegui/processors/GUI_INTEGRATION.md
@@ -0,0 +1,167 @@
+# GUI Integration Guide
+
+## Quick Answer
+
+Here's how to use `scan_processor_folder` in your GUI:
+
+```python
+from example_gui_usage import scan_processor_folder, instantiate_from_scan
+
+# 1. Scan folder
+all_processors = scan_processor_folder("./processors")
+
+# 2. Populate dropdown with keys (for backend) and display names (for user)
+for key, info in all_processors.items():
+ # key = "file.py::ClassName" (use this for instantiation)
+ # display_name = "Human Name (file.py)" (show this to user)
+ display_name = f"{info['name']} ({info['file']})"
+ dropdown.add_item(key, display_name)
+
+# 3. When user selects, get the key from dropdown
+selected_key = dropdown.get_selected_value() # e.g., "dlc_processor_socket.py::MyProcessor_socket"
+
+# 4. Get processor info
+processor_info = all_processors[selected_key]
+
+# 5. Build parameter form from processor_info['params']
+for param_name, param_info in processor_info['params'].items():
+ add_input_field(param_name, param_info['type'], param_info['default'])
+
+# 6. When user clicks Create, instantiate using the key
+user_params = get_form_values()
+processor = instantiate_from_scan(all_processors, selected_key, **user_params)
+```
+
+## The Key Insight
+
+**The key returned by `scan_processor_folder` is what you use to instantiate!**
+
+```python
+# OLD problem: "I have a name, how do I load it?"
+# NEW solution: Use the key directly
+
+all_processors = scan_processor_folder(folder)
+# Returns: {"file.py::ClassName": {processor_info}, ...}
+
+# The KEY "file.py::ClassName" uniquely identifies the processor
+# Pass this key to instantiate_from_scan()
+
+processor = instantiate_from_scan(all_processors, "file.py::ClassName", **params)
+```
+
+## What's in the returned dict?
+
+```python
+all_processors = {
+ "dlc_processor_socket.py::MyProcessor_socket": {
+ "class": , # The actual class
+ "name": "Mouse Pose Processor", # Human-readable name
+ "description": "Calculates mouse...", # Description
+ "params": { # All parameters
+ "bind": {
+ "type": "tuple",
+ "default": ("0.0.0.0", 6000),
+ "description": "Server address"
+ },
+ # ... more parameters
+ },
+ "file": "dlc_processor_socket.py", # Source file
+ "class_name": "MyProcessor_socket", # Class name
+ "file_path": "/full/path/to/file.py" # Full path
+ }
+}
+```
+
+## GUI Workflow
+
+### Step 1: Scan Folder
+```python
+all_processors = scan_processor_folder("./processors")
+```
+
+### Step 2: Populate Dropdown
+```python
+# Store keys in order (for mapping dropdown index -> key)
+self.processor_keys = list(all_processors.keys())
+
+# Create display names for dropdown
+display_names = [
+ f"{info['name']} ({info['file']})"
+ for info in all_processors.values()
+]
+dropdown.set_items(display_names)
+```
+
+### Step 3: User Selects Processor
+```python
+def on_processor_selected(dropdown_index):
+ # Get the key
+ key = self.processor_keys[dropdown_index]
+
+ # Get processor info
+ info = all_processors[key]
+
+ # Show description
+ description_label.text = info['description']
+
+ # Build parameter form
+ for param_name, param_info in info['params'].items():
+ add_parameter_field(
+ name=param_name,
+ type=param_info['type'],
+ default=param_info['default'],
+ help_text=param_info['description']
+ )
+```
+
+### Step 4: User Clicks Create
+```python
+def on_create_clicked():
+ # Get selected key
+ key = self.processor_keys[dropdown.current_index]
+
+ # Get user's parameter values
+ user_params = parameter_form.get_values()
+
+ # Instantiate using the key!
+ self.processor = instantiate_from_scan(
+ all_processors,
+ key,
+ **user_params
+ )
+
+ print(f"Created: {self.processor.__class__.__name__}")
+```
+
+## Why This Works
+
+1. **Unique Keys**: `"file.py::ClassName"` format ensures uniqueness even if multiple files have same class name
+
+2. **All Info Included**: Each dict entry has everything needed (class, metadata, parameters)
+
+3. **Simple Lookup**: Just use the key to get processor info or instantiate
+
+4. **No Manual Imports**: `scan_processor_folder` handles all module loading
+
+5. **Type Safety**: Parameter metadata includes types for validation
+
+## Complete Example
+
+See `processor_gui.py` for a full working tkinter GUI that demonstrates:
+- Folder scanning
+- Processor selection
+- Parameter form generation
+- Instantiation
+
+Run it with:
+```bash
+python processor_gui.py
+```
+
+## Files
+
+- `dlc_processor_socket.py` - Processors with metadata and registry
+- `example_gui_usage.py` - Scanning and instantiation functions + examples
+- `processor_gui.py` - Full tkinter GUI
+- `GUI_USAGE_GUIDE.py` - Pseudocode and examples
+- `README.md` - Documentation on the plugin system
diff --git a/dlclivegui/processors/processor_utils.py b/dlclivegui/processors/processor_utils.py
index 728ff87..dcacaa4 100644
--- a/dlclivegui/processors/processor_utils.py
+++ b/dlclivegui/processors/processor_utils.py
@@ -11,7 +11,7 @@ def load_processors_from_file(file_path):
Args:
file_path: Path to Python file containing processors
- Returns:
+ Returns:/home/as153/work_geneva/mice_ar_tasks/mouse_ar/ctrl/dlc_processors/GUI_INTEGRATION.md
dict: Dictionary of available processors
"""
# Load module from file
@@ -45,7 +45,17 @@ def scan_processor_folder(folder_path):
folder_path: Path to folder containing processor files
Returns:
- dict: Dictionary mapping file names to their processors
+ dict: Dictionary mapping unique processor keys to processor info:
+ {
+ "file_name.py::ClassName": {
+ "class": ProcessorClass,
+ "name": "Display Name",
+ "description": "...",
+ "params": {...},
+ "file": "file_name.py",
+ "class_name": "ClassName"
+ }
+ }
"""
all_processors = {}
folder = Path(folder_path)
@@ -53,18 +63,52 @@ def scan_processor_folder(folder_path):
for py_file in folder.glob("*.py"):
if py_file.name.startswith("_"):
continue
- elif py_file.name == "processor_utils.py":
- continue
+
try:
processors = load_processors_from_file(py_file)
- if processors:
- all_processors[py_file.name] = processors
+ for class_name, processor_info in processors.items():
+ # Create unique key: file::class
+ key = f"{py_file.name}::{class_name}"
+ # Add file and class name to info
+ processor_info["file"] = py_file.name
+ processor_info["class_name"] = class_name
+ processor_info["file_path"] = str(py_file)
+ all_processors[key] = processor_info
except Exception as e:
print(f"Error loading {py_file}: {e}")
return all_processors
+def instantiate_from_scan(processors_dict, processor_key, **kwargs):
+ """
+ Instantiate a processor from scan_processor_folder results.
+
+ Args:
+ processors_dict: Dict returned by scan_processor_folder
+ processor_key: Key like "file.py::ClassName"
+ **kwargs: Parameters for processor constructor
+
+ Returns:
+ Processor instance
+
+ Example:
+ processors = scan_processor_folder("./dlc_processors")
+ processor = instantiate_from_scan(
+ processors,
+ "dlc_processor_socket.py::MyProcessor_socket",
+ use_filter=True
+ )
+ """
+ if processor_key not in processors_dict:
+ available = ", ".join(processors_dict.keys())
+ raise ValueError(f"Unknown processor '{processor_key}'. Available: {available}")
+
+ processor_info = processors_dict[processor_key]
+ processor_class = processor_info["class"]
+ return processor_class(**kwargs)
+
+
def display_processor_info(processors):
"""Display processor information in a user-friendly format."""
print("\n" + "="*70)
From c7ee2f11ef26d984612c5f564bf0a207d28b35db Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 23 Oct 2025 17:54:08 +0200
Subject: [PATCH 010/132] fixing sizes
---
dlclivegui/camera_controller.py | 192 +++++++++++++++++++++++++--
dlclivegui/cameras/factory.py | 2 -
dlclivegui/cameras/gentl_backend.py | 21 +--
dlclivegui/cameras/opencv_backend.py | 52 +++++---
dlclivegui/config.py | 20 ++-
dlclivegui/dlc_processor.py | 2 +-
dlclivegui/gui.py | 138 ++++++++++++++-----
dlclivegui/video_recorder.py | 86 ++++++++++--
8 files changed, 415 insertions(+), 98 deletions(-)
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 821a252..5618163 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -1,6 +1,8 @@
"""Camera management for the DLC Live GUI."""
from __future__ import annotations
+import logging
+import time
from dataclasses import dataclass
from threading import Event
from typing import Optional
@@ -12,6 +14,8 @@
from dlclivegui.cameras.base import CameraBackend
from dlclivegui.config import CameraSettings
+LOGGER = logging.getLogger(__name__)
+
@dataclass
class FrameData:
@@ -27,6 +31,7 @@ class CameraWorker(QObject):
frame_captured = pyqtSignal(object)
started = pyqtSignal(object)
error_occurred = pyqtSignal(str)
+ warning_occurred = pyqtSignal(str)
finished = pyqtSignal()
def __init__(self, settings: CameraSettings):
@@ -34,42 +39,199 @@ def __init__(self, settings: CameraSettings):
self._settings = settings
self._stop_event = Event()
self._backend: Optional[CameraBackend] = None
+
+ # Error recovery settings
+ self._max_consecutive_errors = 5
+ self._max_reconnect_attempts = 3
+ self._retry_delay = 0.1 # seconds
+ self._reconnect_delay = 1.0 # seconds
+
+ # Frame validation
+ self._expected_frame_size: Optional[tuple[int, int]] = None # (height, width)
@pyqtSlot()
def run(self) -> None:
self._stop_event.clear()
- try:
- self._backend = CameraFactory.create(self._settings)
- self._backend.open()
- except Exception as exc: # pragma: no cover - device specific
- self.error_occurred.emit(str(exc))
+
+ # Initialize camera
+ if not self._initialize_camera():
self.finished.emit()
return
self.started.emit(self._settings)
+ consecutive_errors = 0
+ reconnect_attempts = 0
+
while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
- except TimeoutError:
+
+ # Validate frame size
+ if not self._validate_frame_size(frame):
+ consecutive_errors += 1
+ LOGGER.warning(f"Frame size validation failed ({consecutive_errors}/{self._max_consecutive_errors})")
+ if consecutive_errors >= self._max_consecutive_errors:
+ self.error_occurred.emit("Too many frames with incorrect size")
+ break
+ time.sleep(self._retry_delay)
+ continue
+
+ consecutive_errors = 0 # Reset error count on success
+ reconnect_attempts = 0 # Reset reconnect attempts on success
+
+ except TimeoutError as exc:
+ consecutive_errors += 1
+ LOGGER.warning(f"Camera frame timeout ({consecutive_errors}/{self._max_consecutive_errors}): {exc}")
+
if self._stop_event.is_set():
break
- continue
- except Exception as exc: # pragma: no cover - device specific
- if not self._stop_event.is_set():
- self.error_occurred.emit(str(exc))
- break
+
+ # Handle timeout with retry logic
+ if consecutive_errors < self._max_consecutive_errors:
+ self.warning_occurred.emit(f"Frame timeout (retry {consecutive_errors}/{self._max_consecutive_errors})")
+ time.sleep(self._retry_delay)
+ continue
+ else:
+ # Too many consecutive errors, try to reconnect
+ LOGGER.error(f"Too many consecutive timeouts, attempting reconnection...")
+ if self._attempt_reconnection():
+ consecutive_errors = 0
+ reconnect_attempts += 1
+ self.warning_occurred.emit(f"Camera reconnected (attempt {reconnect_attempts})")
+ continue
+ else:
+ reconnect_attempts += 1
+ if reconnect_attempts >= self._max_reconnect_attempts:
+ self.error_occurred.emit(f"Camera reconnection failed after {reconnect_attempts} attempts")
+ break
+ else:
+ consecutive_errors = 0 # Reset to try again
+ self.warning_occurred.emit(f"Reconnection attempt {reconnect_attempts} failed, retrying...")
+ time.sleep(self._reconnect_delay)
+ continue
+
+ except Exception as exc:
+ consecutive_errors += 1
+ LOGGER.warning(f"Camera read error ({consecutive_errors}/{self._max_consecutive_errors}): {exc}")
+
+ if self._stop_event.is_set():
+ break
+
+ # Handle general errors with retry logic
+ if consecutive_errors < self._max_consecutive_errors:
+ self.warning_occurred.emit(f"Frame read error (retry {consecutive_errors}/{self._max_consecutive_errors})")
+ time.sleep(self._retry_delay)
+ continue
+ else:
+ # Too many consecutive errors, try to reconnect
+ LOGGER.error(f"Too many consecutive errors, attempting reconnection...")
+ if self._attempt_reconnection():
+ consecutive_errors = 0
+ reconnect_attempts += 1
+ self.warning_occurred.emit(f"Camera reconnected (attempt {reconnect_attempts})")
+ continue
+ else:
+ reconnect_attempts += 1
+ if reconnect_attempts >= self._max_reconnect_attempts:
+ self.error_occurred.emit(f"Camera failed after {reconnect_attempts} reconnection attempts: {exc}")
+ break
+ else:
+ consecutive_errors = 0 # Reset to try again
+ self.warning_occurred.emit(f"Reconnection attempt {reconnect_attempts} failed, retrying...")
+ time.sleep(self._reconnect_delay)
+ continue
+
if self._stop_event.is_set():
break
+
self.frame_captured.emit(FrameData(frame, timestamp))
+ # Cleanup
+ self._cleanup_camera()
+ self.finished.emit()
+
+ def _initialize_camera(self) -> bool:
+ """Initialize the camera backend. Returns True on success, False on failure."""
+ try:
+ self._backend = CameraFactory.create(self._settings)
+ self._backend.open()
+ # Don't set expected frame size - will be established from first frame
+ self._expected_frame_size = None
+ LOGGER.info("Camera initialized successfully, frame size will be determined from camera")
+ return True
+ except Exception as exc:
+ LOGGER.exception("Failed to initialize camera", exc_info=exc)
+ self.error_occurred.emit(f"Failed to initialize camera: {exc}")
+ return False
+
+ def _validate_frame_size(self, frame: np.ndarray) -> bool:
+ """Validate that the frame has the expected size. Returns True if valid."""
+ if frame is None or frame.size == 0:
+ LOGGER.warning("Received empty frame")
+ return False
+
+ actual_size = (frame.shape[0], frame.shape[1]) # (height, width)
+
+ if self._expected_frame_size is None:
+ # First frame - establish expected size
+ self._expected_frame_size = actual_size
+ LOGGER.info(f"Established expected frame size: (h={actual_size[0]}, w={actual_size[1]})")
+ return True
+
+ if actual_size != self._expected_frame_size:
+ LOGGER.warning(
+ f"Frame size mismatch: expected (h={self._expected_frame_size[0]}, w={self._expected_frame_size[1]}), "
+ f"got (h={actual_size[0]}, w={actual_size[1]}). Camera may have reconnected with different resolution."
+ )
+ # Update expected size for future frames after reconnection
+ self._expected_frame_size = actual_size
+ LOGGER.info(f"Updated expected frame size to: (h={actual_size[0]}, w={actual_size[1]})")
+ # Emit warning so GUI can restart recording if needed
+ self.warning_occurred.emit(
+ f"Camera resolution changed to {actual_size[1]}x{actual_size[0]}"
+ )
+ return True # Accept the new size
+
+ return True
+
+ def _attempt_reconnection(self) -> bool:
+ """Attempt to reconnect to the camera. Returns True on success, False on failure."""
+ if self._stop_event.is_set():
+ return False
+
+ LOGGER.info("Attempting camera reconnection...")
+
+ # Close existing connection
+ self._cleanup_camera()
+
+ # Wait longer before reconnecting to let the device fully release
+ LOGGER.info(f"Waiting {self._reconnect_delay}s before reconnecting...")
+ time.sleep(self._reconnect_delay)
+
+ if self._stop_event.is_set():
+ return False
+
+ # Try to reinitialize (this will also reset expected frame size)
+ try:
+ self._backend = CameraFactory.create(self._settings)
+ self._backend.open()
+ # Reset expected frame size - will be re-established on first frame
+ self._expected_frame_size = None
+ LOGGER.info("Camera reconnection successful, frame size will be determined from camera")
+ return True
+ except Exception as exc:
+ LOGGER.warning(f"Camera reconnection failed: {exc}")
+ return False
+
+ def _cleanup_camera(self) -> None:
+ """Clean up camera backend resources."""
if self._backend is not None:
try:
self._backend.close()
- except Exception as exc: # pragma: no cover - device specific
- self.error_occurred.emit(str(exc))
+ except Exception as exc:
+ LOGGER.warning(f"Error closing camera: {exc}")
self._backend = None
- self.finished.emit()
@pyqtSlot()
def stop(self) -> None:
@@ -88,6 +250,7 @@ class CameraController(QObject):
started = pyqtSignal(object)
stopped = pyqtSignal()
error = pyqtSignal(str)
+ warning = pyqtSignal(str)
def __init__(self) -> None:
super().__init__()
@@ -133,6 +296,7 @@ def _start_worker(self, settings: CameraSettings) -> None:
self._worker.frame_captured.connect(self.frame_ready)
self._worker.started.connect(self.started)
self._worker.error_occurred.connect(self.error)
+ self._worker.warning_occurred.connect(self.warning)
self._worker.finished.connect(self._thread.quit)
self._worker.finished.connect(self._worker.deleteLater)
self._thread.finished.connect(self._cleanup)
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index 1dc33d8..2e937fd 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -76,8 +76,6 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
settings = CameraSettings(
name=f"Probe {index}",
index=index,
- width=640,
- height=480,
fps=30.0,
backend=backend,
properties={},
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index dc6ce7e..ace3f82 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -120,7 +120,7 @@ def read(self) -> Tuple[np.ndarray, float]:
except ValueError:
frame = array.copy()
except HarvesterTimeoutError as exc:
- raise TimeoutError(str(exc)) from exc
+ raise TimeoutError(str(exc)+ " (GenTL timeout)") from exc
frame = self._convert_frame(frame)
timestamp = time.time()
@@ -244,22 +244,9 @@ def _configure_pixel_format(self, node_map) -> None:
pass
def _configure_resolution(self, node_map) -> None:
- width = int(self.settings.width)
- height = int(self.settings.height)
- if self._rotate in (90, 270):
- width, height = height, width
- try:
- node_map.Width.value = self._adjust_to_increment(
- width, node_map.Width.min, node_map.Width.max, node_map.Width.inc
- )
- except Exception:
- pass
- try:
- node_map.Height.value = self._adjust_to_increment(
- height, node_map.Height.min, node_map.Height.max, node_map.Height.inc
- )
- except Exception:
- pass
+ # Don't configure width/height - use camera's native resolution
+ # Width and height will be determined from actual frames
+ pass
def _configure_exposure(self, node_map) -> None:
if self._exposure is None:
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index cbadf73..ca043bf 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -29,20 +29,43 @@ def open(self) -> None:
def read(self) -> Tuple[np.ndarray, float]:
if self._capture is None:
raise RuntimeError("Camera has not been opened")
- success, frame = self._capture.read()
- if not success:
- raise RuntimeError("Failed to read frame from OpenCV camera")
+
+ # Try grab first - this is non-blocking and helps detect connection issues faster
+ grabbed = self._capture.grab()
+ if not grabbed:
+ # Check if camera is still opened - if not, it's a serious error
+ if not self._capture.isOpened():
+ raise RuntimeError("OpenCV camera connection lost")
+ # Otherwise treat as temporary frame read failure (timeout-like)
+ raise TimeoutError("Failed to grab frame from OpenCV camera (temporary)")
+
+ # Now retrieve the frame
+ success, frame = self._capture.retrieve()
+ if not success or frame is None:
+ raise TimeoutError("Failed to retrieve frame from OpenCV camera (temporary)")
+
return frame, time.time()
def close(self) -> None:
if self._capture is not None:
- self._capture.release()
- self._capture = None
+ try:
+ # Try to release properly
+ self._capture.release()
+ except Exception:
+ pass
+ finally:
+ self._capture = None
+ # Give the system a moment to fully release the device
+ time.sleep(0.1)
def stop(self) -> None:
if self._capture is not None:
- self._capture.release()
- self._capture = None
+ try:
+ self._capture.release()
+ except Exception:
+ pass
+ finally:
+ self._capture = None
def device_name(self) -> str:
base_name = "OpenCV"
@@ -58,9 +81,11 @@ def device_name(self) -> str:
def _configure_capture(self) -> None:
if self._capture is None:
return
- self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(self.settings.width))
- self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(self.settings.height))
- self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
+ # Don't set width/height - capture at camera's native resolution
+ # Only set FPS if specified
+ if self.settings.fps:
+ self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
+ # Set any additional properties from the properties dict
for prop, value in self.settings.properties.items():
if prop == "api":
continue
@@ -69,13 +94,8 @@ def _configure_capture(self) -> None:
except (TypeError, ValueError):
continue
self._capture.set(prop_id, float(value))
- actual_width = self._capture.get(cv2.CAP_PROP_FRAME_WIDTH)
- actual_height = self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT)
+ # Update actual FPS from camera
actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
- if actual_width:
- self.settings.width = int(actual_width)
- if actual_height:
- self.settings.height = int(actual_height)
if actual_fps:
self.settings.fps = float(actual_fps)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index 72e3f80..c9be6a4 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -13,23 +13,33 @@ class CameraSettings:
name: str = "Camera 0"
index: int = 0
- width: int = 640
- height: int = 480
fps: float = 25.0
backend: str = "gentl"
exposure: int = 500 # 0 = auto, otherwise microseconds
gain: float = 10 # 0.0 = auto, otherwise gain value
+ crop_x0: int = 0 # Left edge of crop region (0 = no crop)
+ crop_y0: int = 0 # Top edge of crop region (0 = no crop)
+ crop_x1: int = 0 # Right edge of crop region (0 = no crop)
+ crop_y1: int = 0 # Bottom edge of crop region (0 = no crop)
properties: Dict[str, Any] = field(default_factory=dict)
def apply_defaults(self) -> "CameraSettings":
- """Ensure width, height and fps are positive numbers."""
+ """Ensure fps is a positive number and validate crop settings."""
- self.width = int(self.width) if self.width else 640
- self.height = int(self.height) if self.height else 480
self.fps = float(self.fps) if self.fps else 30.0
self.exposure = int(self.exposure) if self.exposure else 0
self.gain = float(self.gain) if self.gain else 0.0
+ self.crop_x0 = max(0, int(self.crop_x0)) if hasattr(self, 'crop_x0') else 0
+ self.crop_y0 = max(0, int(self.crop_y0)) if hasattr(self, 'crop_y0') else 0
+ self.crop_x1 = max(0, int(self.crop_x1)) if hasattr(self, 'crop_x1') else 0
+ self.crop_y1 = max(0, int(self.crop_y1)) if hasattr(self, 'crop_y1') else 0
return self
+
+ def get_crop_region(self) -> Optional[tuple[int, int, int, int]]:
+ """Get crop region as (x0, y0, x1, y1) or None if no cropping."""
+ if self.crop_x0 == 0 and self.crop_y0 == 0 and self.crop_x1 == 0 and self.crop_y1 == 0:
+ return None
+ return (self.crop_x0, self.crop_y0, self.crop_x1, self.crop_y1)
@dataclass
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 201f53c..9dd69ca 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -137,7 +137,7 @@ def _start_worker(self, init_frame: np.ndarray, init_timestamp: float) -> None:
if self._worker_thread is not None and self._worker_thread.is_alive():
return
- self._queue = queue.Queue(maxsize=5)
+ self._queue = queue.Queue(maxsize=2)
self._stop_event.clear()
self._worker_thread = threading.Thread(
target=self._worker_loop,
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 0328222..5c76269 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -171,14 +171,6 @@ def _build_camera_group(self) -> QGroupBox:
index_layout.addWidget(self.refresh_cameras_button)
form.addRow("Camera", index_layout)
- self.camera_width = QSpinBox()
- self.camera_width.setRange(1, 7680)
- form.addRow("Width", self.camera_width)
-
- self.camera_height = QSpinBox()
- self.camera_height.setRange(1, 4320)
- form.addRow("Height", self.camera_height)
-
self.camera_fps = QDoubleSpinBox()
self.camera_fps.setRange(1.0, 240.0)
self.camera_fps.setDecimals(2)
@@ -198,6 +190,34 @@ def _build_camera_group(self) -> QGroupBox:
self.camera_gain.setDecimals(2)
form.addRow("Gain", self.camera_gain)
+ # Crop settings
+ crop_layout = QHBoxLayout()
+ self.crop_x0 = QSpinBox()
+ self.crop_x0.setRange(0, 7680)
+ self.crop_x0.setPrefix("x0:")
+ self.crop_x0.setSpecialValueText("x0:None")
+ crop_layout.addWidget(self.crop_x0)
+
+ self.crop_y0 = QSpinBox()
+ self.crop_y0.setRange(0, 4320)
+ self.crop_y0.setPrefix("y0:")
+ self.crop_y0.setSpecialValueText("y0:None")
+ crop_layout.addWidget(self.crop_y0)
+
+ self.crop_x1 = QSpinBox()
+ self.crop_x1.setRange(0, 7680)
+ self.crop_x1.setPrefix("x1:")
+ self.crop_x1.setSpecialValueText("x1:None")
+ crop_layout.addWidget(self.crop_x1)
+
+ self.crop_y1 = QSpinBox()
+ self.crop_y1.setRange(0, 4320)
+ self.crop_y1.setPrefix("y1:")
+ self.crop_y1.setSpecialValueText("y1:None")
+ crop_layout.addWidget(self.crop_y1)
+
+ form.addRow("Crop (x0,y0,x1,y1)", crop_layout)
+
self.camera_properties_edit = QPlainTextEdit()
self.camera_properties_edit.setPlaceholderText(
'{"other_property": "value"}'
@@ -329,6 +349,7 @@ def _connect_signals(self) -> None:
self.camera_controller.frame_ready.connect(self._on_frame_ready)
self.camera_controller.started.connect(self._on_camera_started)
self.camera_controller.error.connect(self._show_error)
+ self.camera_controller.warning.connect(self._show_warning)
self.camera_controller.stopped.connect(self._on_camera_stopped)
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
@@ -338,14 +359,18 @@ def _connect_signals(self) -> None:
# ------------------------------------------------------------------ config
def _apply_config(self, config: ApplicationSettings) -> None:
camera = config.camera
- self.camera_width.setValue(int(camera.width))
- self.camera_height.setValue(int(camera.height))
self.camera_fps.setValue(float(camera.fps))
# Set exposure and gain from config
self.camera_exposure.setValue(int(camera.exposure))
self.camera_gain.setValue(float(camera.gain))
+ # Set crop settings from config
+ self.crop_x0.setValue(int(camera.crop_x0) if hasattr(camera, 'crop_x0') else 0)
+ self.crop_y0.setValue(int(camera.crop_y0) if hasattr(camera, 'crop_y0') else 0)
+ self.crop_x1.setValue(int(camera.crop_x1) if hasattr(camera, 'crop_x1') else 0)
+ self.crop_y1.setValue(int(camera.crop_y1) if hasattr(camera, 'crop_y1') else 0)
+
backend_name = camera.backend or "opencv"
index = self.camera_backend.findData(backend_name)
if index >= 0:
@@ -408,6 +433,12 @@ def _camera_settings_from_ui(self) -> CameraSettings:
exposure = self.camera_exposure.value()
gain = self.camera_gain.value()
+ # Get crop settings from UI
+ crop_x0 = self.crop_x0.value()
+ crop_y0 = self.crop_y0.value()
+ crop_x1 = self.crop_x1.value()
+ crop_y1 = self.crop_y1.value()
+
# Also add to properties dict for backward compatibility with camera backends
if exposure > 0:
properties["exposure"] = exposure
@@ -418,12 +449,14 @@ def _camera_settings_from_ui(self) -> CameraSettings:
settings = CameraSettings(
name=name_text or f"Camera {index}",
index=index,
- width=self.camera_width.value(),
- height=self.camera_height.value(),
fps=self.camera_fps.value(),
backend=backend_text or "opencv",
exposure=exposure,
gain=gain,
+ crop_x0=crop_x0,
+ crop_y0=crop_y0,
+ crop_x1=crop_x1,
+ crop_y1=crop_y1,
properties=properties,
)
return settings.apply_defaults()
@@ -441,7 +474,7 @@ def _refresh_camera_indices(
backend = self._current_backend_name()
detected = CameraFactory.detect_cameras(backend)
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- print(
+ logging.info(
f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
)
self._detected_cameras = detected
@@ -500,7 +533,7 @@ def _refresh_camera_indices(
backend = self._current_backend_name()
detected = CameraFactory.detect_cameras(backend)
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- print(
+ logging.info(
f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
)
self._detected_cameras = detected
@@ -687,23 +720,17 @@ def _on_camera_started(self, settings: CameraSettings) -> None:
self._active_camera_settings = settings
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(True)
- self.camera_width.blockSignals(True)
- self.camera_width.setValue(int(settings.width))
- self.camera_width.blockSignals(False)
- self.camera_height.blockSignals(True)
- self.camera_height.setValue(int(settings.height))
- self.camera_height.blockSignals(False)
if getattr(settings, "fps", None):
self.camera_fps.blockSignals(True)
self.camera_fps.setValue(float(settings.fps))
self.camera_fps.blockSignals(False)
- resolution = f"{int(settings.width)}×{int(settings.height)}"
+ # Resolution will be determined from actual camera frames
if getattr(settings, "fps", None):
fps_text = f"{float(settings.fps):.2f} FPS"
else:
fps_text = "unknown FPS"
self.statusBar().showMessage(
- f"Camera preview started: {resolution} @ {fps_text}", 5000
+ f"Camera preview started @ {fps_text}", 5000
)
self._update_inference_buttons()
self._update_camera_controls_enabled()
@@ -758,11 +785,13 @@ def _update_camera_controls_enabled(self) -> None:
self.camera_backend,
self.camera_index,
self.refresh_cameras_button,
- self.camera_width,
- self.camera_height,
self.camera_fps,
self.camera_exposure,
self.camera_gain,
+ self.crop_x0,
+ self.crop_y0,
+ self.crop_x1,
+ self.crop_y1,
self.camera_properties_edit,
self.rotation_combo,
self.codec_combo,
@@ -924,7 +953,7 @@ def _start_recording(self) -> None:
output_path = recording.output_path()
self._video_recorder = VideoRecorder(
output_path,
- frame_size=(int(width), int(height)),
+ frame_size=(height, width), # Use numpy convention: (height, width)
frame_rate=float(frame_rate),
codec=recording.codec,
crf=recording.crf,
@@ -974,17 +1003,18 @@ def _stop_recording(self) -> None:
def _on_frame_ready(self, frame_data: FrameData) -> None:
raw_frame = frame_data.image
self._raw_frame = raw_frame
- frame = self._apply_rotation(raw_frame)
+
+ # Apply cropping before rotation
+ frame = self._apply_crop(raw_frame)
+
+ # Apply rotation
+ frame = self._apply_rotation(frame)
frame = np.ascontiguousarray(frame)
self._current_frame = frame
self._track_camera_frame()
- if self._active_camera_settings is not None:
- height, width = frame.shape[:2]
- self._active_camera_settings.width = int(width)
- self._active_camera_settings.height = int(height)
if self._video_recorder and self._video_recorder.is_running:
try:
- success = self._video_recorder.write(frame)
+ success = self._video_recorder.write(frame, timestamp=frame_data.timestamp)
if not success:
now = time.perf_counter()
if now - self._last_drop_warning > 1.0:
@@ -993,8 +1023,19 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
)
self._last_drop_warning = now
except RuntimeError as exc:
- self._show_error(str(exc))
- self._stop_recording()
+ # Check if it's a frame size error
+ if "Frame size changed" in str(exc):
+ self._show_warning(f"Camera resolution changed - restarting recording: {exc}")
+ self._stop_recording()
+ # Restart recording with new resolution if enabled
+ if self.recording_enabled_checkbox.isChecked():
+ try:
+ self._start_recording()
+ except Exception as restart_exc:
+ self._show_error(f"Failed to restart recording: {restart_exc}")
+ else:
+ self._show_error(str(exc))
+ self._stop_recording()
if self._dlc_active:
self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
self._display_frame(frame)
@@ -1003,7 +1044,7 @@ def _on_pose_ready(self, result: PoseResult) -> None:
if not self._dlc_active:
return
self._last_pose = result
- logging.info(f"Pose result: {result.pose}, Timestamp: {result.timestamp}")
+ #logging.info(f"Pose result: {result.pose}, Timestamp: {result.timestamp}")
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
@@ -1025,6 +1066,31 @@ def _update_video_display(self, frame: np.ndarray) -> None:
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
self.video_label.setPixmap(QPixmap.fromImage(image))
+ def _apply_crop(self, frame: np.ndarray) -> np.ndarray:
+ """Apply cropping to the frame based on settings."""
+ if self._active_camera_settings is None:
+ return frame
+
+ crop_region = self._active_camera_settings.get_crop_region()
+ if crop_region is None:
+ return frame
+
+ x0, y0, x1, y1 = crop_region
+ height, width = frame.shape[:2]
+
+ # Validate and constrain crop coordinates
+ x0 = max(0, min(x0, width))
+ y0 = max(0, min(y0, height))
+ x1 = max(x0, min(x1, width)) if x1 > 0 else width
+ y1 = max(y0, min(y1, height)) if y1 > 0 else height
+
+ # Apply crop
+ if x0 < x1 and y0 < y1:
+ return frame[y0:y1, x0:x1]
+ else:
+ # Invalid crop region, return original frame
+ return frame
+
def _apply_rotation(self, frame: np.ndarray) -> np.ndarray:
if self._rotation_degrees == 90:
return cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
@@ -1070,6 +1136,10 @@ def _show_error(self, message: str) -> None:
self.statusBar().showMessage(message, 5000)
QMessageBox.critical(self, "Error", message)
+ def _show_warning(self, message: str) -> None:
+ """Display a warning message in the status bar without blocking."""
+ self.statusBar().showMessage(f"⚠ {message}", 3000)
+
# ------------------------------------------------------------------ Qt overrides
def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
if self.camera_controller.is_running():
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index d729b02..2190314 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -1,6 +1,7 @@
"""Video recording support using the vidgear library."""
from __future__ import annotations
+import json
import logging
import queue
import threading
@@ -8,7 +9,7 @@
from collections import deque
from dataclasses import dataclass
from pathlib import Path
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
import numpy as np
@@ -69,6 +70,7 @@ def __init__(
self._written_times: deque[float] = deque(maxlen=600)
self._encode_error: Optional[Exception] = None
self._last_log_time = 0.0
+ self._frame_timestamps: List[float] = []
@property
def is_running(self) -> bool:
@@ -85,7 +87,7 @@ def start(self) -> None:
writer_kwargs: Dict[str, Any] = {
"compression_mode": True,
- "logging": True,
+ "logging": False,
"-input_framerate": fps_value,
"-vcodec": (self._codec or "libx264").strip() or "libx264",
"-crf": int(self._crf),
@@ -101,6 +103,7 @@ def start(self) -> None:
self._total_latency = 0.0
self._last_latency = 0.0
self._written_times.clear()
+ self._frame_timestamps.clear()
self._encode_error = None
self._stop_event.clear()
self._writer_thread = threading.Thread(
@@ -116,12 +119,20 @@ def configure_stream(
self._frame_size = frame_size
self._frame_rate = frame_rate
- def write(self, frame: np.ndarray) -> bool:
+ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
if not self.is_running or self._queue is None:
return False
error = self._current_error()
if error is not None:
raise RuntimeError(f"Video encoding failed: {error}") from error
+
+ # Record timestamp for this frame
+ if timestamp is None:
+ timestamp = time.time()
+ with self._stats_lock:
+ self._frame_timestamps.append(timestamp)
+
+ # Convert frame to uint8 if needed
if frame.dtype != np.uint8:
frame_float = frame.astype(np.float32, copy=False)
max_val = float(frame_float.max()) if frame_float.size else 0.0
@@ -129,9 +140,31 @@ def write(self, frame: np.ndarray) -> bool:
if max_val > 0:
scale = 255.0 / max_val if max_val > 255.0 else (255.0 if max_val <= 1.0 else 1.0)
frame = np.clip(frame_float * scale, 0.0, 255.0).astype(np.uint8)
+
+ # Convert grayscale to RGB if needed
if frame.ndim == 2:
frame = np.repeat(frame[:, :, None], 3, axis=2)
+
+ # Ensure contiguous array
frame = np.ascontiguousarray(frame)
+
+ # Check if frame size matches expected size
+ if self._frame_size is not None:
+ expected_h, expected_w = self._frame_size
+ actual_h, actual_w = frame.shape[:2]
+ if (actual_h, actual_w) != (expected_h, expected_w):
+ logger.warning(
+ f"Frame size mismatch: expected (h={expected_h}, w={expected_w}), "
+ f"got (h={actual_h}, w={actual_w}). "
+ "Stopping recorder to prevent encoding errors."
+ )
+ # Set error to stop recording gracefully
+ with self._stats_lock:
+ self._encode_error = ValueError(
+ f"Frame size changed from (h={expected_h}, w={expected_w}) to (h={actual_h}, w={actual_w})"
+ )
+ return False
+
try:
assert self._queue is not None
self._queue.put(frame, block=False)
@@ -167,6 +200,10 @@ def stop(self) -> None:
self._writer.close()
except Exception:
logger.exception("Failed to close WriteGear cleanly")
+
+ # Save timestamps to JSON file
+ self._save_timestamps()
+
self._writer = None
self._writer_thread = None
self._queue = None
@@ -239,12 +276,12 @@ def _writer_loop(self) -> None:
if now - self._last_log_time >= 1.0:
fps = self._compute_write_fps_locked()
queue_size = self._queue.qsize()
- logger.info(
- "Recorder throughput: %.2f fps, latency %.2f ms, queue=%d",
- fps,
- elapsed * 1000.0,
- queue_size,
- )
+ # logger.info(
+ # "Recorder throughput: %.2f fps, latency %.2f ms, queue=%d",
+ # fps,
+ # elapsed * 1000.0,
+ # queue_size,
+ # )
self._last_log_time = now
self._queue.task_done()
self._finalize_writer()
@@ -269,3 +306,34 @@ def _compute_write_fps_locked(self) -> float:
def _current_error(self) -> Optional[Exception]:
with self._stats_lock:
return self._encode_error
+
+ def _save_timestamps(self) -> None:
+ """Save frame timestamps to a JSON file alongside the video."""
+ if not self._frame_timestamps:
+ logger.info("No timestamps to save")
+ return
+
+ # Create timestamps file path
+ timestamp_file = self._output.with_suffix('').with_suffix(self._output.suffix + '_timestamps.json')
+
+ try:
+ with self._stats_lock:
+ timestamps = self._frame_timestamps.copy()
+
+ # Prepare metadata
+ data = {
+ "video_file": str(self._output.name),
+ "num_frames": len(timestamps),
+ "timestamps": timestamps,
+ "start_time": timestamps[0] if timestamps else None,
+ "end_time": timestamps[-1] if timestamps else None,
+ "duration_seconds": timestamps[-1] - timestamps[0] if len(timestamps) > 1 else 0.0,
+ }
+
+ # Write to JSON
+ with open(timestamp_file, 'w') as f:
+ json.dump(data, f, indent=2)
+
+ logger.info(f"Saved {len(timestamps)} frame timestamps to {timestamp_file}")
+ except Exception as exc:
+ logger.exception(f"Failed to save timestamps to {timestamp_file}: {exc}")
From 78238299e6e6551b84bc31df496c00f62825d408 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 23 Oct 2025 18:47:08 +0200
Subject: [PATCH 011/132] modified the processor to be controllable
---
dlclivegui/processors/dlc_processor_socket.py | 99 +++++++--
example_recording_control.py | 194 ++++++++++++++++++
2 files changed, 276 insertions(+), 17 deletions(-)
create mode 100644 example_recording_control.py
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index bd183af..dbb0f90 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -131,9 +131,27 @@ def __init__(
self.pose_time = deque()
self.original_pose = deque()
+ self._session_name = "test_session"
+ self.filename = None
+ self._recording = Event() # Thread-safe recording flag
+
# State
self.curr_step = 0
self.save_original = save_original
+
+ @property
+ def recording(self):
+ """Thread-safe recording flag."""
+ return self._recording.is_set()
+
+ @property
+ def session_name(self):
+ return self._session_name
+
+ @session_name.setter
+ def session_name(self, name):
+ self._session_name = name
+ self.filename = f"{name}_dlc_processor_data.pkl"
def _accept_loop(self):
"""Background thread to accept new client connections."""
@@ -154,7 +172,8 @@ def _rx_loop(self, c):
try:
if c.poll(0.05):
msg = c.recv()
- # Optional: handle client messages here
+ # Handle control messages from client
+ self._handle_client_message(msg)
except (EOFError, OSError, BrokenPipeError):
break
try:
@@ -163,6 +182,42 @@ def _rx_loop(self, c):
pass
self.conns.discard(c)
LOG.info("Client disconnected")
+
+ def _handle_client_message(self, msg):
+ """Handle control messages from clients."""
+ if not isinstance(msg, dict):
+ return
+
+ cmd = msg.get("cmd")
+ if cmd == "set_session_name":
+ session_name = msg.get("session_name", "default_session")
+ self.session_name = session_name
+ LOG.info(f"Session name set to: {session_name}")
+
+ elif cmd == "start_recording":
+ self._recording.set()
+ # Clear all data queues
+ self._clear_data_queues()
+ self.curr_step = 0
+ LOG.info("Recording started, data queues cleared")
+
+ elif cmd == "stop_recording":
+ self._recording.clear()
+ LOG.info("Recording stopped")
+
+ elif cmd == "save":
+ filename = msg.get("filename", self.filename)
+ save_code = self.save(filename)
+ LOG.info(f"Save {'successful' if save_code == 1 else 'failed'}: {filename}")
+
+ def _clear_data_queues(self):
+ """Clear all data storage queues. Override in subclasses to clear additional queues."""
+ self.time_stamp.clear()
+ self.step.clear()
+ self.frame_time.clear()
+ self.pose_time.clear()
+ if self.save_original:
+ self.original_pose.clear()
def broadcast(self, payload):
"""Send payload to all connected clients."""
@@ -202,12 +257,13 @@ def process(self, pose, **kwargs):
# Update step counter
self.curr_step = self.curr_step + 1
- # Store metadata
- self.time_stamp.append(curr_time)
- self.step.append(self.curr_step)
- self.frame_time.append(kwargs.get("frame_time", -1))
- if "pose_time" in kwargs:
- self.pose_time.append(kwargs["pose_time"])
+ # Store metadata (only if recording)
+ if self.recording:
+ self.time_stamp.append(curr_time)
+ self.step.append(self.curr_step)
+ self.frame_time.append(kwargs.get("frame_time", -1))
+ if "pose_time" in kwargs:
+ self.pose_time.append(kwargs["pose_time"])
# Broadcast raw pose to all connected clients
payload = [curr_time, pose]
@@ -344,6 +400,14 @@ def __init__(
self.filter_kwargs = filter_kwargs or {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0}
self.filters = None # Will be initialized on first pose
+ def _clear_data_queues(self):
+ """Clear all data storage queues including pose-specific ones."""
+ super()._clear_data_queues()
+ self.center_x.clear()
+ self.center_y.clear()
+ self.heading_direction.clear()
+ self.head_angle.clear()
+
def _initialize_filters(self, vals):
"""Initialize One-Euro filters for each output variable."""
t0 = self.timing_func()
@@ -423,16 +487,17 @@ def process(self, pose, **kwargs):
# Update step counter
self.curr_step = self.curr_step + 1
- # Store processed data
- self.center_x.append(vals[0])
- self.center_y.append(vals[1])
- self.heading_direction.append(vals[2])
- self.head_angle.append(vals[3])
- self.time_stamp.append(curr_time)
- self.step.append(self.curr_step)
- self.frame_time.append(kwargs.get("frame_time", -1))
- if "pose_time" in kwargs:
- self.pose_time.append(kwargs["pose_time"])
+ # Store processed data (only if recording)
+ if self.recording:
+ self.center_x.append(vals[0])
+ self.center_y.append(vals[1])
+ self.heading_direction.append(vals[2])
+ self.head_angle.append(vals[3])
+ self.time_stamp.append(curr_time)
+ self.step.append(self.curr_step)
+ self.frame_time.append(kwargs.get("frame_time", -1))
+ if "pose_time" in kwargs:
+ self.pose_time.append(kwargs["pose_time"])
# Broadcast processed values to all connected clients
payload = [curr_time, vals[0], vals[1], vals[2], vals[3]]
diff --git a/example_recording_control.py b/example_recording_control.py
new file mode 100644
index 0000000..ed426e8
--- /dev/null
+++ b/example_recording_control.py
@@ -0,0 +1,194 @@
+"""
+Example: Recording control with DLCClient and MyProcessor_socket
+
+This demonstrates:
+1. Starting a processor
+2. Connecting a client
+3. Controlling recording (start/stop/save) from the client
+4. Session name management
+"""
+
+import time
+import sys
+from pathlib import Path
+
+# Add parent directory to path
+sys.path.insert(0, str(Path(__file__).parent.parent.parent))
+
+from mouse_ar.ctrl.dlc_client import DLCClient
+
+
+def example_recording_workflow():
+ """Complete workflow: processor + client with recording control."""
+
+ print("\n" + "="*70)
+ print("EXAMPLE: Recording Control Workflow")
+ print("="*70)
+
+ # NOTE: This example assumes MyProcessor_socket is already running
+ # Start it separately with:
+ # from dlc_processor_socket import MyProcessor_socket
+ # processor = MyProcessor_socket(bind=("localhost", 6000))
+ # # Then run DLCLive with this processor
+
+ print("\n[CLIENT] Connecting to processor at localhost:6000...")
+ client = DLCClient(address=("localhost", 6000))
+
+ try:
+ # Start the client (connects and begins receiving data)
+ client.start()
+ print("[CLIENT] Connected!")
+ time.sleep(0.5) # Wait for connection to stabilize
+
+ # Set session name
+ print("\n[CLIENT] Setting session name to 'experiment_001'...")
+ client.set_session_name("experiment_001")
+ time.sleep(0.2)
+
+ # Start recording
+ print("[CLIENT] Starting recording (clears processor data queues)...")
+ client.start_recording()
+ time.sleep(0.2)
+
+ # Receive some data
+ print("\n[CLIENT] Receiving data for 5 seconds...")
+ for i in range(5):
+ data = client.read()
+ if data:
+ vals = data["vals"]
+ print(f" t={vals[0]:.2f}, x={vals[1]:.1f}, y={vals[2]:.1f}, "
+ f"heading={vals[3]:.1f}°, head_angle={vals[4]:.2f}rad")
+ time.sleep(1.0)
+
+ # Stop recording
+ print("\n[CLIENT] Stopping recording...")
+ client.stop_recording()
+ time.sleep(0.2)
+
+ # Trigger save
+ print("[CLIENT] Triggering save on processor...")
+ client.trigger_save() # Uses processor's default filename
+ # OR specify custom filename:
+ # client.trigger_save(filename="my_custom_data.pkl")
+ time.sleep(0.5)
+
+ print("\n[CLIENT] ✓ Workflow complete!")
+
+ except Exception as e:
+ print(f"\n[ERROR] {e}")
+ print("\nMake sure MyProcessor_socket is running!")
+ print("Example:")
+ print(" from dlc_processor_socket import MyProcessor_socket")
+ print(" processor = MyProcessor_socket()")
+ print(" # Then run DLCLive with this processor")
+
+ finally:
+ print("\n[CLIENT] Closing connection...")
+ client.close()
+
+
+def example_multiple_sessions():
+ """Example: Recording multiple sessions with the same processor."""
+
+ print("\n" + "="*70)
+ print("EXAMPLE: Multiple Sessions")
+ print("="*70)
+
+ client = DLCClient(address=("localhost", 6000))
+
+ try:
+ client.start()
+ print("[CLIENT] Connected!")
+ time.sleep(0.5)
+
+ # Session 1
+ print("\n--- SESSION 1 ---")
+ client.set_session_name("trial_001")
+ client.start_recording()
+ print("Recording session 'trial_001' for 3 seconds...")
+ time.sleep(3.0)
+ client.stop_recording()
+ client.trigger_save() # Saves as "trial_001_dlc_processor_data.pkl"
+ print("Session 1 saved!")
+
+ time.sleep(1.0)
+
+ # Session 2
+ print("\n--- SESSION 2 ---")
+ client.set_session_name("trial_002")
+ client.start_recording()
+ print("Recording session 'trial_002' for 3 seconds...")
+ time.sleep(3.0)
+ client.stop_recording()
+ client.trigger_save() # Saves as "trial_002_dlc_processor_data.pkl"
+ print("Session 2 saved!")
+
+ print("\n✓ Multiple sessions recorded successfully!")
+
+ except Exception as e:
+ print(f"\n[ERROR] {e}")
+
+ finally:
+ client.close()
+
+
+def example_command_api():
+ """Example: Using the low-level command API."""
+
+ print("\n" + "="*70)
+ print("EXAMPLE: Low-level Command API")
+ print("="*70)
+
+ client = DLCClient(address=("localhost", 6000))
+
+ try:
+ client.start()
+ time.sleep(0.5)
+
+ # Using send_command directly
+ print("\n[CLIENT] Using send_command()...")
+
+ # Set session name
+ client.send_command("set_session_name", session_name="custom_session")
+ print(" ✓ Sent: set_session_name")
+ time.sleep(0.2)
+
+ # Start recording
+ client.send_command("start_recording")
+ print(" ✓ Sent: start_recording")
+ time.sleep(2.0)
+
+ # Stop recording
+ client.send_command("stop_recording")
+ print(" ✓ Sent: stop_recording")
+ time.sleep(0.2)
+
+ # Save with custom filename
+ client.send_command("save", filename="my_data.pkl")
+ print(" ✓ Sent: save")
+ time.sleep(0.5)
+
+ print("\n✓ Commands sent successfully!")
+
+ except Exception as e:
+ print(f"\n[ERROR] {e}")
+
+ finally:
+ client.close()
+
+
+if __name__ == "__main__":
+ print("\n" + "="*70)
+ print("DLC PROCESSOR RECORDING CONTROL EXAMPLES")
+ print("="*70)
+ print("\nNOTE: These examples require MyProcessor_socket to be running.")
+ print("Start it separately before running these examples.")
+ print("="*70)
+
+ # Uncomment the example you want to run:
+
+ # example_recording_workflow()
+ # example_multiple_sessions()
+ # example_command_api()
+
+ print("\nUncomment an example in the script to run it.")
From 184e87b0b2672fd67cdf8984c4959b5f42f0564b Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 24 Oct 2025 15:01:07 +0200
Subject: [PATCH 012/132] Add GenTL device count retrieval, bounding box
settings, and processor integration
- Implemented `get_device_count` method in `GenTLCameraBackend` to retrieve the number of GenTL devices detected.
- Added `max_devices` configuration option in `CameraSettings` to limit device probing.
- Introduced `BoundingBoxSettings` for bounding box visualization, integrated into the main GUI.
- Enhanced `DLCLiveProcessor` to accept a processor instance during configuration.
- Updated GUI to support processor selection and auto-recording based on processor commands.
- Refactored camera properties handling and removed deprecated advanced properties editor.
- Improved error handling and logging for processor connections and recording states.
---
dlclivegui/cameras/factory.py | 13 +-
dlclivegui/cameras/gentl_backend.py | 82 +++-
dlclivegui/config.py | 17 +-
dlclivegui/dlc_processor.py | 11 +-
dlclivegui/gui.py | 412 +++++++++++++++---
dlclivegui/processors/dlc_processor_socket.py | 17 +-
example_recording_control.py | 194 ---------
7 files changed, 477 insertions(+), 269 deletions(-)
delete mode 100644 example_recording_control.py
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index 2e937fd..540e352 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -57,6 +57,7 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
The backend identifier, e.g. ``"opencv"``.
max_devices:
Upper bound for the indices that should be probed.
+ For GenTL backend, the actual device count is queried if available.
Returns
-------
@@ -71,8 +72,18 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
if not backend_cls.is_available():
return []
+ # For GenTL backend, try to get actual device count
+ num_devices = max_devices
+ if hasattr(backend_cls, 'get_device_count'):
+ try:
+ actual_count = backend_cls.get_device_count()
+ if actual_count >= 0:
+ num_devices = actual_count
+ except Exception:
+ pass
+
detected: List[DetectedCamera] = []
- for index in range(max_devices):
+ for index in range(num_devices):
settings = CameraSettings(
name=f"Probe {index}",
index=index,
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index ace3f82..943cf4a 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -53,6 +53,36 @@ def __init__(self, settings):
def is_available(cls) -> bool:
return Harvester is not None
+ @classmethod
+ def get_device_count(cls) -> int:
+ """Get the actual number of GenTL devices detected by Harvester.
+
+ Returns the number of devices found, or -1 if detection fails.
+ """
+ if Harvester is None:
+ return -1
+
+ harvester = None
+ try:
+ harvester = Harvester()
+ # Use the static helper to find CTI file with default patterns
+ cti_file = cls._search_cti_file(cls._DEFAULT_CTI_PATTERNS)
+
+ if not cti_file:
+ return -1
+
+ harvester.add_file(cti_file)
+ harvester.update()
+ return len(harvester.device_info_list)
+ except Exception:
+ return -1
+ finally:
+ if harvester is not None:
+ try:
+ harvester.reset()
+ except Exception:
+ pass
+
def open(self) -> None:
if Harvester is None: # pragma: no cover - optional dependency
raise RuntimeError(
@@ -90,6 +120,32 @@ def open(self) -> None:
remote = self._acquirer.remote_device
node_map = remote.node_map
+ #print(dir(node_map))
+ """
+ ['AcquisitionBurstFrameCount', 'AcquisitionControl', 'AcquisitionFrameRate', 'AcquisitionMode',
+ 'AcquisitionStart', 'AcquisitionStop', 'AnalogControl', 'AutoFunctionsROI', 'AutoFunctionsROIEnable',
+ 'AutoFunctionsROIHeight', 'AutoFunctionsROILeft', 'AutoFunctionsROIPreset', 'AutoFunctionsROITop',
+ 'AutoFunctionsROIWidth', 'BinningHorizontal', 'BinningVertical', 'BlackLevel', 'CameraRegisterAddress',
+ 'CameraRegisterAddressSpace', 'CameraRegisterControl', 'CameraRegisterRead', 'CameraRegisterValue',
+ 'CameraRegisterWrite', 'Contrast', 'DecimationHorizontal', 'DecimationVertical', 'Denoise',
+ 'DeviceControl', 'DeviceFirmwareVersion', 'DeviceModelName', 'DeviceReset', 'DeviceSFNCVersionMajor',
+ 'DeviceSFNCVersionMinor', 'DeviceSFNCVersionSubMinor', 'DeviceScanType', 'DeviceSerialNumber',
+ 'DeviceTLType', 'DeviceTLVersionMajor', 'DeviceTLVersionMinor', 'DeviceTLVersionSubMinor',
+ 'DeviceTemperature', 'DeviceTemperatureSelector', 'DeviceType', 'DeviceUserID', 'DeviceVendorName',
+ 'DigitalIO', 'ExposureAuto', 'ExposureAutoHighlightReduction', 'ExposureAutoLowerLimit',
+ 'ExposureAutoReference', 'ExposureAutoUpperLimit', 'ExposureAutoUpperLimitAuto', 'ExposureTime',
+ 'GPIn', 'GPOut', 'Gain', 'GainAuto', 'GainAutoLowerLimit', 'GainAutoUpperLimit', 'Gamma', 'Height',
+ 'HeightMax', 'IMXLowLatencyTriggerMode', 'ImageFormatControl', 'OffsetAutoCenter', 'OffsetX', 'OffsetY',
+ 'PayloadSize', 'PixelFormat', 'ReverseX', 'ReverseY', 'Root', 'SensorHeight', 'SensorWidth', 'Sharpness',
+ 'ShowOverlay', 'SoftwareAnalogControl', 'SoftwareTransformControl', 'SoftwareTransformEnable',
+ 'StrobeDelay', 'StrobeDuration', 'StrobeEnable', 'StrobeOperation', 'StrobePolarity', 'TLParamsLocked',
+ 'TestControl', 'TestPendingAck', 'TimestampLatch', 'TimestampLatchValue', 'TimestampReset', 'ToneMappingAuto',
+ 'ToneMappingControl', 'ToneMappingEnable', 'ToneMappingGlobalBrightness', 'ToneMappingIntensity',
+ 'TransportLayerControl', 'TriggerActivation', 'TriggerDebouncer', 'TriggerDelay', 'TriggerDenoise',
+ 'TriggerMask', 'TriggerMode', 'TriggerOverlap', 'TriggerSelector', 'TriggerSoftware', 'TriggerSource',
+ 'UserSetControl', 'UserSetDefault', 'UserSetLoad', 'UserSetSave', 'UserSetSelector', 'Width', 'WidthMax']
+ """
+
self._device_label = self._resolve_device_label(node_map)
self._configure_pixel_format(node_map)
@@ -172,16 +228,30 @@ def _parse_crop(self, crop) -> Optional[Tuple[int, int, int, int]]:
return tuple(int(v) for v in crop)
return None
- def _find_cti_file(self) -> str:
- patterns: List[str] = list(self._cti_search_paths)
+ @staticmethod
+ def _search_cti_file(patterns: Tuple[str, ...]) -> Optional[str]:
+ """Search for a CTI file using the given patterns.
+
+ Returns the first CTI file found, or None if none found.
+ """
for pattern in patterns:
for file_path in glob.glob(pattern):
if os.path.isfile(file_path):
return file_path
- raise RuntimeError(
- "Could not locate a GenTL producer (.cti) file. Set 'cti_file' in "
- "camera.properties or provide search paths via 'cti_search_paths'."
- )
+ return None
+
+ def _find_cti_file(self) -> str:
+ """Find a CTI file using configured or default search paths.
+
+ Raises RuntimeError if no CTI file is found.
+ """
+ cti_file = self._search_cti_file(self._cti_search_paths)
+ if cti_file is None:
+ raise RuntimeError(
+ "Could not locate a GenTL producer (.cti) file. Set 'cti_file' in "
+ "camera.properties or provide search paths via 'cti_search_paths'."
+ )
+ return cti_file
def _available_serials(self) -> List[str]:
assert self._harvester is not None
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index c9be6a4..ca1f3e5 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -21,6 +21,7 @@ class CameraSettings:
crop_y0: int = 0 # Top edge of crop region (0 = no crop)
crop_x1: int = 0 # Right edge of crop region (0 = no crop)
crop_y1: int = 0 # Bottom edge of crop region (0 = no crop)
+ max_devices: int = 3 # Maximum number of devices to probe during detection
properties: Dict[str, Any] = field(default_factory=dict)
def apply_defaults(self) -> "CameraSettings":
@@ -51,6 +52,17 @@ class DLCProcessorSettings:
model_type: Optional[str] = "base"
+@dataclass
+class BoundingBoxSettings:
+ """Configuration for bounding box visualization."""
+
+ enabled: bool = False
+ x0: int = 0
+ y0: int = 0
+ x1: int = 200
+ y1: int = 100
+
+
@dataclass
class RecordingSettings:
"""Configuration for video recording."""
@@ -94,6 +106,7 @@ class ApplicationSettings:
camera: CameraSettings = field(default_factory=CameraSettings)
dlc: DLCProcessorSettings = field(default_factory=DLCProcessorSettings)
recording: RecordingSettings = field(default_factory=RecordingSettings)
+ bbox: BoundingBoxSettings = field(default_factory=BoundingBoxSettings)
@classmethod
def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
@@ -108,7 +121,8 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
recording_data = dict(data.get("recording", {}))
recording_data.pop("options", None)
recording = RecordingSettings(**recording_data)
- return cls(camera=camera, dlc=dlc, recording=recording)
+ bbox = BoundingBoxSettings(**data.get("bbox", {}))
+ return cls(camera=camera, dlc=dlc, recording=recording, bbox=bbox)
def to_dict(self) -> Dict[str, Any]:
"""Serialise the configuration to a dictionary."""
@@ -117,6 +131,7 @@ def to_dict(self) -> Dict[str, Any]:
"camera": asdict(self.camera),
"dlc": asdict(self.dlc),
"recording": asdict(self.recording),
+ "bbox": asdict(self.bbox),
}
@classmethod
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 9dd69ca..6358c74 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -54,6 +54,7 @@ def __init__(self) -> None:
super().__init__()
self._settings = DLCProcessorSettings()
self._dlc: Optional[Any] = None
+ self._processor: Optional[Any] = None
self._queue: Optional[queue.Queue[Any]] = None
self._worker_thread: Optional[threading.Thread] = None
self._stop_event = threading.Event()
@@ -67,8 +68,9 @@ def __init__(self) -> None:
self._processing_times: deque[float] = deque(maxlen=60)
self._stats_lock = threading.Lock()
- def configure(self, settings: DLCProcessorSettings) -> None:
+ def configure(self, settings: DLCProcessorSettings, processor: Optional[Any] = None) -> None:
self._settings = settings
+ self._processor = processor
def reset(self) -> None:
"""Stop the worker thread and drop the current DLCLive instance."""
@@ -93,6 +95,10 @@ def enqueue_frame(self, frame: np.ndarray, timestamp: float) -> None:
self._start_worker(frame.copy(), timestamp)
return
+ # Don't count dropped frames until processor is initialized
+ if not self._initialized:
+ return
+
if self._queue is not None:
try:
# Non-blocking put - drop frame if queue is full
@@ -178,10 +184,11 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
options = {
"model_path": self._settings.model_path,
"model_type": self._settings.model_type,
- "processor": None,
+ "processor": self._processor,
"dynamic": [False,0.5,10],
"resize": 1.0,
}
+ # todo expose more parameters from settings
self._dlc = DLCLive(**options)
self._dlc.init_inference(init_frame)
self._initialized = True
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 5c76269..66db93c 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -41,12 +41,14 @@
from dlclivegui.cameras.factory import DetectedCamera
from dlclivegui.config import (
ApplicationSettings,
+ BoundingBoxSettings,
CameraSettings,
DLCProcessorSettings,
RecordingSettings,
DEFAULT_CONFIG,
)
from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
+from dlclivegui.processors.processor_utils import scan_processor_folder, instantiate_from_scan
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
os.environ["CUDA_VISIBLE_DEVICES"] = "0"
@@ -76,6 +78,15 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._display_interval = 1.0 / 25.0
self._last_display_time = 0.0
self._dlc_initialized = False
+ self._scanned_processors: dict = {}
+ self._processor_keys: list = []
+ self._last_processor_vid_recording = False
+ self._auto_record_session_name: Optional[str] = None
+ self._bbox_x0 = 0
+ self._bbox_y0 = 0
+ self._bbox_x1 = 0
+ self._bbox_y1 = 0
+ self._bbox_enabled = False
self.camera_controller = CameraController()
self.dlc_processor = DLCLiveProcessor()
@@ -83,6 +94,7 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._setup_ui()
self._connect_signals()
self._apply_config(self._config)
+ self._refresh_processors() # Scan and populate processor dropdown
self._update_inference_buttons()
self._update_camera_controls_enabled()
self._metrics_timer = QTimer(self)
@@ -96,6 +108,7 @@ def _setup_ui(self) -> None:
central = QWidget()
layout = QHBoxLayout(central)
+ # Video display widget
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
@@ -103,27 +116,36 @@ def _setup_ui(self) -> None:
QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
)
+ # Controls panel with fixed width to prevent shifting
controls_widget = QWidget()
+ controls_widget.setMaximumWidth(500)
+ controls_widget.setSizePolicy(
+ QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding
+ )
controls_layout = QVBoxLayout(controls_widget)
+ controls_layout.setContentsMargins(5, 5, 5, 5)
controls_layout.addWidget(self._build_camera_group())
controls_layout.addWidget(self._build_dlc_group())
controls_layout.addWidget(self._build_recording_group())
+ controls_layout.addWidget(self._build_bbox_group())
- button_bar = QHBoxLayout()
+ # Preview/Stop buttons at bottom of controls - wrap in widget
+ button_bar_widget = QWidget()
+ button_bar = QHBoxLayout(button_bar_widget)
+ button_bar.setContentsMargins(0, 5, 0, 5)
self.preview_button = QPushButton("Start Preview")
+ self.preview_button.setMinimumWidth(150)
self.stop_preview_button = QPushButton("Stop Preview")
self.stop_preview_button.setEnabled(False)
+ self.stop_preview_button.setMinimumWidth(150)
button_bar.addWidget(self.preview_button)
button_bar.addWidget(self.stop_preview_button)
- controls_layout.addLayout(button_bar)
+ controls_layout.addWidget(button_bar_widget)
controls_layout.addStretch(1)
- preview_layout = QVBoxLayout()
- preview_layout.addWidget(self.video_label)
- preview_layout.addStretch(1)
-
- layout.addWidget(controls_widget)
- layout.addLayout(preview_layout, stretch=1)
+ # Add controls and video to main layout
+ layout.addWidget(controls_widget, stretch=0)
+ layout.addWidget(self.video_label, stretch=1)
self.setCentralWidget(central)
self.setStatusBar(QStatusBar())
@@ -154,7 +176,6 @@ def _build_camera_group(self) -> QGroupBox:
form = QFormLayout(group)
self.camera_backend = QComboBox()
- self.camera_backend.setEditable(True)
availability = CameraFactory.available_backends()
for backend in CameraFactory.backend_names():
label = backend
@@ -218,13 +239,6 @@ def _build_camera_group(self) -> QGroupBox:
form.addRow("Crop (x0,y0,x1,y1)", crop_layout)
- self.camera_properties_edit = QPlainTextEdit()
- self.camera_properties_edit.setPlaceholderText(
- '{"other_property": "value"}'
- )
- self.camera_properties_edit.setFixedHeight(60)
- form.addRow("Advanced properties", self.camera_properties_edit)
-
self.rotation_combo = QComboBox()
self.rotation_combo.addItem("0° (default)", 0)
self.rotation_combo.addItem("90°", 90)
@@ -245,9 +259,9 @@ def _build_dlc_group(self) -> QGroupBox:
self.model_path_edit = QLineEdit()
self.model_path_edit.setPlaceholderText("/path/to/exported/model")
path_layout.addWidget(self.model_path_edit)
- browse_model = QPushButton("Browse…")
- browse_model.clicked.connect(self._action_browse_model)
- path_layout.addWidget(browse_model)
+ self.browse_model_button = QPushButton("Browse…")
+ self.browse_model_button.clicked.connect(self._action_browse_model)
+ path_layout.addWidget(self.browse_model_button)
form.addRow("Model directory", path_layout)
self.model_type_combo = QComboBox()
@@ -256,24 +270,57 @@ def _build_dlc_group(self) -> QGroupBox:
self.model_type_combo.setCurrentIndex(0) # Default to base
form.addRow("Model type", self.model_type_combo)
+ # Processor selection
+ processor_path_layout = QHBoxLayout()
+ self.processor_folder_edit = QLineEdit()
+ self.processor_folder_edit.setText(str(Path(__file__).parent.joinpath("processors")))
+ processor_path_layout.addWidget(self.processor_folder_edit)
+
+ self.browse_processor_folder_button = QPushButton("Browse...")
+ self.browse_processor_folder_button.clicked.connect(self._action_browse_processor_folder)
+ processor_path_layout.addWidget(self.browse_processor_folder_button)
+
+ self.refresh_processors_button = QPushButton("Refresh")
+ self.refresh_processors_button.clicked.connect(self._refresh_processors)
+ processor_path_layout.addWidget(self.refresh_processors_button)
+ form.addRow("Processor folder", processor_path_layout)
+
+ self.processor_combo = QComboBox()
+ self.processor_combo.addItem("No Processor", None)
+ form.addRow("Processor", self.processor_combo)
+
self.additional_options_edit = QPlainTextEdit()
self.additional_options_edit.setPlaceholderText('')
- self.additional_options_edit.setFixedHeight(60)
+ self.additional_options_edit.setFixedHeight(40)
form.addRow("Additional options", self.additional_options_edit)
- inference_buttons = QHBoxLayout()
+ # Wrap inference buttons in a widget to prevent shifting
+ inference_button_widget = QWidget()
+ inference_buttons = QHBoxLayout(inference_button_widget)
+ inference_buttons.setContentsMargins(0, 0, 0, 0)
self.start_inference_button = QPushButton("Start pose inference")
self.start_inference_button.setEnabled(False)
+ self.start_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.start_inference_button)
self.stop_inference_button = QPushButton("Stop pose inference")
self.stop_inference_button.setEnabled(False)
+ self.stop_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.stop_inference_button)
- form.addRow(inference_buttons)
+ form.addRow(inference_button_widget)
self.show_predictions_checkbox = QCheckBox("Display pose predictions")
self.show_predictions_checkbox.setChecked(True)
form.addRow(self.show_predictions_checkbox)
+ self.auto_record_checkbox = QCheckBox("Auto-record video on processor command")
+ self.auto_record_checkbox.setChecked(False)
+ self.auto_record_checkbox.setToolTip("Automatically start/stop video recording when processor receives video recording commands")
+ form.addRow(self.auto_record_checkbox)
+
+ self.processor_status_label = QLabel("Processor: No clients | Recording: No")
+ self.processor_status_label.setWordWrap(True)
+ form.addRow("Processor Status", self.processor_status_label)
+
self.dlc_stats_label = QLabel("DLC processor idle")
self.dlc_stats_label.setWordWrap(True)
form.addRow("Performance", self.dlc_stats_label)
@@ -284,9 +331,6 @@ def _build_recording_group(self) -> QGroupBox:
group = QGroupBox("Recording")
form = QFormLayout(group)
- self.recording_enabled_checkbox = QCheckBox("Record video while running")
- form.addRow(self.recording_enabled_checkbox)
-
dir_layout = QHBoxLayout()
self.output_directory_edit = QLineEdit()
dir_layout.addWidget(self.output_directory_edit)
@@ -313,14 +357,18 @@ def _build_recording_group(self) -> QGroupBox:
self.crf_spin.setValue(23)
form.addRow("CRF", self.crf_spin)
+ # Wrap recording buttons in a widget to prevent shifting
+ recording_button_widget = QWidget()
+ buttons = QHBoxLayout(recording_button_widget)
+ buttons.setContentsMargins(0, 0, 0, 0)
self.start_record_button = QPushButton("Start recording")
+ self.start_record_button.setMinimumWidth(150)
+ buttons.addWidget(self.start_record_button)
self.stop_record_button = QPushButton("Stop recording")
self.stop_record_button.setEnabled(False)
-
- buttons = QHBoxLayout()
- buttons.addWidget(self.start_record_button)
+ self.stop_record_button.setMinimumWidth(150)
buttons.addWidget(self.stop_record_button)
- form.addRow(buttons)
+ form.addRow(recording_button_widget)
self.recording_stats_label = QLabel(self._last_recorder_summary)
self.recording_stats_label.setWordWrap(True)
@@ -328,6 +376,45 @@ def _build_recording_group(self) -> QGroupBox:
return group
+ def _build_bbox_group(self) -> QGroupBox:
+ """Build bounding box visualization controls."""
+ group = QGroupBox("Bounding Box Visualization")
+ form = QFormLayout(group)
+
+ self.bbox_enabled_checkbox = QCheckBox("Show bounding box")
+ self.bbox_enabled_checkbox.setChecked(False)
+ form.addRow(self.bbox_enabled_checkbox)
+
+ bbox_layout = QHBoxLayout()
+
+ self.bbox_x0_spin = QSpinBox()
+ self.bbox_x0_spin.setRange(0, 7680)
+ self.bbox_x0_spin.setPrefix("x0:")
+ self.bbox_x0_spin.setValue(0)
+ bbox_layout.addWidget(self.bbox_x0_spin)
+
+ self.bbox_y0_spin = QSpinBox()
+ self.bbox_y0_spin.setRange(0, 4320)
+ self.bbox_y0_spin.setPrefix("y0:")
+ self.bbox_y0_spin.setValue(0)
+ bbox_layout.addWidget(self.bbox_y0_spin)
+
+ self.bbox_x1_spin = QSpinBox()
+ self.bbox_x1_spin.setRange(0, 7680)
+ self.bbox_x1_spin.setPrefix("x1:")
+ self.bbox_x1_spin.setValue(100)
+ bbox_layout.addWidget(self.bbox_x1_spin)
+
+ self.bbox_y1_spin = QSpinBox()
+ self.bbox_y1_spin.setRange(0, 4320)
+ self.bbox_y1_spin.setPrefix("y1:")
+ self.bbox_y1_spin.setValue(100)
+ bbox_layout.addWidget(self.bbox_y1_spin)
+
+ form.addRow("Coordinates", bbox_layout)
+
+ return group
+
# ------------------------------------------------------------------ signals
def _connect_signals(self) -> None:
self.preview_button.clicked.connect(self._start_preview)
@@ -338,13 +425,20 @@ def _connect_signals(self) -> None:
lambda: self._refresh_camera_indices(keep_current=True)
)
self.camera_backend.currentIndexChanged.connect(self._on_backend_changed)
- self.camera_backend.editTextChanged.connect(self._on_backend_changed)
+ self.camera_backend.currentIndexChanged.connect(self._update_backend_specific_controls)
self.rotation_combo.currentIndexChanged.connect(self._on_rotation_changed)
self.start_inference_button.clicked.connect(self._start_inference)
self.stop_inference_button.clicked.connect(lambda: self._stop_inference())
self.show_predictions_checkbox.stateChanged.connect(
self._on_show_predictions_changed
)
+
+ # Connect bounding box controls
+ self.bbox_enabled_checkbox.stateChanged.connect(self._on_bbox_changed)
+ self.bbox_x0_spin.valueChanged.connect(self._on_bbox_changed)
+ self.bbox_y0_spin.valueChanged.connect(self._on_bbox_changed)
+ self.bbox_x1_spin.valueChanged.connect(self._on_bbox_changed)
+ self.bbox_y1_spin.valueChanged.connect(self._on_bbox_changed)
self.camera_controller.frame_ready.connect(self._on_frame_ready)
self.camera_controller.started.connect(self._on_camera_started)
@@ -372,22 +466,20 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.crop_y1.setValue(int(camera.crop_y1) if hasattr(camera, 'crop_y1') else 0)
backend_name = camera.backend or "opencv"
+ self.camera_backend.blockSignals(True)
index = self.camera_backend.findData(backend_name)
if index >= 0:
self.camera_backend.setCurrentIndex(index)
else:
self.camera_backend.setEditText(backend_name)
+ self.camera_backend.blockSignals(False)
self._refresh_camera_indices(keep_current=False)
self._select_camera_by_index(
camera.index, fallback_text=camera.name or str(camera.index)
)
- # Set advanced properties (exposure and gain are now separate fields)
- self.camera_properties_edit.setPlainText(
- json.dumps(camera.properties, indent=2) if camera.properties else ""
- )
-
self._active_camera_settings = None
+ self._update_backend_specific_controls()
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
@@ -403,7 +495,6 @@ def _apply_config(self, config: ApplicationSettings) -> None:
)
recording = config.recording
- self.recording_enabled_checkbox.setChecked(recording.enabled)
self.output_directory_edit.setText(recording.directory)
self.filename_edit.setText(recording.filename)
self.container_combo.setCurrentText(recording.container)
@@ -415,11 +506,20 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.codec_combo.setCurrentIndex(self.codec_combo.count() - 1)
self.crf_spin.setValue(int(recording.crf))
+ # Set bounding box settings from config
+ bbox = config.bbox
+ self.bbox_enabled_checkbox.setChecked(bbox.enabled)
+ self.bbox_x0_spin.setValue(bbox.x0)
+ self.bbox_y0_spin.setValue(bbox.y0)
+ self.bbox_x1_spin.setValue(bbox.x1)
+ self.bbox_y1_spin.setValue(bbox.y1)
+
def _current_config(self) -> ApplicationSettings:
return ApplicationSettings(
camera=self._camera_settings_from_ui(),
dlc=self._dlc_settings_from_ui(),
recording=self._recording_settings_from_ui(),
+ bbox=self._bbox_settings_from_ui(),
)
def _camera_settings_from_ui(self) -> CameraSettings:
@@ -427,7 +527,6 @@ def _camera_settings_from_ui(self) -> CameraSettings:
if index is None:
raise ValueError("Camera selection must provide a numeric index")
backend_text = self._current_backend_name()
- properties = self._parse_json(self.camera_properties_edit.toPlainText())
# Get exposure and gain from explicit UI fields
exposure = self.camera_exposure.value()
@@ -439,12 +538,6 @@ def _camera_settings_from_ui(self) -> CameraSettings:
crop_x1 = self.crop_x1.value()
crop_y1 = self.crop_y1.value()
- # Also add to properties dict for backward compatibility with camera backends
- if exposure > 0:
- properties["exposure"] = exposure
- if gain > 0.0:
- properties["gain"] = gain
-
name_text = self.camera_index.currentText().strip()
settings = CameraSettings(
name=name_text or f"Camera {index}",
@@ -457,7 +550,7 @@ def _camera_settings_from_ui(self) -> CameraSettings:
crop_y0=crop_y0,
crop_x1=crop_x1,
crop_y1=crop_y1,
- properties=properties,
+ properties={},
)
return settings.apply_defaults()
@@ -472,7 +565,9 @@ def _refresh_camera_indices(
self, *_args: object, keep_current: bool = True
) -> None:
backend = self._current_backend_name()
- detected = CameraFactory.detect_cameras(backend)
+ # Get max_devices from config, default to 3
+ max_devices = self._config.camera.max_devices if hasattr(self._config.camera, 'max_devices') else 3
+ detected = CameraFactory.detect_cameras(backend, max_devices=max_devices)
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
logging.info(
f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
@@ -519,19 +614,6 @@ def _current_camera_index_value(self) -> Optional[int]:
return int(text)
except ValueError:
return None
-
- def _current_backend_name(self) -> str:
- backend_data = self.camera_backend.currentData()
- if isinstance(backend_data, str) and backend_data:
- return backend_data
- text = self.camera_backend.currentText().strip()
- return text or "opencv"
-
- def _refresh_camera_indices(
- self, *_args: object, keep_current: bool = True
- ) -> None:
- backend = self._current_backend_name()
- detected = CameraFactory.detect_cameras(backend)
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
logging.info(
f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
@@ -600,7 +682,7 @@ def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
def _recording_settings_from_ui(self) -> RecordingSettings:
return RecordingSettings(
- enabled=self.recording_enabled_checkbox.isChecked(),
+ enabled=True, # Always enabled - recording controlled by button
directory=self.output_directory_edit.text().strip(),
filename=self.filename_edit.text().strip() or "session.mp4",
container=self.container_combo.currentText().strip() or "mp4",
@@ -608,6 +690,15 @@ def _recording_settings_from_ui(self) -> RecordingSettings:
crf=int(self.crf_spin.value()),
)
+ def _bbox_settings_from_ui(self) -> BoundingBoxSettings:
+ return BoundingBoxSettings(
+ enabled=self.bbox_enabled_checkbox.isChecked(),
+ x0=self.bbox_x0_spin.value(),
+ y0=self.bbox_y0_spin.value(),
+ x1=self.bbox_x1_spin.value(),
+ y1=self.bbox_y1_spin.value(),
+ )
+
# ------------------------------------------------------------------ actions
def _action_load_config(self) -> None:
file_name, _ = QFileDialog.getOpenFileName(
@@ -666,9 +757,66 @@ def _action_browse_directory(self) -> None:
if directory:
self.output_directory_edit.setText(directory)
+ def _action_browse_processor_folder(self) -> None:
+ """Browse for processor folder."""
+ current_path = self.processor_folder_edit.text() or "./processors"
+ directory = QFileDialog.getExistingDirectory(
+ self, "Select processor folder", current_path
+ )
+ if directory:
+ self.processor_folder_edit.setText(directory)
+ self._refresh_processors()
+
+ def _refresh_processors(self) -> None:
+ """Scan processor folder and populate dropdown."""
+ folder_path = self.processor_folder_edit.text() or "./processors"
+
+ # Clear existing items (keep "No Processor")
+ self.processor_combo.clear()
+ self.processor_combo.addItem("No Processor", None)
+
+ # Scan folder
+ try:
+ self._scanned_processors = scan_processor_folder(folder_path)
+ self._processor_keys = list(self._scanned_processors.keys())
+
+ # Populate dropdown
+ for key in self._processor_keys:
+ info = self._scanned_processors[key]
+ display_name = f"{info['name']} ({info['file']})"
+ self.processor_combo.addItem(display_name, key)
+
+ status_msg = f"Found {len(self._processor_keys)} processor(s) in {folder_path}"
+ self.statusBar().showMessage(status_msg, 3000)
+
+ except Exception as e:
+ error_msg = f"Error scanning processors: {e}"
+ self.statusBar().showMessage(error_msg, 5000)
+ logging.error(error_msg)
+ self._scanned_processors = {}
+ self._processor_keys = []
+
def _on_backend_changed(self, *_args: object) -> None:
self._refresh_camera_indices(keep_current=False)
+ def _update_backend_specific_controls(self) -> None:
+ """Enable/disable controls based on selected backend."""
+ backend = self._current_backend_name()
+ is_opencv = backend.lower() == "opencv"
+
+ # Disable exposure and gain controls for OpenCV backend
+ self.camera_exposure.setEnabled(not is_opencv)
+ self.camera_gain.setEnabled(not is_opencv)
+
+ # Set tooltip to explain why controls are disabled
+ if is_opencv:
+ tooltip = "Exposure and gain control not supported with OpenCV backend"
+ self.camera_exposure.setToolTip(tooltip)
+ self.camera_gain.setToolTip(tooltip)
+ else:
+ self.camera_exposure.setToolTip("")
+ self.camera_gain.setToolTip("")
+
def _on_rotation_changed(self, _index: int) -> None:
data = self.rotation_combo.currentData()
self._rotation_degrees = int(data) if isinstance(data, int) else 0
@@ -764,7 +912,25 @@ def _configure_dlc(self) -> bool:
if not settings.model_path:
self._show_error("Please select a DLCLive model before starting inference.")
return False
- self.dlc_processor.configure(settings)
+
+ # Instantiate processor if selected
+ processor = None
+ selected_key = self.processor_combo.currentData()
+ if selected_key is not None and self._scanned_processors:
+ try:
+ # For now, instantiate with no parameters
+ # TODO: Add parameter dialog for processors that need params
+ # or pass kwargs from config ?
+ processor = instantiate_from_scan(self._scanned_processors, selected_key)
+ processor_name = self._scanned_processors[selected_key]['name']
+ self.statusBar().showMessage(f"Loaded processor: {processor_name}", 3000)
+ except Exception as e:
+ error_msg = f"Failed to instantiate processor: {e}"
+ self._show_error(error_msg)
+ logging.error(error_msg)
+ return False
+
+ self.dlc_processor.configure(settings, processor=processor)
return True
def _update_inference_buttons(self) -> None:
@@ -772,6 +938,22 @@ def _update_inference_buttons(self) -> None:
self.start_inference_button.setEnabled(preview_running and not self._dlc_active)
self.stop_inference_button.setEnabled(preview_running and self._dlc_active)
+ def _update_dlc_controls_enabled(self) -> None:
+ """Enable/disable DLC settings based on inference state."""
+ allow_changes = not self._dlc_active
+ widgets = [
+ self.model_path_edit,
+ self.browse_model_button,
+ self.model_type_combo,
+ self.processor_folder_edit,
+ self.browse_processor_folder_button,
+ self.refresh_processors_button,
+ self.processor_combo,
+ self.additional_options_edit,
+ ]
+ for widget in widgets:
+ widget.setEnabled(allow_changes)
+
def _update_camera_controls_enabled(self) -> None:
recording_active = (
self._video_recorder is not None and self._video_recorder.is_running
@@ -792,7 +974,6 @@ def _update_camera_controls_enabled(self) -> None:
self.crop_y0,
self.crop_x1,
self.crop_y1,
- self.camera_properties_edit,
self.rotation_combo,
self.codec_combo,
self.crf_spin,
@@ -871,6 +1052,10 @@ def _update_metrics(self) -> None:
else:
self.dlc_stats_label.setText("DLC processor idle")
+ # Update processor status (connection and recording state)
+ if hasattr(self, "processor_status_label"):
+ self._update_processor_status()
+
if hasattr(self, "recording_stats_label"):
if self._video_recorder is not None:
stats = self._video_recorder.get_stats()
@@ -884,6 +1069,62 @@ def _update_metrics(self) -> None:
else:
self.recording_stats_label.setText(self._last_recorder_summary)
+ def _update_processor_status(self) -> None:
+ """Update processor connection and recording status, handle auto-recording."""
+ if not self._dlc_active or not self._dlc_initialized:
+ self.processor_status_label.setText("Processor: Not active")
+ return
+
+ # Get processor instance from dlc_processor
+ processor = self.dlc_processor._processor
+
+ if processor is None:
+ self.processor_status_label.setText("Processor: None loaded")
+ return
+
+ # Check if processor has the required attributes (socket-based processors)
+ if not hasattr(processor, 'conns') or not hasattr(processor, '_recording'):
+ self.processor_status_label.setText("Processor: No status info")
+ return
+
+ # Get connection count and recording state
+ num_clients = len(processor.conns)
+ is_recording = processor.recording if hasattr(processor, 'recording') else False
+
+ # Format status message
+ client_str = f"{num_clients} client{'s' if num_clients != 1 else ''}"
+ recording_str = "Yes" if is_recording else "No"
+ self.processor_status_label.setText(f"Clients: {client_str} | Recording: {recording_str}")
+
+ # Handle auto-recording based on processor's video recording flag
+ if hasattr(processor, '_vid_recording') and self.auto_record_checkbox.isChecked():
+ current_vid_recording = processor.video_recording
+
+ # Check if video recording state changed
+ if current_vid_recording != self._last_processor_vid_recording:
+ if current_vid_recording:
+ # Start video recording
+ if not self._video_recorder or not self._video_recorder.is_running:
+ # Get session name from processor
+ session_name = getattr(processor, 'session_name', 'auto_session')
+ self._auto_record_session_name = session_name
+
+ # Update filename with session name
+ original_filename = self.filename_edit.text()
+ self.filename_edit.setText(f"{session_name}.mp4")
+
+ self._start_recording()
+ self.statusBar().showMessage(f"Auto-started recording: {session_name}", 3000)
+ logging.info(f"Auto-recording started for session: {session_name}")
+ else:
+ # Stop video recording
+ if self._video_recorder and self._video_recorder.is_running:
+ self._stop_recording()
+ self.statusBar().showMessage("Auto-stopped recording", 3000)
+ logging.info("Auto-recording stopped")
+
+ self._last_processor_vid_recording = current_vid_recording
+
def _start_inference(self) -> None:
if self._dlc_active:
self.statusBar().showMessage("Pose inference already running", 3000)
@@ -909,6 +1150,7 @@ def _start_inference(self) -> None:
self.statusBar().showMessage("Initializing DLCLive…", 3000)
self._update_camera_controls_enabled()
+ self._update_dlc_controls_enabled()
def _stop_inference(self, show_message: bool = True) -> None:
was_active = self._dlc_active
@@ -916,6 +1158,8 @@ def _stop_inference(self, show_message: bool = True) -> None:
self._dlc_initialized = False
self.dlc_processor.reset()
self._last_pose = None
+ self._last_processor_vid_recording = False
+ self._auto_record_session_name = None
# Reset button appearance
self.start_inference_button.setText("Start pose inference")
@@ -927,6 +1171,7 @@ def _stop_inference(self, show_message: bool = True) -> None:
self.statusBar().showMessage("Pose inference stopped", 3000)
self._update_inference_buttons()
self._update_camera_controls_enabled()
+ self._update_dlc_controls_enabled()
# ------------------------------------------------------------------ recording
def _start_recording(self) -> None:
@@ -1026,9 +1271,10 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
# Check if it's a frame size error
if "Frame size changed" in str(exc):
self._show_warning(f"Camera resolution changed - restarting recording: {exc}")
+ was_recording = self._video_recorder and self._video_recorder.is_running
self._stop_recording()
- # Restart recording with new resolution if enabled
- if self.recording_enabled_checkbox.isChecked():
+ # Restart recording with new resolution if it was already running
+ if was_recording:
try:
self._start_recording()
except Exception as restart_exc:
@@ -1060,6 +1306,11 @@ def _update_video_display(self, frame: np.ndarray) -> None:
and self._last_pose.pose is not None
):
display_frame = self._draw_pose(frame, self._last_pose.pose)
+
+ # Draw bounding box if enabled
+ if self._bbox_enabled:
+ display_frame = self._draw_bbox(display_frame)
+
rgb = cv2.cvtColor(display_frame, cv2.COLOR_BGR2RGB)
h, w, ch = rgb.shape
bytes_per_line = ch * w
@@ -1104,6 +1355,41 @@ def _on_show_predictions_changed(self, _state: int) -> None:
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
+ def _on_bbox_changed(self, _value: int = 0) -> None:
+ """Handle bounding box parameter changes."""
+ self._bbox_enabled = self.bbox_enabled_checkbox.isChecked()
+ self._bbox_x0 = self.bbox_x0_spin.value()
+ self._bbox_y0 = self.bbox_y0_spin.value()
+ self._bbox_x1 = self.bbox_x1_spin.value()
+ self._bbox_y1 = self.bbox_y1_spin.value()
+
+ # Force redraw if preview is running
+ if self._current_frame is not None:
+ self._display_frame(self._current_frame, force=True)
+
+ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
+ """Draw bounding box on frame with red lines."""
+ overlay = frame.copy()
+ x0 = self._bbox_x0
+ y0 = self._bbox_y0
+ x1 = self._bbox_x1
+ y1 = self._bbox_y1
+
+ # Validate coordinates
+ if x0 >= x1 or y0 >= y1:
+ return overlay
+
+ height, width = frame.shape[:2]
+ x0 = max(0, min(x0, width - 1))
+ y0 = max(0, min(y0, height - 1))
+ x1 = max(x0 + 1, min(x1, width))
+ y1 = max(y0 + 1, min(y1, height))
+
+ # Draw red rectangle (BGR format: red is (0, 0, 255))
+ cv2.rectangle(overlay, (x0, y0), (x1, y1), (0, 0, 255), 2)
+
+ return overlay
+
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
for keypoint in np.asarray(pose):
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index dbb0f90..3f5b951 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -134,6 +134,7 @@ def __init__(
self._session_name = "test_session"
self.filename = None
self._recording = Event() # Thread-safe recording flag
+ self._vid_recording = Event() # Thread-safe video recording flag
# State
self.curr_step = 0
@@ -144,6 +145,11 @@ def recording(self):
"""Thread-safe recording flag."""
return self._recording.is_set()
+ @property
+ def video_recording(self):
+ """Thread-safe video recording flag."""
+ return self._vid_recording.is_set()
+
@property
def session_name(self):
return self._session_name
@@ -155,11 +161,11 @@ def session_name(self, name):
def _accept_loop(self):
"""Background thread to accept new client connections."""
- LOG.info(f"DLC Processor listening on {self.address[0]}:{self.address[1]}")
+ LOG.debug(f"DLC Processor listening on {self.address[0]}:{self.address[1]}")
while not self._stop.is_set():
try:
c = self.listener.accept()
- LOG.info(f"Client connected from {self.listener.last_accepted}")
+ LOG.debug(f"Client connected from {self.listener.last_accepted}")
self.conns.add(c)
# Start RX loop for this connection (in case clients send data)
Thread(target=self._rx_loop, args=(c,), name="DLCRX", daemon=True).start()
@@ -195,6 +201,7 @@ def _handle_client_message(self, msg):
LOG.info(f"Session name set to: {session_name}")
elif cmd == "start_recording":
+ self._vid_recording.set()
self._recording.set()
# Clear all data queues
self._clear_data_queues()
@@ -203,12 +210,18 @@ def _handle_client_message(self, msg):
elif cmd == "stop_recording":
self._recording.clear()
+ self._vid_recording.clear()
LOG.info("Recording stopped")
elif cmd == "save":
filename = msg.get("filename", self.filename)
save_code = self.save(filename)
LOG.info(f"Save {'successful' if save_code == 1 else 'failed'}: {filename}")
+
+ elif cmd == "start_video":
+ # Placeholder for video recording start
+ self._vid_recording.set()
+ LOG.info("Start video recording command received")
def _clear_data_queues(self):
"""Clear all data storage queues. Override in subclasses to clear additional queues."""
diff --git a/example_recording_control.py b/example_recording_control.py
deleted file mode 100644
index ed426e8..0000000
--- a/example_recording_control.py
+++ /dev/null
@@ -1,194 +0,0 @@
-"""
-Example: Recording control with DLCClient and MyProcessor_socket
-
-This demonstrates:
-1. Starting a processor
-2. Connecting a client
-3. Controlling recording (start/stop/save) from the client
-4. Session name management
-"""
-
-import time
-import sys
-from pathlib import Path
-
-# Add parent directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
-
-from mouse_ar.ctrl.dlc_client import DLCClient
-
-
-def example_recording_workflow():
- """Complete workflow: processor + client with recording control."""
-
- print("\n" + "="*70)
- print("EXAMPLE: Recording Control Workflow")
- print("="*70)
-
- # NOTE: This example assumes MyProcessor_socket is already running
- # Start it separately with:
- # from dlc_processor_socket import MyProcessor_socket
- # processor = MyProcessor_socket(bind=("localhost", 6000))
- # # Then run DLCLive with this processor
-
- print("\n[CLIENT] Connecting to processor at localhost:6000...")
- client = DLCClient(address=("localhost", 6000))
-
- try:
- # Start the client (connects and begins receiving data)
- client.start()
- print("[CLIENT] Connected!")
- time.sleep(0.5) # Wait for connection to stabilize
-
- # Set session name
- print("\n[CLIENT] Setting session name to 'experiment_001'...")
- client.set_session_name("experiment_001")
- time.sleep(0.2)
-
- # Start recording
- print("[CLIENT] Starting recording (clears processor data queues)...")
- client.start_recording()
- time.sleep(0.2)
-
- # Receive some data
- print("\n[CLIENT] Receiving data for 5 seconds...")
- for i in range(5):
- data = client.read()
- if data:
- vals = data["vals"]
- print(f" t={vals[0]:.2f}, x={vals[1]:.1f}, y={vals[2]:.1f}, "
- f"heading={vals[3]:.1f}°, head_angle={vals[4]:.2f}rad")
- time.sleep(1.0)
-
- # Stop recording
- print("\n[CLIENT] Stopping recording...")
- client.stop_recording()
- time.sleep(0.2)
-
- # Trigger save
- print("[CLIENT] Triggering save on processor...")
- client.trigger_save() # Uses processor's default filename
- # OR specify custom filename:
- # client.trigger_save(filename="my_custom_data.pkl")
- time.sleep(0.5)
-
- print("\n[CLIENT] ✓ Workflow complete!")
-
- except Exception as e:
- print(f"\n[ERROR] {e}")
- print("\nMake sure MyProcessor_socket is running!")
- print("Example:")
- print(" from dlc_processor_socket import MyProcessor_socket")
- print(" processor = MyProcessor_socket()")
- print(" # Then run DLCLive with this processor")
-
- finally:
- print("\n[CLIENT] Closing connection...")
- client.close()
-
-
-def example_multiple_sessions():
- """Example: Recording multiple sessions with the same processor."""
-
- print("\n" + "="*70)
- print("EXAMPLE: Multiple Sessions")
- print("="*70)
-
- client = DLCClient(address=("localhost", 6000))
-
- try:
- client.start()
- print("[CLIENT] Connected!")
- time.sleep(0.5)
-
- # Session 1
- print("\n--- SESSION 1 ---")
- client.set_session_name("trial_001")
- client.start_recording()
- print("Recording session 'trial_001' for 3 seconds...")
- time.sleep(3.0)
- client.stop_recording()
- client.trigger_save() # Saves as "trial_001_dlc_processor_data.pkl"
- print("Session 1 saved!")
-
- time.sleep(1.0)
-
- # Session 2
- print("\n--- SESSION 2 ---")
- client.set_session_name("trial_002")
- client.start_recording()
- print("Recording session 'trial_002' for 3 seconds...")
- time.sleep(3.0)
- client.stop_recording()
- client.trigger_save() # Saves as "trial_002_dlc_processor_data.pkl"
- print("Session 2 saved!")
-
- print("\n✓ Multiple sessions recorded successfully!")
-
- except Exception as e:
- print(f"\n[ERROR] {e}")
-
- finally:
- client.close()
-
-
-def example_command_api():
- """Example: Using the low-level command API."""
-
- print("\n" + "="*70)
- print("EXAMPLE: Low-level Command API")
- print("="*70)
-
- client = DLCClient(address=("localhost", 6000))
-
- try:
- client.start()
- time.sleep(0.5)
-
- # Using send_command directly
- print("\n[CLIENT] Using send_command()...")
-
- # Set session name
- client.send_command("set_session_name", session_name="custom_session")
- print(" ✓ Sent: set_session_name")
- time.sleep(0.2)
-
- # Start recording
- client.send_command("start_recording")
- print(" ✓ Sent: start_recording")
- time.sleep(2.0)
-
- # Stop recording
- client.send_command("stop_recording")
- print(" ✓ Sent: stop_recording")
- time.sleep(0.2)
-
- # Save with custom filename
- client.send_command("save", filename="my_data.pkl")
- print(" ✓ Sent: save")
- time.sleep(0.5)
-
- print("\n✓ Commands sent successfully!")
-
- except Exception as e:
- print(f"\n[ERROR] {e}")
-
- finally:
- client.close()
-
-
-if __name__ == "__main__":
- print("\n" + "="*70)
- print("DLC PROCESSOR RECORDING CONTROL EXAMPLES")
- print("="*70)
- print("\nNOTE: These examples require MyProcessor_socket to be running.")
- print("Start it separately before running these examples.")
- print("="*70)
-
- # Uncomment the example you want to run:
-
- # example_recording_workflow()
- # example_multiple_sessions()
- # example_command_api()
-
- print("\nUncomment an example in the script to run it.")
From f1ab8b02c28e3553097598fe451cae37bb58f901 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 24 Oct 2025 15:12:44 +0200
Subject: [PATCH 013/132] formatting and precommit workflow
---
.github/workflows/format.yml | 23 ++
.gitignore | 1 -
.pre-commit-config.yaml | 23 ++
dlclivegui/__init__.py | 8 +-
dlclivegui/camera_controller.py | 99 ++++---
dlclivegui/cameras/__init__.py | 1 +
dlclivegui/cameras/base.py | 1 +
dlclivegui/cameras/basler_backend.py | 9 +-
dlclivegui/cameras/factory.py | 3 +-
dlclivegui/cameras/gentl_backend.py | 46 ++--
dlclivegui/cameras/opencv_backend.py | 11 +-
dlclivegui/config.py | 13 +-
dlclivegui/dlc_processor.py | 62 +++--
dlclivegui/gui.py | 243 ++++++++----------
dlclivegui/processors/GUI_INTEGRATION.md | 12 +-
dlclivegui/processors/PLUGIN_SYSTEM.md | 4 +-
dlclivegui/processors/dlc_processor_socket.py | 62 ++---
dlclivegui/processors/processor_utils.py | 43 ++--
dlclivegui/video_recorder.py | 41 ++-
setup.py | 1 +
20 files changed, 378 insertions(+), 328 deletions(-)
create mode 100644 .github/workflows/format.yml
create mode 100644 .pre-commit-config.yaml
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 0000000..a226ae0
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,23 @@
+name: pre-commit-format
+
+on:
+ push:
+ branches: [main]
+ pull_request:
+ branches: [main]
+
+jobs:
+ pre_commit_checks:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ github.head_ref }}
+
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.10'
+
+ - run: pip install pre-commit
+ - run: pre-commit run --all-files
diff --git a/.gitignore b/.gitignore
index 1a13ced..d2ee717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
### DLC Live Specific
#####################
-*config*
**test*
###################
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..09dc3cd
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,23 @@
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.4.0
+ hooks:
+ - id: check-added-large-files
+ - id: check-yaml
+ - id: end-of-file-fixer
+ - id: name-tests-test
+ args: [--pytest-test-first]
+ - id: trailing-whitespace
+ - id: check-merge-conflict
+
+ - repo: https://github.com/PyCQA/isort
+ rev: 5.12.0
+ hooks:
+ - id: isort
+ args: ["--profile", "black", "--line-length", "100", "--atomic"]
+
+ - repo: https://github.com/psf/black
+ rev: 24.4.2
+ hooks:
+ - id: black
+ args: ["--line-length=100"]
diff --git a/dlclivegui/__init__.py b/dlclivegui/__init__.py
index 1408486..d91f23b 100644
--- a/dlclivegui/__init__.py
+++ b/dlclivegui/__init__.py
@@ -1,10 +1,6 @@
"""DeepLabCut Live GUI package."""
-from .config import (
- ApplicationSettings,
- CameraSettings,
- DLCProcessorSettings,
- RecordingSettings,
-)
+
+from .config import ApplicationSettings, CameraSettings, DLCProcessorSettings, RecordingSettings
from .gui import MainWindow, main
__all__ = [
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
index 5618163..7c80df1 100644
--- a/dlclivegui/camera_controller.py
+++ b/dlclivegui/camera_controller.py
@@ -1,4 +1,5 @@
"""Camera management for the DLC Live GUI."""
+
from __future__ import annotations
import logging
@@ -8,7 +9,7 @@
from typing import Optional
import numpy as np
-from PyQt6.QtCore import QObject, QThread, QMetaObject, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtCore import QMetaObject, QObject, Qt, QThread, pyqtSignal, pyqtSlot
from dlclivegui.cameras import CameraFactory
from dlclivegui.cameras.base import CameraBackend
@@ -39,20 +40,20 @@ def __init__(self, settings: CameraSettings):
self._settings = settings
self._stop_event = Event()
self._backend: Optional[CameraBackend] = None
-
+
# Error recovery settings
self._max_consecutive_errors = 5
self._max_reconnect_attempts = 3
self._retry_delay = 0.1 # seconds
self._reconnect_delay = 1.0 # seconds
-
+
# Frame validation
self._expected_frame_size: Optional[tuple[int, int]] = None # (height, width)
@pyqtSlot()
def run(self) -> None:
self._stop_event.clear()
-
+
# Initialize camera
if not self._initialize_camera():
self.finished.emit()
@@ -66,30 +67,36 @@ def run(self) -> None:
while not self._stop_event.is_set():
try:
frame, timestamp = self._backend.read()
-
+
# Validate frame size
if not self._validate_frame_size(frame):
consecutive_errors += 1
- LOGGER.warning(f"Frame size validation failed ({consecutive_errors}/{self._max_consecutive_errors})")
+ LOGGER.warning(
+ f"Frame size validation failed ({consecutive_errors}/{self._max_consecutive_errors})"
+ )
if consecutive_errors >= self._max_consecutive_errors:
self.error_occurred.emit("Too many frames with incorrect size")
break
time.sleep(self._retry_delay)
continue
-
+
consecutive_errors = 0 # Reset error count on success
reconnect_attempts = 0 # Reset reconnect attempts on success
-
+
except TimeoutError as exc:
consecutive_errors += 1
- LOGGER.warning(f"Camera frame timeout ({consecutive_errors}/{self._max_consecutive_errors}): {exc}")
-
+ LOGGER.warning(
+ f"Camera frame timeout ({consecutive_errors}/{self._max_consecutive_errors}): {exc}"
+ )
+
if self._stop_event.is_set():
break
-
+
# Handle timeout with retry logic
if consecutive_errors < self._max_consecutive_errors:
- self.warning_occurred.emit(f"Frame timeout (retry {consecutive_errors}/{self._max_consecutive_errors})")
+ self.warning_occurred.emit(
+ f"Frame timeout (retry {consecutive_errors}/{self._max_consecutive_errors})"
+ )
time.sleep(self._retry_delay)
continue
else:
@@ -98,29 +105,39 @@ def run(self) -> None:
if self._attempt_reconnection():
consecutive_errors = 0
reconnect_attempts += 1
- self.warning_occurred.emit(f"Camera reconnected (attempt {reconnect_attempts})")
+ self.warning_occurred.emit(
+ f"Camera reconnected (attempt {reconnect_attempts})"
+ )
continue
else:
reconnect_attempts += 1
if reconnect_attempts >= self._max_reconnect_attempts:
- self.error_occurred.emit(f"Camera reconnection failed after {reconnect_attempts} attempts")
+ self.error_occurred.emit(
+ f"Camera reconnection failed after {reconnect_attempts} attempts"
+ )
break
else:
consecutive_errors = 0 # Reset to try again
- self.warning_occurred.emit(f"Reconnection attempt {reconnect_attempts} failed, retrying...")
+ self.warning_occurred.emit(
+ f"Reconnection attempt {reconnect_attempts} failed, retrying..."
+ )
time.sleep(self._reconnect_delay)
continue
-
+
except Exception as exc:
consecutive_errors += 1
- LOGGER.warning(f"Camera read error ({consecutive_errors}/{self._max_consecutive_errors}): {exc}")
-
+ LOGGER.warning(
+ f"Camera read error ({consecutive_errors}/{self._max_consecutive_errors}): {exc}"
+ )
+
if self._stop_event.is_set():
break
-
+
# Handle general errors with retry logic
if consecutive_errors < self._max_consecutive_errors:
- self.warning_occurred.emit(f"Frame read error (retry {consecutive_errors}/{self._max_consecutive_errors})")
+ self.warning_occurred.emit(
+ f"Frame read error (retry {consecutive_errors}/{self._max_consecutive_errors})"
+ )
time.sleep(self._retry_delay)
continue
else:
@@ -129,22 +146,28 @@ def run(self) -> None:
if self._attempt_reconnection():
consecutive_errors = 0
reconnect_attempts += 1
- self.warning_occurred.emit(f"Camera reconnected (attempt {reconnect_attempts})")
+ self.warning_occurred.emit(
+ f"Camera reconnected (attempt {reconnect_attempts})"
+ )
continue
else:
reconnect_attempts += 1
if reconnect_attempts >= self._max_reconnect_attempts:
- self.error_occurred.emit(f"Camera failed after {reconnect_attempts} reconnection attempts: {exc}")
+ self.error_occurred.emit(
+ f"Camera failed after {reconnect_attempts} reconnection attempts: {exc}"
+ )
break
else:
consecutive_errors = 0 # Reset to try again
- self.warning_occurred.emit(f"Reconnection attempt {reconnect_attempts} failed, retrying...")
+ self.warning_occurred.emit(
+ f"Reconnection attempt {reconnect_attempts} failed, retrying..."
+ )
time.sleep(self._reconnect_delay)
continue
-
+
if self._stop_event.is_set():
break
-
+
self.frame_captured.emit(FrameData(frame, timestamp))
# Cleanup
@@ -158,7 +181,9 @@ def _initialize_camera(self) -> bool:
self._backend.open()
# Don't set expected frame size - will be established from first frame
self._expected_frame_size = None
- LOGGER.info("Camera initialized successfully, frame size will be determined from camera")
+ LOGGER.info(
+ "Camera initialized successfully, frame size will be determined from camera"
+ )
return True
except Exception as exc:
LOGGER.exception("Failed to initialize camera", exc_info=exc)
@@ -170,15 +195,17 @@ def _validate_frame_size(self, frame: np.ndarray) -> bool:
if frame is None or frame.size == 0:
LOGGER.warning("Received empty frame")
return False
-
+
actual_size = (frame.shape[0], frame.shape[1]) # (height, width)
-
+
if self._expected_frame_size is None:
# First frame - establish expected size
self._expected_frame_size = actual_size
- LOGGER.info(f"Established expected frame size: (h={actual_size[0]}, w={actual_size[1]})")
+ LOGGER.info(
+ f"Established expected frame size: (h={actual_size[0]}, w={actual_size[1]})"
+ )
return True
-
+
if actual_size != self._expected_frame_size:
LOGGER.warning(
f"Frame size mismatch: expected (h={self._expected_frame_size[0]}, w={self._expected_frame_size[1]}), "
@@ -192,26 +219,26 @@ def _validate_frame_size(self, frame: np.ndarray) -> bool:
f"Camera resolution changed to {actual_size[1]}x{actual_size[0]}"
)
return True # Accept the new size
-
+
return True
def _attempt_reconnection(self) -> bool:
"""Attempt to reconnect to the camera. Returns True on success, False on failure."""
if self._stop_event.is_set():
return False
-
+
LOGGER.info("Attempting camera reconnection...")
-
+
# Close existing connection
self._cleanup_camera()
-
+
# Wait longer before reconnecting to let the device fully release
LOGGER.info(f"Waiting {self._reconnect_delay}s before reconnecting...")
time.sleep(self._reconnect_delay)
-
+
if self._stop_event.is_set():
return False
-
+
# Try to reinitialize (this will also reset expected frame size)
try:
self._backend = CameraFactory.create(self._settings)
diff --git a/dlclivegui/cameras/__init__.py b/dlclivegui/cameras/__init__.py
index cf7f488..7aa4621 100644
--- a/dlclivegui/cameras/__init__.py
+++ b/dlclivegui/cameras/__init__.py
@@ -1,4 +1,5 @@
"""Camera backend implementations and factory helpers."""
+
from __future__ import annotations
from .factory import CameraFactory
diff --git a/dlclivegui/cameras/base.py b/dlclivegui/cameras/base.py
index 910331c..f060d8b 100644
--- a/dlclivegui/cameras/base.py
+++ b/dlclivegui/cameras/base.py
@@ -1,4 +1,5 @@
"""Abstract camera backend definitions."""
+
from __future__ import annotations
from abc import ABC, abstractmethod
diff --git a/dlclivegui/cameras/basler_backend.py b/dlclivegui/cameras/basler_backend.py
index e83185a..ec23806 100644
--- a/dlclivegui/cameras/basler_backend.py
+++ b/dlclivegui/cameras/basler_backend.py
@@ -1,4 +1,5 @@
"""Basler camera backend implemented with :mod:`pypylon`."""
+
from __future__ import annotations
import time
@@ -28,9 +29,7 @@ def is_available(cls) -> bool:
def open(self) -> None:
if pylon is None: # pragma: no cover - optional dependency
- raise RuntimeError(
- "pypylon is required for the Basler backend but is not installed"
- )
+ raise RuntimeError("pypylon is required for the Basler backend but is not installed")
devices = self._enumerate_devices()
if not devices:
raise RuntimeError("No Basler cameras detected")
@@ -114,7 +113,9 @@ def _enumerate_devices(self):
return factory.EnumerateDevices()
def _select_device(self, devices):
- serial = self.settings.properties.get("serial") or self.settings.properties.get("serial_number")
+ serial = self.settings.properties.get("serial") or self.settings.properties.get(
+ "serial_number"
+ )
if serial:
for device in devices:
if getattr(device, "GetSerialNumber", None) and device.GetSerialNumber() == serial:
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index 540e352..eca4f58 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -1,4 +1,5 @@
"""Backend discovery and construction utilities."""
+
from __future__ import annotations
import importlib
@@ -74,7 +75,7 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
# For GenTL backend, try to get actual device count
num_devices = max_devices
- if hasattr(backend_cls, 'get_device_count'):
+ if hasattr(backend_cls, "get_device_count"):
try:
actual_count = backend_cls.get_device_count()
if actual_count >= 0:
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 943cf4a..701d4fd 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -1,4 +1,5 @@
"""GenTL backend implemented using the Harvesters library."""
+
from __future__ import annotations
import glob
@@ -13,6 +14,7 @@
try: # pragma: no cover - optional dependency
from harvesters.core import Harvester
+
try:
from harvesters.core import HarvesterTimeoutError # type: ignore
except Exception: # pragma: no cover - optional dependency
@@ -43,7 +45,9 @@ def __init__(self, settings):
self._exposure: Optional[float] = props.get("exposure")
self._gain: Optional[float] = props.get("gain")
self._timeout: float = float(props.get("timeout", 2.0))
- self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(props.get("cti_search_paths"))
+ self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(
+ props.get("cti_search_paths")
+ )
self._harvester = None
self._acquirer = None
@@ -56,21 +60,21 @@ def is_available(cls) -> bool:
@classmethod
def get_device_count(cls) -> int:
"""Get the actual number of GenTL devices detected by Harvester.
-
+
Returns the number of devices found, or -1 if detection fails.
"""
if Harvester is None:
return -1
-
+
harvester = None
try:
harvester = Harvester()
# Use the static helper to find CTI file with default patterns
cti_file = cls._search_cti_file(cls._DEFAULT_CTI_PATTERNS)
-
+
if not cti_file:
return -1
-
+
harvester.add_file(cti_file)
harvester.update()
return len(harvester.device_info_list)
@@ -120,28 +124,28 @@ def open(self) -> None:
remote = self._acquirer.remote_device
node_map = remote.node_map
- #print(dir(node_map))
+ # print(dir(node_map))
"""
- ['AcquisitionBurstFrameCount', 'AcquisitionControl', 'AcquisitionFrameRate', 'AcquisitionMode',
+ ['AcquisitionBurstFrameCount', 'AcquisitionControl', 'AcquisitionFrameRate', 'AcquisitionMode',
'AcquisitionStart', 'AcquisitionStop', 'AnalogControl', 'AutoFunctionsROI', 'AutoFunctionsROIEnable',
'AutoFunctionsROIHeight', 'AutoFunctionsROILeft', 'AutoFunctionsROIPreset', 'AutoFunctionsROITop',
'AutoFunctionsROIWidth', 'BinningHorizontal', 'BinningVertical', 'BlackLevel', 'CameraRegisterAddress',
- 'CameraRegisterAddressSpace', 'CameraRegisterControl', 'CameraRegisterRead', 'CameraRegisterValue',
+ 'CameraRegisterAddressSpace', 'CameraRegisterControl', 'CameraRegisterRead', 'CameraRegisterValue',
'CameraRegisterWrite', 'Contrast', 'DecimationHorizontal', 'DecimationVertical', 'Denoise',
- 'DeviceControl', 'DeviceFirmwareVersion', 'DeviceModelName', 'DeviceReset', 'DeviceSFNCVersionMajor',
- 'DeviceSFNCVersionMinor', 'DeviceSFNCVersionSubMinor', 'DeviceScanType', 'DeviceSerialNumber',
- 'DeviceTLType', 'DeviceTLVersionMajor', 'DeviceTLVersionMinor', 'DeviceTLVersionSubMinor',
- 'DeviceTemperature', 'DeviceTemperatureSelector', 'DeviceType', 'DeviceUserID', 'DeviceVendorName',
- 'DigitalIO', 'ExposureAuto', 'ExposureAutoHighlightReduction', 'ExposureAutoLowerLimit',
- 'ExposureAutoReference', 'ExposureAutoUpperLimit', 'ExposureAutoUpperLimitAuto', 'ExposureTime',
+ 'DeviceControl', 'DeviceFirmwareVersion', 'DeviceModelName', 'DeviceReset', 'DeviceSFNCVersionMajor',
+ 'DeviceSFNCVersionMinor', 'DeviceSFNCVersionSubMinor', 'DeviceScanType', 'DeviceSerialNumber',
+ 'DeviceTLType', 'DeviceTLVersionMajor', 'DeviceTLVersionMinor', 'DeviceTLVersionSubMinor',
+ 'DeviceTemperature', 'DeviceTemperatureSelector', 'DeviceType', 'DeviceUserID', 'DeviceVendorName',
+ 'DigitalIO', 'ExposureAuto', 'ExposureAutoHighlightReduction', 'ExposureAutoLowerLimit',
+ 'ExposureAutoReference', 'ExposureAutoUpperLimit', 'ExposureAutoUpperLimitAuto', 'ExposureTime',
'GPIn', 'GPOut', 'Gain', 'GainAuto', 'GainAutoLowerLimit', 'GainAutoUpperLimit', 'Gamma', 'Height',
'HeightMax', 'IMXLowLatencyTriggerMode', 'ImageFormatControl', 'OffsetAutoCenter', 'OffsetX', 'OffsetY',
'PayloadSize', 'PixelFormat', 'ReverseX', 'ReverseY', 'Root', 'SensorHeight', 'SensorWidth', 'Sharpness',
'ShowOverlay', 'SoftwareAnalogControl', 'SoftwareTransformControl', 'SoftwareTransformEnable',
'StrobeDelay', 'StrobeDuration', 'StrobeEnable', 'StrobeOperation', 'StrobePolarity', 'TLParamsLocked',
- 'TestControl', 'TestPendingAck', 'TimestampLatch', 'TimestampLatchValue', 'TimestampReset', 'ToneMappingAuto',
- 'ToneMappingControl', 'ToneMappingEnable', 'ToneMappingGlobalBrightness', 'ToneMappingIntensity',
- 'TransportLayerControl', 'TriggerActivation', 'TriggerDebouncer', 'TriggerDelay', 'TriggerDenoise',
+ 'TestControl', 'TestPendingAck', 'TimestampLatch', 'TimestampLatchValue', 'TimestampReset', 'ToneMappingAuto',
+ 'ToneMappingControl', 'ToneMappingEnable', 'ToneMappingGlobalBrightness', 'ToneMappingIntensity',
+ 'TransportLayerControl', 'TriggerActivation', 'TriggerDebouncer', 'TriggerDelay', 'TriggerDenoise',
'TriggerMask', 'TriggerMode', 'TriggerOverlap', 'TriggerSelector', 'TriggerSoftware', 'TriggerSource',
'UserSetControl', 'UserSetDefault', 'UserSetLoad', 'UserSetSave', 'UserSetSelector', 'Width', 'WidthMax']
"""
@@ -176,7 +180,7 @@ def read(self) -> Tuple[np.ndarray, float]:
except ValueError:
frame = array.copy()
except HarvesterTimeoutError as exc:
- raise TimeoutError(str(exc)+ " (GenTL timeout)") from exc
+ raise TimeoutError(str(exc) + " (GenTL timeout)") from exc
frame = self._convert_frame(frame)
timestamp = time.time()
@@ -231,7 +235,7 @@ def _parse_crop(self, crop) -> Optional[Tuple[int, int, int, int]]:
@staticmethod
def _search_cti_file(patterns: Tuple[str, ...]) -> Optional[str]:
"""Search for a CTI file using the given patterns.
-
+
Returns the first CTI file found, or None if none found.
"""
for pattern in patterns:
@@ -242,7 +246,7 @@ def _search_cti_file(patterns: Tuple[str, ...]) -> Optional[str]:
def _find_cti_file(self) -> str:
"""Find a CTI file using configured or default search paths.
-
+
Raises RuntimeError if no CTI file is found.
"""
cti_file = self._search_cti_file(self._cti_search_paths)
@@ -266,7 +270,7 @@ def _create_acquirer(self, serial: Optional[str], index: int):
assert self._harvester is not None
methods = [
getattr(self._harvester, "create", None),
- getattr(self._harvester, "create_image_acquirer", None),
+ getattr(self._harvester, "create_image_acquirer", None),
]
methods = [m for m in methods if m is not None]
errors: List[str] = []
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index ca043bf..f4ee01a 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -1,4 +1,5 @@
"""OpenCV based camera backend."""
+
from __future__ import annotations
import time
@@ -21,15 +22,13 @@ def open(self) -> None:
backend_flag = self._resolve_backend(self.settings.properties.get("api"))
self._capture = cv2.VideoCapture(int(self.settings.index), backend_flag)
if not self._capture.isOpened():
- raise RuntimeError(
- f"Unable to open camera index {self.settings.index} with OpenCV"
- )
+ raise RuntimeError(f"Unable to open camera index {self.settings.index} with OpenCV")
self._configure_capture()
def read(self) -> Tuple[np.ndarray, float]:
if self._capture is None:
raise RuntimeError("Camera has not been opened")
-
+
# Try grab first - this is non-blocking and helps detect connection issues faster
grabbed = self._capture.grab()
if not grabbed:
@@ -38,12 +37,12 @@ def read(self) -> Tuple[np.ndarray, float]:
raise RuntimeError("OpenCV camera connection lost")
# Otherwise treat as temporary frame read failure (timeout-like)
raise TimeoutError("Failed to grab frame from OpenCV camera (temporary)")
-
+
# Now retrieve the frame
success, frame = self._capture.retrieve()
if not success or frame is None:
raise TimeoutError("Failed to retrieve frame from OpenCV camera (temporary)")
-
+
return frame, time.time()
def close(self) -> None:
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index ca1f3e5..126eb13 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -1,10 +1,11 @@
"""Configuration helpers for the DLC Live GUI."""
+
from __future__ import annotations
+import json
from dataclasses import asdict, dataclass, field
from pathlib import Path
from typing import Any, Dict, Optional
-import json
@dataclass
@@ -30,12 +31,12 @@ def apply_defaults(self) -> "CameraSettings":
self.fps = float(self.fps) if self.fps else 30.0
self.exposure = int(self.exposure) if self.exposure else 0
self.gain = float(self.gain) if self.gain else 0.0
- self.crop_x0 = max(0, int(self.crop_x0)) if hasattr(self, 'crop_x0') else 0
- self.crop_y0 = max(0, int(self.crop_y0)) if hasattr(self, 'crop_y0') else 0
- self.crop_x1 = max(0, int(self.crop_x1)) if hasattr(self, 'crop_x1') else 0
- self.crop_y1 = max(0, int(self.crop_y1)) if hasattr(self, 'crop_y1') else 0
+ self.crop_x0 = max(0, int(self.crop_x0)) if hasattr(self, "crop_x0") else 0
+ self.crop_y0 = max(0, int(self.crop_y0)) if hasattr(self, "crop_y0") else 0
+ self.crop_x1 = max(0, int(self.crop_x1)) if hasattr(self, "crop_x1") else 0
+ self.crop_y1 = max(0, int(self.crop_y1)) if hasattr(self, "crop_y1") else 0
return self
-
+
def get_crop_region(self) -> Optional[tuple[int, int, int, int]]:
"""Get crop region as (x0, y0, x1, y1) or None if no cropping."""
if self.crop_x0 == 0 and self.crop_y0 == 0 and self.crop_x1 == 0 and self.crop_y1 == 0:
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 6358c74..80944d8 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -1,4 +1,5 @@
"""DLCLive integration helpers."""
+
from __future__ import annotations
import logging
@@ -31,6 +32,7 @@ class PoseResult:
@dataclass
class ProcessorStats:
"""Statistics for DLC processor performance."""
+
frames_enqueued: int = 0
frames_processed: int = 0
frames_dropped: int = 0
@@ -59,7 +61,7 @@ def __init__(self) -> None:
self._worker_thread: Optional[threading.Thread] = None
self._stop_event = threading.Event()
self._initialized = False
-
+
# Statistics tracking
self._frames_enqueued = 0
self._frames_processed = 0
@@ -94,11 +96,11 @@ def enqueue_frame(self, frame: np.ndarray, timestamp: float) -> None:
# Start worker thread with initialization
self._start_worker(frame.copy(), timestamp)
return
-
+
# Don't count dropped frames until processor is initialized
if not self._initialized:
return
-
+
if self._queue is not None:
try:
# Non-blocking put - drop frame if queue is full
@@ -113,22 +115,20 @@ def enqueue_frame(self, frame: np.ndarray, timestamp: float) -> None:
def get_stats(self) -> ProcessorStats:
"""Get current processing statistics."""
queue_size = self._queue.qsize() if self._queue is not None else 0
-
+
with self._stats_lock:
- avg_latency = (
- sum(self._latencies) / len(self._latencies)
- if self._latencies
- else 0.0
- )
+ avg_latency = sum(self._latencies) / len(self._latencies) if self._latencies else 0.0
last_latency = self._latencies[-1] if self._latencies else 0.0
-
+
# Compute processing FPS from processing times
if len(self._processing_times) >= 2:
duration = self._processing_times[-1] - self._processing_times[0]
- processing_fps = (len(self._processing_times) - 1) / duration if duration > 0 else 0.0
+ processing_fps = (
+ (len(self._processing_times) - 1) / duration if duration > 0 else 0.0
+ )
else:
processing_fps = 0.0
-
+
return ProcessorStats(
frames_enqueued=self._frames_enqueued,
frames_processed=self._frames_processed,
@@ -142,7 +142,7 @@ def get_stats(self) -> ProcessorStats:
def _start_worker(self, init_frame: np.ndarray, init_timestamp: float) -> None:
if self._worker_thread is not None and self._worker_thread.is_alive():
return
-
+
self._queue = queue.Queue(maxsize=2)
self._stop_event.clear()
self._worker_thread = threading.Thread(
@@ -156,18 +156,18 @@ def _start_worker(self, init_frame: np.ndarray, init_timestamp: float) -> None:
def _stop_worker(self) -> None:
if self._worker_thread is None:
return
-
+
self._stop_event.set()
if self._queue is not None:
try:
self._queue.put_nowait(_SENTINEL)
except queue.Full:
pass
-
+
self._worker_thread.join(timeout=2.0)
if self._worker_thread.is_alive():
LOGGER.warning("DLC worker thread did not terminate cleanly")
-
+
self._worker_thread = None
self._queue = None
@@ -175,17 +175,15 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
try:
# Initialize model
if DLCLive is None:
- raise RuntimeError(
- "The 'dlclive' package is required for pose estimation."
- )
+ raise RuntimeError("The 'dlclive' package is required for pose estimation.")
if not self._settings.model_path:
raise RuntimeError("No DLCLive model path configured.")
-
+
options = {
"model_path": self._settings.model_path,
"model_type": self._settings.model_type,
"processor": self._processor,
- "dynamic": [False,0.5,10],
+ "dynamic": [False, 0.5, 10],
"resize": 1.0,
}
# todo expose more parameters from settings
@@ -194,53 +192,53 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
self._initialized = True
self.initialized.emit(True)
LOGGER.info("DLCLive model initialized successfully")
-
+
# Process the initialization frame
enqueue_time = time.perf_counter()
pose = self._dlc.get_pose(init_frame, frame_time=init_timestamp)
process_time = time.perf_counter()
-
+
with self._stats_lock:
self._frames_enqueued += 1
self._frames_processed += 1
self._processing_times.append(process_time)
-
+
self.pose_ready.emit(PoseResult(pose=pose, timestamp=init_timestamp))
-
+
except Exception as exc:
LOGGER.exception("Failed to initialize DLCLive", exc_info=exc)
self.error.emit(str(exc))
self.initialized.emit(False)
return
-
+
# Main processing loop
while not self._stop_event.is_set():
try:
item = self._queue.get(timeout=0.1)
except queue.Empty:
continue
-
+
if item is _SENTINEL:
break
-
+
frame, timestamp, enqueue_time = item
try:
start_process = time.perf_counter()
pose = self._dlc.get_pose(frame, frame_time=timestamp)
end_process = time.perf_counter()
-
+
latency = end_process - enqueue_time
-
+
with self._stats_lock:
self._frames_processed += 1
self._latencies.append(latency)
self._processing_times.append(end_process)
-
+
self.pose_ready.emit(PoseResult(pose=pose, timestamp=timestamp))
except Exception as exc:
LOGGER.exception("Pose inference failed", exc_info=exc)
self.error.emit(str(exc))
finally:
self._queue.task_done()
-
+
LOGGER.info("DLC worker thread exiting")
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 66db93c..bd3bee7 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -1,11 +1,12 @@
"""PyQt6 based GUI for DeepLabCut Live."""
+
from __future__ import annotations
-import os
import json
+import logging
+import os
import sys
import time
-import logging
from collections import deque
from pathlib import Path
from typing import Optional
@@ -18,6 +19,7 @@
QApplication,
QCheckBox,
QComboBox,
+ QDoubleSpinBox,
QFileDialog,
QFormLayout,
QGroupBox,
@@ -30,7 +32,6 @@
QPushButton,
QSizePolicy,
QSpinBox,
- QDoubleSpinBox,
QStatusBar,
QVBoxLayout,
QWidget,
@@ -40,22 +41,24 @@
from dlclivegui.cameras import CameraFactory
from dlclivegui.cameras.factory import DetectedCamera
from dlclivegui.config import (
+ DEFAULT_CONFIG,
ApplicationSettings,
BoundingBoxSettings,
CameraSettings,
DLCProcessorSettings,
RecordingSettings,
- DEFAULT_CONFIG,
)
from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
-from dlclivegui.processors.processor_utils import scan_processor_folder, instantiate_from_scan
+from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
-os.environ["CUDA_VISIBLE_DEVICES"] = "0"
+os.environ["CUDA_VISIBLE_DEVICES"] = "0"
logging.basicConfig(level=logging.INFO)
PATH2MODELS = "C:\\Users\\User\\Repos\\DeepLabCut-live-GUI\\models"
+
+
class MainWindow(QMainWindow):
"""Main application window."""
@@ -112,16 +115,12 @@ def _setup_ui(self) -> None:
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
- self.video_label.setSizePolicy(
- QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
- )
+ self.video_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
# Controls panel with fixed width to prevent shifting
controls_widget = QWidget()
controls_widget.setMaximumWidth(500)
- controls_widget.setSizePolicy(
- QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding
- )
+ controls_widget.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding)
controls_layout = QVBoxLayout(controls_widget)
controls_layout.setContentsMargins(5, 5, 5, 5)
controls_layout.addWidget(self._build_camera_group())
@@ -218,25 +217,25 @@ def _build_camera_group(self) -> QGroupBox:
self.crop_x0.setPrefix("x0:")
self.crop_x0.setSpecialValueText("x0:None")
crop_layout.addWidget(self.crop_x0)
-
+
self.crop_y0 = QSpinBox()
self.crop_y0.setRange(0, 4320)
self.crop_y0.setPrefix("y0:")
self.crop_y0.setSpecialValueText("y0:None")
crop_layout.addWidget(self.crop_y0)
-
+
self.crop_x1 = QSpinBox()
self.crop_x1.setRange(0, 7680)
self.crop_x1.setPrefix("x1:")
self.crop_x1.setSpecialValueText("x1:None")
crop_layout.addWidget(self.crop_x1)
-
+
self.crop_y1 = QSpinBox()
self.crop_y1.setRange(0, 4320)
self.crop_y1.setPrefix("y1:")
self.crop_y1.setSpecialValueText("y1:None")
crop_layout.addWidget(self.crop_y1)
-
+
form.addRow("Crop (x0,y0,x1,y1)", crop_layout)
self.rotation_combo = QComboBox()
@@ -275,22 +274,22 @@ def _build_dlc_group(self) -> QGroupBox:
self.processor_folder_edit = QLineEdit()
self.processor_folder_edit.setText(str(Path(__file__).parent.joinpath("processors")))
processor_path_layout.addWidget(self.processor_folder_edit)
-
+
self.browse_processor_folder_button = QPushButton("Browse...")
self.browse_processor_folder_button.clicked.connect(self._action_browse_processor_folder)
processor_path_layout.addWidget(self.browse_processor_folder_button)
-
+
self.refresh_processors_button = QPushButton("Refresh")
self.refresh_processors_button.clicked.connect(self._refresh_processors)
processor_path_layout.addWidget(self.refresh_processors_button)
form.addRow("Processor folder", processor_path_layout)
-
+
self.processor_combo = QComboBox()
self.processor_combo.addItem("No Processor", None)
form.addRow("Processor", self.processor_combo)
self.additional_options_edit = QPlainTextEdit()
- self.additional_options_edit.setPlaceholderText('')
+ self.additional_options_edit.setPlaceholderText("")
self.additional_options_edit.setFixedHeight(40)
form.addRow("Additional options", self.additional_options_edit)
@@ -314,7 +313,9 @@ def _build_dlc_group(self) -> QGroupBox:
self.auto_record_checkbox = QCheckBox("Auto-record video on processor command")
self.auto_record_checkbox.setChecked(False)
- self.auto_record_checkbox.setToolTip("Automatically start/stop video recording when processor receives video recording commands")
+ self.auto_record_checkbox.setToolTip(
+ "Automatically start/stop video recording when processor receives video recording commands"
+ )
form.addRow(self.auto_record_checkbox)
self.processor_status_label = QLabel("Processor: No clients | Recording: No")
@@ -386,31 +387,31 @@ def _build_bbox_group(self) -> QGroupBox:
form.addRow(self.bbox_enabled_checkbox)
bbox_layout = QHBoxLayout()
-
+
self.bbox_x0_spin = QSpinBox()
self.bbox_x0_spin.setRange(0, 7680)
self.bbox_x0_spin.setPrefix("x0:")
self.bbox_x0_spin.setValue(0)
bbox_layout.addWidget(self.bbox_x0_spin)
-
+
self.bbox_y0_spin = QSpinBox()
self.bbox_y0_spin.setRange(0, 4320)
self.bbox_y0_spin.setPrefix("y0:")
self.bbox_y0_spin.setValue(0)
bbox_layout.addWidget(self.bbox_y0_spin)
-
+
self.bbox_x1_spin = QSpinBox()
self.bbox_x1_spin.setRange(0, 7680)
self.bbox_x1_spin.setPrefix("x1:")
self.bbox_x1_spin.setValue(100)
bbox_layout.addWidget(self.bbox_x1_spin)
-
+
self.bbox_y1_spin = QSpinBox()
self.bbox_y1_spin.setRange(0, 4320)
self.bbox_y1_spin.setPrefix("y1:")
self.bbox_y1_spin.setValue(100)
bbox_layout.addWidget(self.bbox_y1_spin)
-
+
form.addRow("Coordinates", bbox_layout)
return group
@@ -429,10 +430,8 @@ def _connect_signals(self) -> None:
self.rotation_combo.currentIndexChanged.connect(self._on_rotation_changed)
self.start_inference_button.clicked.connect(self._start_inference)
self.stop_inference_button.clicked.connect(lambda: self._stop_inference())
- self.show_predictions_checkbox.stateChanged.connect(
- self._on_show_predictions_changed
- )
-
+ self.show_predictions_checkbox.stateChanged.connect(self._on_show_predictions_changed)
+
# Connect bounding box controls
self.bbox_enabled_checkbox.stateChanged.connect(self._on_bbox_changed)
self.bbox_x0_spin.valueChanged.connect(self._on_bbox_changed)
@@ -454,17 +453,17 @@ def _connect_signals(self) -> None:
def _apply_config(self, config: ApplicationSettings) -> None:
camera = config.camera
self.camera_fps.setValue(float(camera.fps))
-
+
# Set exposure and gain from config
self.camera_exposure.setValue(int(camera.exposure))
self.camera_gain.setValue(float(camera.gain))
-
+
# Set crop settings from config
- self.crop_x0.setValue(int(camera.crop_x0) if hasattr(camera, 'crop_x0') else 0)
- self.crop_y0.setValue(int(camera.crop_y0) if hasattr(camera, 'crop_y0') else 0)
- self.crop_x1.setValue(int(camera.crop_x1) if hasattr(camera, 'crop_x1') else 0)
- self.crop_y1.setValue(int(camera.crop_y1) if hasattr(camera, 'crop_y1') else 0)
-
+ self.crop_x0.setValue(int(camera.crop_x0) if hasattr(camera, "crop_x0") else 0)
+ self.crop_y0.setValue(int(camera.crop_y0) if hasattr(camera, "crop_y0") else 0)
+ self.crop_x1.setValue(int(camera.crop_x1) if hasattr(camera, "crop_x1") else 0)
+ self.crop_y1.setValue(int(camera.crop_y1) if hasattr(camera, "crop_y1") else 0)
+
backend_name = camera.backend or "opencv"
self.camera_backend.blockSignals(True)
index = self.camera_backend.findData(backend_name)
@@ -474,25 +473,21 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.camera_backend.setEditText(backend_name)
self.camera_backend.blockSignals(False)
self._refresh_camera_indices(keep_current=False)
- self._select_camera_by_index(
- camera.index, fallback_text=camera.name or str(camera.index)
- )
-
+ self._select_camera_by_index(camera.index, fallback_text=camera.name or str(camera.index))
+
self._active_camera_settings = None
self._update_backend_specific_controls()
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
-
+
# Set model type
model_type = dlc.model_type or "base"
model_type_index = self.model_type_combo.findData(model_type)
if model_type_index >= 0:
self.model_type_combo.setCurrentIndex(model_type_index)
-
- self.additional_options_edit.setPlainText(
- json.dumps(dlc.additional_options, indent=2)
- )
+
+ self.additional_options_edit.setPlainText(json.dumps(dlc.additional_options, indent=2))
recording = config.recording
self.output_directory_edit.setText(recording.directory)
@@ -527,17 +522,17 @@ def _camera_settings_from_ui(self) -> CameraSettings:
if index is None:
raise ValueError("Camera selection must provide a numeric index")
backend_text = self._current_backend_name()
-
+
# Get exposure and gain from explicit UI fields
exposure = self.camera_exposure.value()
gain = self.camera_gain.value()
-
+
# Get crop settings from UI
crop_x0 = self.crop_x0.value()
crop_y0 = self.crop_y0.value()
crop_x1 = self.crop_x1.value()
crop_y1 = self.crop_y1.value()
-
+
name_text = self.camera_index.currentText().strip()
settings = CameraSettings(
name=name_text or f"Camera {index}",
@@ -561,17 +556,15 @@ def _current_backend_name(self) -> str:
text = self.camera_backend.currentText().strip()
return text or "opencv"
- def _refresh_camera_indices(
- self, *_args: object, keep_current: bool = True
- ) -> None:
+ def _refresh_camera_indices(self, *_args: object, keep_current: bool = True) -> None:
backend = self._current_backend_name()
# Get max_devices from config, default to 3
- max_devices = self._config.camera.max_devices if hasattr(self._config.camera, 'max_devices') else 3
+ max_devices = (
+ self._config.camera.max_devices if hasattr(self._config.camera, "max_devices") else 3
+ )
detected = CameraFactory.detect_cameras(backend, max_devices=max_devices)
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- logging.info(
- f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
- )
+ logging.info(f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}")
self._detected_cameras = detected
previous_index = self._current_camera_index_value()
previous_text = self.camera_index.currentText()
@@ -590,9 +583,7 @@ def _refresh_camera_indices(
self.camera_index.setEditText("")
self.camera_index.blockSignals(False)
- def _select_camera_by_index(
- self, index: int, fallback_text: Optional[str] = None
- ) -> None:
+ def _select_camera_by_index(self, index: int, fallback_text: Optional[str] = None) -> None:
self.camera_index.blockSignals(True)
for row in range(self.camera_index.count()):
if self.camera_index.itemData(row) == index:
@@ -615,9 +606,7 @@ def _current_camera_index_value(self) -> Optional[int]:
except ValueError:
return None
debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- logging.info(
- f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}"
- )
+ logging.info(f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}")
self._detected_cameras = detected
previous_index = self._current_camera_index_value()
previous_text = self.camera_index.currentText()
@@ -636,9 +625,7 @@ def _current_camera_index_value(self) -> Optional[int]:
self.camera_index.setEditText("")
self.camera_index.blockSignals(False)
- def _select_camera_by_index(
- self, index: int, fallback_text: Optional[str] = None
- ) -> None:
+ def _select_camera_by_index(self, index: int, fallback_text: Optional[str] = None) -> None:
self.camera_index.blockSignals(True)
for row in range(self.camera_index.count()):
if self.camera_index.itemData(row) == index:
@@ -671,13 +658,11 @@ def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
model_type = self.model_type_combo.currentData()
if not isinstance(model_type, str):
model_type = "base"
-
+
return DLCProcessorSettings(
model_path=self.model_path_edit.text().strip(),
model_type=model_type,
- additional_options=self._parse_json(
- self.additional_options_edit.toPlainText()
- ),
+ additional_options=self._parse_json(self.additional_options_edit.toPlainText()),
)
def _recording_settings_from_ui(self) -> RecordingSettings:
@@ -760,9 +745,7 @@ def _action_browse_directory(self) -> None:
def _action_browse_processor_folder(self) -> None:
"""Browse for processor folder."""
current_path = self.processor_folder_edit.text() or "./processors"
- directory = QFileDialog.getExistingDirectory(
- self, "Select processor folder", current_path
- )
+ directory = QFileDialog.getExistingDirectory(self, "Select processor folder", current_path)
if directory:
self.processor_folder_edit.setText(directory)
self._refresh_processors()
@@ -770,25 +753,25 @@ def _action_browse_processor_folder(self) -> None:
def _refresh_processors(self) -> None:
"""Scan processor folder and populate dropdown."""
folder_path = self.processor_folder_edit.text() or "./processors"
-
+
# Clear existing items (keep "No Processor")
self.processor_combo.clear()
self.processor_combo.addItem("No Processor", None)
-
+
# Scan folder
try:
self._scanned_processors = scan_processor_folder(folder_path)
self._processor_keys = list(self._scanned_processors.keys())
-
+
# Populate dropdown
for key in self._processor_keys:
info = self._scanned_processors[key]
display_name = f"{info['name']} ({info['file']})"
self.processor_combo.addItem(display_name, key)
-
+
status_msg = f"Found {len(self._processor_keys)} processor(s) in {folder_path}"
self.statusBar().showMessage(status_msg, 3000)
-
+
except Exception as e:
error_msg = f"Error scanning processors: {e}"
self.statusBar().showMessage(error_msg, 5000)
@@ -803,11 +786,11 @@ def _update_backend_specific_controls(self) -> None:
"""Enable/disable controls based on selected backend."""
backend = self._current_backend_name()
is_opencv = backend.lower() == "opencv"
-
+
# Disable exposure and gain controls for OpenCV backend
self.camera_exposure.setEnabled(not is_opencv)
self.camera_gain.setEnabled(not is_opencv)
-
+
# Set tooltip to explain why controls are disabled
if is_opencv:
tooltip = "Exposure and gain control not supported with OpenCV backend"
@@ -877,9 +860,7 @@ def _on_camera_started(self, settings: CameraSettings) -> None:
fps_text = f"{float(settings.fps):.2f} FPS"
else:
fps_text = "unknown FPS"
- self.statusBar().showMessage(
- f"Camera preview started @ {fps_text}", 5000
- )
+ self.statusBar().showMessage(f"Camera preview started @ {fps_text}", 5000)
self._update_inference_buttons()
self._update_camera_controls_enabled()
@@ -912,7 +893,7 @@ def _configure_dlc(self) -> bool:
if not settings.model_path:
self._show_error("Please select a DLCLive model before starting inference.")
return False
-
+
# Instantiate processor if selected
processor = None
selected_key = self.processor_combo.currentData()
@@ -920,16 +901,16 @@ def _configure_dlc(self) -> bool:
try:
# For now, instantiate with no parameters
# TODO: Add parameter dialog for processors that need params
- # or pass kwargs from config ?
+ # or pass kwargs from config ?
processor = instantiate_from_scan(self._scanned_processors, selected_key)
- processor_name = self._scanned_processors[selected_key]['name']
+ processor_name = self._scanned_processors[selected_key]["name"]
self.statusBar().showMessage(f"Loaded processor: {processor_name}", 3000)
except Exception as e:
error_msg = f"Failed to instantiate processor: {e}"
self._show_error(error_msg)
logging.error(error_msg)
return False
-
+
self.dlc_processor.configure(settings, processor=processor)
return True
@@ -955,9 +936,7 @@ def _update_dlc_controls_enabled(self) -> None:
widget.setEnabled(allow_changes)
def _update_camera_controls_enabled(self) -> None:
- recording_active = (
- self._video_recorder is not None and self._video_recorder.is_running
- )
+ recording_active = self._video_recorder is not None and self._video_recorder.is_running
allow_changes = (
not self.camera_controller.is_running()
and not self._dlc_active
@@ -1043,7 +1022,7 @@ def _update_metrics(self) -> None:
self.camera_stats_label.setText("Measuring…")
else:
self.camera_stats_label.setText("Camera idle")
-
+
if hasattr(self, "dlc_stats_label"):
if self._dlc_active and self._dlc_initialized:
stats = self.dlc_processor.get_stats()
@@ -1051,11 +1030,11 @@ def _update_metrics(self) -> None:
self.dlc_stats_label.setText(summary)
else:
self.dlc_stats_label.setText("DLC processor idle")
-
+
# Update processor status (connection and recording state)
if hasattr(self, "processor_status_label"):
self._update_processor_status()
-
+
if hasattr(self, "recording_stats_label"):
if self._video_recorder is not None:
stats = self._video_recorder.get_stats()
@@ -1074,47 +1053,49 @@ def _update_processor_status(self) -> None:
if not self._dlc_active or not self._dlc_initialized:
self.processor_status_label.setText("Processor: Not active")
return
-
+
# Get processor instance from dlc_processor
processor = self.dlc_processor._processor
-
+
if processor is None:
self.processor_status_label.setText("Processor: None loaded")
return
-
+
# Check if processor has the required attributes (socket-based processors)
- if not hasattr(processor, 'conns') or not hasattr(processor, '_recording'):
+ if not hasattr(processor, "conns") or not hasattr(processor, "_recording"):
self.processor_status_label.setText("Processor: No status info")
return
-
+
# Get connection count and recording state
num_clients = len(processor.conns)
- is_recording = processor.recording if hasattr(processor, 'recording') else False
-
+ is_recording = processor.recording if hasattr(processor, "recording") else False
+
# Format status message
client_str = f"{num_clients} client{'s' if num_clients != 1 else ''}"
recording_str = "Yes" if is_recording else "No"
self.processor_status_label.setText(f"Clients: {client_str} | Recording: {recording_str}")
-
+
# Handle auto-recording based on processor's video recording flag
- if hasattr(processor, '_vid_recording') and self.auto_record_checkbox.isChecked():
+ if hasattr(processor, "_vid_recording") and self.auto_record_checkbox.isChecked():
current_vid_recording = processor.video_recording
-
+
# Check if video recording state changed
if current_vid_recording != self._last_processor_vid_recording:
if current_vid_recording:
# Start video recording
if not self._video_recorder or not self._video_recorder.is_running:
# Get session name from processor
- session_name = getattr(processor, 'session_name', 'auto_session')
+ session_name = getattr(processor, "session_name", "auto_session")
self._auto_record_session_name = session_name
-
+
# Update filename with session name
original_filename = self.filename_edit.text()
self.filename_edit.setText(f"{session_name}.mp4")
-
+
self._start_recording()
- self.statusBar().showMessage(f"Auto-started recording: {session_name}", 3000)
+ self.statusBar().showMessage(
+ f"Auto-started recording: {session_name}", 3000
+ )
logging.info(f"Auto-recording started for session: {session_name}")
else:
# Stop video recording
@@ -1122,7 +1103,7 @@ def _update_processor_status(self) -> None:
self._stop_recording()
self.statusBar().showMessage("Auto-stopped recording", 3000)
logging.info("Auto-recording stopped")
-
+
self._last_processor_vid_recording = current_vid_recording
def _start_inference(self) -> None:
@@ -1130,9 +1111,7 @@ def _start_inference(self) -> None:
self.statusBar().showMessage("Pose inference already running", 3000)
return
if not self.camera_controller.is_running():
- self._show_error(
- "Start the camera preview before running pose inference."
- )
+ self._show_error("Start the camera preview before running pose inference.")
return
if not self._configure_dlc():
self._update_inference_buttons()
@@ -1141,13 +1120,13 @@ def _start_inference(self) -> None:
self._last_pose = None
self._dlc_active = True
self._dlc_initialized = False
-
+
# Update button to show initializing state
self.start_inference_button.setText("Initializing DLCLive!")
self.start_inference_button.setStyleSheet("background-color: #4A90E2; color: white;")
self.start_inference_button.setEnabled(False)
self.stop_inference_button.setEnabled(True)
-
+
self.statusBar().showMessage("Initializing DLCLive…", 3000)
self._update_camera_controls_enabled()
self._update_dlc_controls_enabled()
@@ -1160,11 +1139,11 @@ def _stop_inference(self, show_message: bool = True) -> None:
self._last_pose = None
self._last_processor_vid_recording = False
self._auto_record_session_name = None
-
+
# Reset button appearance
self.start_inference_button.setText("Start pose inference")
self.start_inference_button.setStyleSheet("")
-
+
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
if was_active and show_message:
@@ -1236,9 +1215,7 @@ def _stop_recording(self) -> None:
self.recording_stats_label.setText(summary)
else:
self._last_recorder_summary = (
- self._format_recorder_stats(stats)
- if stats is not None
- else "Recorder idle"
+ self._format_recorder_stats(stats) if stats is not None else "Recorder idle"
)
self._last_drop_warning = 0.0
self.statusBar().showMessage("Recording stopped", 3000)
@@ -1248,10 +1225,10 @@ def _stop_recording(self) -> None:
def _on_frame_ready(self, frame_data: FrameData) -> None:
raw_frame = frame_data.image
self._raw_frame = raw_frame
-
+
# Apply cropping before rotation
frame = self._apply_crop(raw_frame)
-
+
# Apply rotation
frame = self._apply_rotation(frame)
frame = np.ascontiguousarray(frame)
@@ -1263,9 +1240,7 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
if not success:
now = time.perf_counter()
if now - self._last_drop_warning > 1.0:
- self.statusBar().showMessage(
- "Recorder backlog full; dropping frames", 2000
- )
+ self.statusBar().showMessage("Recorder backlog full; dropping frames", 2000)
self._last_drop_warning = now
except RuntimeError as exc:
# Check if it's a frame size error
@@ -1290,7 +1265,7 @@ def _on_pose_ready(self, result: PoseResult) -> None:
if not self._dlc_active:
return
self._last_pose = result
- #logging.info(f"Pose result: {result.pose}, Timestamp: {result.timestamp}")
+ # logging.info(f"Pose result: {result.pose}, Timestamp: {result.timestamp}")
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
@@ -1306,11 +1281,11 @@ def _update_video_display(self, frame: np.ndarray) -> None:
and self._last_pose.pose is not None
):
display_frame = self._draw_pose(frame, self._last_pose.pose)
-
+
# Draw bounding box if enabled
if self._bbox_enabled:
display_frame = self._draw_bbox(display_frame)
-
+
rgb = cv2.cvtColor(display_frame, cv2.COLOR_BGR2RGB)
h, w, ch = rgb.shape
bytes_per_line = ch * w
@@ -1321,20 +1296,20 @@ def _apply_crop(self, frame: np.ndarray) -> np.ndarray:
"""Apply cropping to the frame based on settings."""
if self._active_camera_settings is None:
return frame
-
+
crop_region = self._active_camera_settings.get_crop_region()
if crop_region is None:
return frame
-
+
x0, y0, x1, y1 = crop_region
height, width = frame.shape[:2]
-
+
# Validate and constrain crop coordinates
x0 = max(0, min(x0, width))
y0 = max(0, min(y0, height))
x1 = max(x0, min(x1, width)) if x1 > 0 else width
y1 = max(y0, min(y1, height)) if y1 > 0 else height
-
+
# Apply crop
if x0 < x1 and y0 < y1:
return frame[y0:y1, x0:x1]
@@ -1362,7 +1337,7 @@ def _on_bbox_changed(self, _value: int = 0) -> None:
self._bbox_y0 = self.bbox_y0_spin.value()
self._bbox_x1 = self.bbox_x1_spin.value()
self._bbox_y1 = self.bbox_y1_spin.value()
-
+
# Force redraw if preview is running
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
@@ -1374,20 +1349,20 @@ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
y0 = self._bbox_y0
x1 = self._bbox_x1
y1 = self._bbox_y1
-
+
# Validate coordinates
if x0 >= x1 or y0 >= y1:
return overlay
-
+
height, width = frame.shape[:2]
x0 = max(0, min(x0, width - 1))
y0 = max(0, min(y0, height - 1))
x1 = max(x0 + 1, min(x1, width))
y1 = max(y0 + 1, min(y1, height))
-
+
# Draw red rectangle (BGR format: red is (0, 0, 255))
cv2.rectangle(overlay, (x0, y0), (x1, y1), (0, 0, 255), 2)
-
+
return overlay
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
diff --git a/dlclivegui/processors/GUI_INTEGRATION.md b/dlclivegui/processors/GUI_INTEGRATION.md
index 446232e..6e504f1 100644
--- a/dlclivegui/processors/GUI_INTEGRATION.md
+++ b/dlclivegui/processors/GUI_INTEGRATION.md
@@ -97,13 +97,13 @@ dropdown.set_items(display_names)
def on_processor_selected(dropdown_index):
# Get the key
key = self.processor_keys[dropdown_index]
-
+
# Get processor info
info = all_processors[key]
-
+
# Show description
description_label.text = info['description']
-
+
# Build parameter form
for param_name, param_info in info['params'].items():
add_parameter_field(
@@ -119,17 +119,17 @@ def on_processor_selected(dropdown_index):
def on_create_clicked():
# Get selected key
key = self.processor_keys[dropdown.current_index]
-
+
# Get user's parameter values
user_params = parameter_form.get_values()
-
+
# Instantiate using the key!
self.processor = instantiate_from_scan(
all_processors,
key,
**user_params
)
-
+
print(f"Created: {self.processor.__class__.__name__}")
```
diff --git a/dlclivegui/processors/PLUGIN_SYSTEM.md b/dlclivegui/processors/PLUGIN_SYSTEM.md
index b02402d..fc9cab4 100644
--- a/dlclivegui/processors/PLUGIN_SYSTEM.md
+++ b/dlclivegui/processors/PLUGIN_SYSTEM.md
@@ -47,7 +47,7 @@ Two helper functions enable GUI discovery:
```python
def get_available_processors():
"""Returns dict of available processors with metadata."""
-
+
def instantiate_processor(class_name, **kwargs):
"""Instantiates a processor by name with given parameters."""
```
@@ -96,7 +96,7 @@ def load_processors_from_file(file_path):
spec = importlib.util.spec_from_file_location("processors", file_path)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
-
+
if hasattr(module, 'get_available_processors'):
return module.get_available_processors()
return {}
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index 3f5b951..fb6522c 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -65,7 +65,7 @@ class BaseProcessor_socket(Processor):
Handles network connections, timing, and data logging.
Subclasses should implement custom pose processing logic.
"""
-
+
# Metadata for GUI discovery
PROCESSOR_NAME = "Base Socket Processor"
PROCESSOR_DESCRIPTION = "Base class for socket-based processors with multi-client support"
@@ -73,23 +73,23 @@ class BaseProcessor_socket(Processor):
"bind": {
"type": "tuple",
"default": ("0.0.0.0", 6000),
- "description": "Server address (host, port)"
+ "description": "Server address (host, port)",
},
"authkey": {
"type": "bytes",
"default": b"secret password",
- "description": "Authentication key for clients"
+ "description": "Authentication key for clients",
},
"use_perf_counter": {
"type": "bool",
"default": False,
- "description": "Use time.perf_counter() instead of time.time()"
+ "description": "Use time.perf_counter() instead of time.time()",
},
"save_original": {
"type": "bool",
"default": False,
- "description": "Save raw pose arrays for analysis"
- }
+ "description": "Save raw pose arrays for analysis",
+ },
}
def __init__(
@@ -139,12 +139,12 @@ def __init__(
# State
self.curr_step = 0
self.save_original = save_original
-
+
@property
def recording(self):
"""Thread-safe recording flag."""
return self._recording.is_set()
-
+
@property
def video_recording(self):
"""Thread-safe video recording flag."""
@@ -153,7 +153,7 @@ def video_recording(self):
@property
def session_name(self):
return self._session_name
-
+
@session_name.setter
def session_name(self, name):
self._session_name = name
@@ -188,18 +188,18 @@ def _rx_loop(self, c):
pass
self.conns.discard(c)
LOG.info("Client disconnected")
-
+
def _handle_client_message(self, msg):
"""Handle control messages from clients."""
if not isinstance(msg, dict):
return
-
+
cmd = msg.get("cmd")
if cmd == "set_session_name":
session_name = msg.get("session_name", "default_session")
self.session_name = session_name
LOG.info(f"Session name set to: {session_name}")
-
+
elif cmd == "start_recording":
self._vid_recording.set()
self._recording.set()
@@ -207,12 +207,12 @@ def _handle_client_message(self, msg):
self._clear_data_queues()
self.curr_step = 0
LOG.info("Recording started, data queues cleared")
-
+
elif cmd == "stop_recording":
self._recording.clear()
self._vid_recording.clear()
LOG.info("Recording stopped")
-
+
elif cmd == "save":
filename = msg.get("filename", self.filename)
save_code = self.save(filename)
@@ -222,7 +222,7 @@ def _handle_client_message(self, msg):
# Placeholder for video recording start
self._vid_recording.set()
LOG.info("Start video recording command received")
-
+
def _clear_data_queues(self):
"""Clear all data storage queues. Override in subclasses to clear additional queues."""
self.time_stamp.clear()
@@ -338,41 +338,43 @@ class MyProcessor_socket(BaseProcessor_socket):
Broadcasts: [timestamp, center_x, center_y, heading, head_angle]
"""
-
+
# Metadata for GUI discovery
PROCESSOR_NAME = "Mouse Pose Processor"
- PROCESSOR_DESCRIPTION = "Calculates mouse center, heading, and head angle with optional One-Euro filtering"
+ PROCESSOR_DESCRIPTION = (
+ "Calculates mouse center, heading, and head angle with optional One-Euro filtering"
+ )
PROCESSOR_PARAMS = {
"bind": {
"type": "tuple",
"default": ("0.0.0.0", 6000),
- "description": "Server address (host, port)"
+ "description": "Server address (host, port)",
},
"authkey": {
"type": "bytes",
"default": b"secret password",
- "description": "Authentication key for clients"
+ "description": "Authentication key for clients",
},
"use_perf_counter": {
"type": "bool",
"default": False,
- "description": "Use time.perf_counter() instead of time.time()"
+ "description": "Use time.perf_counter() instead of time.time()",
},
"use_filter": {
"type": "bool",
"default": False,
- "description": "Apply One-Euro filter to calculated values"
+ "description": "Apply One-Euro filter to calculated values",
},
"filter_kwargs": {
"type": "dict",
"default": {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0},
- "description": "One-Euro filter parameters (min_cutoff, beta, d_cutoff)"
+ "description": "One-Euro filter parameters (min_cutoff, beta, d_cutoff)",
},
"save_original": {
"type": "bool",
"default": False,
- "description": "Save raw pose arrays for analysis"
- }
+ "description": "Save raw pose arrays for analysis",
+ },
}
def __init__(
@@ -542,7 +544,7 @@ def get_data(self):
def get_available_processors():
"""
Get list of available processor classes.
-
+
Returns:
dict: Dictionary mapping class names to processor info:
{
@@ -560,7 +562,7 @@ def get_available_processors():
"class": processor_class,
"name": getattr(processor_class, "PROCESSOR_NAME", class_name),
"description": getattr(processor_class, "PROCESSOR_DESCRIPTION", ""),
- "params": getattr(processor_class, "PROCESSOR_PARAMS", {})
+ "params": getattr(processor_class, "PROCESSOR_PARAMS", {}),
}
return processors
@@ -568,20 +570,20 @@ def get_available_processors():
def instantiate_processor(class_name, **kwargs):
"""
Instantiate a processor by class name with given parameters.
-
+
Args:
class_name: Name of the processor class (e.g., "MyProcessor_socket")
**kwargs: Parameters to pass to the processor constructor
-
+
Returns:
Processor instance
-
+
Raises:
ValueError: If class_name is not in registry
"""
if class_name not in PROCESSOR_REGISTRY:
available = ", ".join(PROCESSOR_REGISTRY.keys())
raise ValueError(f"Unknown processor '{class_name}'. Available: {available}")
-
+
processor_class = PROCESSOR_REGISTRY[class_name]
return processor_class(**kwargs)
diff --git a/dlclivegui/processors/processor_utils.py b/dlclivegui/processors/processor_utils.py
index dcacaa4..b69b3a7 100644
--- a/dlclivegui/processors/processor_utils.py
+++ b/dlclivegui/processors/processor_utils.py
@@ -1,4 +1,3 @@
-
import importlib.util
import inspect
from pathlib import Path
@@ -7,10 +6,10 @@
def load_processors_from_file(file_path):
"""
Load all processor classes from a Python file.
-
+
Args:
file_path: Path to Python file containing processors
-
+
Returns:/home/as153/work_geneva/mice_ar_tasks/mouse_ar/ctrl/dlc_processors/GUI_INTEGRATION.md
dict: Dictionary of available processors
"""
@@ -18,13 +17,14 @@ def load_processors_from_file(file_path):
spec = importlib.util.spec_from_file_location("processors", file_path)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
-
+
# Check if module has get_available_processors function
- if hasattr(module, 'get_available_processors'):
+ if hasattr(module, "get_available_processors"):
return module.get_available_processors()
-
+
# Fallback: scan for Processor subclasses
from dlclive import Processor
+
processors = {}
for name, obj in inspect.getmembers(module, inspect.isclass):
if issubclass(obj, Processor) and obj != Processor:
@@ -32,7 +32,7 @@ def load_processors_from_file(file_path):
"class": obj,
"name": getattr(obj, "PROCESSOR_NAME", name),
"description": getattr(obj, "PROCESSOR_DESCRIPTION", ""),
- "params": getattr(obj, "PROCESSOR_PARAMS", {})
+ "params": getattr(obj, "PROCESSOR_PARAMS", {}),
}
return processors
@@ -40,10 +40,10 @@ def load_processors_from_file(file_path):
def scan_processor_folder(folder_path):
"""
Scan a folder for all Python files with processor definitions.
-
+
Args:
folder_path: Path to folder containing processor files
-
+
Returns:
dict: Dictionary mapping unique processor keys to processor info:
{
@@ -59,11 +59,11 @@ def scan_processor_folder(folder_path):
"""
all_processors = {}
folder = Path(folder_path)
-
+
for py_file in folder.glob("*.py"):
if py_file.name.startswith("_"):
continue
-
+
try:
processors = load_processors_from_file(py_file)
for class_name, processor_info in processors.items():
@@ -76,26 +76,26 @@ def scan_processor_folder(folder_path):
all_processors[key] = processor_info
except Exception as e:
print(f"Error loading {py_file}: {e}")
-
+
return all_processors
def instantiate_from_scan(processors_dict, processor_key, **kwargs):
"""
Instantiate a processor from scan_processor_folder results.
-
+
Args:
processors_dict: Dict returned by scan_processor_folder
processor_key: Key like "file.py::ClassName"
**kwargs: Parameters for processor constructor
-
+
Returns:
Processor instance
-
+
Example:
processors = scan_processor_folder("./dlc_processors")
processor = instantiate_from_scan(
- processors,
+ processors,
"dlc_processor_socket.py::MyProcessor_socket",
use_filter=True
)
@@ -103,7 +103,7 @@ def instantiate_from_scan(processors_dict, processor_key, **kwargs):
if processor_key not in processors_dict:
available = ", ".join(processors_dict.keys())
raise ValueError(f"Unknown processor '{processor_key}'. Available: {available}")
-
+
processor_info = processors_dict[processor_key]
processor_class = processor_info["class"]
return processor_class(**kwargs)
@@ -111,17 +111,16 @@ def instantiate_from_scan(processors_dict, processor_key, **kwargs):
def display_processor_info(processors):
"""Display processor information in a user-friendly format."""
- print("\n" + "="*70)
+ print("\n" + "=" * 70)
print("AVAILABLE PROCESSORS")
- print("="*70)
-
+ print("=" * 70)
+
for idx, (class_name, info) in enumerate(processors.items(), 1):
print(f"\n[{idx}] {info['name']}")
print(f" Class: {class_name}")
print(f" Description: {info['description']}")
print(f" Parameters:")
- for param_name, param_info in info['params'].items():
+ for param_name, param_info in info["params"].items():
print(f" - {param_name} ({param_info['type']})")
print(f" Default: {param_info['default']}")
print(f" {param_info['description']}")
-
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index 2190314..a40ed28 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -1,4 +1,5 @@
"""Video recording support using the vidgear library."""
+
from __future__ import annotations
import json
@@ -113,9 +114,7 @@ def start(self) -> None:
)
self._writer_thread.start()
- def configure_stream(
- self, frame_size: Tuple[int, int], frame_rate: Optional[float]
- ) -> None:
+ def configure_stream(self, frame_size: Tuple[int, int], frame_rate: Optional[float]) -> None:
self._frame_size = frame_size
self._frame_rate = frame_rate
@@ -125,13 +124,13 @@ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
error = self._current_error()
if error is not None:
raise RuntimeError(f"Video encoding failed: {error}") from error
-
+
# Record timestamp for this frame
if timestamp is None:
timestamp = time.time()
with self._stats_lock:
self._frame_timestamps.append(timestamp)
-
+
# Convert frame to uint8 if needed
if frame.dtype != np.uint8:
frame_float = frame.astype(np.float32, copy=False)
@@ -140,14 +139,14 @@ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
if max_val > 0:
scale = 255.0 / max_val if max_val > 255.0 else (255.0 if max_val <= 1.0 else 1.0)
frame = np.clip(frame_float * scale, 0.0, 255.0).astype(np.uint8)
-
+
# Convert grayscale to RGB if needed
if frame.ndim == 2:
frame = np.repeat(frame[:, :, None], 3, axis=2)
-
+
# Ensure contiguous array
frame = np.ascontiguousarray(frame)
-
+
# Check if frame size matches expected size
if self._frame_size is not None:
expected_h, expected_w = self._frame_size
@@ -164,7 +163,7 @@ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
f"Frame size changed from (h={expected_h}, w={expected_w}) to (h={actual_h}, w={actual_w})"
)
return False
-
+
try:
assert self._queue is not None
self._queue.put(frame, block=False)
@@ -200,10 +199,10 @@ def stop(self) -> None:
self._writer.close()
except Exception:
logger.exception("Failed to close WriteGear cleanly")
-
+
# Save timestamps to JSON file
self._save_timestamps()
-
+
self._writer = None
self._writer_thread = None
self._queue = None
@@ -224,9 +223,7 @@ def get_stats(self) -> Optional[RecorderStats]:
frames_written = self._frames_written
dropped = self._dropped_frames
avg_latency = (
- self._total_latency / self._frames_written
- if self._frames_written
- else 0.0
+ self._total_latency / self._frames_written if self._frames_written else 0.0
)
last_latency = self._last_latency
write_fps = self._compute_write_fps_locked()
@@ -312,14 +309,16 @@ def _save_timestamps(self) -> None:
if not self._frame_timestamps:
logger.info("No timestamps to save")
return
-
+
# Create timestamps file path
- timestamp_file = self._output.with_suffix('').with_suffix(self._output.suffix + '_timestamps.json')
-
+ timestamp_file = self._output.with_suffix("").with_suffix(
+ self._output.suffix + "_timestamps.json"
+ )
+
try:
with self._stats_lock:
timestamps = self._frame_timestamps.copy()
-
+
# Prepare metadata
data = {
"video_file": str(self._output.name),
@@ -329,11 +328,11 @@ def _save_timestamps(self) -> None:
"end_time": timestamps[-1] if timestamps else None,
"duration_seconds": timestamps[-1] - timestamps[0] if len(timestamps) > 1 else 0.0,
}
-
+
# Write to JSON
- with open(timestamp_file, 'w') as f:
+ with open(timestamp_file, "w") as f:
json.dump(data, f, indent=2)
-
+
logger.info(f"Saved {len(timestamps)} frame timestamps to {timestamp_file}")
except Exception as exc:
logger.exception(f"Failed to save timestamps to {timestamp_file}: {exc}")
diff --git a/setup.py b/setup.py
index a254101..02954f2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
"""Setup configuration for the DeepLabCut Live GUI."""
+
from __future__ import annotations
import setuptools
From 39be1b20b2ed1102237612398816e3970ac7a2fc Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 24 Oct 2025 16:20:00 +0200
Subject: [PATCH 014/132] documentations
---
.pre-commit-config.yaml | 2 +-
README.md | 371 ++++++++++++---
dlclivegui/cameras/aravis_backend.py | 323 +++++++++++++
dlclivegui/cameras/factory.py | 3 +-
docs/README.md | 262 +++++++++++
docs/aravis_backend.md | 202 +++++++++
docs/camera_support.md | 84 +++-
docs/features.md | 653 +++++++++++++++++++++++++++
docs/install.md | 2 +-
docs/timestamp_format.md | 79 ++++
docs/user_guide.md | 633 ++++++++++++++++++++++++++
11 files changed, 2544 insertions(+), 70 deletions(-)
create mode 100644 dlclivegui/cameras/aravis_backend.py
create mode 100644 docs/README.md
create mode 100644 docs/aravis_backend.md
create mode 100644 docs/features.md
create mode 100644 docs/timestamp_format.md
create mode 100644 docs/user_guide.md
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 09dc3cd..0178c8e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
- id: check-yaml
- id: end-of-file-fixer
- id: name-tests-test
- args: [--pytest-test-first]
+ args: [--pytest-test-first]
- id: trailing-whitespace
- id: check-merge-conflict
diff --git a/README.md b/README.md
index a886a98..34a2682 100644
--- a/README.md
+++ b/README.md
@@ -1,126 +1,375 @@
# DeepLabCut Live GUI
-A modernised PyQt6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) experiments. The application
-streams frames from a camera, optionally performs DLCLive inference, and records video using the
-[vidgear](https://github.com/abhiTronix/vidgear) toolkit.
+A modern PyQt6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) experiments with real-time pose estimation. The application streams frames from industrial or consumer cameras, performs DLCLive inference, and records high-quality video with synchronized pose data.
## Features
-- Python 3.11+ compatible codebase with a PyQt6 interface.
-- Modular architecture with dedicated modules for camera control, video recording, configuration
- management, and DLCLive processing.
-- Single JSON configuration file that captures camera settings, DLCLive parameters, and recording
- options. All fields can be edited directly within the GUI.
-- Optional DLCLive inference with pose visualisation over the live video feed.
-- Recording support via vidgear's `WriteGear`, including custom encoder options.
+### Core Functionality
+- **Modern Python Stack**: Python 3.10+ compatible codebase with PyQt6 interface
+- **Multi-Backend Camera Support**: OpenCV, GenTL (Harvesters), Aravis, and Basler (pypylon)
+- **Real-Time Pose Estimation**: Live DLCLive inference with configurable models (TensorFlow, PyTorch)
+- **High-Performance Recording**: Hardware-accelerated video encoding via FFmpeg
+- **Flexible Configuration**: Single JSON file for all settings with GUI editing
+
+### Camera Features
+- **Multiple Backends**:
+ - OpenCV - Universal webcam support
+ - GenTL - Industrial cameras via Harvesters (Windows/Linux)
+ - Aravis - GenICam/GigE cameras (Linux/macOS)
+ - Basler - Basler cameras via pypylon
+- **Smart Device Detection**: Automatic camera enumeration without unnecessary probing
+- **Camera Controls**: Exposure time, gain, frame rate, and ROI cropping
+- **Live Preview**: Real-time camera feed with rotation support (0°, 90°, 180°, 270°)
+
+### DLCLive Features
+- **Model Support**: TensorFlow (base) and PyTorch models
+- **Processor System**: Plugin architecture for custom pose processing
+- **Auto-Recording**: Automatic video recording triggered by processor commands
+- **Performance Metrics**: Real-time FPS, latency, and queue monitoring
+- **Pose Visualization**: Optional overlay of detected keypoints on live feed
+
+### Recording Features
+- **Hardware Encoding**: NVENC (NVIDIA GPU) and software codecs (libx264, libx265)
+- **Configurable Quality**: CRF-based quality control
+- **Multiple Formats**: MP4, AVI, MOV containers
+- **Timestamp Support**: Frame-accurate timestamps for synchronization
+- **Performance Monitoring**: Write FPS, buffer status, and dropped frame tracking
+
+### User Interface
+- **Intuitive Layout**: Organized control panels with clear separation of concerns
+- **Configuration Management**: Load/save settings, support for multiple configurations
+- **Status Indicators**: Real-time feedback on camera, inference, and recording status
+- **Bounding Box Tool**: Visual overlay for ROI definition
## Installation
-1. Install the package and its dependencies:
+### Basic Installation
- ```bash
- pip install deeplabcut-live-gui
- ```
+```bash
+pip install deeplabcut-live-gui
+```
+
+This installs the core package with OpenCV camera support.
+
+### Full Installation with Optional Dependencies
+
+```bash
+# Install with gentl support
+pip install deeplabcut-live-gui[gentl]
+```
+
+### Platform-Specific Camera Backend Setup
+
+#### Windows (GenTL for Industrial Cameras)
+1. Install camera vendor drivers and SDK
+2. Ensure GenTL producer (.cti) files are accessible
+3. Common locations:
+ - `C:\Program Files\The Imaging Source Europe GmbH\IC4 GenTL Driver\bin\`
+ - Check vendor documentation for CTI file location
+
+#### Linux (Aravis for GenICam Cameras - Recommended)
+NOT tested
+```bash
+# Ubuntu/Debian
+sudo apt-get install gir1.2-aravis-0.8 python3-gi
+
+# Fedora
+sudo dnf install aravis python3-gobject
+```
+
+#### macOS (Aravis)
+NOT tested
+```bash
+brew install aravis
+pip install pygobject
+```
- The GUI requires additional runtime packages for optional features:
+#### Basler Cameras (All Platforms)
+NOT tested
+```bash
+# Install Pylon SDK from Basler website
+# Then install pypylon
+pip install pypylon
+```
- - [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) for pose estimation.
- - [vidgear](https://github.com/abhiTronix/vidgear) for video recording.
- - [OpenCV](https://opencv.org/) for camera access.
+### Hardware Acceleration (Optional)
- These libraries are listed in `setup.py` and will be installed automatically when the package is
- installed via `pip`.
+For NVIDIA GPU encoding (highly recommended for high-resolution/high-FPS recording):
+```bash
+# Ensure NVIDIA drivers are installed
+# FFmpeg with NVENC support will be used automatically
+```
-2. Launch the GUI:
+## Quick Start
+1. **Launch the GUI**:
```bash
dlclivegui
```
+2. **Select Camera Backend**: Choose from the dropdown (opencv, gentl, aravis, basler)
+
+3. **Configure Camera**: Set FPS, exposure, gain, and other parameters
+
+4. **Start Preview**: Click "Start Preview" to begin camera streaming
+
+5. **Optional - Load DLC Model**: Browse to your exported DLCLive model directory
+
+6. **Optional - Start Inference**: Click "Start pose inference" for real-time tracking
+
+7. **Optional - Record Video**: Configure output path and click "Start recording"
+
## Configuration
-The GUI works with a single JSON configuration describing the experiment. The configuration contains
-three main sections:
+The GUI uses a single JSON configuration file containing all experiment settings:
```json
{
"camera": {
+ "name": "Camera 0",
"index": 0,
- "width": 1280,
- "height": 720,
"fps": 60.0,
- "backend": "opencv",
+ "backend": "gentl",
+ "exposure": 10000,
+ "gain": 5.0,
+ "crop_x0": 0,
+ "crop_y0": 0,
+ "crop_x1": 0,
+ "crop_y1": 0,
+ "max_devices": 3,
"properties": {}
},
"dlc": {
"model_path": "/path/to/exported-model",
- "processor": "cpu",
- "shuffle": 1,
- "trainingsetindex": 0,
- "processor_args": {},
- "additional_options": {}
+ "model_type": "base",
+ "additional_options": {
+ "resize": 0.5,
+ "processor": "cpu"
+ }
},
"recording": {
"enabled": true,
- "directory": "~/Videos/deeplabcut",
+ "directory": "~/Videos/deeplabcut-live",
"filename": "session.mp4",
"container": "mp4",
- "options": {
- "compression_mode": "mp4"
- }
+ "codec": "h264_nvenc",
+ "crf": 23
+ },
+ "bbox": {
+ "enabled": false,
+ "x0": 0,
+ "y0": 0,
+ "x1": 200,
+ "y1": 100
}
}
```
-Use **File → Load configuration…** to open an existing configuration, or **File → Save configuration**
-to persist the current settings. Every field in the GUI is editable, and values entered in the
-interface will be written back to the JSON file.
+### Configuration Management
-### Camera backends
+- **Load**: File → Load configuration… (or Ctrl+O)
+- **Save**: File → Save configuration (or Ctrl+S)
+- **Save As**: File → Save configuration as… (or Ctrl+Shift+S)
-Set `camera.backend` to one of the supported drivers:
+All GUI fields are automatically synchronized with the configuration file.
-- `opencv` – standard `cv2.VideoCapture` fallback available on every platform.
-- `basler` – uses the Basler Pylon SDK via `pypylon` (install separately).
-- `gentl` – uses Aravis for GenTL-compatible cameras (requires `python-gi` bindings).
+## Camera Backends
-Backend specific parameters can be supplied through the `camera.properties` object. For example:
+### Backend Selection Guide
+| Backend | Platform | Use Case | Auto-Detection |
+|---------|----------|----------|----------------|
+| **opencv** | All | Webcams, simple USB cameras | Basic |
+| **gentl** | Windows, Linux | Industrial cameras via CTI files | Yes |
+| **aravis** | Linux, macOS | GenICam/GigE cameras | Yes |
+| **basler** | All | Basler cameras specifically | Yes |
+
+### Backend-Specific Configuration
+
+#### OpenCV
+```json
+{
+ "camera": {
+ "backend": "opencv",
+ "index": 0,
+ "fps": 30.0
+ }
+}
+```
+**Note**: Exposure and gain controls are disabled for OpenCV backend due to limited driver support.
+
+#### GenTL (Harvesters)
```json
{
"camera": {
+ "backend": "gentl",
"index": 0,
- "backend": "basler",
+ "fps": 60.0,
+ "exposure": 15000,
+ "gain": 8.0,
"properties": {
- "serial": "40123456",
- "exposure": 15000,
- "gain": 6.0
+ "cti_file": "C:\\Path\\To\\Producer.cti",
+ "serial_number": "12345678",
+ "pixel_format": "Mono8"
}
}
}
```
-If optional dependencies are missing, the GUI will show the backend as unavailable in the drop-down
-but you can still configure it for a system where the drivers are present.
+#### Aravis
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0,
+ "fps": 60.0,
+ "exposure": 10000,
+ "gain": 5.0,
+ "properties": {
+ "camera_id": "TheImagingSource-12345678",
+ "pixel_format": "Mono8",
+ "n_buffers": 10,
+ "timeout": 2000000
+ }
+ }
+}
+```
+
+See [Camera Backend Documentation](docs/camera_support.md) for detailed setup instructions.
+
+## DLCLive Integration
-## Development
+### Model Types
-The core modules of the package are organised as follows:
+The GUI supports both TensorFlow and PyTorch DLCLive models:
-- `dlclivegui.config` – dataclasses for loading, storing, and saving application settings.
-- `dlclivegui.cameras` – modular camera backends (OpenCV, Basler, GenTL) and factory helpers.
-- `dlclivegui.camera_controller` – camera capture worker running in a dedicated `QThread`.
-- `dlclivegui.video_recorder` – wrapper around `WriteGear` for video output.
-- `dlclivegui.dlc_processor` – asynchronous DLCLive inference with optional pose overlay.
-- `dlclivegui.gui` – PyQt6 user interface and application entry point.
+1. **Base (TensorFlow)**: Original DLC models exported for live inference
+2. **PyTorch**: PyTorch-based models (requires PyTorch installation)
-Run a quick syntax check with:
+Select the model type from the dropdown before starting inference.
+
+### Processor System
+
+The GUI includes a plugin system for custom pose processing:
+
+```python
+# Example processor
+class MyProcessor:
+ def process(self, pose, timestamp):
+ # Custom processing logic
+ x, y = pose[0, :2] # First keypoint
+ print(f"Position: ({x}, {y})")
+ def save(self):
+ pass
+```
+
+Place processors in `dlclivegui/processors/` and refresh to load them.
+
+See [Processor Plugin Documentation](docs/PLUGIN_SYSTEM.md) for details.
+
+### Auto-Recording Feature
+
+Enable "Auto-record video on processor command" to automatically start/stop recording based on processor signals. Useful for event-triggered recording in behavioral experiments.
+
+## Performance Optimization
+
+### High-Speed Camera Tips
+
+1. **Use Hardware Encoding**: Select `h264_nvenc` codec for NVIDIA GPUs
+2. **Adjust Buffer Count**: Increase buffers for GenTL/Aravis backends
+ ```json
+ "properties": {"n_buffers": 20}
+ ```
+3. **Optimize CRF**: Lower CRF = higher quality but larger files (default: 23)
+4. **Disable Visualization**: Uncheck "Display pose predictions" during recording
+5. **Crop Region**: Use cropping to reduce frame size before inference
+
+### Recommended Settings by FPS
+
+| FPS Range | Codec | CRF | Buffers | Notes |
+|-----------|-------|-----|---------|-------|
+| 30-60 | libx264 | 23 | 10 | Standard quality |
+| 60-120 | h264_nvenc | 23 | 15 | GPU encoding |
+| 120-200 | h264_nvenc | 28 | 20 | Higher compression |
+| 200+ | h264_nvenc | 30 | 30 | Max performance |
+
+### Project Structure
+
+```
+dlclivegui/
+├── __init__.py
+├── gui.py # Main PyQt6 application
+├── config.py # Configuration dataclasses
+├── camera_controller.py # Camera capture thread
+├── dlc_processor.py # DLCLive inference thread
+├── video_recorder.py # Video encoding thread
+├── cameras/ # Camera backend modules
+│ ├── base.py # Abstract base class
+│ ├── factory.py # Backend registry and detection
+│ ├── opencv_backend.py
+│ ├── gentl_backend.py
+│ ├── aravis_backend.py
+│ └── basler_backend.py
+└── processors/ # Pose processor plugins
+ ├── processor_utils.py
+ └── dlc_processor_socket.py
+```
+
+### Running Tests
```bash
+# Syntax check
python -m compileall dlclivegui
+
+# Type checking (optional)
+mypy dlclivegui
+
```
+### Adding New Camera Backends
+
+1. Create new backend inheriting from `CameraBackend`
+2. Implement required methods: `open()`, `read()`, `close()`
+3. Optional: Implement `get_device_count()` for smart detection
+4. Register in `cameras/factory.py`
+
+See [Camera Backend Development](docs/camera_support.md) for detailed instructions.
+
+
+## Documentation
+
+- [Camera Support](docs/camera_support.md) - All camera backends and setup
+- [Aravis Backend](docs/aravis_backend.md) - GenICam camera setup (Linux/macOS)
+- [Processor Plugins](docs/PLUGIN_SYSTEM.md) - Custom pose processing
+- [Installation Guide](docs/install.md) - Detailed setup instructions
+- [Timestamp Format](docs/timestamp_format.md) - Timestamp synchronization
+
+## System Requirements
+
+
+### Recommended
+- Python 3.10+
+- 8 GB RAM
+- NVIDIA GPU with CUDA support (for DLCLive inference and video encoding)
+- USB 3.0 or GigE network (for industrial cameras)
+- SSD storage (for high-speed recording)
+
+### Tested Platforms
+- Windows 11
+
## License
-This project is licensed under the GNU Lesser General Public License v3.0. See the `LICENSE` file for
-more information.
+This project is licensed under the GNU Lesser General Public License v3.0. See the [LICENSE](LICENSE) file for more information.
+
+## Citation
+
+Cite the original DeepLabCut-live paper:
+```bibtex
+@article{Kane2020,
+ title={Real-time, low-latency closed-loop feedback using markerless posture tracking},
+ author={Kane, Gary A and Lopes, Gonçalo and Saunders, Jonny L and Mathis, Alexander and Mathis, Mackenzie W},
+ journal={eLife},
+ year={2020},
+ doi={10.7554/eLife.61909}
+}
+```
diff --git a/dlclivegui/cameras/aravis_backend.py b/dlclivegui/cameras/aravis_backend.py
new file mode 100644
index 0000000..e033096
--- /dev/null
+++ b/dlclivegui/cameras/aravis_backend.py
@@ -0,0 +1,323 @@
+"""Aravis backend for GenICam cameras."""
+
+from __future__ import annotations
+
+import time
+from typing import Optional, Tuple
+
+import cv2
+import numpy as np
+
+from .base import CameraBackend
+
+try: # pragma: no cover - optional dependency
+ import gi
+
+ gi.require_version("Aravis", "0.8")
+ from gi.repository import Aravis
+
+ ARAVIS_AVAILABLE = True
+except Exception: # pragma: no cover - optional dependency
+ Aravis = None # type: ignore
+ ARAVIS_AVAILABLE = False
+
+
+class AravisCameraBackend(CameraBackend):
+ """Capture frames from GenICam-compatible devices via Aravis."""
+
+ def __init__(self, settings):
+ super().__init__(settings)
+ props = settings.properties
+ self._camera_id: Optional[str] = props.get("camera_id")
+ self._pixel_format: str = props.get("pixel_format", "Mono8")
+ self._timeout: int = int(props.get("timeout", 2000000)) # microseconds
+ self._n_buffers: int = int(props.get("n_buffers", 10))
+
+ self._camera = None
+ self._stream = None
+ self._device_label: Optional[str] = None
+
+ @classmethod
+ def is_available(cls) -> bool:
+ """Check if Aravis is available on this system."""
+ return ARAVIS_AVAILABLE
+
+ @classmethod
+ def get_device_count(cls) -> int:
+ """Get the actual number of Aravis devices detected.
+
+ Returns the number of devices found, or -1 if detection fails.
+ """
+ if not ARAVIS_AVAILABLE:
+ return -1
+
+ try:
+ Aravis.update_device_list()
+ return Aravis.get_n_devices()
+ except Exception:
+ return -1
+
+ def open(self) -> None:
+ """Open the Aravis camera device."""
+ if not ARAVIS_AVAILABLE: # pragma: no cover - optional dependency
+ raise RuntimeError(
+ "The 'aravis' library is required for the Aravis backend. "
+ "Install it via your system package manager (e.g., 'sudo apt install gir1.2-aravis-0.8' on Ubuntu)."
+ )
+
+ # Update device list
+ Aravis.update_device_list()
+ n_devices = Aravis.get_n_devices()
+
+ if n_devices == 0:
+ raise RuntimeError("No Aravis cameras detected")
+
+ # Open camera by ID or index
+ if self._camera_id:
+ self._camera = Aravis.Camera.new(self._camera_id)
+ if self._camera is None:
+ raise RuntimeError(f"Failed to open camera with ID '{self._camera_id}'")
+ else:
+ index = int(self.settings.index or 0)
+ if index < 0 or index >= n_devices:
+ raise RuntimeError(
+ f"Camera index {index} out of range for {n_devices} Aravis device(s)"
+ )
+ camera_id = Aravis.get_device_id(index)
+ self._camera = Aravis.Camera.new(camera_id)
+ if self._camera is None:
+ raise RuntimeError(f"Failed to open camera at index {index}")
+
+ # Get device information for label
+ self._device_label = self._resolve_device_label()
+
+ # Configure camera
+ self._configure_pixel_format()
+ self._configure_exposure()
+ self._configure_gain()
+ self._configure_frame_rate()
+
+ # Create stream
+ self._stream = self._camera.create_stream(None, None)
+ if self._stream is None:
+ raise RuntimeError("Failed to create Aravis stream")
+
+ # Push buffers to stream
+ payload_size = self._camera.get_payload()
+ for _ in range(self._n_buffers):
+ self._stream.push_buffer(Aravis.Buffer.new_allocate(payload_size))
+
+ # Start acquisition
+ self._camera.start_acquisition()
+
+ def read(self) -> Tuple[np.ndarray, float]:
+ """Read a frame from the camera."""
+ if self._camera is None or self._stream is None:
+ raise RuntimeError("Aravis camera not initialized")
+
+ # Pop buffer from stream
+ buffer = self._stream.timeout_pop_buffer(self._timeout)
+
+ if buffer is None:
+ raise TimeoutError("Failed to grab frame from Aravis camera (timeout)")
+
+ # Check buffer status
+ status = buffer.get_status()
+ if status != Aravis.BufferStatus.SUCCESS:
+ self._stream.push_buffer(buffer)
+ raise TimeoutError(f"Aravis buffer status error: {status}")
+
+ # Get image data
+ try:
+ # Get buffer data as numpy array
+ data = buffer.get_data()
+ width = buffer.get_image_width()
+ height = buffer.get_image_height()
+ pixel_format = buffer.get_image_pixel_format()
+
+ # Convert to numpy array
+ if pixel_format == Aravis.PIXEL_FORMAT_MONO_8:
+ frame = np.frombuffer(data, dtype=np.uint8).reshape((height, width))
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+ elif pixel_format == Aravis.PIXEL_FORMAT_RGB_8_PACKED:
+ frame = np.frombuffer(data, dtype=np.uint8).reshape((height, width, 3))
+ frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+ elif pixel_format == Aravis.PIXEL_FORMAT_BGR_8_PACKED:
+ frame = np.frombuffer(data, dtype=np.uint8).reshape((height, width, 3))
+ elif pixel_format in (Aravis.PIXEL_FORMAT_MONO_12, Aravis.PIXEL_FORMAT_MONO_16):
+ # Handle 12-bit and 16-bit mono
+ frame = np.frombuffer(data, dtype=np.uint16).reshape((height, width))
+ # Scale to 8-bit
+ max_val = float(frame.max()) if frame.size else 0.0
+ scale = 255.0 / max_val if max_val > 0.0 else 1.0
+ frame = np.clip(frame * scale, 0, 255).astype(np.uint8)
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+ else:
+ # Fallback for unknown formats - try to interpret as mono8
+ frame = np.frombuffer(data, dtype=np.uint8).reshape((height, width))
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+
+ frame = frame.copy()
+ timestamp = time.time()
+
+ finally:
+ # Always push buffer back to stream
+ self._stream.push_buffer(buffer)
+
+ return frame, timestamp
+
+ def stop(self) -> None:
+ """Stop camera acquisition."""
+ if self._camera is not None:
+ try:
+ self._camera.stop_acquisition()
+ except Exception:
+ pass
+
+ def close(self) -> None:
+ """Release the camera and stream."""
+ if self._camera is not None:
+ try:
+ self._camera.stop_acquisition()
+ except Exception:
+ pass
+
+ # Clear stream buffers
+ if self._stream is not None:
+ try:
+ # Flush remaining buffers
+ while True:
+ buffer = self._stream.try_pop_buffer()
+ if buffer is None:
+ break
+ except Exception:
+ pass
+ self._stream = None
+
+ # Release camera
+ try:
+ del self._camera
+ except Exception:
+ pass
+ finally:
+ self._camera = None
+
+ self._device_label = None
+
+ def device_name(self) -> str:
+ """Return a human-readable device name."""
+ if self._device_label:
+ return self._device_label
+ return super().device_name()
+
+ # ------------------------------------------------------------------
+ # Configuration helpers
+ # ------------------------------------------------------------------
+
+ def _configure_pixel_format(self) -> None:
+ """Configure the camera pixel format."""
+ if self._camera is None:
+ return
+
+ try:
+ # Map common format names to Aravis pixel formats
+ format_map = {
+ "Mono8": Aravis.PIXEL_FORMAT_MONO_8,
+ "Mono12": Aravis.PIXEL_FORMAT_MONO_12,
+ "Mono16": Aravis.PIXEL_FORMAT_MONO_16,
+ "RGB8": Aravis.PIXEL_FORMAT_RGB_8_PACKED,
+ "BGR8": Aravis.PIXEL_FORMAT_BGR_8_PACKED,
+ }
+
+ if self._pixel_format in format_map:
+ self._camera.set_pixel_format(format_map[self._pixel_format])
+ else:
+ # Try setting as string
+ self._camera.set_pixel_format_from_string(self._pixel_format)
+ except Exception:
+ # If pixel format setting fails, continue with default
+ pass
+
+ def _configure_exposure(self) -> None:
+ """Configure camera exposure time."""
+ if self._camera is None:
+ return
+
+ # Get exposure from settings
+ exposure = None
+ if hasattr(self.settings, "exposure") and self.settings.exposure > 0:
+ exposure = float(self.settings.exposure)
+
+ if exposure is None:
+ return
+
+ try:
+ # Disable auto exposure
+ try:
+ self._camera.set_exposure_time_auto(Aravis.Auto.OFF)
+ except Exception:
+ pass
+
+ # Set exposure time (in microseconds)
+ self._camera.set_exposure_time(exposure)
+ except Exception:
+ pass
+
+ def _configure_gain(self) -> None:
+ """Configure camera gain."""
+ if self._camera is None:
+ return
+
+ # Get gain from settings
+ gain = None
+ if hasattr(self.settings, "gain") and self.settings.gain > 0.0:
+ gain = float(self.settings.gain)
+
+ if gain is None:
+ return
+
+ try:
+ # Disable auto gain
+ try:
+ self._camera.set_gain_auto(Aravis.Auto.OFF)
+ except Exception:
+ pass
+
+ # Set gain value
+ self._camera.set_gain(gain)
+ except Exception:
+ pass
+
+ def _configure_frame_rate(self) -> None:
+ """Configure camera frame rate."""
+ if self._camera is None or not self.settings.fps:
+ return
+
+ try:
+ target_fps = float(self.settings.fps)
+ self._camera.set_frame_rate(target_fps)
+ except Exception:
+ pass
+
+ def _resolve_device_label(self) -> Optional[str]:
+ """Get a human-readable device label."""
+ if self._camera is None:
+ return None
+
+ try:
+ model = self._camera.get_model_name()
+ vendor = self._camera.get_vendor_name()
+ serial = self._camera.get_device_serial_number()
+
+ if model and serial:
+ if vendor:
+ return f"{vendor} {model} ({serial})"
+ return f"{model} ({serial})"
+ elif model:
+ return model
+ elif serial:
+ return f"Camera {serial}"
+ except Exception:
+ pass
+
+ return None
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index eca4f58..3261ba5 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -22,6 +22,7 @@ class DetectedCamera:
"opencv": ("dlclivegui.cameras.opencv_backend", "OpenCVCameraBackend"),
"basler": ("dlclivegui.cameras.basler_backend", "BaslerCameraBackend"),
"gentl": ("dlclivegui.cameras.gentl_backend", "GenTLCameraBackend"),
+ "aravis": ("dlclivegui.cameras.aravis_backend", "AravisCameraBackend"),
}
@@ -58,7 +59,7 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
The backend identifier, e.g. ``"opencv"``.
max_devices:
Upper bound for the indices that should be probed.
- For GenTL backend, the actual device count is queried if available.
+ For backends with get_device_count (GenTL, Aravis), the actual device count is queried.
Returns
-------
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..3cc524f
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,262 @@
+# DeepLabCut-live-GUI Documentation Index
+
+Welcome to the DeepLabCut-live-GUI documentation! This index will help you find the information you need.
+
+## Getting Started
+
+### New Users
+1. **[README](../README.md)** - Project overview, installation, and quick start
+2. **[User Guide](user_guide.md)** - Step-by-step walkthrough of all features
+3. **[Installation Guide](install.md)** - Detailed installation instructions
+
+### Quick References
+- **[ARAVIS_QUICK_REF](../ARAVIS_QUICK_REF.md)** - Aravis backend quick reference
+- **[Features Overview](features.md)** - Complete feature documentation
+
+## Core Documentation
+
+### Camera Setup
+- **[Camera Support](camera_support.md)** - Overview of all camera backends
+- **[Aravis Backend](aravis_backend.md)** - Linux/macOS GenICam camera setup
+- Platform-specific guides for industrial cameras
+
+### Application Features
+- **[Features Documentation](features.md)** - Detailed feature descriptions:
+ - Camera control and backends
+ - Real-time pose estimation
+ - Video recording
+ - Configuration management
+ - Processor system
+ - User interface
+ - Performance monitoring
+ - Advanced features
+
+### User Guide
+- **[User Guide](user_guide.md)** - Complete usage walkthrough:
+ - Getting started
+ - Camera setup
+ - DLCLive configuration
+ - Recording videos
+ - Configuration management
+ - Common workflows
+ - Tips and best practices
+ - Troubleshooting
+
+## Advanced Topics
+
+### Processor System
+- **[Processor Plugins](PLUGIN_SYSTEM.md)** - Custom pose processing
+- **[Processor Auto-Recording](processor_auto_recording.md)** - Event-triggered recording
+- Socket processor documentation
+
+### Technical Details
+- **[Timestamp Format](timestamp_format.md)** - Synchronization and timing
+- **[ARAVIS_BACKEND_SUMMARY](../ARAVIS_BACKEND_SUMMARY.md)** - Implementation details
+
+## By Use Case
+
+### I want to...
+
+#### Set up a camera
+→ [Camera Support](camera_support.md) → Select backend → Follow setup guide
+
+**By Platform**:
+- **Windows**: [README](../README.md#windows-gentl-for-industrial-cameras) → GenTL setup
+- **Linux**: [Aravis Backend](aravis_backend.md) → Installation for Ubuntu/Debian
+- **macOS**: [Aravis Backend](aravis_backend.md) → Installation via Homebrew
+
+**By Camera Type**:
+- **Webcam**: [User Guide](user_guide.md#camera-setup) → OpenCV backend
+- **Industrial Camera**: [Camera Support](camera_support.md) → GenTL/Aravis
+- **Basler Camera**: [Camera Support](camera_support.md#basler-cameras) → pypylon setup
+- **The Imaging Source**: [Aravis Backend](aravis_backend.md) or GenTL
+
+#### Run pose estimation
+→ [User Guide](user_guide.md#dlclive-configuration) → Load model → Start inference
+
+#### Record high-speed video
+→ [Features](features.md#video-recording) → Hardware encoding → GPU setup
+→ [User Guide](user_guide.md#high-speed-recording-60-fps) → Optimization tips
+
+#### Create custom processor
+→ [Processor Plugins](PLUGIN_SYSTEM.md) → Plugin architecture → Examples
+
+#### Trigger recording remotely
+→ [Features](features.md#auto-recording-feature) → Auto-recording setup
+→ Socket processor documentation
+
+#### Optimize performance
+→ [Features](features.md#performance-optimization) → Metrics → Adjustments
+→ [User Guide](user_guide.md#tips-and-best-practices) → Best practices
+
+## By Topic
+
+### Camera Backends
+| Backend | Documentation | Platform |
+|---------|---------------|----------|
+| OpenCV | [User Guide](user_guide.md#step-1-select-camera-backend) | All |
+| GenTL | [Camera Support](camera_support.md) | Windows, Linux |
+| Aravis | [Aravis Backend](aravis_backend.md) | Linux, macOS |
+| Basler | [Camera Support](camera_support.md#basler-cameras) | All |
+
+### Configuration
+- **Basics**: [README](../README.md#configuration)
+- **Management**: [User Guide](user_guide.md#working-with-configurations)
+- **Templates**: [User Guide](user_guide.md#configuration-templates)
+- **Details**: [Features](features.md#configuration-management)
+
+### Recording
+- **Quick Start**: [User Guide](user_guide.md#recording-videos)
+- **Features**: [Features](features.md#video-recording)
+- **Optimization**: [README](../README.md#performance-optimization)
+- **Auto-Recording**: [Features](features.md#auto-recording-feature)
+
+### DLCLive
+- **Setup**: [User Guide](user_guide.md#dlclive-configuration)
+- **Models**: [Features](features.md#model-support)
+- **Performance**: [Features](features.md#performance-metrics)
+- **Visualization**: [Features](features.md#pose-visualization)
+
+## Troubleshooting
+
+### Quick Fixes
+1. **Camera not detected** → [User Guide](user_guide.md#troubleshooting-guide)
+2. **Slow inference** → [Features](features.md#performance-optimization)
+3. **Dropped frames** → [README](../README.md#troubleshooting)
+4. **Recording issues** → [User Guide](user_guide.md#troubleshooting-guide)
+
+### Detailed Troubleshooting
+- [User Guide - Troubleshooting Section](user_guide.md#troubleshooting-guide)
+- [README - Troubleshooting](../README.md#troubleshooting)
+- [Aravis Backend - Troubleshooting](aravis_backend.md#troubleshooting)
+
+## Development
+
+### Architecture
+- **Project Structure**: [README](../README.md#development)
+- **Backend Development**: [Camera Support](camera_support.md#contributing-new-camera-types)
+- **Processor Development**: [Processor Plugins](PLUGIN_SYSTEM.md)
+
+### Implementation Details
+- **Aravis Backend**: [ARAVIS_BACKEND_SUMMARY](../ARAVIS_BACKEND_SUMMARY.md)
+- **Thread Safety**: [Features](features.md#thread-safety)
+- **Resource Management**: [Features](features.md#resource-management)
+
+## Reference
+
+### Configuration Schema
+```json
+{
+ "camera": {
+ "name": "string",
+ "index": "number",
+ "fps": "number",
+ "backend": "opencv|gentl|aravis|basler",
+ "exposure": "number (μs, 0=auto)",
+ "gain": "number (0.0=auto)",
+ "crop_x0/y0/x1/y1": "number",
+ "max_devices": "number",
+ "properties": "object"
+ },
+ "dlc": {
+ "model_path": "string",
+ "model_type": "base|pytorch",
+ "additional_options": "object"
+ },
+ "recording": {
+ "enabled": "boolean",
+ "directory": "string",
+ "filename": "string",
+ "container": "mp4|avi|mov",
+ "codec": "h264_nvenc|libx264|hevc_nvenc",
+ "crf": "number (0-51)"
+ },
+ "bbox": {
+ "enabled": "boolean",
+ "x0/y0/x1/y1": "number"
+ }
+}
+```
+
+### Performance Metrics
+- **Camera FPS**: [Features](features.md#camera-metrics)
+- **DLC Metrics**: [Features](features.md#dlc-metrics)
+- **Recording Metrics**: [Features](features.md#recording-metrics)
+
+### Keyboard Shortcuts
+| Action | Shortcut |
+|--------|----------|
+| Load configuration | Ctrl+O |
+| Save configuration | Ctrl+S |
+| Save as | Ctrl+Shift+S |
+| Quit | Ctrl+Q |
+
+## External Resources
+
+### DeepLabCut
+- [DeepLabCut](http://www.mackenziemathislab.org/deeplabcut)
+- [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live)
+- [DeepLabCut Documentation](http://deeplabcut.github.io/DeepLabCut/docs/intro.html)
+
+### Camera Libraries
+- [Aravis Project](https://github.com/AravisProject/aravis)
+- [Harvesters (GenTL)](https://github.com/genicam/harvesters)
+- [pypylon (Basler)](https://github.com/basler/pypylon)
+- [OpenCV](https://opencv.org/)
+
+### Video Encoding
+- [FFmpeg](https://ffmpeg.org/)
+- [NVENC (NVIDIA)](https://developer.nvidia.com/nvidia-video-codec-sdk)
+
+## Getting Help
+
+### Support Channels
+1. Check relevant documentation (use this index!)
+2. Search GitHub issues
+3. Review example configurations
+4. Contact maintainers
+
+### Reporting Issues
+When reporting bugs, include:
+- GUI version
+- Platform (OS, Python version)
+- Camera backend and model
+- Configuration file (if applicable)
+- Error messages
+- Steps to reproduce
+
+## Contributing
+
+Interested in contributing?
+- See [README - Contributing](../README.md#contributing)
+- Review [Development Section](../README.md#development)
+- Check open GitHub issues
+- Read coding guidelines
+
+---
+
+## Document Version History
+
+- **v1.0** - Initial comprehensive documentation
+ - Complete README overhaul
+ - User guide creation
+ - Features documentation
+ - Camera backend guides
+ - Aravis backend implementation
+
+## Quick Navigation
+
+**Popular Pages**:
+- [User Guide](user_guide.md) - Most comprehensive walkthrough
+- [Features](features.md) - All capabilities detailed
+- [Aravis Setup](aravis_backend.md) - Linux industrial cameras
+- [Camera Support](camera_support.md) - All camera backends
+
+**By Experience Level**:
+- **Beginner**: [README](../README.md) → [User Guide](user_guide.md)
+- **Intermediate**: [Features](features.md) → [Camera Support](camera_support.md)
+- **Advanced**: [Processor Plugins](PLUGIN_SYSTEM.md) → Implementation details
+
+---
+
+*Last updated: 2025-10-24*
diff --git a/docs/aravis_backend.md b/docs/aravis_backend.md
new file mode 100644
index 0000000..67024ba
--- /dev/null
+++ b/docs/aravis_backend.md
@@ -0,0 +1,202 @@
+# Aravis Backend
+
+The Aravis backend provides support for GenICam-compatible cameras using the [Aravis](https://github.com/AravisProject/aravis) library.
+
+## Features
+
+- Support for GenICam/GigE Vision cameras
+- Automatic device detection with `get_device_count()`
+- Configurable exposure time and gain
+- Support for various pixel formats (Mono8, Mono12, Mono16, RGB8, BGR8)
+- Efficient streaming with configurable buffer count
+- Timeout handling for robust operation
+
+## Installation
+
+### Linux (Ubuntu/Debian)
+```bash
+sudo apt-get install gir1.2-aravis-0.8 python3-gi
+```
+
+### Linux (Fedora)
+```bash
+sudo dnf install aravis python3-gobject
+```
+
+### Windows
+Aravis support on Windows requires building from source or using WSL. For native Windows support, consider using the GenTL backend instead.
+
+### macOS
+```bash
+brew install aravis
+pip install pygobject
+```
+
+## Configuration
+
+### Basic Configuration
+
+Select "aravis" as the backend in the GUI or in your configuration file:
+
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0,
+ "fps": 30.0,
+ "exposure": 10000,
+ "gain": 5.0
+ }
+}
+```
+
+### Advanced Properties
+
+You can configure additional Aravis-specific properties via the `properties` dictionary:
+
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0,
+ "fps": 30.0,
+ "exposure": 10000,
+ "gain": 5.0,
+ "properties": {
+ "camera_id": "MyCamera-12345",
+ "pixel_format": "Mono8",
+ "timeout": 2000000,
+ "n_buffers": 10
+ }
+ }
+}
+```
+
+#### Available Properties
+
+| Property | Type | Default | Description |
+|----------|------|---------|-------------|
+| `camera_id` | string | None | Specific camera ID to open (overrides index) |
+| `pixel_format` | string | "Mono8" | Pixel format: Mono8, Mono12, Mono16, RGB8, BGR8 |
+| `timeout` | int | 2000000 | Frame timeout in microseconds (2 seconds) |
+| `n_buffers` | int | 10 | Number of buffers in the acquisition stream |
+
+### Exposure and Gain
+
+The Aravis backend supports exposure time (in microseconds) and gain control:
+
+- **Exposure**: Set via the GUI exposure field or `settings.exposure` (0 = auto, >0 = manual in μs)
+- **Gain**: Set via the GUI gain field or `settings.gain` (0.0 = auto, >0.0 = manual value)
+
+When exposure or gain are set to non-zero values, the backend automatically disables auto-exposure and auto-gain.
+
+## Camera Selection
+
+### By Index
+The default method is to select cameras by index (0, 1, 2, etc.):
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0
+ }
+}
+```
+
+### By Camera ID
+You can also select a specific camera by its ID:
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "properties": {
+ "camera_id": "TheImagingSource-12345678"
+ }
+ }
+}
+```
+
+## Supported Pixel Formats
+
+The backend automatically converts different pixel formats to BGR format for consistency:
+
+- **Mono8**: 8-bit grayscale → BGR
+- **Mono12**: 12-bit grayscale → scaled to 8-bit → BGR
+- **Mono16**: 16-bit grayscale → scaled to 8-bit → BGR
+- **RGB8**: 8-bit RGB → BGR (color conversion)
+- **BGR8**: 8-bit BGR (no conversion needed)
+
+## Performance Tuning
+
+### Buffer Count
+Increase `n_buffers` for high-speed cameras or systems with variable latency:
+```json
+{
+ "properties": {
+ "n_buffers": 20
+ }
+}
+```
+
+### Timeout
+Adjust timeout for slower cameras or network cameras:
+```json
+{
+ "properties": {
+ "timeout": 5000000
+ }
+}
+```
+(5 seconds = 5,000,000 microseconds)
+
+## Troubleshooting
+
+### No cameras detected
+1. Verify Aravis installation: `arv-tool-0.8 -l`
+2. Check camera is powered and connected
+3. Ensure proper network configuration for GigE cameras
+4. Check user permissions for USB cameras
+
+### Timeout errors
+- Increase the `timeout` property
+- Check network bandwidth for GigE cameras
+- Verify camera is properly configured and streaming
+
+### Pixel format errors
+- Check camera's supported pixel formats: `arv-tool-0.8 -n features`
+- Try alternative formats: Mono8, RGB8, etc.
+
+## Comparison with GenTL Backend
+
+| Feature | Aravis | GenTL |
+|---------|--------|-------|
+| Platform | Linux (best), macOS | Windows (best), Linux |
+| Camera Support | GenICam/GigE | GenTL producers |
+| Installation | System packages | Vendor CTI files |
+| Performance | Excellent | Excellent |
+| Auto-detection | Yes | Yes |
+
+## Example: The Imaging Source Camera
+
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0,
+ "fps": 60.0,
+ "exposure": 8000,
+ "gain": 10.0,
+ "properties": {
+ "pixel_format": "Mono8",
+ "n_buffers": 15,
+ "timeout": 3000000
+ }
+ }
+}
+```
+
+## Resources
+
+- [Aravis Project](https://github.com/AravisProject/aravis)
+- [GenICam Standard](https://www.emva.org/standards-technology/genicam/)
+- [Python GObject Documentation](https://pygobject.readthedocs.io/)
diff --git a/docs/camera_support.md b/docs/camera_support.md
index 6e36e22..4d9ba22 100644
--- a/docs/camera_support.md
+++ b/docs/camera_support.md
@@ -1,13 +1,85 @@
## Camera Support
-### Windows
-- **The Imaging Source USB3 Cameras**: via code based on [Windows code samples](https://github.com/TheImagingSource/IC-Imaging-Control-Samples) provided by The Imaging Source. To use The Imaging Source USB3 cameras on Windows, you must first [install their drivers](https://www.theimagingsource.com/support/downloads-for-windows/device-drivers/icwdmuvccamtis/) and [C library](https://www.theimagingsource.com/support/downloads-for-windows/software-development-kits-sdks/tisgrabberdll/).
-- **OpenCV compatible cameras**: OpenCV is installed with DeepLabCut-live-GUI, so webcams or other cameras compatible with OpenCV on Windows require no additional installation.
+DeepLabCut-live-GUI supports multiple camera backends for different platforms and camera types:
-### Linux and NVIDIA Jetson Development Kits
+### Supported Backends
-- **OpenCV compatible cameras**: We provide support for many webcams and industrial cameras using OpenCV via Video4Linux drivers. This includes The Imaging Source USB3 cameras (and others, but untested). OpenCV is installed with DeepLabCut-live-GUI.
-- **Aravis Project compatible USB3Vision and GigE Cameras**: [The Aravis Project](https://github.com/AravisProject/aravis) supports a number of popular industrial cameras used in neuroscience, including The Imaging Source, Point Grey, and Basler cameras. To use Aravis Project drivers, please follow their [installation instructions](https://github.com/AravisProject/aravis#installing-aravis). The Aravis Project drivers are supported on the NVIDIA Jetson platform, but there are known bugs (e.g. [here](https://github.com/AravisProject/aravis/issues/324)).
+1. **OpenCV** - Universal webcam and USB camera support (all platforms)
+2. **GenTL** - Industrial cameras via GenTL producers (Windows, Linux)
+3. **Aravis** - GenICam/GigE Vision cameras (Linux, macOS)
+4. **Basler** - Basler cameras via pypylon (all platforms)
+
+### Backend Selection
+
+You can select the backend in the GUI from the "Backend" dropdown, or in your configuration file:
+
+```json
+{
+ "camera": {
+ "backend": "aravis",
+ "index": 0,
+ "fps": 30.0
+ }
+}
+```
+
+### Platform-Specific Recommendations
+
+#### Windows
+- **OpenCV compatible cameras**: Best for webcams and simple USB cameras. OpenCV is installed with DeepLabCut-live-GUI.
+- **GenTL backend**: Recommended for industrial cameras (The Imaging Source, Basler, etc.) via vendor-provided CTI files.
+- **Basler cameras**: Can use either GenTL or pypylon backend.
+
+#### Linux
+- **OpenCV compatible cameras**: Good for webcams via Video4Linux drivers. Installed with DeepLabCut-live-GUI.
+- **Aravis backend**: **Recommended** for GenICam/GigE Vision industrial cameras (The Imaging Source, Basler, Point Grey, etc.)
+ - Easy installation via system package manager
+ - Better Linux support than GenTL
+ - See [Aravis Backend Documentation](aravis_backend.md)
+- **GenTL backend**: Alternative for industrial cameras if vendor provides Linux CTI files.
+
+#### macOS
+- **OpenCV compatible cameras**: For webcams and compatible USB cameras.
+- **Aravis backend**: For GenICam/GigE Vision cameras (requires Homebrew installation).
+
+#### NVIDIA Jetson
+- **OpenCV compatible cameras**: Standard V4L2 camera support.
+- **Aravis backend**: Supported but may have platform-specific bugs. See [Aravis issues](https://github.com/AravisProject/aravis/issues/324).
+
+### Quick Installation Guide
+
+#### Aravis (Linux/Ubuntu)
+```bash
+sudo apt-get install gir1.2-aravis-0.8 python3-gi
+```
+
+#### Aravis (macOS)
+```bash
+brew install aravis
+pip install pygobject
+```
+
+#### GenTL (Windows)
+Install vendor-provided camera drivers and SDK. CTI files are typically in:
+- `C:\Program Files\The Imaging Source Europe GmbH\IC4 GenTL Driver\bin\`
+
+### Backend Comparison
+
+| Feature | OpenCV | GenTL | Aravis | Basler (pypylon) |
+|---------|--------|-------|--------|------------------|
+| Ease of use | ⭐⭐⭐⭐⭐ | ⭐⭐⭐ | ⭐⭐⭐⭐ | ⭐⭐⭐ |
+| Auto-detection | Basic | Yes | Yes | Yes |
+| Exposure control | Limited | Yes | Yes | Yes |
+| Gain control | Limited | Yes | Yes | Yes |
+| Windows | ✅ | ✅ | ❌ | ✅ |
+| Linux | ✅ | ✅ | ✅ | ✅ |
+| macOS | ✅ | ❌ | ✅ | ✅ |
+
+### Detailed Backend Documentation
+
+- [Aravis Backend](aravis_backend.md) - GenICam/GigE cameras on Linux/macOS
+- GenTL Backend - Industrial cameras via vendor CTI files
+- OpenCV Backend - Universal webcam support
### Contributing New Camera Types
diff --git a/docs/features.md b/docs/features.md
new file mode 100644
index 0000000..5fd535d
--- /dev/null
+++ b/docs/features.md
@@ -0,0 +1,653 @@
+# DeepLabCut-live-GUI Features
+
+## Table of Contents
+
+- [Camera Control](#camera-control)
+- [Real-Time Pose Estimation](#real-time-pose-estimation)
+- [Video Recording](#video-recording)
+- [Configuration Management](#configuration-management)
+- [Processor System](#processor-system)
+- [User Interface](#user-interface)
+- [Performance Monitoring](#performance-monitoring)
+- [Advanced Features](#advanced-features)
+
+---
+
+## Camera Control
+
+### Multi-Backend Support
+
+The GUI supports four different camera backends, each optimized for different use cases:
+
+#### OpenCV Backend
+- **Platform**: Windows, Linux, macOS
+- **Best For**: Webcams, simple USB cameras
+- **Installation**: Built-in with OpenCV
+- **Limitations**: Limited exposure/gain control
+
+#### GenTL Backend (Harvesters)
+- **Platform**: Windows, Linux
+- **Best For**: Industrial cameras with GenTL producers
+- **Installation**: Requires vendor CTI files
+- **Features**: Full camera control, smart device detection
+
+#### Aravis Backend
+- **Platform**: Linux (best), macOS
+- **Best For**: GenICam/GigE Vision cameras
+- **Installation**: System packages (`gir1.2-aravis-0.8`)
+- **Features**: Excellent Linux support, native GigE
+
+#### Basler Backend (pypylon)
+- **Platform**: Windows, Linux, macOS
+- **Best For**: Basler cameras specifically
+- **Installation**: Pylon SDK + pypylon
+- **Features**: Vendor-specific optimizations
+
+### Camera Settings
+
+#### Frame Rate Control
+- Range: 1-240 FPS (hardware dependent)
+- Real-time FPS monitoring
+- Automatic camera validation
+
+#### Exposure Control
+- Auto mode (value = 0)
+- Manual mode (microseconds)
+- Range: 0-1,000,000 μs
+- Real-time adjustment (backend dependent)
+
+#### Gain Control
+- Auto mode (value = 0.0)
+- Manual mode (gain value)
+- Range: 0.0-100.0
+- Useful for low-light conditions
+
+#### Region of Interest (ROI) Cropping
+- Define crop region: (x0, y0, x1, y1)
+- Applied before recording and inference
+- Reduces processing load
+- Maintains aspect ratio
+
+#### Image Rotation
+- 0°, 90°, 180°, 270° rotation
+- Applied to all outputs
+- Useful for mounted cameras
+
+### Smart Camera Detection
+
+The GUI intelligently detects available cameras:
+
+1. **Backend-Specific**: Each backend reports available cameras
+2. **No Blind Probing**: GenTL and Aravis query actual device count
+3. **Fast Refresh**: Only check connected devices
+4. **Detailed Labels**: Shows vendor, model, serial number
+
+Example detection output:
+```
+[CameraDetection] Available cameras for backend 'gentl':
+ ['0:DMK 37BUX287 (26320523)', '1:Basler acA1920 (40123456)']
+```
+
+---
+
+## Real-Time Pose Estimation
+
+### DLCLive Integration
+
+#### Model Support
+- **TensorFlow (Base)**: Original DeepLabCut models
+- **PyTorch**: PyTorch-exported models
+- Model selection via dropdown
+- Automatic model validation
+
+#### Inference Pipeline
+1. **Frame Acquisition**: Camera thread → Queue
+2. **Preprocessing**: Crop, resize (optional)
+3. **Inference**: DLCLive model processing
+4. **Pose Output**: (x, y) coordinates per keypoint
+5. **Visualization**: Optional overlay on video
+
+#### Performance Metrics
+- **Inference FPS**: Actual processing rate
+- **Latency**: Time from capture to pose output
+ - Last latency (ms)
+ - Average latency (ms)
+- **Queue Status**: Frame buffer depth
+- **Dropped Frames**: Count of skipped frames
+
+### Pose Visualization
+
+#### Overlay Options
+- **Toggle**: "Display pose predictions" checkbox
+- **Keypoint Markers**: Green circles at (x, y) positions
+- **Real-Time Update**: Synchronized with video feed
+- **No Performance Impact**: Rendering optimized
+
+#### Bounding Box Visualization
+- **Purpose**: Visual ROI definition
+- **Configuration**: (x0, y0, x1, y1) coordinates
+- **Color**: Red rectangle overlay
+- **Use Cases**:
+ - Crop region preview
+ - Analysis area marking
+ - Multi-region tracking
+
+### Initialization Feedback
+
+Visual indicators during model loading:
+1. **"Initializing DLCLive!"** - Blue button during load
+2. **"DLCLive running!"** - Green button when ready
+3. Status bar updates with progress
+
+---
+
+## Video Recording
+
+### Recording Capabilities
+
+#### Hardware-Accelerated Encoding
+- **NVENC (NVIDIA)**: GPU-accelerated H.264/H.265
+ - Codecs: `h264_nvenc`, `hevc_nvenc`
+ - 10x faster than software encoding
+ - Minimal CPU usage
+- **Software Encoding**: CPU-based fallback
+ - Codecs: `libx264`, `libx265`
+ - Universal compatibility
+
+#### Container Formats
+- **MP4**: Most compatible, web-ready
+- **AVI**: Legacy support
+- **MOV**: Apple ecosystem
+
+#### Quality Control
+- **CRF (Constant Rate Factor)**: 0-51
+ - 0 = Lossless (huge files)
+ - 23 = Default (good quality)
+ - 28 = High compression
+ - 51 = Lowest quality
+- **Presets**: ultrafast, fast, medium, slow
+
+### Recording Features
+
+#### Timestamp Synchronization
+- Frame-accurate timestamps
+- Microsecond precision
+- Synchronized with pose data
+- Stored in separate files
+
+#### Performance Monitoring
+- **Write FPS**: Actual encoding rate
+- **Queue Size**: Buffer depth (~ms)
+- **Latency**: Encoding delay
+- **Frames Written/Enqueued**: Progress tracking
+- **Dropped Frames**: Quality indicator
+
+#### Buffer Management
+- Configurable queue size
+- Automatic overflow handling
+- Warning on frame drops
+- Backpressure indication
+
+### Auto-Recording Feature
+
+Processor-triggered recording:
+
+1. **Enable**: Check "Auto-record video on processor command"
+2. **Processor Control**: Custom processor sets recording flag
+3. **Automatic Start**: GUI starts recording when flag set
+4. **Session Naming**: Uses processor-defined session name
+5. **Automatic Stop**: GUI stops when flag cleared
+
+**Use Cases**:
+- Event-triggered recording
+- Trial-based experiments
+- Conditional data capture
+- Remote control via socket
+
+---
+
+## Configuration Management
+
+### Configuration File Structure
+
+Single JSON file contains all settings:
+
+```json
+{
+ "camera": { ... },
+ "dlc": { ... },
+ "recording": { ... },
+ "bbox": { ... }
+}
+```
+
+### Features
+
+#### Save/Load Operations
+- **Load**: File → Load configuration (Ctrl+O)
+- **Save**: File → Save configuration (Ctrl+S)
+- **Save As**: File → Save configuration as (Ctrl+Shift+S)
+- **Auto-sync**: GUI fields update from file
+
+#### Multiple Configurations
+- Switch between experiments quickly
+- Per-animal configurations
+- Environment-specific settings
+- Backup and version control
+
+#### Validation
+- Type checking on load
+- Default values for missing fields
+- Error messages for invalid entries
+- Safe fallback to defaults
+
+### Configuration Sections
+
+#### Camera Settings (`camera`)
+```json
+{
+ "name": "Camera 0",
+ "index": 0,
+ "fps": 60.0,
+ "backend": "gentl",
+ "exposure": 10000,
+ "gain": 5.0,
+ "crop_x0": 0,
+ "crop_y0": 0,
+ "crop_x1": 0,
+ "crop_y1": 0,
+ "max_devices": 3,
+ "properties": {}
+}
+```
+
+#### DLC Settings (`dlc`)
+```json
+{
+ "model_path": "/path/to/model",
+ "model_type": "base",
+ "additional_options": {
+ "resize": 0.5,
+ "processor": "cpu",
+ "pcutoff": 0.6
+ }
+}
+```
+
+#### Recording Settings (`recording`)
+```json
+{
+ "enabled": true,
+ "directory": "~/Videos/dlc",
+ "filename": "session.mp4",
+ "container": "mp4",
+ "codec": "h264_nvenc",
+ "crf": 23
+}
+```
+
+#### Bounding Box Settings (`bbox`)
+```json
+{
+ "enabled": false,
+ "x0": 0,
+ "y0": 0,
+ "x1": 200,
+ "y1": 100
+}
+```
+
+---
+
+## Processor System
+
+### Plugin Architecture
+
+Custom pose processors for real-time analysis and control.
+
+#### Processor Interface
+
+```python
+class MyProcessor:
+ """Custom processor example."""
+
+ def process(self, pose, timestamp):
+ """Process pose data in real-time.
+
+ Args:
+ pose: numpy array (n_keypoints, 3) - x, y, likelihood
+ timestamp: float - frame timestamp
+ """
+ # Extract keypoint positions
+ nose_x, nose_y = pose[0, :2]
+
+ # Custom logic
+ if nose_x > 320:
+ self.trigger_event()
+
+ # Return results (optional)
+ return {"position": (nose_x, nose_y)}
+```
+
+#### Loading Processors
+
+1. Place processor file in `dlclivegui/processors/`
+2. Click "Refresh" in processor dropdown
+3. Select processor from list
+4. Start inference to activate
+
+#### Built-in Processors
+
+**Socket Processor** (`dlc_processor_socket.py`):
+- TCP socket server for remote control
+- Commands: `START_RECORDING`, `STOP_RECORDING`
+- Session management
+- Multi-client support
+
+### Auto-Recording Integration
+
+Processors can control recording:
+
+```python
+class RecordingProcessor:
+ def __init__(self):
+ self._vid_recording = False
+ self.session_name = "default"
+
+ @property
+ def video_recording(self):
+ return self._vid_recording
+
+ def start_recording(self, session):
+ self.session_name = session
+ self._vid_recording = True
+
+ def stop_recording(self):
+ self._vid_recording = False
+```
+
+The GUI monitors `video_recording` property and automatically starts/stops recording.
+
+---
+
+## User Interface
+
+### Layout
+
+#### Control Panel (Left)
+- **Camera Settings**: Backend, index, FPS, exposure, gain, crop
+- **DLC Settings**: Model path, type, processor, options
+- **Recording Settings**: Path, filename, codec, quality
+- **Bounding Box**: Visualization controls
+
+#### Video Display (Right)
+- Live camera feed
+- Pose overlay (optional)
+- Bounding box overlay (optional)
+- Auto-scaling to window size
+
+#### Status Bar (Bottom)
+- Current operation status
+- Error messages
+- Success confirmations
+
+### Control Groups
+
+#### Camera Controls
+- Backend selection dropdown
+- Camera index/refresh
+- FPS, exposure, gain spinboxes
+- Crop coordinates
+- Rotation selector
+- **Start/Stop Preview** buttons
+
+#### DLC Controls
+- Model path browser
+- Model type selector
+- Processor folder/selection
+- Additional options (JSON)
+- **Start/Stop Inference** buttons
+- "Display pose predictions" checkbox
+- "Auto-record" checkbox
+- Processor status display
+
+#### Recording Controls
+- Output directory browser
+- Filename input
+- Container/codec selectors
+- CRF quality slider
+- **Start/Stop Recording** buttons
+
+### Visual Feedback
+
+#### Button States
+- **Disabled**: Gray, not clickable
+- **Enabled**: Default color, clickable
+- **Active**:
+ - Preview running: Stop button enabled
+ - Inference initializing: Blue "Initializing DLCLive!"
+ - Inference ready: Green "DLCLive running!"
+
+#### Status Indicators
+- Camera FPS (last 5 seconds)
+- DLC performance metrics
+- Recording statistics
+- Processor connection status
+
+---
+
+## Performance Monitoring
+
+### Real-Time Metrics
+
+#### Camera Metrics
+- **Throughput**: FPS over last 5 seconds
+- **Formula**: `(frame_count - 1) / time_elapsed`
+- **Display**: "45.2 fps (last 5 s)"
+
+#### DLC Metrics
+- **Inference FPS**: Poses processed per second
+- **Latency**:
+ - Last frame latency (ms)
+ - Average latency over session (ms)
+- **Queue**: Number of frames waiting
+- **Dropped**: Frames skipped due to queue full
+- **Format**: "150/152 frames | inference 42.1 fps | latency 23.5 ms (avg 24.1 ms) | queue 2 | dropped 2"
+
+#### Recording Metrics
+- **Write FPS**: Encoding rate
+- **Frames**: Written/Enqueued ratio
+- **Latency**: Encoding delay (ms)
+- **Buffer**: Queue size (~milliseconds)
+- **Dropped**: Encoding failures
+- **Format**: "1500/1502 frames | write 59.8 fps | latency 12.3 ms (avg 12.5 ms) | queue 5 (~83 ms) | dropped 2"
+
+### Performance Optimization
+
+#### Automatic Adjustments
+- Frame display throttling (25 Hz max)
+- Queue backpressure handling
+- Automatic resolution detection
+
+#### User Adjustments
+- Reduce camera FPS
+- Enable ROI cropping
+- Use hardware encoding
+- Increase CRF value
+- Disable pose visualization
+- Adjust buffer counts
+
+---
+
+## Advanced Features
+
+### Frame Synchronization
+
+All components share frame timestamps:
+- Camera controller generates timestamps
+- DLC processor preserves timestamps
+- Video recorder stores timestamps
+- Enables post-hoc alignment
+
+### Error Recovery
+
+#### Camera Connection Loss
+- Automatic detection via frame grab failure
+- User notification
+- Clean resource cleanup
+- Restart capability
+
+#### Recording Errors
+- Frame size mismatch detection
+- Automatic recovery with new settings
+- Warning display
+- No data loss
+
+### Thread Safety
+
+Multi-threaded architecture:
+- **Main Thread**: GUI event loop
+- **Camera Thread**: Frame acquisition
+- **DLC Thread**: Pose inference
+- **Recording Thread**: Video encoding
+
+Qt signals/slots ensure thread-safe communication.
+
+### Resource Management
+
+#### Automatic Cleanup
+- Camera release on stop/error
+- DLC model unload on stop
+- Recording finalization
+- Thread termination
+
+#### Memory Management
+- Bounded queues prevent memory leaks
+- Frame copy-on-write
+- Efficient numpy array handling
+
+### Extensibility
+
+#### Custom Backends
+Implement `CameraBackend` abstract class:
+```python
+class MyBackend(CameraBackend):
+ def open(self): ...
+ def read(self) -> Tuple[np.ndarray, float]: ...
+ def close(self): ...
+
+ @classmethod
+ def get_device_count(cls) -> int: ...
+```
+
+Register in `factory.py`:
+```python
+_BACKENDS = {
+ "mybackend": ("module.path", "MyBackend")
+}
+```
+
+#### Custom Processors
+Place in `processors/` directory:
+```python
+class MyProcessor:
+ def __init__(self, **kwargs):
+ # Initialize
+ pass
+
+ def process(self, pose, timestamp):
+ # Process pose
+ pass
+```
+
+### Debugging Features
+
+#### Logging
+- Console output for errors
+- Frame acquisition logging
+- Performance warnings
+- Connection status
+
+#### Development Mode
+- Syntax validation: `python -m compileall dlclivegui`
+- Type checking: `mypy dlclivegui`
+- Test files included
+
+---
+
+## Use Case Examples
+
+### High-Speed Behavior Tracking
+
+**Setup**:
+- Camera: GenTL industrial camera @ 120 FPS
+- Codec: h264_nvenc (GPU encoding)
+- Crop: Region of interest only
+- DLC: PyTorch model on GPU
+
+**Settings**:
+```json
+{
+ "camera": {"fps": 120, "crop_x0": 200, "crop_y0": 100, "crop_x1": 800, "crop_y1": 600},
+ "recording": {"codec": "h264_nvenc", "crf": 28},
+ "dlc": {"additional_options": {"processor": "gpu", "resize": 0.5}}
+}
+```
+
+### Event-Triggered Recording
+
+**Setup**:
+- Processor: Socket processor with auto-record
+- Trigger: Remote computer sends START/STOP commands
+- Session naming: Unique per trial
+
+**Workflow**:
+1. Enable "Auto-record video on processor command"
+2. Start preview and inference
+3. Remote system connects via socket
+4. Sends `START_RECORDING:trial_001` → recording starts
+5. Sends `STOP_RECORDING` → recording stops
+6. Files saved as `trial_001.mp4`
+
+### Multi-Camera Synchronization
+
+**Setup**:
+- Multiple GUI instances
+- Shared trigger signal
+- Synchronized filenames
+
+**Configuration**:
+Each instance with different camera index but same settings template.
+
+---
+
+## Keyboard Shortcuts
+
+- **Ctrl+O**: Load configuration
+- **Ctrl+S**: Save configuration
+- **Ctrl+Shift+S**: Save configuration as
+- **Ctrl+Q**: Quit application
+
+---
+
+## Platform-Specific Notes
+
+### Windows
+- Best GenTL support (vendor CTI files)
+- NVENC highly recommended
+- DirectShow backend for webcams
+
+### Linux
+- Best Aravis support (native GigE)
+- V4L2 backend for webcams
+- NVENC available with proprietary drivers
+
+### macOS
+- Limited industrial camera support
+- Aravis via Homebrew
+- Software encoding recommended
+
+### NVIDIA Jetson
+- Optimized for edge deployment
+- Hardware encoding available
+- Some Aravis compatibility issues
diff --git a/docs/install.md b/docs/install.md
index fa69ab4..24ef4f4 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -22,4 +22,4 @@ pip install deeplabcut-live-gui
First, please refer to our complete instructions for [installing DeepLabCut-Live! on a NVIDIA Jetson Development Kit](https://github.com/DeepLabCut/DeepLabCut-live/blob/master/docs/install_jetson.md).
-Next, install the DeepLabCut-live-GUI: `pip install deeplabcut-live-gui`.
\ No newline at end of file
+Next, install the DeepLabCut-live-GUI: `pip install deeplabcut-live-gui`.
diff --git a/docs/timestamp_format.md b/docs/timestamp_format.md
new file mode 100644
index 0000000..ac5e5a7
--- /dev/null
+++ b/docs/timestamp_format.md
@@ -0,0 +1,79 @@
+# Video Frame Timestamp Format
+
+When recording video, the application automatically saves frame timestamps to a JSON file alongside the video file.
+
+## File Naming
+
+For a video file named `recording_2025-10-23_143052.mp4`, the timestamp file will be:
+```
+recording_2025-10-23_143052.mp4_timestamps.json
+```
+
+## JSON Structure
+
+```json
+{
+ "video_file": "recording_2025-10-23_143052.mp4",
+ "num_frames": 1500,
+ "timestamps": [
+ 1729693852.123456,
+ 1729693852.156789,
+ 1729693852.190123,
+ ...
+ ],
+ "start_time": 1729693852.123456,
+ "end_time": 1729693902.123456,
+ "duration_seconds": 50.0
+}
+```
+
+## Fields
+
+- **video_file**: Name of the associated video file
+- **num_frames**: Total number of frames recorded
+- **timestamps**: Array of Unix timestamps (seconds since epoch with microsecond precision) for each frame
+- **start_time**: Timestamp of the first frame
+- **end_time**: Timestamp of the last frame
+- **duration_seconds**: Total recording duration in seconds
+
+## Usage
+
+The timestamps correspond to the exact time each frame was captured by the camera (from `FrameData.timestamp`). This allows precise synchronization with:
+
+- DLC pose estimation results
+- External sensors or triggers
+- Other data streams recorded during the same session
+
+## Example: Loading Timestamps in Python
+
+```python
+import json
+from datetime import datetime
+
+# Load timestamps
+with open('recording_2025-10-23_143052.mp4_timestamps.json', 'r') as f:
+ data = json.load(f)
+
+print(f"Video: {data['video_file']}")
+print(f"Total frames: {data['num_frames']}")
+print(f"Duration: {data['duration_seconds']:.2f} seconds")
+
+# Convert first timestamp to human-readable format
+start_dt = datetime.fromtimestamp(data['start_time'])
+print(f"Recording started: {start_dt.isoformat()}")
+
+# Calculate average frame rate
+avg_fps = data['num_frames'] / data['duration_seconds']
+print(f"Average FPS: {avg_fps:.2f}")
+
+# Access individual frame timestamps
+for frame_idx, timestamp in enumerate(data['timestamps']):
+ print(f"Frame {frame_idx}: {timestamp}")
+```
+
+## Notes
+
+- Timestamps use `time.time()` which returns Unix epoch time with high precision
+- Frame timestamps are captured when frames arrive from the camera, before any processing
+- If frames are dropped due to queue overflow, those frames will not have timestamps in the array
+- The timestamp array length should match the number of frames in the video file
diff --git a/docs/user_guide.md b/docs/user_guide.md
new file mode 100644
index 0000000..289bfb8
--- /dev/null
+++ b/docs/user_guide.md
@@ -0,0 +1,633 @@
+# DeepLabCut-live-GUI User Guide
+
+Complete walkthrough for using the DeepLabCut-live-GUI application.
+
+## Table of Contents
+
+1. [Getting Started](#getting-started)
+2. [Camera Setup](#camera-setup)
+3. [DLCLive Configuration](#dlclive-configuration)
+4. [Recording Videos](#recording-videos)
+5. [Working with Configurations](#working-with-configurations)
+6. [Common Workflows](#common-workflows)
+7. [Tips and Best Practices](#tips-and-best-practices)
+
+---
+
+## Getting Started
+
+### First Launch
+
+1. Open a terminal/command prompt
+2. Run the application:
+ ```bash
+ dlclivegui
+ ```
+3. The main window will appear with three control panels and a video display area
+
+### Interface Overview
+
+```
+┌─────────────────────────────────────────────────────┐
+│ File Help │
+├─────────────┬───────────────────────────────────────┤
+│ Camera │ │
+│ Settings │ │
+│ │ │
+│ ─────────── │ Video Display │
+│ DLCLive │ │
+│ Settings │ │
+│ │ │
+│ ─────────── │ │
+│ Recording │ │
+│ Settings │ │
+│ │ │
+│ ─────────── │ │
+│ Bounding │ │
+│ Box │ │
+│ │ │
+│ ─────────── │ │
+│ [Preview] │ │
+│ [Stop] │ │
+└─────────────┴───────────────────────────────────────┘
+│ Status: Ready │
+└─────────────────────────────────────────────────────┘
+```
+
+---
+
+## Camera Setup
+
+### Step 1: Select Camera Backend
+
+The **Backend** dropdown shows available camera drivers:
+
+| Backend | When to Use |
+|---------|-------------|
+| **opencv** | Webcams, USB cameras (universal) |
+| **gentl** | Industrial cameras (Windows/Linux) |
+| **aravis** | GenICam/GigE cameras (Linux/macOS) |
+| **basler** | Basler cameras specifically |
+
+**Note**: Unavailable backends appear grayed out. Install required drivers to enable them.
+
+### Step 2: Select Camera
+
+1. Click **Refresh** next to the camera dropdown
+2. Wait for camera detection (1-3 seconds)
+3. Select your camera from the dropdown
+
+The list shows camera details:
+```
+0:DMK 37BUX287 (26320523)
+│ │ └─ Serial Number
+│ └─ Model Name
+└─ Index
+```
+
+### Step 3: Configure Camera Parameters
+
+#### Frame Rate
+- **Range**: 1-240 FPS (hardware dependent)
+- **Recommendation**: Start with 30 FPS, increase as needed
+- **Note**: Higher FPS = more processing load
+
+#### Exposure Time
+- **Auto**: Set to 0 (default)
+- **Manual**: Microseconds (e.g., 10000 = 10ms)
+- **Tips**:
+ - Shorter exposure = less motion blur
+ - Longer exposure = better low-light performance
+ - Typical range: 5,000-30,000 μs
+
+#### Gain
+- **Auto**: Set to 0.0 (default)
+- **Manual**: 0.0-100.0
+- **Tips**:
+ - Higher gain = brighter image but more noise
+ - Start low (5-10) and increase if needed
+ - Auto mode works well for most cases
+
+#### Cropping (Optional)
+Reduce frame size for faster processing:
+
+1. Set crop region: (x0, y0, x1, y1)
+ - x0, y0: Top-left corner
+ - x1, y1: Bottom-right corner
+2. Use Bounding Box visualization to preview
+3. Set all to 0 to disable cropping
+
+**Example**: Crop to center 640x480 region of 1280x720 camera:
+```
+x0: 320
+y0: 120
+x1: 960
+y1: 600
+```
+
+#### Rotation
+Select if camera is mounted at an angle:
+- 0° (default)
+- 90° (rotated right)
+- 180° (upside down)
+- 270° (rotated left)
+
+### Step 4: Start Camera Preview
+
+1. Click **Start Preview**
+2. Video feed should appear in the display area
+3. Check the **Throughput** metric below camera settings
+4. Verify frame rate matches expected value
+
+**Troubleshooting**:
+- **No preview**: Check camera connection and permissions
+- **Low FPS**: Reduce resolution or increase exposure time
+- **Black screen**: Check exposure settings
+- **Distorted image**: Verify backend compatibility
+
+---
+
+## DLCLive Configuration
+
+### Prerequisites
+
+1. Exported DLCLive model (see DLC documentation)
+2. DeepLabCut-live installed (`pip install deeplabcut-live`)
+3. Camera preview running
+
+### Step 1: Select Model
+
+1. Click **Browse** next to "Model directory"
+2. Navigate to your exported DLCLive model folder
+3. Select the folder containing:
+ - `pose_cfg.yaml`
+ - Model weights (`.pb`, `.pth`, etc.)
+
+### Step 2: Choose Model Type
+
+Select from dropdown:
+- **Base (TensorFlow)**: Standard DLC models
+- **PyTorch**: PyTorch-based models (requires PyTorch)
+
+### Step 3: Configure Options (Optional)
+
+Click in "Additional options" field and enter JSON:
+
+```json
+{
+ "processor": "gpu",
+ "resize": 0.5,
+ "pcutoff": 0.6
+}
+```
+
+**Common options**:
+- `processor`: "cpu" or "gpu"
+- `resize`: Scale factor (0.5 = half size)
+- `pcutoff`: Likelihood threshold
+- `cropping`: Crop before inference
+
+### Step 4: Select Processor (Optional)
+
+If using custom pose processors:
+
+1. Click **Browse** next to "Processor folder" (or use default)
+2. Click **Refresh** to scan for processors
+3. Select processor from dropdown
+4. Processor will activate when inference starts
+
+### Step 5: Start Inference
+
+1. Ensure camera preview is running
+2. Click **Start pose inference**
+3. Button changes to "Initializing DLCLive!" (blue)
+4. Wait for model loading (5-30 seconds)
+5. Button changes to "DLCLive running!" (green)
+6. Check **Performance** metrics
+
+**Performance Metrics**:
+```
+150/152 frames | inference 42.1 fps | latency 23.5 ms (avg 24.1 ms) | queue 2 | dropped 2
+```
+- **150/152**: Processed/Total frames
+- **inference 42.1 fps**: Processing rate
+- **latency 23.5 ms**: Current processing delay
+- **queue 2**: Frames waiting
+- **dropped 2**: Skipped frames (due to full queue)
+
+### Step 6: Enable Visualization (Optional)
+
+Check **"Display pose predictions"** to overlay keypoints on video.
+
+- Keypoints appear as green circles
+- Updates in real-time with video
+- Can be toggled during inference
+
+---
+
+## Recording Videos
+
+### Basic Recording
+
+1. **Configure output path**:
+ - Click **Browse** next to "Output directory"
+ - Select or create destination folder
+
+2. **Set filename**:
+ - Enter base filename (e.g., "session_001")
+ - Extension added automatically based on container
+
+3. **Select format**:
+ - **Container**: mp4 (recommended), avi, mov
+ - **Codec**:
+ - `h264_nvenc` (NVIDIA GPU - fastest)
+ - `libx264` (CPU - universal)
+ - `hevc_nvenc` (NVIDIA H.265)
+
+4. **Set quality** (CRF slider):
+ - 0-17: Very high quality, large files
+ - 18-23: High quality (recommended)
+ - 24-28: Medium quality, smaller files
+ - 29-51: Lower quality, smallest files
+
+5. **Start recording**:
+ - Ensure camera preview is running
+ - Click **Start recording**
+ - **Stop recording** button becomes enabled
+
+6. **Monitor performance**:
+ - Check "Performance" metrics
+ - Watch for dropped frames
+ - Verify write FPS matches camera FPS
+
+### Advanced Recording Options
+
+#### High-Speed Recording (60+ FPS)
+
+**Settings**:
+- Codec: `h264_nvenc` (requires NVIDIA GPU)
+- CRF: 28 (higher compression)
+- Crop region: Reduce frame size
+- Close other applications
+
+#### High-Quality Recording
+
+**Settings**:
+- Codec: `libx264` or `h264_nvenc`
+- CRF: 18-20
+- Full resolution
+- Sufficient disk space
+
+#### Long Duration Recording
+
+**Tips**:
+- Use CRF 23-25 to balance quality/size
+- Monitor disk space
+- Consider splitting into multiple files
+- Use fast SSD storage
+
+### Auto-Recording
+
+Enable automatic recording triggered by processor events:
+
+1. **Select a processor** that supports auto-recording
+2. **Enable**: Check "Auto-record video on processor command"
+3. **Start inference**: Processor will control recording
+4. **Session management**: Files named by processor
+
+**Use cases**:
+- Trial-based experiments
+- Event-triggered recording
+- Remote control via socket processor
+- Conditional data capture
+
+---
+
+## Working with Configurations
+
+### Saving Current Settings
+
+**Save** (overwrites existing file):
+1. File → Save configuration (or Ctrl+S)
+2. If no file loaded, prompts for location
+
+**Save As** (create new file):
+1. File → Save configuration as… (or Ctrl+Shift+S)
+2. Choose location and filename
+3. Enter name (e.g., `mouse_experiment.json`)
+4. Click Save
+
+### Loading Saved Settings
+
+1. File → Load configuration… (or Ctrl+O)
+2. Navigate to configuration file
+3. Select `.json` file
+4. Click Open
+5. All GUI fields update automatically
+
+### Managing Multiple Configurations
+
+**Recommended structure**:
+```
+configs/
+├── default.json # Base settings
+├── mouse_arena1.json # Arena-specific
+├── mouse_arena2.json
+├── rat_setup.json
+└── high_speed.json # Performance-specific
+```
+
+**Workflow**:
+1. Create base configuration with common settings
+2. Save variants for different:
+ - Animals/subjects
+ - Experimental setups
+ - Camera positions
+ - Recording quality levels
+
+### Configuration Templates
+
+#### Webcam + CPU Processing
+```json
+{
+ "camera": {
+ "backend": "opencv",
+ "index": 0,
+ "fps": 30.0
+ },
+ "dlc": {
+ "model_type": "base",
+ "additional_options": {"processor": "cpu"}
+ },
+ "recording": {
+ "codec": "libx264",
+ "crf": 23
+ }
+}
+```
+
+#### Industrial Camera + GPU
+```json
+{
+ "camera": {
+ "backend": "gentl",
+ "index": 0,
+ "fps": 60.0,
+ "exposure": 10000,
+ "gain": 8.0
+ },
+ "dlc": {
+ "model_type": "pytorch",
+ "additional_options": {
+ "processor": "gpu",
+ "resize": 0.5
+ }
+ },
+ "recording": {
+ "codec": "h264_nvenc",
+ "crf": 23
+ }
+}
+```
+
+---
+
+## Common Workflows
+
+### Workflow 1: Simple Webcam Tracking
+
+**Goal**: Track mouse behavior with webcam
+
+1. **Camera Setup**:
+ - Backend: opencv
+ - Camera: Built-in webcam (index 0)
+ - FPS: 30
+
+2. **Start Preview**: Verify mouse is visible
+
+3. **Load DLC Model**: Browse to mouse tracking model
+
+4. **Start Inference**: Enable pose estimation
+
+5. **Verify Tracking**: Enable pose visualization
+
+6. **Record Trial**: Start/stop recording as needed
+
+### Workflow 2: High-Speed Industrial Camera
+
+**Goal**: Track fast movements at 120 FPS
+
+1. **Camera Setup**:
+ - Backend: gentl or aravis
+ - Refresh and select camera
+ - FPS: 120
+ - Exposure: 4000 μs (short exposure)
+ - Crop: Region of interest only
+
+2. **Start Preview**: Check FPS is stable
+
+3. **Configure Recording**:
+ - Codec: h264_nvenc
+ - CRF: 28
+ - Output: Fast SSD
+
+4. **Load DLC Model** (if needed):
+ - PyTorch model
+ - GPU processor
+ - Resize: 0.5 (reduce load)
+
+5. **Start Recording**: Begin data capture
+
+6. **Monitor Performance**: Watch for dropped frames
+
+### Workflow 3: Event-Triggered Recording
+
+**Goal**: Record only during specific events
+
+1. **Camera Setup**: Configure as normal
+
+2. **Processor Setup**:
+ - Select socket processor
+ - Enable "Auto-record video on processor command"
+
+3. **Start Preview**: Camera running
+
+4. **Start Inference**: DLC + processor active
+
+5. **Remote Control**:
+ - Connect to socket (default port 5000)
+ - Send `START_RECORDING:trial_001`
+ - Recording starts automatically
+ - Send `STOP_RECORDING`
+ - Recording stops, file saved
+
+### Workflow 4: Multi-Subject Tracking
+
+**Goal**: Track multiple animals simultaneously
+
+**Option A: Single Camera, Multiple Keypoints**
+1. Use DLC model trained for multiple subjects
+2. Single GUI instance
+3. Processor distinguishes subjects
+
+**Option B: Multiple Cameras**
+1. Launch multiple GUI instances
+2. Each with different camera index
+3. Synchronized configurations
+4. Coordinated filenames
+
+---
+
+## Tips and Best Practices
+
+### Camera Tips
+
+1. **Lighting**:
+ - Consistent, diffuse lighting
+ - Avoid shadows and reflections
+ - IR lighting for night vision
+
+2. **Positioning**:
+ - Stable mount (minimize vibration)
+ - Appropriate angle for markers
+ - Sufficient field of view
+
+3. **Settings**:
+ - Start with auto exposure/gain
+ - Adjust manually if needed
+ - Test different FPS rates
+ - Use cropping to reduce load
+
+### Recording Tips
+
+1. **File Management**:
+ - Use descriptive filenames
+ - Include date/subject/trial info
+ - Organize by experiment/session
+ - Regular backups
+
+2. **Performance**:
+ - Close unnecessary applications
+ - Monitor disk space
+ - Use SSD for high-speed recording
+ - Enable GPU encoding if available
+
+3. **Quality**:
+ - Test CRF values beforehand
+ - Balance quality vs. file size
+ - Consider post-processing needs
+ - Verify recordings occasionally
+
+### DLCLive Tips
+
+1. **Model Selection**:
+ - Use model trained on similar conditions
+ - Test offline before live use
+ - Consider resize for speed
+ - GPU highly recommended
+
+2. **Performance**:
+ - Monitor inference FPS
+ - Check latency values
+ - Watch queue depth
+ - Reduce resolution if needed
+
+3. **Validation**:
+ - Enable visualization initially
+ - Verify tracking quality
+ - Check all keypoints
+ - Test edge cases
+
+### General Best Practices
+
+1. **Configuration Management**:
+ - Save configurations frequently
+ - Version control config files
+ - Document custom settings
+ - Share team configurations
+
+2. **Testing**:
+ - Test setup before experiments
+ - Run trial recordings
+ - Verify all components
+ - Check file outputs
+
+3. **Troubleshooting**:
+ - Check status messages
+ - Monitor performance metrics
+ - Review error dialogs carefully
+ - Restart if issues persist
+
+4. **Data Organization**:
+ - Consistent naming scheme
+ - Separate folders per session
+ - Include metadata files
+ - Regular data validation
+
+---
+
+## Troubleshooting Guide
+
+### Camera Issues
+
+**Problem**: Camera not detected
+- **Solution**: Click Refresh, check connections, verify drivers
+
+**Problem**: Low frame rate
+- **Solution**: Reduce resolution, increase exposure, check CPU usage
+
+**Problem**: Image too dark/bright
+- **Solution**: Adjust exposure and gain settings
+
+### DLCLive Issues
+
+**Problem**: Model fails to load
+- **Solution**: Verify path, check model type, install dependencies
+
+**Problem**: Slow inference
+- **Solution**: Enable GPU, reduce resolution, use resize option
+
+**Problem**: Poor tracking
+- **Solution**: Check lighting, enable visualization, verify model quality
+
+### Recording Issues
+
+**Problem**: Dropped frames
+- **Solution**: Use GPU encoding, increase CRF, reduce FPS
+
+**Problem**: Large file sizes
+- **Solution**: Increase CRF value, use better codec
+
+**Problem**: Recording won't start
+- **Solution**: Check disk space, verify path permissions
+
+---
+
+## Keyboard Reference
+
+| Action | Shortcut |
+|--------|----------|
+| Load configuration | Ctrl+O |
+| Save configuration | Ctrl+S |
+| Save configuration as | Ctrl+Shift+S |
+| Quit application | Ctrl+Q |
+
+---
+
+## Next Steps
+
+- Explore [Features Documentation](features.md) for detailed capabilities
+- Review [Camera Backend Guide](camera_support.md) for advanced setup
+- Check [Processor System](PLUGIN_SYSTEM.md) for custom processing
+- See [Aravis Backend](aravis_backend.md) for Linux industrial cameras
+
+---
+
+## Getting Help
+
+If you encounter issues:
+1. Check status messages in GUI
+2. Review this user guide
+3. Consult technical documentation
+4. Check GitHub issues
+5. Contact support team
From ddcbc419350baec4e755b1ca36fb64a768753a04 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 28 Oct 2025 15:34:36 +0100
Subject: [PATCH 015/132] update dlc_processor, fix filtering
---
dlclivegui/processors/dlc_processor_socket.py | 58 ++++++++++++++++---
1 file changed, 49 insertions(+), 9 deletions(-)
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index fb6522c..3ab5866 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -1,5 +1,6 @@
import logging
import pickle
+import socket
import time
from collections import deque
from math import acos, atan2, copysign, degrees, pi, sqrt
@@ -7,7 +8,7 @@
from threading import Event, Thread
import numpy as np
-from dlclive import Processor
+from dlclive import Processor # type: ignore
LOG = logging.getLogger("dlc_processor_socket")
LOG.setLevel(logging.INFO)
@@ -42,7 +43,8 @@ def exponential_smoothing(alpha, x, x_prev):
def __call__(self, t, x):
t_e = t - self.t_prev
-
+ if t_e <= 0:
+ return x
a_d = self.smoothing_factor(t_e, self.d_cutoff)
dx = (x - self.x_prev) / t_e
dx_hat = self.exponential_smoothing(a_d, dx, self.dx_prev)
@@ -223,6 +225,31 @@ def _handle_client_message(self, msg):
self._vid_recording.set()
LOG.info("Start video recording command received")
+ elif cmd == "set_filter":
+ # Handle filter enable/disable (subclasses override if they support filtering)
+ use_filter = msg.get("use_filter", False)
+ if hasattr(self, 'use_filter'):
+ self.use_filter = bool(use_filter)
+ # Reset filters to reinitialize with new setting
+ if hasattr(self, 'filters'):
+ self.filters = None
+ LOG.info(f"Filtering {'enabled' if use_filter else 'disabled'}")
+ else:
+ LOG.warning("set_filter command not supported by this processor")
+
+ elif cmd == "set_filter_params":
+ # Handle filter parameter updates (subclasses override if they support filtering)
+ filter_kwargs = msg.get("filter_kwargs", {})
+ if hasattr(self, 'filter_kwargs'):
+ # Update filter parameters
+ self.filter_kwargs.update(filter_kwargs)
+ # Reset filters to reinitialize with new parameters
+ if hasattr(self, 'filters'):
+ self.filters = None
+ LOG.info(f"Filter parameters updated: {filter_kwargs}")
+ else:
+ LOG.warning("set_filter_params command not supported by this processor")
+
def _clear_data_queues(self):
"""Clear all data storage queues. Override in subclasses to clear additional queues."""
self.time_stamp.clear()
@@ -286,17 +313,30 @@ def process(self, pose, **kwargs):
def stop(self):
"""Stop the processor and close all connections."""
+ LOG.info("Stopping processor...")
+
+ # Signal stop to all threads
self._stop.set()
- try:
- self.listener.close()
- except Exception:
- pass
+
+ # Close all client connections first
for c in list(self.conns):
try:
c.close()
except Exception:
pass
self.conns.discard(c)
+
+ # Close the listener socket
+ if hasattr(self, 'listener') and self.listener:
+ try:
+ self.listener.close()
+ except Exception as e:
+ LOG.debug(f"Error closing listener: {e}")
+
+ # Give the OS time to release the socket on Windows
+ # This prevents WinError 10048 when restarting
+ time.sleep(0.1)
+
LOG.info("Processor stopped, all connections closed")
def save(self, file=None):
@@ -306,7 +346,7 @@ def save(self, file=None):
LOG.info(f"Saving data to {file}")
try:
save_dict = self.get_data()
- pickle.dump(save_dict, open(file, "wb"))
+ pickle.dump(save_dict, open(file, "wb"))
save_code = 1
except Exception as e:
LOG.error(f"Save failed: {e}")
@@ -383,7 +423,7 @@ def __init__(
authkey=b"secret password",
use_perf_counter=False,
use_filter=False,
- filter_kwargs=None,
+ filter_kwargs={},
save_original=False,
):
"""
@@ -412,7 +452,7 @@ def __init__(
# Filtering
self.use_filter = use_filter
- self.filter_kwargs = filter_kwargs or {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0}
+ self.filter_kwargs = filter_kwargs
self.filters = None # Will be initialized on first pose
def _clear_data_queues(self):
From e2ff610eca9e918fb2cd9c32ad93e765bcbb8df2 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Wed, 29 Oct 2025 18:33:31 +0100
Subject: [PATCH 016/132] setting frame resolution
---
dlclivegui/cameras/gentl_backend.py | 81 ++++++++++++++++++++++++++--
dlclivegui/cameras/opencv_backend.py | 37 +++++++++++--
2 files changed, 112 insertions(+), 6 deletions(-)
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 701d4fd..7e81f84 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -48,6 +48,10 @@ def __init__(self, settings):
self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(
props.get("cti_search_paths")
)
+ # Parse resolution (width, height) with defaults
+ self._resolution: Optional[Tuple[int, int]] = self._parse_resolution(
+ props.get("resolution")
+ )
self._harvester = None
self._acquirer = None
@@ -232,6 +236,27 @@ def _parse_crop(self, crop) -> Optional[Tuple[int, int, int, int]]:
return tuple(int(v) for v in crop)
return None
+ def _parse_resolution(self, resolution) -> Optional[Tuple[int, int]]:
+ """Parse resolution setting.
+
+ Args:
+ resolution: Can be a tuple/list [width, height], or None
+
+ Returns:
+ Tuple of (width, height) or None if not specified
+ Default is (720, 540) if parsing fails but value is provided
+ """
+ if resolution is None:
+ return (720, 540) # Default resolution
+
+ if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
+ try:
+ return (int(resolution[0]), int(resolution[1]))
+ except (ValueError, TypeError):
+ return (720, 540)
+
+ return (720, 540)
+
@staticmethod
def _search_cti_file(patterns: Tuple[str, ...]) -> Optional[str]:
"""Search for a CTI file using the given patterns.
@@ -318,9 +343,59 @@ def _configure_pixel_format(self, node_map) -> None:
pass
def _configure_resolution(self, node_map) -> None:
- # Don't configure width/height - use camera's native resolution
- # Width and height will be determined from actual frames
- pass
+ """Configure camera resolution (width and height)."""
+ if self._resolution is None:
+ return
+
+ width, height = self._resolution
+
+ # Try to set width
+ for width_attr in ("Width", "WidthMax"):
+ try:
+ node = getattr(node_map, width_attr)
+ if width_attr == "Width":
+ # Get constraints
+ try:
+ min_w = node.min
+ max_w = node.max
+ inc_w = getattr(node, 'inc', 1)
+ # Adjust to valid value
+ width = self._adjust_to_increment(width, min_w, max_w, inc_w)
+ node.value = int(width)
+ break
+ except Exception:
+ # Try setting without adjustment
+ try:
+ node.value = int(width)
+ break
+ except Exception:
+ continue
+ except AttributeError:
+ continue
+
+ # Try to set height
+ for height_attr in ("Height", "HeightMax"):
+ try:
+ node = getattr(node_map, height_attr)
+ if height_attr == "Height":
+ # Get constraints
+ try:
+ min_h = node.min
+ max_h = node.max
+ inc_h = getattr(node, 'inc', 1)
+ # Adjust to valid value
+ height = self._adjust_to_increment(height, min_h, max_h, inc_h)
+ node.value = int(height)
+ break
+ except Exception:
+ # Try setting without adjustment
+ try:
+ node.value = int(height)
+ break
+ except Exception:
+ continue
+ except AttributeError:
+ continue
def _configure_exposure(self, node_map) -> None:
if self._exposure is None:
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index f4ee01a..7face8f 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -17,6 +17,10 @@ class OpenCVCameraBackend(CameraBackend):
def __init__(self, settings):
super().__init__(settings)
self._capture: cv2.VideoCapture | None = None
+ # Parse resolution with defaults (720x540)
+ self._resolution: Tuple[int, int] = self._parse_resolution(
+ settings.properties.get("resolution")
+ )
def open(self) -> None:
backend_flag = self._resolve_backend(self.settings.properties.get("api"))
@@ -77,22 +81,49 @@ def device_name(self) -> str:
base_name = backend_name
return f"{base_name} camera #{self.settings.index}"
+ def _parse_resolution(self, resolution) -> Tuple[int, int]:
+ """Parse resolution setting.
+
+ Args:
+ resolution: Can be a tuple/list [width, height], or None
+
+ Returns:
+ Tuple of (width, height), defaults to (720, 540)
+ """
+ if resolution is None:
+ return (720, 540) # Default resolution
+
+ if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
+ try:
+ return (int(resolution[0]), int(resolution[1]))
+ except (ValueError, TypeError):
+ return (720, 540)
+
+ return (720, 540)
+
def _configure_capture(self) -> None:
if self._capture is None:
return
- # Don't set width/height - capture at camera's native resolution
- # Only set FPS if specified
+
+ # Set resolution (width x height)
+ width, height = self._resolution
+ self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width))
+ self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height))
+
+ # Set FPS if specified
if self.settings.fps:
self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
+
# Set any additional properties from the properties dict
for prop, value in self.settings.properties.items():
- if prop == "api":
+ if prop in ("api", "resolution"):
continue
try:
prop_id = int(prop)
except (TypeError, ValueError):
continue
self._capture.set(prop_id, float(value))
+
# Update actual FPS from camera
actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
if actual_fps:
From 44de72325f5439caf6d4c7a7ee308395b4572fb8 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 4 Nov 2025 11:13:28 +0100
Subject: [PATCH 017/132] updated to look for model files
---
dlclivegui/gui.py | 12 +-
dlclivegui/processors/dlc_processor_socket.py | 213 ++++++++++++++++++
docs/features.md | 26 +--
docs/user_guide.md | 2 +-
4 files changed, 233 insertions(+), 20 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index bd3bee7..efc4b35 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -56,7 +56,7 @@
logging.basicConfig(level=logging.INFO)
-PATH2MODELS = "C:\\Users\\User\\Repos\\DeepLabCut-live-GUI\\models"
+PATH2MODELS = "C:\\Users\\User\\Repos\\DeepLabCut-live-GUI\\dlc_training\\dlclive"
class MainWindow(QMainWindow):
@@ -266,7 +266,7 @@ def _build_dlc_group(self) -> QGroupBox:
self.model_type_combo = QComboBox()
self.model_type_combo.addItem("Base (TensorFlow)", "base")
self.model_type_combo.addItem("PyTorch", "pytorch")
- self.model_type_combo.setCurrentIndex(0) # Default to base
+ self.model_type_combo.setCurrentIndex(1) # Default to PyTorch
form.addRow("Model type", self.model_type_combo)
# Processor selection
@@ -729,11 +729,11 @@ def _save_config_to_path(self, path: Path) -> None:
self.statusBar().showMessage(f"Saved configuration to {path}", 5000)
def _action_browse_model(self) -> None:
- directory = QFileDialog.getExistingDirectory(
- self, "Select DLCLive model directory", PATH2MODELS
+ file_path, _ = QFileDialog.getOpenFileName(
+ self, "Select DLCLive model file", PATH2MODELS, "Model files (*.pt *.pb);;All files (*.*)"
)
- if directory:
- self.model_path_edit.setText(directory)
+ if file_path:
+ self.model_path_edit.setText(file_path)
def _action_browse_directory(self) -> None:
directory = QFileDialog.getExistingDirectory(
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index 3ab5866..9215c5e 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -574,11 +574,224 @@ def get_data(self):
save_dict["filter_kwargs"] = self.filter_kwargs
return save_dict
+
+
+class MyProcessorTorchmodels_socket(BaseProcessor_socket):
+ """
+ DLC Processor with pose calculations (center, heading, head angle) and optional filtering.
+
+ Calculates:
+ - center: Weighted average of head keypoints
+ - heading: Body orientation (degrees)
+ - head_angle: Head rotation relative to body (radians)
+
+ Broadcasts: [timestamp, center_x, center_y, heading, head_angle]
+ """
+
+ # Metadata for GUI discovery
+ PROCESSOR_NAME = "Mouse Pose with less keypoints"
+ PROCESSOR_DESCRIPTION = (
+ "Calculates mouse center, heading, and head angle with optional One-Euro filtering"
+ )
+ PROCESSOR_PARAMS = {
+ "bind": {
+ "type": "tuple",
+ "default": ("0.0.0.0", 6000),
+ "description": "Server address (host, port)",
+ },
+ "authkey": {
+ "type": "bytes",
+ "default": b"secret password",
+ "description": "Authentication key for clients",
+ },
+ "use_perf_counter": {
+ "type": "bool",
+ "default": False,
+ "description": "Use time.perf_counter() instead of time.time()",
+ },
+ "use_filter": {
+ "type": "bool",
+ "default": False,
+ "description": "Apply One-Euro filter to calculated values",
+ },
+ "filter_kwargs": {
+ "type": "dict",
+ "default": {"min_cutoff": 1.0, "beta": 0.02, "d_cutoff": 1.0},
+ "description": "One-Euro filter parameters (min_cutoff, beta, d_cutoff)",
+ },
+ "save_original": {
+ "type": "bool",
+ "default": False,
+ "description": "Save raw pose arrays for analysis",
+ },
+ }
+
+ def __init__(
+ self,
+ bind=("0.0.0.0", 6000),
+ authkey=b"secret password",
+ use_perf_counter=False,
+ use_filter=False,
+ filter_kwargs={},
+ save_original=False,
+ ):
+ """
+ DLC Processor with multi-client broadcasting support.
+
+ Args:
+ bind: (host, port) tuple for server binding
+ authkey: Authentication key for client connections
+ use_perf_counter: If True, use time.perf_counter() instead of time.time()
+ use_filter: If True, apply One-Euro filter to pose data
+ filter_kwargs: Dict with OneEuroFilter parameters (min_cutoff, beta, d_cutoff)
+ save_original: If True, save raw pose arrays
+ """
+ super().__init__(
+ bind=bind,
+ authkey=authkey,
+ use_perf_counter=use_perf_counter,
+ save_original=save_original,
+ )
+
+ # Additional data storage for processed values
+ self.center_x = deque()
+ self.center_y = deque()
+ self.heading_direction = deque()
+ self.head_angle = deque()
+
+ # Filtering
+ self.use_filter = use_filter
+ self.filter_kwargs = filter_kwargs
+ self.filters = None # Will be initialized on first pose
+
+ def _clear_data_queues(self):
+ """Clear all data storage queues including pose-specific ones."""
+ super()._clear_data_queues()
+ self.center_x.clear()
+ self.center_y.clear()
+ self.heading_direction.clear()
+ self.head_angle.clear()
+
+ def _initialize_filters(self, vals):
+ """Initialize One-Euro filters for each output variable."""
+ t0 = self.timing_func()
+ self.filters = {
+ "center_x": OneEuroFilter(t0, vals[0], **self.filter_kwargs),
+ "center_y": OneEuroFilter(t0, vals[1], **self.filter_kwargs),
+ "heading": OneEuroFilter(t0, vals[2], **self.filter_kwargs),
+ "head_angle": OneEuroFilter(t0, vals[3], **self.filter_kwargs),
+ }
+ LOG.debug(f"Initialized One-Euro filters with parameters: {self.filter_kwargs}")
+
+ def process(self, pose, **kwargs):
+ """
+ Process pose: calculate center/heading/head_angle, optionally filter, and broadcast.
+
+ Args:
+ pose: DLC pose array (N_keypoints x 3) with [x, y, confidence]
+ **kwargs: Additional metadata (frame_time, pose_time, etc.)
+
+ Returns:
+ pose: Unmodified pose array
+ """
+ # Save original pose if requested (from base class)
+ if self.save_original:
+ self.original_pose.append(pose.copy())
+
+ # Extract keypoints and confidence
+ xy = pose[:, :2]
+ conf = pose[:, 2]
+
+ # Calculate weighted center from head keypoints
+ head_xy = xy[[0, 1, 2, 3, 5, 6, 7], :]
+ head_conf = conf[[0, 1, 2, 3, 5, 6, 7]]
+ center = np.average(head_xy, axis=0, weights=head_conf)
+
+ neck = np.average(xy[[2, 3, 6, 7], :], axis=0, weights=conf[[2, 3, 6, 7]])
+
+ # Calculate body axis (tail_base -> neck)
+ body_axis = neck - xy[9]
+ body_axis /= sqrt(np.sum(body_axis**2))
+
+ # Calculate head axis (neck -> nose)
+ head_axis = xy[0] - neck
+ head_axis /= sqrt(np.sum(head_axis**2))
+
+ # Calculate head angle relative to body
+ cross = body_axis[0] * head_axis[1] - head_axis[0] * body_axis[1]
+ sign = copysign(1, cross) # Positive when looking left
+ try:
+ head_angle = acos(body_axis @ head_axis) * sign
+ except ValueError:
+ head_angle = 0
+
+ # Calculate heading (body orientation)
+ heading = atan2(body_axis[1], body_axis[0])
+ heading = degrees(heading)
+
+ # Raw values (heading unwrapped for filtering)
+ vals = [center[0], center[1], heading, head_angle]
+
+ # Apply filtering if enabled
+ curr_time = self.timing_func()
+ if self.use_filter:
+ if self.filters is None:
+ self._initialize_filters(vals)
+
+ # Filter each value (heading is filtered in unwrapped space)
+ filtered_vals = [
+ self.filters["center_x"](curr_time, vals[0]),
+ self.filters["center_y"](curr_time, vals[1]),
+ self.filters["heading"](curr_time, vals[2]),
+ self.filters["head_angle"](curr_time, vals[3]),
+ ]
+ vals = filtered_vals
+
+ # Wrap heading to [0, 360) after filtering
+ vals[2] = vals[2] % 360
+
+ # Update step counter
+ self.curr_step = self.curr_step + 1
+
+ # Store processed data (only if recording)
+ if self.recording:
+ self.center_x.append(vals[0])
+ self.center_y.append(vals[1])
+ self.heading_direction.append(vals[2])
+ self.head_angle.append(vals[3])
+ self.time_stamp.append(curr_time)
+ self.step.append(self.curr_step)
+ self.frame_time.append(kwargs.get("frame_time", -1))
+ if "pose_time" in kwargs:
+ self.pose_time.append(kwargs["pose_time"])
+
+ # Broadcast processed values to all connected clients
+ payload = [curr_time, vals[0], vals[1], vals[2], vals[3]]
+ self.broadcast(payload)
+
+ return pose
+
+ def get_data(self):
+ """Get logged data including base class data and processed values."""
+ # Get base class data
+ save_dict = super().get_data()
+
+ # Add processed values
+ save_dict["x_pos"] = np.array(self.center_x)
+ save_dict["y_pos"] = np.array(self.center_y)
+ save_dict["heading_direction"] = np.array(self.heading_direction)
+ save_dict["head_angle"] = np.array(self.head_angle)
+ save_dict["use_filter"] = self.use_filter
+ save_dict["filter_kwargs"] = self.filter_kwargs
+
+ return save_dict
+
# Register processors for GUI discovery
PROCESSOR_REGISTRY["BaseProcessor_socket"] = BaseProcessor_socket
PROCESSOR_REGISTRY["MyProcessor_socket"] = MyProcessor_socket
+PROCESSOR_REGISTRY["MyProcessorTorchmodels_socket"] = MyProcessorTorchmodels_socket
def get_available_processors():
diff --git a/docs/features.md b/docs/features.md
index 5fd535d..1a04068 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -84,7 +84,7 @@ The GUI intelligently detects available cameras:
Example detection output:
```
-[CameraDetection] Available cameras for backend 'gentl':
+[CameraDetection] Available cameras for backend 'gentl':
['0:DMK 37BUX287 (26320523)', '1:Basler acA1920 (40123456)']
```
@@ -127,7 +127,7 @@ Example detection output:
- **Purpose**: Visual ROI definition
- **Configuration**: (x0, y0, x1, y1) coordinates
- **Color**: Red rectangle overlay
-- **Use Cases**:
+- **Use Cases**:
- Crop region preview
- Analysis area marking
- Multi-region tracking
@@ -310,21 +310,21 @@ Custom pose processors for real-time analysis and control.
```python
class MyProcessor:
"""Custom processor example."""
-
+
def process(self, pose, timestamp):
"""Process pose data in real-time.
-
+
Args:
pose: numpy array (n_keypoints, 3) - x, y, likelihood
timestamp: float - frame timestamp
"""
# Extract keypoint positions
nose_x, nose_y = pose[0, :2]
-
+
# Custom logic
if nose_x > 320:
self.trigger_event()
-
+
# Return results (optional)
return {"position": (nose_x, nose_y)}
```
@@ -353,15 +353,15 @@ class RecordingProcessor:
def __init__(self):
self._vid_recording = False
self.session_name = "default"
-
+
@property
def video_recording(self):
return self._vid_recording
-
+
def start_recording(self, session):
self.session_name = session
self._vid_recording = True
-
+
def stop_recording(self):
self._vid_recording = False
```
@@ -423,7 +423,7 @@ The GUI monitors `video_recording` property and automatically starts/stops recor
#### Button States
- **Disabled**: Gray, not clickable
- **Enabled**: Default color, clickable
-- **Active**:
+- **Active**:
- Preview running: Stop button enabled
- Inference initializing: Blue "Initializing DLCLive!"
- Inference ready: Green "DLCLive running!"
@@ -447,7 +447,7 @@ The GUI monitors `video_recording` property and automatically starts/stops recor
#### DLC Metrics
- **Inference FPS**: Poses processed per second
-- **Latency**:
+- **Latency**:
- Last frame latency (ms)
- Average latency over session (ms)
- **Queue**: Number of frames waiting
@@ -535,7 +535,7 @@ class MyBackend(CameraBackend):
def open(self): ...
def read(self) -> Tuple[np.ndarray, float]: ...
def close(self): ...
-
+
@classmethod
def get_device_count(cls) -> int: ...
```
@@ -554,7 +554,7 @@ class MyProcessor:
def __init__(self, **kwargs):
# Initialize
pass
-
+
def process(self, pose, timestamp):
# Process pose
pass
diff --git a/docs/user_guide.md b/docs/user_guide.md
index 289bfb8..50374c0 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -239,7 +239,7 @@ Check **"Display pose predictions"** to overlay keypoints on video.
3. **Select format**:
- **Container**: mp4 (recommended), avi, mov
- - **Codec**:
+ - **Codec**:
- `h264_nvenc` (NVIDIA GPU - fastest)
- `libx264` (CPU - universal)
- `hevc_nvenc` (NVIDIA H.265)
From a5e70a654d1444829a2d0bbe79aa44e1a4d80353 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Wed, 5 Nov 2025 14:42:09 +0100
Subject: [PATCH 018/132] dropped tensorflow support via GUI
---
dlclivegui/config.py | 2 +-
dlclivegui/gui.py | 21 ++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index 126eb13..f78cae8 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -50,7 +50,7 @@ class DLCProcessorSettings:
model_path: str = ""
additional_options: Dict[str, Any] = field(default_factory=dict)
- model_type: Optional[str] = "base"
+ model_type: str = "pytorch" # Only PyTorch models are supported
@dataclass
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index efc4b35..eba2d6c 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -261,13 +261,7 @@ def _build_dlc_group(self) -> QGroupBox:
self.browse_model_button = QPushButton("Browse…")
self.browse_model_button.clicked.connect(self._action_browse_model)
path_layout.addWidget(self.browse_model_button)
- form.addRow("Model directory", path_layout)
-
- self.model_type_combo = QComboBox()
- self.model_type_combo.addItem("Base (TensorFlow)", "base")
- self.model_type_combo.addItem("PyTorch", "pytorch")
- self.model_type_combo.setCurrentIndex(1) # Default to PyTorch
- form.addRow("Model type", self.model_type_combo)
+ form.addRow("Model file", path_layout)
# Processor selection
processor_path_layout = QHBoxLayout()
@@ -481,12 +475,6 @@ def _apply_config(self, config: ApplicationSettings) -> None:
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
- # Set model type
- model_type = dlc.model_type or "base"
- model_type_index = self.model_type_combo.findData(model_type)
- if model_type_index >= 0:
- self.model_type_combo.setCurrentIndex(model_type_index)
-
self.additional_options_edit.setPlainText(json.dumps(dlc.additional_options, indent=2))
recording = config.recording
@@ -655,13 +643,9 @@ def _parse_json(self, value: str) -> dict:
return json.loads(text)
def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
- model_type = self.model_type_combo.currentData()
- if not isinstance(model_type, str):
- model_type = "base"
-
return DLCProcessorSettings(
model_path=self.model_path_edit.text().strip(),
- model_type=model_type,
+ model_type="pytorch",
additional_options=self._parse_json(self.additional_options_edit.toPlainText()),
)
@@ -925,7 +909,6 @@ def _update_dlc_controls_enabled(self) -> None:
widgets = [
self.model_path_edit,
self.browse_model_button,
- self.model_type_combo,
self.processor_folder_edit,
self.browse_processor_folder_button,
self.refresh_processors_button,
From 229a8396d27b235a10f477725a880515d35b3d3b Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 6 Nov 2025 11:51:26 +0100
Subject: [PATCH 019/132] more profiling of the processes
---
dlclivegui/dlc_processor.py | 133 +++++++++++++++++++++++++++++++++---
dlclivegui/gui.py | 110 ++++++++++++++++++++++++-----
2 files changed, 219 insertions(+), 24 deletions(-)
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 80944d8..5ce2061 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -17,6 +17,9 @@
LOGGER = logging.getLogger(__name__)
+# Enable profiling
+ENABLE_PROFILING = True
+
try: # pragma: no cover - optional dependency
from dlclive import DLCLive # type: ignore
except Exception: # pragma: no cover - handled gracefully
@@ -40,6 +43,14 @@ class ProcessorStats:
processing_fps: float = 0.0
average_latency: float = 0.0
last_latency: float = 0.0
+ # Profiling metrics
+ avg_queue_wait: float = 0.0
+ avg_inference_time: float = 0.0
+ avg_signal_emit_time: float = 0.0
+ avg_total_process_time: float = 0.0
+ # Separated timing for GPU vs socket processor
+ avg_gpu_inference_time: float = 0.0 # Pure model inference
+ avg_processor_overhead: float = 0.0 # Socket processor overhead
_SENTINEL = object()
@@ -69,6 +80,14 @@ def __init__(self) -> None:
self._latencies: deque[float] = deque(maxlen=60)
self._processing_times: deque[float] = deque(maxlen=60)
self._stats_lock = threading.Lock()
+
+ # Profiling metrics
+ self._queue_wait_times: deque[float] = deque(maxlen=60)
+ self._inference_times: deque[float] = deque(maxlen=60)
+ self._signal_emit_times: deque[float] = deque(maxlen=60)
+ self._total_process_times: deque[float] = deque(maxlen=60)
+ self._gpu_inference_times: deque[float] = deque(maxlen=60)
+ self._processor_overhead_times: deque[float] = deque(maxlen=60)
def configure(self, settings: DLCProcessorSettings, processor: Optional[Any] = None) -> None:
self._settings = settings
@@ -85,6 +104,12 @@ def reset(self) -> None:
self._frames_dropped = 0
self._latencies.clear()
self._processing_times.clear()
+ self._queue_wait_times.clear()
+ self._inference_times.clear()
+ self._signal_emit_times.clear()
+ self._total_process_times.clear()
+ self._gpu_inference_times.clear()
+ self._processor_overhead_times.clear()
def shutdown(self) -> None:
self._stop_worker()
@@ -128,6 +153,14 @@ def get_stats(self) -> ProcessorStats:
)
else:
processing_fps = 0.0
+
+ # Profiling metrics
+ avg_queue_wait = sum(self._queue_wait_times) / len(self._queue_wait_times) if self._queue_wait_times else 0.0
+ avg_inference = sum(self._inference_times) / len(self._inference_times) if self._inference_times else 0.0
+ avg_signal_emit = sum(self._signal_emit_times) / len(self._signal_emit_times) if self._signal_emit_times else 0.0
+ avg_total = sum(self._total_process_times) / len(self._total_process_times) if self._total_process_times else 0.0
+ avg_gpu = sum(self._gpu_inference_times) / len(self._gpu_inference_times) if self._gpu_inference_times else 0.0
+ avg_proc_overhead = sum(self._processor_overhead_times) / len(self._processor_overhead_times) if self._processor_overhead_times else 0.0
return ProcessorStats(
frames_enqueued=self._frames_enqueued,
@@ -137,13 +170,19 @@ def get_stats(self) -> ProcessorStats:
processing_fps=processing_fps,
average_latency=avg_latency,
last_latency=last_latency,
+ avg_queue_wait=avg_queue_wait,
+ avg_inference_time=avg_inference,
+ avg_signal_emit_time=avg_signal_emit,
+ avg_total_process_time=avg_total,
+ avg_gpu_inference_time=avg_gpu,
+ avg_processor_overhead=avg_proc_overhead,
)
def _start_worker(self, init_frame: np.ndarray, init_timestamp: float) -> None:
if self._worker_thread is not None and self._worker_thread.is_alive():
return
- self._queue = queue.Queue(maxsize=2)
+ self._queue = queue.Queue(maxsize=1)
self._stop_event.clear()
self._worker_thread = threading.Thread(
target=self._worker_loop,
@@ -179,31 +218,48 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
if not self._settings.model_path:
raise RuntimeError("No DLCLive model path configured.")
+ init_start = time.perf_counter()
options = {
"model_path": self._settings.model_path,
"model_type": self._settings.model_type,
"processor": self._processor,
"dynamic": [False, 0.5, 10],
"resize": 1.0,
+ "precision": "FP32",
}
# todo expose more parameters from settings
self._dlc = DLCLive(**options)
+
+ init_inference_start = time.perf_counter()
self._dlc.init_inference(init_frame)
+ init_inference_time = time.perf_counter() - init_inference_start
+
self._initialized = True
self.initialized.emit(True)
- LOGGER.info("DLCLive model initialized successfully")
+
+ total_init_time = time.perf_counter() - init_start
+ LOGGER.info(f"DLCLive model initialized successfully (total: {total_init_time:.3f}s, init_inference: {init_inference_time:.3f}s)")
# Process the initialization frame
enqueue_time = time.perf_counter()
+
+ inference_start = time.perf_counter()
pose = self._dlc.get_pose(init_frame, frame_time=init_timestamp)
+ inference_time = time.perf_counter() - inference_start
+
+ signal_start = time.perf_counter()
+ self.pose_ready.emit(PoseResult(pose=pose, timestamp=init_timestamp))
+ signal_time = time.perf_counter() - signal_start
+
process_time = time.perf_counter()
with self._stats_lock:
self._frames_enqueued += 1
self._frames_processed += 1
self._processing_times.append(process_time)
-
- self.pose_ready.emit(PoseResult(pose=pose, timestamp=init_timestamp))
+ if ENABLE_PROFILING:
+ self._inference_times.append(inference_time)
+ self._signal_emit_times.append(signal_time)
except Exception as exc:
LOGGER.exception("Failed to initialize DLCLive", exc_info=exc)
@@ -212,29 +268,90 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
return
# Main processing loop
+ frame_count = 0
while not self._stop_event.is_set():
+ loop_start = time.perf_counter()
+
+ # Time spent waiting for queue
+ queue_wait_start = time.perf_counter()
try:
item = self._queue.get(timeout=0.1)
except queue.Empty:
continue
+ queue_wait_time = time.perf_counter() - queue_wait_start
if item is _SENTINEL:
break
frame, timestamp, enqueue_time = item
+
try:
- start_process = time.perf_counter()
+ # Time the inference - we need to separate GPU from processor overhead
+ # If processor exists, wrap its process method to time it separately
+ processor_overhead_time = 0.0
+ gpu_inference_time = 0.0
+
+ if self._processor is not None:
+ # Wrap processor.process() to time it
+ original_process = self._processor.process
+ processor_time_holder = [0.0] # Use list to allow modification in nested scope
+
+ def timed_process(pose, **kwargs):
+ proc_start = time.perf_counter()
+ result = original_process(pose, **kwargs)
+ processor_time_holder[0] = time.perf_counter() - proc_start
+ return result
+
+ self._processor.process = timed_process
+
+ inference_start = time.perf_counter()
pose = self._dlc.get_pose(frame, frame_time=timestamp)
+ inference_time = time.perf_counter() - inference_start
+
+ if self._processor is not None:
+ # Restore original process method
+ self._processor.process = original_process
+ processor_overhead_time = processor_time_holder[0]
+ gpu_inference_time = inference_time - processor_overhead_time
+ else:
+ # No processor, all time is GPU inference
+ gpu_inference_time = inference_time
+
+ # Time the signal emission
+ signal_start = time.perf_counter()
+ self.pose_ready.emit(PoseResult(pose=pose, timestamp=timestamp))
+ signal_time = time.perf_counter() - signal_start
+
end_process = time.perf_counter()
-
+ total_process_time = end_process - loop_start
latency = end_process - enqueue_time
with self._stats_lock:
self._frames_processed += 1
self._latencies.append(latency)
self._processing_times.append(end_process)
-
- self.pose_ready.emit(PoseResult(pose=pose, timestamp=timestamp))
+
+ if ENABLE_PROFILING:
+ self._queue_wait_times.append(queue_wait_time)
+ self._inference_times.append(inference_time)
+ self._signal_emit_times.append(signal_time)
+ self._total_process_times.append(total_process_time)
+ self._gpu_inference_times.append(gpu_inference_time)
+ self._processor_overhead_times.append(processor_overhead_time)
+
+ # Log profiling every 100 frames
+ frame_count += 1
+ if ENABLE_PROFILING and frame_count % 100 == 0:
+ LOGGER.info(
+ f"[Profile] Frame {frame_count}: "
+ f"queue_wait={queue_wait_time*1000:.2f}ms, "
+ f"inference={inference_time*1000:.2f}ms "
+ f"(GPU={gpu_inference_time*1000:.2f}ms, processor={processor_overhead_time*1000:.2f}ms), "
+ f"signal_emit={signal_time*1000:.2f}ms, "
+ f"total={total_process_time*1000:.2f}ms, "
+ f"latency={latency*1000:.2f}ms"
+ )
+
except Exception as exc:
LOGGER.exception("Pose inference failed", exc_info=exc)
self.error.emit(str(exc))
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index eba2d6c..bb5dd1e 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -65,8 +65,26 @@ class MainWindow(QMainWindow):
def __init__(self, config: Optional[ApplicationSettings] = None):
super().__init__()
self.setWindowTitle("DeepLabCut Live GUI")
- self._config = config or DEFAULT_CONFIG
- self._config_path: Optional[Path] = None
+
+ # Try to load myconfig.json from the application directory if no config provided
+ if config is None:
+ myconfig_path = Path(__file__).parent.parent / "myconfig.json"
+ if myconfig_path.exists():
+ try:
+ config = ApplicationSettings.load(str(myconfig_path))
+ self._config_path = myconfig_path
+ logging.info(f"Loaded configuration from {myconfig_path}")
+ except Exception as exc:
+ logging.warning(f"Failed to load myconfig.json: {exc}. Using default config.")
+ config = DEFAULT_CONFIG
+ self._config_path = None
+ else:
+ config = DEFAULT_CONFIG
+ self._config_path = None
+ else:
+ self._config_path = None
+
+ self._config = config
self._current_frame: Optional[np.ndarray] = None
self._raw_frame: Optional[np.ndarray] = None
self._last_pose: Optional[PoseResult] = None
@@ -105,17 +123,67 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._metrics_timer.timeout.connect(self._update_metrics)
self._metrics_timer.start()
self._update_metrics()
+
+ # Show status message if myconfig.json was loaded
+ if self._config_path and self._config_path.name == "myconfig.json":
+ self.statusBar().showMessage(f"Auto-loaded configuration from {self._config_path}", 5000)
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
central = QWidget()
layout = QHBoxLayout(central)
+ # Video panel with display and performance stats
+ video_panel = QWidget()
+ video_layout = QVBoxLayout(video_panel)
+ video_layout.setContentsMargins(0, 0, 0, 0)
+
# Video display widget
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
self.video_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+ video_layout.addWidget(self.video_label)
+
+ # Stats panel below video with clear labels
+ stats_widget = QWidget()
+ stats_widget.setStyleSheet("padding: 5px;")
+ stats_widget.setMinimumWidth(800) # Prevent excessive line breaks
+ stats_layout = QVBoxLayout(stats_widget)
+ stats_layout.setContentsMargins(5, 5, 5, 5)
+ stats_layout.setSpacing(3)
+
+ # Camera throughput stats
+ camera_stats_container = QHBoxLayout()
+ camera_stats_label_title = QLabel("Camera:")
+ camera_stats_container.addWidget(camera_stats_label_title)
+ self.camera_stats_label = QLabel("Camera idle")
+ self.camera_stats_label.setWordWrap(True)
+ camera_stats_container.addWidget(self.camera_stats_label)
+ camera_stats_container.addStretch(1)
+ stats_layout.addLayout(camera_stats_container)
+
+ # DLC processor stats
+ dlc_stats_container = QHBoxLayout()
+ dlc_stats_label_title = QLabel("DLC Processor:")
+ dlc_stats_container.addWidget(dlc_stats_label_title)
+ self.dlc_stats_label = QLabel("DLC processor idle")
+ self.dlc_stats_label.setWordWrap(True)
+ dlc_stats_container.addWidget(self.dlc_stats_label)
+ dlc_stats_container.addStretch(1)
+ stats_layout.addLayout(dlc_stats_container)
+
+ # Video recorder stats
+ recorder_stats_container = QHBoxLayout()
+ recorder_stats_label_title = QLabel("Recorder:")
+ recorder_stats_container.addWidget(recorder_stats_label_title)
+ self.recording_stats_label = QLabel("Recorder idle")
+ self.recording_stats_label.setWordWrap(True)
+ recorder_stats_container.addWidget(self.recording_stats_label)
+ recorder_stats_container.addStretch(1)
+ stats_layout.addLayout(recorder_stats_container)
+
+ video_layout.addWidget(stats_widget)
# Controls panel with fixed width to prevent shifting
controls_widget = QWidget()
@@ -142,9 +210,9 @@ def _setup_ui(self) -> None:
controls_layout.addWidget(button_bar_widget)
controls_layout.addStretch(1)
- # Add controls and video to main layout
+ # Add controls and video panel to main layout
layout.addWidget(controls_widget, stretch=0)
- layout.addWidget(self.video_label, stretch=1)
+ layout.addWidget(video_panel, stretch=1)
self.setCentralWidget(central)
self.setStatusBar(QStatusBar())
@@ -245,9 +313,6 @@ def _build_camera_group(self) -> QGroupBox:
self.rotation_combo.addItem("270°", 270)
form.addRow("Rotation", self.rotation_combo)
- self.camera_stats_label = QLabel("Camera idle")
- form.addRow("Throughput", self.camera_stats_label)
-
return group
def _build_dlc_group(self) -> QGroupBox:
@@ -316,10 +381,6 @@ def _build_dlc_group(self) -> QGroupBox:
self.processor_status_label.setWordWrap(True)
form.addRow("Processor Status", self.processor_status_label)
- self.dlc_stats_label = QLabel("DLC processor idle")
- self.dlc_stats_label.setWordWrap(True)
- form.addRow("Performance", self.dlc_stats_label)
-
return group
def _build_recording_group(self) -> QGroupBox:
@@ -365,10 +426,6 @@ def _build_recording_group(self) -> QGroupBox:
buttons.addWidget(self.stop_record_button)
form.addRow(recording_button_widget)
- self.recording_stats_label = QLabel(self._last_recorder_summary)
- self.recording_stats_label.setWordWrap(True)
- form.addRow("Performance", self.recording_stats_label)
-
return group
def _build_bbox_group(self) -> QGroupBox:
@@ -989,10 +1046,31 @@ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
enqueue = stats.frames_enqueued
processed = stats.frames_processed
dropped = stats.frames_dropped
+
+ # Add profiling info if available
+ profile_info = ""
+ if stats.avg_inference_time > 0:
+ inf_ms = stats.avg_inference_time * 1000.0
+ queue_ms = stats.avg_queue_wait * 1000.0
+ signal_ms = stats.avg_signal_emit_time * 1000.0
+ total_ms = stats.avg_total_process_time * 1000.0
+
+ # Add GPU vs processor breakdown if available
+ gpu_breakdown = ""
+ if stats.avg_gpu_inference_time > 0 or stats.avg_processor_overhead > 0:
+ gpu_ms = stats.avg_gpu_inference_time * 1000.0
+ proc_ms = stats.avg_processor_overhead * 1000.0
+ gpu_breakdown = f" (GPU:{gpu_ms:.1f}ms+proc:{proc_ms:.1f}ms)"
+
+ profile_info = (
+ f"\n[Profile] inf:{inf_ms:.1f}ms{gpu_breakdown} queue:{queue_ms:.1f}ms "
+ f"signal:{signal_ms:.1f}ms total:{total_ms:.1f}ms"
+ )
+
return (
f"{processed}/{enqueue} frames | inference {processing_fps:.1f} fps | "
f"latency {latency_ms:.1f} ms (avg {avg_ms:.1f} ms) | "
- f"queue {stats.queue_size} | dropped {dropped}"
+ f"queue {stats.queue_size} | dropped {dropped}{profile_info}"
)
def _update_metrics(self) -> None:
From 448bdc5cd187edb74ee9bc59f9e481a43dbc54f1 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 18 Nov 2025 13:45:35 +0100
Subject: [PATCH 020/132] Add visualization settings and update camera backend
for improved pose display
---
dlclivegui/cameras/gentl_backend.py | 2 +-
dlclivegui/config.py | 20 ++-
dlclivegui/gui.py | 116 +++++++++++++++---
dlclivegui/processors/dlc_processor_socket.py | 16 ++-
pyproject.toml | 112 +++++++++++++++++
5 files changed, 248 insertions(+), 18 deletions(-)
create mode 100644 pyproject.toml
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 7e81f84..89b7dd5 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -13,7 +13,7 @@
from .base import CameraBackend
try: # pragma: no cover - optional dependency
- from harvesters.core import Harvester
+ from harvesters.core import Harvester # type: ignore
try:
from harvesters.core import HarvesterTimeoutError # type: ignore
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index f78cae8..c3a49c3 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -64,6 +64,21 @@ class BoundingBoxSettings:
y1: int = 100
+@dataclass
+class VisualizationSettings:
+ """Configuration for pose visualization."""
+
+ p_cutoff: float = 0.6 # Confidence threshold for displaying keypoints
+ colormap: str = "hot" # Matplotlib colormap for keypoints
+ bbox_color: tuple[int, int, int] = (0, 0, 255) # BGR color for bounding box (default: red)
+
+ def get_bbox_color_bgr(self) -> tuple[int, int, int]:
+ """Get bounding box color in BGR format."""
+ if isinstance(self.bbox_color, (list, tuple)) and len(self.bbox_color) == 3:
+ return tuple(int(c) for c in self.bbox_color)
+ return (0, 0, 255) # Default to red
+
+
@dataclass
class RecordingSettings:
"""Configuration for video recording."""
@@ -108,6 +123,7 @@ class ApplicationSettings:
dlc: DLCProcessorSettings = field(default_factory=DLCProcessorSettings)
recording: RecordingSettings = field(default_factory=RecordingSettings)
bbox: BoundingBoxSettings = field(default_factory=BoundingBoxSettings)
+ visualization: VisualizationSettings = field(default_factory=VisualizationSettings)
@classmethod
def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
@@ -123,7 +139,8 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
recording_data.pop("options", None)
recording = RecordingSettings(**recording_data)
bbox = BoundingBoxSettings(**data.get("bbox", {}))
- return cls(camera=camera, dlc=dlc, recording=recording, bbox=bbox)
+ visualization = VisualizationSettings(**data.get("visualization", {}))
+ return cls(camera=camera, dlc=dlc, recording=recording, bbox=bbox, visualization=visualization)
def to_dict(self) -> Dict[str, Any]:
"""Serialise the configuration to a dictionary."""
@@ -133,6 +150,7 @@ def to_dict(self) -> Dict[str, Any]:
"dlc": asdict(self.dlc),
"recording": asdict(self.recording),
"bbox": asdict(self.bbox),
+ "visualization": asdict(self.visualization),
}
@classmethod
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index bb5dd1e..d1b9cf0 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -12,6 +12,7 @@
from typing import Optional
import cv2
+import matplotlib.pyplot as plt
import numpy as np
from PyQt6.QtCore import Qt, QTimer
from PyQt6.QtGui import QAction, QCloseEvent, QImage, QPixmap
@@ -47,12 +48,13 @@
CameraSettings,
DLCProcessorSettings,
RecordingSettings,
+ VisualizationSettings,
)
from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
-os.environ["CUDA_VISIBLE_DEVICES"] = "0"
+os.environ["CUDA_VISIBLE_DEVICES"] = "1"
logging.basicConfig(level=logging.INFO)
@@ -108,6 +110,11 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._bbox_x1 = 0
self._bbox_y1 = 0
self._bbox_enabled = False
+
+ # Visualization settings (will be updated from config)
+ self._p_cutoff = 0.6
+ self._colormap = "hot"
+ self._bbox_color = (0, 0, 255) # BGR: red
self.camera_controller = CameraController()
self.dlc_processor = DLCLiveProcessor()
@@ -553,6 +560,12 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.bbox_y0_spin.setValue(bbox.y0)
self.bbox_x1_spin.setValue(bbox.x1)
self.bbox_y1_spin.setValue(bbox.y1)
+
+ # Set visualization settings from config
+ viz = config.visualization
+ self._p_cutoff = viz.p_cutoff
+ self._colormap = viz.colormap
+ self._bbox_color = viz.get_bbox_color_bgr()
def _current_config(self) -> ApplicationSettings:
return ApplicationSettings(
@@ -560,6 +573,7 @@ def _current_config(self) -> ApplicationSettings:
dlc=self._dlc_settings_from_ui(),
recording=self._recording_settings_from_ui(),
bbox=self._bbox_settings_from_ui(),
+ visualization=self._visualization_settings_from_ui(),
)
def _camera_settings_from_ui(self) -> CameraSettings:
@@ -725,6 +739,13 @@ def _bbox_settings_from_ui(self) -> BoundingBoxSettings:
y1=self.bbox_y1_spin.value(),
)
+ def _visualization_settings_from_ui(self) -> VisualizationSettings:
+ return VisualizationSettings(
+ p_cutoff=self._p_cutoff,
+ colormap=self._colormap,
+ bbox_color=self._bbox_color,
+ )
+
# ------------------------------------------------------------------ actions
def _action_load_config(self) -> None:
file_name, _ = QFileDialog.getOpenFileName(
@@ -1215,31 +1236,60 @@ def _stop_inference(self, show_message: bool = True) -> None:
# ------------------------------------------------------------------ recording
def _start_recording(self) -> None:
+ # If recorder already running, nothing to do
if self._video_recorder and self._video_recorder.is_running:
return
+
+ # If camera not running, start it automatically so frames will arrive.
+ # This allows starting recording without the user manually pressing "Start Preview".
if not self.camera_controller.is_running():
- self._show_error("Start the camera preview before recording.")
- return
- if self._current_frame is None:
- self._show_error("Wait for the first preview frame before recording.")
- return
+ try:
+ settings = self._camera_settings_from_ui()
+ except ValueError as exc:
+ self._show_error(str(exc))
+ return
+ # Store active settings and start camera preview in background
+ self._active_camera_settings = settings
+ self.camera_controller.start(settings)
+ self.preview_button.setEnabled(False)
+ self.stop_preview_button.setEnabled(True)
+ self._current_frame = None
+ self._raw_frame = None
+ self._last_pose = None
+ self._dlc_active = False
+ self._camera_frame_times.clear()
+ self._last_display_time = 0.0
+ if hasattr(self, "camera_stats_label"):
+ self.camera_stats_label.setText("Camera starting…")
+ self.statusBar().showMessage("Starting camera preview…", 3000)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
recording = self._recording_settings_from_ui()
if not recording.enabled:
self._show_error("Recording is disabled in the configuration.")
return
+
+ # If we already have a current frame, use its shape to set the recorder stream.
+ # Otherwise start the recorder without a fixed frame_size and configure it
+ # once the first frame arrives (see _on_frame_ready).
frame = self._current_frame
- assert frame is not None
- height, width = frame.shape[:2]
+ if frame is not None:
+ height, width = frame.shape[:2]
+ frame_size = (height, width)
+ else:
+ frame_size = None
+
frame_rate = (
self._active_camera_settings.fps
if self._active_camera_settings is not None
else self.camera_fps.value()
)
+
output_path = recording.output_path()
self._video_recorder = VideoRecorder(
output_path,
- frame_size=(height, width), # Use numpy convention: (height, width)
- frame_rate=float(frame_rate),
+ frame_size=frame_size, # None allowed; will be configured on first frame
+ frame_rate=float(frame_rate) if frame_rate is not None else None,
codec=recording.codec,
crf=recording.crf,
)
@@ -1295,7 +1345,30 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
frame = np.ascontiguousarray(frame)
self._current_frame = frame
self._track_camera_frame()
+ # If recorder is running but was started without a fixed frame_size, configure
+ # the stream now that we know the actual frame dimensions.
if self._video_recorder and self._video_recorder.is_running:
+ # Configure stream if recorder was started without a frame_size
+ try:
+ current_frame_size = getattr(self._video_recorder, "_frame_size", None)
+ except Exception:
+ current_frame_size = None
+ if current_frame_size is None:
+ try:
+ fps_value = (
+ self._active_camera_settings.fps
+ if self._active_camera_settings is not None
+ else self.camera_fps.value()
+ )
+ except Exception:
+ fps_value = None
+ h, w = frame.shape[:2]
+ try:
+ # configure_stream expects (height, width)
+ self._video_recorder.configure_stream((h, w), float(fps_value) if fps_value is not None else None)
+ except Exception:
+ # Non-fatal: continue and attempt to write anyway
+ pass
try:
success = self._video_recorder.write(frame, timestamp=frame_data.timestamp)
if not success:
@@ -1421,20 +1494,35 @@ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
x1 = max(x0 + 1, min(x1, width))
y1 = max(y0 + 1, min(y1, height))
- # Draw red rectangle (BGR format: red is (0, 0, 255))
- cv2.rectangle(overlay, (x0, y0), (x1, y1), (0, 0, 255), 2)
+ # Draw rectangle with configured color
+ cv2.rectangle(overlay, (x0, y0), (x1, y1), self._bbox_color, 2)
return overlay
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
- for keypoint in np.asarray(pose):
+
+ # Get the colormap from config
+ cmap = plt.get_cmap(self._colormap)
+ num_keypoints = len(np.asarray(pose))
+
+ for idx, keypoint in enumerate(np.asarray(pose)):
if len(keypoint) < 2:
continue
x, y = keypoint[:2]
+ confidence = keypoint[2] if len(keypoint) > 2 else 1.0
if np.isnan(x) or np.isnan(y):
continue
- cv2.circle(overlay, (int(x), int(y)), 4, (0, 255, 0), -1)
+ if confidence < self._p_cutoff:
+ continue
+
+ # Get color from colormap (cycle through 0 to 1)
+ color_normalized = idx / max(num_keypoints - 1, 1)
+ rgba = cmap(color_normalized)
+ # Convert from RGBA [0, 1] to BGR [0, 255] for OpenCV
+ bgr_color = (int(rgba[2] * 255), int(rgba[1] * 255), int(rgba[0] * 255))
+
+ cv2.circle(overlay, (int(x), int(y)), 4, bgr_color, -1)
return overlay
def _on_dlc_initialised(self, success: bool) -> None:
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index 9215c5e..8caf31f 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -6,6 +6,7 @@
from math import acos, atan2, copysign, degrees, pi, sqrt
from multiprocessing.connection import Listener
from threading import Event, Thread
+from pathlib import Path
import numpy as np
from dlclive import Processor # type: ignore
@@ -346,7 +347,9 @@ def save(self, file=None):
LOG.info(f"Saving data to {file}")
try:
save_dict = self.get_data()
- pickle.dump(save_dict, open(file, "wb"))
+ path2save = Path(__file__).parent.parent.parent / "data" / file
+ LOG.info(f"Path should be {path2save}")
+ pickle.dump(file, open(path2save, "wb"))
save_code = 1
except Exception as e:
LOG.error(f"Save failed: {e}")
@@ -634,6 +637,7 @@ def __init__(
use_filter=False,
filter_kwargs={},
save_original=False,
+ p_cutoff=0.4,
):
"""
DLC Processor with multi-client broadcasting support.
@@ -659,6 +663,8 @@ def __init__(
self.heading_direction = deque()
self.head_angle = deque()
+ self.p_cutoff = p_cutoff
+
# Filtering
self.use_filter = use_filter
self.filter_kwargs = filter_kwargs
@@ -705,7 +711,13 @@ def process(self, pose, **kwargs):
# Calculate weighted center from head keypoints
head_xy = xy[[0, 1, 2, 3, 5, 6, 7], :]
head_conf = conf[[0, 1, 2, 3, 5, 6, 7]]
- center = np.average(head_xy, axis=0, weights=head_conf)
+ # set low confidence keypoints to zero weight
+ head_conf = np.where(head_conf < self.p_cutoff, 0, head_conf)
+ try:
+ center = np.average(head_xy, axis=0, weights=head_conf)
+ except ZeroDivisionError:
+ # If all keypoints have zero weight, return without processing
+ return pose
neck = np.average(xy[[2, 3, 6, 7], :], axis=0, weights=conf[[2, 3, 6, 7]])
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..edbb9d0
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,112 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "deeplabcut-live-gui"
+version = "2.0"
+description = "PyQt-based GUI to run real time DeepLabCut experiments"
+readme = "README.md"
+requires-python = ">=3.10"
+license = {text = "GNU Lesser General Public License v3 (LGPLv3)"}
+authors = [
+ {name = "A. & M. Mathis Labs", email = "adim@deeplabcut.org"}
+]
+keywords = ["deeplabcut", "pose estimation", "real-time", "gui", "deep learning"]
+classifiers = [
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
+ "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+ "Operating System :: OS Independent",
+ "Development Status :: 4 - Beta",
+ "Intended Audience :: Science/Research",
+ "Topic :: Scientific/Engineering :: Artificial Intelligence",
+]
+
+dependencies = [
+ "deeplabcut-live",
+ "PyQt6",
+ "numpy",
+ "opencv-python",
+ "vidgear[core]",
+ "matplotlib",
+]
+
+[project.optional-dependencies]
+basler = ["pypylon"]
+gentl = ["harvesters"]
+all = ["pypylon", "harvesters"]
+dev = [
+ "pytest>=7.0",
+ "pytest-cov>=4.0",
+ "pytest-mock>=3.10",
+ "pytest-qt>=4.2",
+ "black>=23.0",
+ "flake8>=6.0",
+ "mypy>=1.0",
+]
+test = [
+ "pytest>=7.0",
+ "pytest-cov>=4.0",
+ "pytest-mock>=3.10",
+ "pytest-qt>=4.2",
+]
+
+[project.urls]
+Homepage = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+Repository = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+Documentation = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+"Bug Tracker" = "https://github.com/DeepLabCut/DeepLabCut-live-GUI/issues"
+
+[project.scripts]
+dlclivegui = "dlclivegui.gui:main"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["dlclivegui*"]
+exclude = ["tests*", "docs*"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = [
+ "-v",
+ "--strict-markers",
+ "--tb=short",
+ "--cov=dlclivegui",
+ "--cov-report=term-missing",
+ "--cov-report=html",
+]
+markers = [
+ "unit: Unit tests for individual components",
+ "integration: Integration tests for component interaction",
+ "functional: Functional tests for end-to-end workflows",
+ "slow: Tests that take a long time to run",
+ "gui: Tests that require GUI interaction",
+]
+
+[tool.coverage.run]
+source = ["dlclivegui"]
+omit = [
+ "*/tests/*",
+ "*/__pycache__/*",
+ "*/site-packages/*",
+]
+
+[tool.coverage.report]
+exclude_lines = [
+ "pragma: no cover",
+ "def __repr__",
+ "raise AssertionError",
+ "raise NotImplementedError",
+ "if __name__ == .__main__.:",
+ "if TYPE_CHECKING:",
+ "@abstract",
+]
From 246452f5484f8eb3f6c63874ace1b5a77eac849a Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 5 Dec 2025 12:01:17 +0100
Subject: [PATCH 021/132] small bug fixes
---
dlclivegui/processors/GUI_INTEGRATION.md | 167 ------------------
dlclivegui/processors/dlc_processor_socket.py | 2 +-
dlclivegui/video_recorder.py | 16 +-
docs/install.md | 25 ---
4 files changed, 9 insertions(+), 201 deletions(-)
delete mode 100644 dlclivegui/processors/GUI_INTEGRATION.md
delete mode 100644 docs/install.md
diff --git a/dlclivegui/processors/GUI_INTEGRATION.md b/dlclivegui/processors/GUI_INTEGRATION.md
deleted file mode 100644
index 6e504f1..0000000
--- a/dlclivegui/processors/GUI_INTEGRATION.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# GUI Integration Guide
-
-## Quick Answer
-
-Here's how to use `scan_processor_folder` in your GUI:
-
-```python
-from example_gui_usage import scan_processor_folder, instantiate_from_scan
-
-# 1. Scan folder
-all_processors = scan_processor_folder("./processors")
-
-# 2. Populate dropdown with keys (for backend) and display names (for user)
-for key, info in all_processors.items():
- # key = "file.py::ClassName" (use this for instantiation)
- # display_name = "Human Name (file.py)" (show this to user)
- display_name = f"{info['name']} ({info['file']})"
- dropdown.add_item(key, display_name)
-
-# 3. When user selects, get the key from dropdown
-selected_key = dropdown.get_selected_value() # e.g., "dlc_processor_socket.py::MyProcessor_socket"
-
-# 4. Get processor info
-processor_info = all_processors[selected_key]
-
-# 5. Build parameter form from processor_info['params']
-for param_name, param_info in processor_info['params'].items():
- add_input_field(param_name, param_info['type'], param_info['default'])
-
-# 6. When user clicks Create, instantiate using the key
-user_params = get_form_values()
-processor = instantiate_from_scan(all_processors, selected_key, **user_params)
-```
-
-## The Key Insight
-
-**The key returned by `scan_processor_folder` is what you use to instantiate!**
-
-```python
-# OLD problem: "I have a name, how do I load it?"
-# NEW solution: Use the key directly
-
-all_processors = scan_processor_folder(folder)
-# Returns: {"file.py::ClassName": {processor_info}, ...}
-
-# The KEY "file.py::ClassName" uniquely identifies the processor
-# Pass this key to instantiate_from_scan()
-
-processor = instantiate_from_scan(all_processors, "file.py::ClassName", **params)
-```
-
-## What's in the returned dict?
-
-```python
-all_processors = {
- "dlc_processor_socket.py::MyProcessor_socket": {
- "class": , # The actual class
- "name": "Mouse Pose Processor", # Human-readable name
- "description": "Calculates mouse...", # Description
- "params": { # All parameters
- "bind": {
- "type": "tuple",
- "default": ("0.0.0.0", 6000),
- "description": "Server address"
- },
- # ... more parameters
- },
- "file": "dlc_processor_socket.py", # Source file
- "class_name": "MyProcessor_socket", # Class name
- "file_path": "/full/path/to/file.py" # Full path
- }
-}
-```
-
-## GUI Workflow
-
-### Step 1: Scan Folder
-```python
-all_processors = scan_processor_folder("./processors")
-```
-
-### Step 2: Populate Dropdown
-```python
-# Store keys in order (for mapping dropdown index -> key)
-self.processor_keys = list(all_processors.keys())
-
-# Create display names for dropdown
-display_names = [
- f"{info['name']} ({info['file']})"
- for info in all_processors.values()
-]
-dropdown.set_items(display_names)
-```
-
-### Step 3: User Selects Processor
-```python
-def on_processor_selected(dropdown_index):
- # Get the key
- key = self.processor_keys[dropdown_index]
-
- # Get processor info
- info = all_processors[key]
-
- # Show description
- description_label.text = info['description']
-
- # Build parameter form
- for param_name, param_info in info['params'].items():
- add_parameter_field(
- name=param_name,
- type=param_info['type'],
- default=param_info['default'],
- help_text=param_info['description']
- )
-```
-
-### Step 4: User Clicks Create
-```python
-def on_create_clicked():
- # Get selected key
- key = self.processor_keys[dropdown.current_index]
-
- # Get user's parameter values
- user_params = parameter_form.get_values()
-
- # Instantiate using the key!
- self.processor = instantiate_from_scan(
- all_processors,
- key,
- **user_params
- )
-
- print(f"Created: {self.processor.__class__.__name__}")
-```
-
-## Why This Works
-
-1. **Unique Keys**: `"file.py::ClassName"` format ensures uniqueness even if multiple files have same class name
-
-2. **All Info Included**: Each dict entry has everything needed (class, metadata, parameters)
-
-3. **Simple Lookup**: Just use the key to get processor info or instantiate
-
-4. **No Manual Imports**: `scan_processor_folder` handles all module loading
-
-5. **Type Safety**: Parameter metadata includes types for validation
-
-## Complete Example
-
-See `processor_gui.py` for a full working tkinter GUI that demonstrates:
-- Folder scanning
-- Processor selection
-- Parameter form generation
-- Instantiation
-
-Run it with:
-```bash
-python processor_gui.py
-```
-
-## Files
-
-- `dlc_processor_socket.py` - Processors with metadata and registry
-- `example_gui_usage.py` - Scanning and instantiation functions + examples
-- `processor_gui.py` - Full tkinter GUI
-- `GUI_USAGE_GUIDE.py` - Pseudocode and examples
-- `README.md` - Documentation on the plugin system
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index 8caf31f..73a5cb4 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -349,7 +349,7 @@ def save(self, file=None):
save_dict = self.get_data()
path2save = Path(__file__).parent.parent.parent / "data" / file
LOG.info(f"Path should be {path2save}")
- pickle.dump(file, open(path2save, "wb"))
+ pickle.dump(save_dict, open(path2save, "wb"))
save_code = 1
except Exception as e:
LOG.error(f"Save failed: {e}")
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index a40ed28..47cfff4 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -27,14 +27,14 @@
class RecorderStats:
"""Snapshot of recorder throughput metrics."""
- frames_enqueued: int
- frames_written: int
- dropped_frames: int
- queue_size: int
- average_latency: float
- last_latency: float
- write_fps: float
- buffer_seconds: float
+ frames_enqueued: int = 0
+ frames_written: int = 0
+ dropped_frames: int = 0
+ queue_size: int = 0
+ average_latency: float = 0.0
+ last_latency: float = 0.0
+ write_fps: float = 0.0
+ buffer_seconds: float = 0.0
_SENTINEL = object()
diff --git a/docs/install.md b/docs/install.md
deleted file mode 100644
index 24ef4f4..0000000
--- a/docs/install.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Installation Instructions
-
-### Windows or Linux Desktop
-
-We recommend that you install DeepLabCut-live in a conda environment. First, please install Anaconda:
-- [Windows](https://docs.anaconda.com/anaconda/install/windows/)
-- [Linux](https://docs.anaconda.com/anaconda/install/linux/)
-
-Create a conda environment with python 3.7 and tensorflow:
-```
-conda create -n dlc-live python=3.7 tensorflow-gpu==1.13.1 # if using GPU
-conda create -n dlc-live python=3.7 tensorflow==1.13.1 # if not using GPU
-```
-
-Activate the conda environment and install the DeepLabCut-live package:
-```
-conda activate dlc-live
-pip install deeplabcut-live-gui
-```
-
-### NVIDIA Jetson Development Kit
-
-First, please refer to our complete instructions for [installing DeepLabCut-Live! on a NVIDIA Jetson Development Kit](https://github.com/DeepLabCut/DeepLabCut-live/blob/master/docs/install_jetson.md).
-
-Next, install the DeepLabCut-live-GUI: `pip install deeplabcut-live-gui`.
From 103399c0a98631d8d96e44948cdd9e45608b96bf Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 5 Dec 2025 13:36:34 +0100
Subject: [PATCH 022/132] black formatting
---
dlclivegui/cameras/gentl_backend.py | 20 ++---
dlclivegui/cameras/opencv_backend.py | 16 ++--
dlclivegui/config.py | 4 +-
dlclivegui/dlc_processor.py | 78 ++++++++++++-------
dlclivegui/gui.py | 51 ++++++------
dlclivegui/processors/dlc_processor_socket.py | 29 ++++---
6 files changed, 116 insertions(+), 82 deletions(-)
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 89b7dd5..cdc798e 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -13,7 +13,7 @@
from .base import CameraBackend
try: # pragma: no cover - optional dependency
- from harvesters.core import Harvester # type: ignore
+ from harvesters.core import Harvester # type: ignore
try:
from harvesters.core import HarvesterTimeoutError # type: ignore
@@ -238,23 +238,23 @@ def _parse_crop(self, crop) -> Optional[Tuple[int, int, int, int]]:
def _parse_resolution(self, resolution) -> Optional[Tuple[int, int]]:
"""Parse resolution setting.
-
+
Args:
resolution: Can be a tuple/list [width, height], or None
-
+
Returns:
Tuple of (width, height) or None if not specified
Default is (720, 540) if parsing fails but value is provided
"""
if resolution is None:
return (720, 540) # Default resolution
-
+
if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
try:
return (int(resolution[0]), int(resolution[1]))
except (ValueError, TypeError):
return (720, 540)
-
+
return (720, 540)
@staticmethod
@@ -346,9 +346,9 @@ def _configure_resolution(self, node_map) -> None:
"""Configure camera resolution (width and height)."""
if self._resolution is None:
return
-
+
width, height = self._resolution
-
+
# Try to set width
for width_attr in ("Width", "WidthMax"):
try:
@@ -358,7 +358,7 @@ def _configure_resolution(self, node_map) -> None:
try:
min_w = node.min
max_w = node.max
- inc_w = getattr(node, 'inc', 1)
+ inc_w = getattr(node, "inc", 1)
# Adjust to valid value
width = self._adjust_to_increment(width, min_w, max_w, inc_w)
node.value = int(width)
@@ -372,7 +372,7 @@ def _configure_resolution(self, node_map) -> None:
continue
except AttributeError:
continue
-
+
# Try to set height
for height_attr in ("Height", "HeightMax"):
try:
@@ -382,7 +382,7 @@ def _configure_resolution(self, node_map) -> None:
try:
min_h = node.min
max_h = node.max
- inc_h = getattr(node, 'inc', 1)
+ inc_h = getattr(node, "inc", 1)
# Adjust to valid value
height = self._adjust_to_increment(height, min_h, max_h, inc_h)
node.value = int(height)
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 7face8f..651eeab 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -83,37 +83,37 @@ def device_name(self) -> str:
def _parse_resolution(self, resolution) -> Tuple[int, int]:
"""Parse resolution setting.
-
+
Args:
resolution: Can be a tuple/list [width, height], or None
-
+
Returns:
Tuple of (width, height), defaults to (720, 540)
"""
if resolution is None:
return (720, 540) # Default resolution
-
+
if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
try:
return (int(resolution[0]), int(resolution[1]))
except (ValueError, TypeError):
return (720, 540)
-
+
return (720, 540)
def _configure_capture(self) -> None:
if self._capture is None:
return
-
+
# Set resolution (width x height)
width, height = self._resolution
self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width))
self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height))
-
+
# Set FPS if specified
if self.settings.fps:
self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
-
+
# Set any additional properties from the properties dict
for prop, value in self.settings.properties.items():
if prop in ("api", "resolution"):
@@ -123,7 +123,7 @@ def _configure_capture(self) -> None:
except (TypeError, ValueError):
continue
self._capture.set(prop_id, float(value))
-
+
# Update actual FPS from camera
actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
if actual_fps:
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index c3a49c3..7cc629a 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -140,7 +140,9 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
recording = RecordingSettings(**recording_data)
bbox = BoundingBoxSettings(**data.get("bbox", {}))
visualization = VisualizationSettings(**data.get("visualization", {}))
- return cls(camera=camera, dlc=dlc, recording=recording, bbox=bbox, visualization=visualization)
+ return cls(
+ camera=camera, dlc=dlc, recording=recording, bbox=bbox, visualization=visualization
+ )
def to_dict(self) -> Dict[str, Any]:
"""Serialise the configuration to a dictionary."""
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 5ce2061..03a9b70 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -80,7 +80,7 @@ def __init__(self) -> None:
self._latencies: deque[float] = deque(maxlen=60)
self._processing_times: deque[float] = deque(maxlen=60)
self._stats_lock = threading.Lock()
-
+
# Profiling metrics
self._queue_wait_times: deque[float] = deque(maxlen=60)
self._inference_times: deque[float] = deque(maxlen=60)
@@ -153,14 +153,38 @@ def get_stats(self) -> ProcessorStats:
)
else:
processing_fps = 0.0
-
+
# Profiling metrics
- avg_queue_wait = sum(self._queue_wait_times) / len(self._queue_wait_times) if self._queue_wait_times else 0.0
- avg_inference = sum(self._inference_times) / len(self._inference_times) if self._inference_times else 0.0
- avg_signal_emit = sum(self._signal_emit_times) / len(self._signal_emit_times) if self._signal_emit_times else 0.0
- avg_total = sum(self._total_process_times) / len(self._total_process_times) if self._total_process_times else 0.0
- avg_gpu = sum(self._gpu_inference_times) / len(self._gpu_inference_times) if self._gpu_inference_times else 0.0
- avg_proc_overhead = sum(self._processor_overhead_times) / len(self._processor_overhead_times) if self._processor_overhead_times else 0.0
+ avg_queue_wait = (
+ sum(self._queue_wait_times) / len(self._queue_wait_times)
+ if self._queue_wait_times
+ else 0.0
+ )
+ avg_inference = (
+ sum(self._inference_times) / len(self._inference_times)
+ if self._inference_times
+ else 0.0
+ )
+ avg_signal_emit = (
+ sum(self._signal_emit_times) / len(self._signal_emit_times)
+ if self._signal_emit_times
+ else 0.0
+ )
+ avg_total = (
+ sum(self._total_process_times) / len(self._total_process_times)
+ if self._total_process_times
+ else 0.0
+ )
+ avg_gpu = (
+ sum(self._gpu_inference_times) / len(self._gpu_inference_times)
+ if self._gpu_inference_times
+ else 0.0
+ )
+ avg_proc_overhead = (
+ sum(self._processor_overhead_times) / len(self._processor_overhead_times)
+ if self._processor_overhead_times
+ else 0.0
+ )
return ProcessorStats(
frames_enqueued=self._frames_enqueued,
@@ -229,28 +253,30 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
}
# todo expose more parameters from settings
self._dlc = DLCLive(**options)
-
+
init_inference_start = time.perf_counter()
self._dlc.init_inference(init_frame)
init_inference_time = time.perf_counter() - init_inference_start
-
+
self._initialized = True
self.initialized.emit(True)
-
+
total_init_time = time.perf_counter() - init_start
- LOGGER.info(f"DLCLive model initialized successfully (total: {total_init_time:.3f}s, init_inference: {init_inference_time:.3f}s)")
+ LOGGER.info(
+ f"DLCLive model initialized successfully (total: {total_init_time:.3f}s, init_inference: {init_inference_time:.3f}s)"
+ )
# Process the initialization frame
enqueue_time = time.perf_counter()
-
+
inference_start = time.perf_counter()
pose = self._dlc.get_pose(init_frame, frame_time=init_timestamp)
inference_time = time.perf_counter() - inference_start
-
+
signal_start = time.perf_counter()
self.pose_ready.emit(PoseResult(pose=pose, timestamp=init_timestamp))
signal_time = time.perf_counter() - signal_start
-
+
process_time = time.perf_counter()
with self._stats_lock:
@@ -271,7 +297,7 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
frame_count = 0
while not self._stop_event.is_set():
loop_start = time.perf_counter()
-
+
# Time spent waiting for queue
queue_wait_start = time.perf_counter()
try:
@@ -284,30 +310,30 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
break
frame, timestamp, enqueue_time = item
-
+
try:
# Time the inference - we need to separate GPU from processor overhead
# If processor exists, wrap its process method to time it separately
processor_overhead_time = 0.0
gpu_inference_time = 0.0
-
+
if self._processor is not None:
# Wrap processor.process() to time it
original_process = self._processor.process
processor_time_holder = [0.0] # Use list to allow modification in nested scope
-
+
def timed_process(pose, **kwargs):
proc_start = time.perf_counter()
result = original_process(pose, **kwargs)
processor_time_holder[0] = time.perf_counter() - proc_start
return result
-
+
self._processor.process = timed_process
-
+
inference_start = time.perf_counter()
pose = self._dlc.get_pose(frame, frame_time=timestamp)
inference_time = time.perf_counter() - inference_start
-
+
if self._processor is not None:
# Restore original process method
self._processor.process = original_process
@@ -321,7 +347,7 @@ def timed_process(pose, **kwargs):
signal_start = time.perf_counter()
self.pose_ready.emit(PoseResult(pose=pose, timestamp=timestamp))
signal_time = time.perf_counter() - signal_start
-
+
end_process = time.perf_counter()
total_process_time = end_process - loop_start
latency = end_process - enqueue_time
@@ -330,7 +356,7 @@ def timed_process(pose, **kwargs):
self._frames_processed += 1
self._latencies.append(latency)
self._processing_times.append(end_process)
-
+
if ENABLE_PROFILING:
self._queue_wait_times.append(queue_wait_time)
self._inference_times.append(inference_time)
@@ -338,7 +364,7 @@ def timed_process(pose, **kwargs):
self._total_process_times.append(total_process_time)
self._gpu_inference_times.append(gpu_inference_time)
self._processor_overhead_times.append(processor_overhead_time)
-
+
# Log profiling every 100 frames
frame_count += 1
if ENABLE_PROFILING and frame_count % 100 == 0:
@@ -351,7 +377,7 @@ def timed_process(pose, **kwargs):
f"total={total_process_time*1000:.2f}ms, "
f"latency={latency*1000:.2f}ms"
)
-
+
except Exception as exc:
LOGGER.exception("Pose inference failed", exc_info=exc)
self.error.emit(str(exc))
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index d1b9cf0..c4d5781 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -67,7 +67,7 @@ class MainWindow(QMainWindow):
def __init__(self, config: Optional[ApplicationSettings] = None):
super().__init__()
self.setWindowTitle("DeepLabCut Live GUI")
-
+
# Try to load myconfig.json from the application directory if no config provided
if config is None:
myconfig_path = Path(__file__).parent.parent / "myconfig.json"
@@ -85,7 +85,7 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._config_path = None
else:
self._config_path = None
-
+
self._config = config
self._current_frame: Optional[np.ndarray] = None
self._raw_frame: Optional[np.ndarray] = None
@@ -110,7 +110,7 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._bbox_x1 = 0
self._bbox_y1 = 0
self._bbox_enabled = False
-
+
# Visualization settings (will be updated from config)
self._p_cutoff = 0.6
self._colormap = "hot"
@@ -130,10 +130,12 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._metrics_timer.timeout.connect(self._update_metrics)
self._metrics_timer.start()
self._update_metrics()
-
+
# Show status message if myconfig.json was loaded
if self._config_path and self._config_path.name == "myconfig.json":
- self.statusBar().showMessage(f"Auto-loaded configuration from {self._config_path}", 5000)
+ self.statusBar().showMessage(
+ f"Auto-loaded configuration from {self._config_path}", 5000
+ )
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
@@ -144,14 +146,14 @@ def _setup_ui(self) -> None:
video_panel = QWidget()
video_layout = QVBoxLayout(video_panel)
video_layout.setContentsMargins(0, 0, 0, 0)
-
+
# Video display widget
self.video_label = QLabel("Camera preview not started")
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
self.video_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
video_layout.addWidget(self.video_label)
-
+
# Stats panel below video with clear labels
stats_widget = QWidget()
stats_widget.setStyleSheet("padding: 5px;")
@@ -159,7 +161,7 @@ def _setup_ui(self) -> None:
stats_layout = QVBoxLayout(stats_widget)
stats_layout.setContentsMargins(5, 5, 5, 5)
stats_layout.setSpacing(3)
-
+
# Camera throughput stats
camera_stats_container = QHBoxLayout()
camera_stats_label_title = QLabel("Camera:")
@@ -169,7 +171,7 @@ def _setup_ui(self) -> None:
camera_stats_container.addWidget(self.camera_stats_label)
camera_stats_container.addStretch(1)
stats_layout.addLayout(camera_stats_container)
-
+
# DLC processor stats
dlc_stats_container = QHBoxLayout()
dlc_stats_label_title = QLabel("DLC Processor:")
@@ -179,7 +181,7 @@ def _setup_ui(self) -> None:
dlc_stats_container.addWidget(self.dlc_stats_label)
dlc_stats_container.addStretch(1)
stats_layout.addLayout(dlc_stats_container)
-
+
# Video recorder stats
recorder_stats_container = QHBoxLayout()
recorder_stats_label_title = QLabel("Recorder:")
@@ -189,7 +191,7 @@ def _setup_ui(self) -> None:
recorder_stats_container.addWidget(self.recording_stats_label)
recorder_stats_container.addStretch(1)
stats_layout.addLayout(recorder_stats_container)
-
+
video_layout.addWidget(stats_widget)
# Controls panel with fixed width to prevent shifting
@@ -560,7 +562,7 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self.bbox_y0_spin.setValue(bbox.y0)
self.bbox_x1_spin.setValue(bbox.x1)
self.bbox_y1_spin.setValue(bbox.y1)
-
+
# Set visualization settings from config
viz = config.visualization
self._p_cutoff = viz.p_cutoff
@@ -792,7 +794,10 @@ def _save_config_to_path(self, path: Path) -> None:
def _action_browse_model(self) -> None:
file_path, _ = QFileDialog.getOpenFileName(
- self, "Select DLCLive model file", PATH2MODELS, "Model files (*.pt *.pb);;All files (*.*)"
+ self,
+ "Select DLCLive model file",
+ PATH2MODELS,
+ "Model files (*.pt *.pb);;All files (*.*)",
)
if file_path:
self.model_path_edit.setText(file_path)
@@ -1067,7 +1072,7 @@ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
enqueue = stats.frames_enqueued
processed = stats.frames_processed
dropped = stats.frames_dropped
-
+
# Add profiling info if available
profile_info = ""
if stats.avg_inference_time > 0:
@@ -1075,19 +1080,19 @@ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
queue_ms = stats.avg_queue_wait * 1000.0
signal_ms = stats.avg_signal_emit_time * 1000.0
total_ms = stats.avg_total_process_time * 1000.0
-
+
# Add GPU vs processor breakdown if available
gpu_breakdown = ""
if stats.avg_gpu_inference_time > 0 or stats.avg_processor_overhead > 0:
gpu_ms = stats.avg_gpu_inference_time * 1000.0
proc_ms = stats.avg_processor_overhead * 1000.0
gpu_breakdown = f" (GPU:{gpu_ms:.1f}ms+proc:{proc_ms:.1f}ms)"
-
+
profile_info = (
f"\n[Profile] inf:{inf_ms:.1f}ms{gpu_breakdown} queue:{queue_ms:.1f}ms "
f"signal:{signal_ms:.1f}ms total:{total_ms:.1f}ms"
)
-
+
return (
f"{processed}/{enqueue} frames | inference {processing_fps:.1f} fps | "
f"latency {latency_ms:.1f} ms (avg {avg_ms:.1f} ms) | "
@@ -1365,7 +1370,9 @@ def _on_frame_ready(self, frame_data: FrameData) -> None:
h, w = frame.shape[:2]
try:
# configure_stream expects (height, width)
- self._video_recorder.configure_stream((h, w), float(fps_value) if fps_value is not None else None)
+ self._video_recorder.configure_stream(
+ (h, w), float(fps_value) if fps_value is not None else None
+ )
except Exception:
# Non-fatal: continue and attempt to write anyway
pass
@@ -1501,11 +1508,11 @@ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
-
+
# Get the colormap from config
cmap = plt.get_cmap(self._colormap)
num_keypoints = len(np.asarray(pose))
-
+
for idx, keypoint in enumerate(np.asarray(pose)):
if len(keypoint) < 2:
continue
@@ -1515,13 +1522,13 @@ def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
continue
if confidence < self._p_cutoff:
continue
-
+
# Get color from colormap (cycle through 0 to 1)
color_normalized = idx / max(num_keypoints - 1, 1)
rgba = cmap(color_normalized)
# Convert from RGBA [0, 1] to BGR [0, 255] for OpenCV
bgr_color = (int(rgba[2] * 255), int(rgba[1] * 255), int(rgba[0] * 255))
-
+
cv2.circle(overlay, (int(x), int(y)), 4, bgr_color, -1)
return overlay
diff --git a/dlclivegui/processors/dlc_processor_socket.py b/dlclivegui/processors/dlc_processor_socket.py
index 73a5cb4..1ec9827 100644
--- a/dlclivegui/processors/dlc_processor_socket.py
+++ b/dlclivegui/processors/dlc_processor_socket.py
@@ -5,8 +5,8 @@
from collections import deque
from math import acos, atan2, copysign, degrees, pi, sqrt
from multiprocessing.connection import Listener
-from threading import Event, Thread
from pathlib import Path
+from threading import Event, Thread
import numpy as np
from dlclive import Processor # type: ignore
@@ -229,10 +229,10 @@ def _handle_client_message(self, msg):
elif cmd == "set_filter":
# Handle filter enable/disable (subclasses override if they support filtering)
use_filter = msg.get("use_filter", False)
- if hasattr(self, 'use_filter'):
+ if hasattr(self, "use_filter"):
self.use_filter = bool(use_filter)
# Reset filters to reinitialize with new setting
- if hasattr(self, 'filters'):
+ if hasattr(self, "filters"):
self.filters = None
LOG.info(f"Filtering {'enabled' if use_filter else 'disabled'}")
else:
@@ -241,11 +241,11 @@ def _handle_client_message(self, msg):
elif cmd == "set_filter_params":
# Handle filter parameter updates (subclasses override if they support filtering)
filter_kwargs = msg.get("filter_kwargs", {})
- if hasattr(self, 'filter_kwargs'):
+ if hasattr(self, "filter_kwargs"):
# Update filter parameters
self.filter_kwargs.update(filter_kwargs)
# Reset filters to reinitialize with new parameters
- if hasattr(self, 'filters'):
+ if hasattr(self, "filters"):
self.filters = None
LOG.info(f"Filter parameters updated: {filter_kwargs}")
else:
@@ -315,10 +315,10 @@ def process(self, pose, **kwargs):
def stop(self):
"""Stop the processor and close all connections."""
LOG.info("Stopping processor...")
-
+
# Signal stop to all threads
self._stop.set()
-
+
# Close all client connections first
for c in list(self.conns):
try:
@@ -326,18 +326,18 @@ def stop(self):
except Exception:
pass
self.conns.discard(c)
-
+
# Close the listener socket
- if hasattr(self, 'listener') and self.listener:
+ if hasattr(self, "listener") and self.listener:
try:
self.listener.close()
except Exception as e:
LOG.debug(f"Error closing listener: {e}")
-
+
# Give the OS time to release the socket on Windows
# This prevents WinError 10048 when restarting
time.sleep(0.1)
-
+
LOG.info("Processor stopped, all connections closed")
def save(self, file=None):
@@ -349,7 +349,7 @@ def save(self, file=None):
save_dict = self.get_data()
path2save = Path(__file__).parent.parent.parent / "data" / file
LOG.info(f"Path should be {path2save}")
- pickle.dump(save_dict, open(path2save, "wb"))
+ pickle.dump(save_dict, open(path2save, "wb"))
save_code = 1
except Exception as e:
LOG.error(f"Save failed: {e}")
@@ -577,7 +577,7 @@ def get_data(self):
save_dict["filter_kwargs"] = self.filter_kwargs
return save_dict
-
+
class MyProcessorTorchmodels_socket(BaseProcessor_socket):
"""
@@ -716,7 +716,7 @@ def process(self, pose, **kwargs):
try:
center = np.average(head_xy, axis=0, weights=head_conf)
except ZeroDivisionError:
- # If all keypoints have zero weight, return without processing
+ # If all keypoints have zero weight, return without processing
return pose
neck = np.average(xy[[2, 3, 6, 7], :], axis=0, weights=conf[[2, 3, 6, 7]])
@@ -797,7 +797,6 @@ def get_data(self):
save_dict["filter_kwargs"] = self.filter_kwargs
return save_dict
-
# Register processors for GUI discovery
From bcd89cc0ec12c4029296dc94fbf71a1d692d59cd Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 5 Dec 2025 16:15:49 +0100
Subject: [PATCH 023/132] some docs
---
docs/camera_support.md | 135 +---------------
docs/features.md | 184 +--------------------
docs/user_guide.md | 353 +----------------------------------------
3 files changed, 5 insertions(+), 667 deletions(-)
diff --git a/docs/camera_support.md b/docs/camera_support.md
index 4d9ba22..ed0b1e0 100644
--- a/docs/camera_support.md
+++ b/docs/camera_support.md
@@ -42,10 +42,6 @@ You can select the backend in the GUI from the "Backend" dropdown, or in your co
- **OpenCV compatible cameras**: For webcams and compatible USB cameras.
- **Aravis backend**: For GenICam/GigE Vision cameras (requires Homebrew installation).
-#### NVIDIA Jetson
-- **OpenCV compatible cameras**: Standard V4L2 camera support.
-- **Aravis backend**: Supported but may have platform-specific bugs. See [Aravis issues](https://github.com/AravisProject/aravis/issues/324).
-
### Quick Installation Guide
#### Aravis (Linux/Ubuntu)
@@ -67,10 +63,8 @@ Install vendor-provided camera drivers and SDK. CTI files are typically in:
| Feature | OpenCV | GenTL | Aravis | Basler (pypylon) |
|---------|--------|-------|--------|------------------|
-| Ease of use | ⭐⭐⭐⭐⭐ | ⭐⭐⭐ | ⭐⭐⭐⭐ | ⭐⭐⭐ |
-| Auto-detection | Basic | Yes | Yes | Yes |
-| Exposure control | Limited | Yes | Yes | Yes |
-| Gain control | Limited | Yes | Yes | Yes |
+| Exposure control | No | Yes | Yes | Yes |
+| Gain control | No | Yes | Yes | Yes |
| Windows | ✅ | ✅ | ❌ | ✅ |
| Linux | ✅ | ✅ | ✅ | ✅ |
| macOS | ✅ | ❌ | ✅ | ✅ |
@@ -80,128 +74,3 @@ Install vendor-provided camera drivers and SDK. CTI files are typically in:
- [Aravis Backend](aravis_backend.md) - GenICam/GigE cameras on Linux/macOS
- GenTL Backend - Industrial cameras via vendor CTI files
- OpenCV Backend - Universal webcam support
-
-### Contributing New Camera Types
-
-Any camera that can be accessed through python (e.g. if the company offers a python package) can be integrated into the DeepLabCut-live-GUI. To contribute, please build off of our [base `Camera` class](../dlclivegui/camera/camera.py), and please use our [currently supported cameras](../dlclivegui/camera) as examples.
-
-New camera classes must inherit our base camera class, and provide at least two arguments:
-
-- id: an arbitrary name for a camera
-- resolution: the image size
-
-Other common options include:
-
-- exposure
-- gain
-- rotate
-- crop
-- fps
-
-If the camera does not have it's own display module, you can use our Tkinter video display built into the DeepLabCut-live-GUI by passing `use_tk_display=True` to the base camera class, and control the size of the displayed image using the `display_resize` parameter (`display_resize=1` for full image, `display_resize=0.5` to display images at half the width and height of recorded images).
-
-Here is an example of a camera that allows users to set the resolution, exposure, and crop, and uses the Tkinter display:
-
-```python
-from dlclivegui import Camera
-
-class MyNewCamera(Camera)
-
- def __init__(self, id="", resolution=[640, 480], exposure=0, crop=None, display_resize=1):
- super().__init__(id,
- resolution=resolution,
- exposure=exposure,
- crop=crop,
- use_tk_display=True,
- display_resize=display_resize)
-
-```
-
-All arguments of your camera's `__init__` method will be available to edit in the GUI's `Edit Camera Settings` window. To ensure that you pass arguments of the correct data type, it is helpful to provide default values for each argument of the correct data type (e.g. if `myarg` is a string, please use `myarg=""` instead of `myarg=None`). If a certain argument has only a few possible values, and you want to limit the options user's can input into the `Edit Camera Settings` window, please implement a `@static_method` called `arg_restrictions`. This method should return a dictionary where the keys are the arguments for which you want to provide value restrictions, and the values are the possible values that a specific argument can take on. Below is an example that restrictions the values for `use_tk_display` to `True` or `False`, and restricts the possible values of `resolution` to `[640, 480]` or `[320, 240]`.
-
-```python
- @static_method
- def arg_restrictions():
- return {'use_tk_display' : [True, False],
- 'resolution' : [[640, 480], [320, 240]]}
-```
-
-In addition to an `__init__` method that calls the `dlclivegui.Camera.__init__` method, you need to overwrite the `dlclivegui.Camera.set_capture_device`, `dlclive.Camera.close_capture_device`, and one of the following two methods: `dlclivegui.Camera.get_image` or `dlclivegui.Camera.get_image_on_time`.
-
-Your camera class's `set_capture_device` method should open the camera feed and confirm that the appropriate settings (such as exposure, rotation, gain, etc.) have been properly set. The `close_capture_device` method should simply close the camera stream. For example, see the [OpenCV camera](../dlclivegui/camera/opencv.py) `set_capture_device` and `close_capture_device` method.
-
-If you're camera has built in methods to ensure the correct frame rate (e.g. when grabbing images, it will block until the next image is ready), then overwrite the `get_image_on_time` method. If the camera does not block until the next image is ready, then please set the `get_image` method, and the base camera class's `get_image_on_time` method will ensure that images are only grabbed at the specified frame rate.
-
-The `get_image` method has no input arguments, but must return an image as a numpy array. We also recommend converting images to 8-bit integers (data type `uint8`).
-
-The `get_image_on_time` method has no input arguments, but must return an image as a numpy array (as in `get_image`) and the timestamp at which the image is returned (using python's `time.time()` function).
-
-### Camera Specific Tips for Installation & Use:
-
-#### Basler cameras
-
-Basler USB3 cameras are compatible with Aravis. However, integration with DeepLabCut-live-GUI can also be obtained with `pypylon`, the python module to drive Basler cameras, and supported by the company. Please note using `pypylon` requires you to install Pylon viewer, a free of cost GUI also developed and supported by Basler and available on several platforms.
-
-* **Pylon viewer**: https://www.baslerweb.com/en/sales-support/downloads/software-downloads/#type=pylonsoftware;language=all;version=all
-* `pypylon`: https://github.com/basler/pypylon/releases
-
-If you want to use DeepLabCut-live-GUI with a Basler USB3 camera via pypylon, see the folllowing instructions. Please note this is tested on Ubuntu 20.04. It may (or may not) work similarly in other platforms (contributed by [@antortjim](https://github.com/antortjim)). This procedure should take around 10 minutes:
-
-**Install Pylon viewer**
-
-1. Download .deb file
-Download the .deb file in the downloads center of Basler. Last version as of writing this was **pylon 6.2.0 Camera Software Suite Linux x86 (64 Bit) - Debian Installer Package**.
-
-
-2. Install .deb file
-
-```
-sudo dpkg -i pylon_6.2.0.21487-deb0_amd64.deb
-```
-
-**Install swig**
-
-Required for compilation of non python code within pypylon
-
-1. Install swig dependencies
-
-You may have to install these in a fresh Ubuntu 20.04 install
-
-```
-sudo apt install gcc g++
-sudo apt install libpcre3-dev
-sudo apt install make
-```
-
-2. Download swig
-
-Go to http://prdownloads.sourceforge.net/swig/swig-4.0.2.tar.gz and download the tar gz
-
-3. Install swig
-```
-tar -zxvf swig-4.0.2.tar.gz
-cd swig-4.0.2
-./configure
-make
-sudo make install
-```
-
-**Install pypylon**
-
-1. Download pypylon
-
-```
-wget https://github.com/basler/pypylon/archive/refs/tags/1.7.2.tar.gz
-```
-
-or go to https://github.com/basler/pypylon/releases and get the version you want!
-
-2. Install pypylon
-
-```
-tar -zxvf 1.7.2.tar.gz
-cd pypylon-1.7.2
-python setup.py install
-```
-
-Once you have completed these steps, you should be able to call your Basler camera from DeepLabCut-live-GUI using the BaslerCam camera type that appears after clicking "Add camera")
diff --git a/docs/features.md b/docs/features.md
index 1a04068..91d87ad 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -20,7 +20,7 @@
The GUI supports four different camera backends, each optimized for different use cases:
#### OpenCV Backend
-- **Platform**: Windows, Linux, macOS
+- **Platform**: Windows, Linux
- **Best For**: Webcams, simple USB cameras
- **Installation**: Built-in with OpenCV
- **Limitations**: Limited exposure/gain control
@@ -32,10 +32,9 @@ The GUI supports four different camera backends, each optimized for different us
- **Features**: Full camera control, smart device detection
#### Aravis Backend
-- **Platform**: Linux (best), macOS
+- **Platform**: Linux (best)
- **Best For**: GenICam/GigE Vision cameras
- **Installation**: System packages (`gir1.2-aravis-0.8`)
-- **Features**: Excellent Linux support, native GigE
#### Basler Backend (pypylon)
- **Platform**: Windows, Linux, macOS
@@ -95,7 +94,6 @@ Example detection output:
### DLCLive Integration
#### Model Support
-- **TensorFlow (Base)**: Original DeepLabCut models
- **PyTorch**: PyTorch-exported models
- Model selection via dropdown
- Automatic model validation
@@ -240,63 +238,6 @@ Single JSON file contains all settings:
- Default values for missing fields
- Error messages for invalid entries
- Safe fallback to defaults
-
-### Configuration Sections
-
-#### Camera Settings (`camera`)
-```json
-{
- "name": "Camera 0",
- "index": 0,
- "fps": 60.0,
- "backend": "gentl",
- "exposure": 10000,
- "gain": 5.0,
- "crop_x0": 0,
- "crop_y0": 0,
- "crop_x1": 0,
- "crop_y1": 0,
- "max_devices": 3,
- "properties": {}
-}
-```
-
-#### DLC Settings (`dlc`)
-```json
-{
- "model_path": "/path/to/model",
- "model_type": "base",
- "additional_options": {
- "resize": 0.5,
- "processor": "cpu",
- "pcutoff": 0.6
- }
-}
-```
-
-#### Recording Settings (`recording`)
-```json
-{
- "enabled": true,
- "directory": "~/Videos/dlc",
- "filename": "session.mp4",
- "container": "mp4",
- "codec": "h264_nvenc",
- "crf": 23
-}
-```
-
-#### Bounding Box Settings (`bbox`)
-```json
-{
- "enabled": false,
- "x0": 0,
- "y0": 0,
- "x1": 200,
- "y1": 100
-}
-```
-
---
## Processor System
@@ -462,21 +403,6 @@ The GUI monitors `video_recording` property and automatically starts/stops recor
- **Dropped**: Encoding failures
- **Format**: "1500/1502 frames | write 59.8 fps | latency 12.3 ms (avg 12.5 ms) | queue 5 (~83 ms) | dropped 2"
-### Performance Optimization
-
-#### Automatic Adjustments
-- Frame display throttling (25 Hz max)
-- Queue backpressure handling
-- Automatic resolution detection
-
-#### User Adjustments
-- Reduce camera FPS
-- Enable ROI cropping
-- Use hardware encoding
-- Increase CRF value
-- Disable pose visualization
-- Adjust buffer counts
-
---
## Advanced Features
@@ -528,38 +454,6 @@ Qt signals/slots ensure thread-safe communication.
### Extensibility
-#### Custom Backends
-Implement `CameraBackend` abstract class:
-```python
-class MyBackend(CameraBackend):
- def open(self): ...
- def read(self) -> Tuple[np.ndarray, float]: ...
- def close(self): ...
-
- @classmethod
- def get_device_count(cls) -> int: ...
-```
-
-Register in `factory.py`:
-```python
-_BACKENDS = {
- "mybackend": ("module.path", "MyBackend")
-}
-```
-
-#### Custom Processors
-Place in `processors/` directory:
-```python
-class MyProcessor:
- def __init__(self, **kwargs):
- # Initialize
- pass
-
- def process(self, pose, timestamp):
- # Process pose
- pass
-```
-
### Debugging Features
#### Logging
@@ -567,58 +461,7 @@ class MyProcessor:
- Frame acquisition logging
- Performance warnings
- Connection status
-
-#### Development Mode
-- Syntax validation: `python -m compileall dlclivegui`
-- Type checking: `mypy dlclivegui`
-- Test files included
-
---
-
-## Use Case Examples
-
-### High-Speed Behavior Tracking
-
-**Setup**:
-- Camera: GenTL industrial camera @ 120 FPS
-- Codec: h264_nvenc (GPU encoding)
-- Crop: Region of interest only
-- DLC: PyTorch model on GPU
-
-**Settings**:
-```json
-{
- "camera": {"fps": 120, "crop_x0": 200, "crop_y0": 100, "crop_x1": 800, "crop_y1": 600},
- "recording": {"codec": "h264_nvenc", "crf": 28},
- "dlc": {"additional_options": {"processor": "gpu", "resize": 0.5}}
-}
-```
-
-### Event-Triggered Recording
-
-**Setup**:
-- Processor: Socket processor with auto-record
-- Trigger: Remote computer sends START/STOP commands
-- Session naming: Unique per trial
-
-**Workflow**:
-1. Enable "Auto-record video on processor command"
-2. Start preview and inference
-3. Remote system connects via socket
-4. Sends `START_RECORDING:trial_001` → recording starts
-5. Sends `STOP_RECORDING` → recording stops
-6. Files saved as `trial_001.mp4`
-
-### Multi-Camera Synchronization
-
-**Setup**:
-- Multiple GUI instances
-- Shared trigger signal
-- Synchronized filenames
-
-**Configuration**:
-Each instance with different camera index but same settings template.
-
---
## Keyboard Shortcuts
@@ -627,27 +470,4 @@ Each instance with different camera index but same settings template.
- **Ctrl+S**: Save configuration
- **Ctrl+Shift+S**: Save configuration as
- **Ctrl+Q**: Quit application
-
---
-
-## Platform-Specific Notes
-
-### Windows
-- Best GenTL support (vendor CTI files)
-- NVENC highly recommended
-- DirectShow backend for webcams
-
-### Linux
-- Best Aravis support (native GigE)
-- V4L2 backend for webcams
-- NVENC available with proprietary drivers
-
-### macOS
-- Limited industrial camera support
-- Aravis via Homebrew
-- Software encoding recommended
-
-### NVIDIA Jetson
-- Optimized for edge deployment
-- Hardware encoding available
-- Some Aravis compatibility issues
diff --git a/docs/user_guide.md b/docs/user_guide.md
index 50374c0..0346d53 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -8,10 +8,6 @@ Complete walkthrough for using the DeepLabCut-live-GUI application.
2. [Camera Setup](#camera-setup)
3. [DLCLive Configuration](#dlclive-configuration)
4. [Recording Videos](#recording-videos)
-5. [Working with Configurations](#working-with-configurations)
-6. [Common Workflows](#common-workflows)
-7. [Tips and Best Practices](#tips-and-best-practices)
-
---
## Getting Started
@@ -164,22 +160,9 @@ Select if camera is mounted at an angle:
- Model weights (`.pb`, `.pth`, etc.)
### Step 2: Choose Model Type
-
-Select from dropdown:
-- **Base (TensorFlow)**: Standard DLC models
+We only support newer, pytorch based models.
- **PyTorch**: PyTorch-based models (requires PyTorch)
-### Step 3: Configure Options (Optional)
-
-Click in "Additional options" field and enter JSON:
-
-```json
-{
- "processor": "gpu",
- "resize": 0.5,
- "pcutoff": 0.6
-}
-```
**Common options**:
- `processor`: "cpu" or "gpu"
@@ -278,13 +261,6 @@ Check **"Display pose predictions"** to overlay keypoints on video.
- Full resolution
- Sufficient disk space
-#### Long Duration Recording
-
-**Tips**:
-- Use CRF 23-25 to balance quality/size
-- Monitor disk space
-- Consider splitting into multiple files
-- Use fast SSD storage
### Auto-Recording
@@ -295,325 +271,7 @@ Enable automatic recording triggered by processor events:
3. **Start inference**: Processor will control recording
4. **Session management**: Files named by processor
-**Use cases**:
-- Trial-based experiments
-- Event-triggered recording
-- Remote control via socket processor
-- Conditional data capture
-
----
-
-## Working with Configurations
-
-### Saving Current Settings
-
-**Save** (overwrites existing file):
-1. File → Save configuration (or Ctrl+S)
-2. If no file loaded, prompts for location
-
-**Save As** (create new file):
-1. File → Save configuration as… (or Ctrl+Shift+S)
-2. Choose location and filename
-3. Enter name (e.g., `mouse_experiment.json`)
-4. Click Save
-
-### Loading Saved Settings
-
-1. File → Load configuration… (or Ctrl+O)
-2. Navigate to configuration file
-3. Select `.json` file
-4. Click Open
-5. All GUI fields update automatically
-
-### Managing Multiple Configurations
-
-**Recommended structure**:
-```
-configs/
-├── default.json # Base settings
-├── mouse_arena1.json # Arena-specific
-├── mouse_arena2.json
-├── rat_setup.json
-└── high_speed.json # Performance-specific
-```
-
-**Workflow**:
-1. Create base configuration with common settings
-2. Save variants for different:
- - Animals/subjects
- - Experimental setups
- - Camera positions
- - Recording quality levels
-
-### Configuration Templates
-
-#### Webcam + CPU Processing
-```json
-{
- "camera": {
- "backend": "opencv",
- "index": 0,
- "fps": 30.0
- },
- "dlc": {
- "model_type": "base",
- "additional_options": {"processor": "cpu"}
- },
- "recording": {
- "codec": "libx264",
- "crf": 23
- }
-}
-```
-
-#### Industrial Camera + GPU
-```json
-{
- "camera": {
- "backend": "gentl",
- "index": 0,
- "fps": 60.0,
- "exposure": 10000,
- "gain": 8.0
- },
- "dlc": {
- "model_type": "pytorch",
- "additional_options": {
- "processor": "gpu",
- "resize": 0.5
- }
- },
- "recording": {
- "codec": "h264_nvenc",
- "crf": 23
- }
-}
-```
-
----
-
-## Common Workflows
-
-### Workflow 1: Simple Webcam Tracking
-
-**Goal**: Track mouse behavior with webcam
-
-1. **Camera Setup**:
- - Backend: opencv
- - Camera: Built-in webcam (index 0)
- - FPS: 30
-
-2. **Start Preview**: Verify mouse is visible
-
-3. **Load DLC Model**: Browse to mouse tracking model
-
-4. **Start Inference**: Enable pose estimation
-
-5. **Verify Tracking**: Enable pose visualization
-
-6. **Record Trial**: Start/stop recording as needed
-
-### Workflow 2: High-Speed Industrial Camera
-
-**Goal**: Track fast movements at 120 FPS
-
-1. **Camera Setup**:
- - Backend: gentl or aravis
- - Refresh and select camera
- - FPS: 120
- - Exposure: 4000 μs (short exposure)
- - Crop: Region of interest only
-
-2. **Start Preview**: Check FPS is stable
-
-3. **Configure Recording**:
- - Codec: h264_nvenc
- - CRF: 28
- - Output: Fast SSD
-
-4. **Load DLC Model** (if needed):
- - PyTorch model
- - GPU processor
- - Resize: 0.5 (reduce load)
-
-5. **Start Recording**: Begin data capture
-
-6. **Monitor Performance**: Watch for dropped frames
-
-### Workflow 3: Event-Triggered Recording
-
-**Goal**: Record only during specific events
-
-1. **Camera Setup**: Configure as normal
-
-2. **Processor Setup**:
- - Select socket processor
- - Enable "Auto-record video on processor command"
-
-3. **Start Preview**: Camera running
-
-4. **Start Inference**: DLC + processor active
-
-5. **Remote Control**:
- - Connect to socket (default port 5000)
- - Send `START_RECORDING:trial_001`
- - Recording starts automatically
- - Send `STOP_RECORDING`
- - Recording stops, file saved
-
-### Workflow 4: Multi-Subject Tracking
-
-**Goal**: Track multiple animals simultaneously
-
-**Option A: Single Camera, Multiple Keypoints**
-1. Use DLC model trained for multiple subjects
-2. Single GUI instance
-3. Processor distinguishes subjects
-
-**Option B: Multiple Cameras**
-1. Launch multiple GUI instances
-2. Each with different camera index
-3. Synchronized configurations
-4. Coordinated filenames
-
----
-
-## Tips and Best Practices
-
-### Camera Tips
-
-1. **Lighting**:
- - Consistent, diffuse lighting
- - Avoid shadows and reflections
- - IR lighting for night vision
-
-2. **Positioning**:
- - Stable mount (minimize vibration)
- - Appropriate angle for markers
- - Sufficient field of view
-
-3. **Settings**:
- - Start with auto exposure/gain
- - Adjust manually if needed
- - Test different FPS rates
- - Use cropping to reduce load
-
-### Recording Tips
-
-1. **File Management**:
- - Use descriptive filenames
- - Include date/subject/trial info
- - Organize by experiment/session
- - Regular backups
-
-2. **Performance**:
- - Close unnecessary applications
- - Monitor disk space
- - Use SSD for high-speed recording
- - Enable GPU encoding if available
-
-3. **Quality**:
- - Test CRF values beforehand
- - Balance quality vs. file size
- - Consider post-processing needs
- - Verify recordings occasionally
-
-### DLCLive Tips
-
-1. **Model Selection**:
- - Use model trained on similar conditions
- - Test offline before live use
- - Consider resize for speed
- - GPU highly recommended
-
-2. **Performance**:
- - Monitor inference FPS
- - Check latency values
- - Watch queue depth
- - Reduce resolution if needed
-
-3. **Validation**:
- - Enable visualization initially
- - Verify tracking quality
- - Check all keypoints
- - Test edge cases
-
-### General Best Practices
-
-1. **Configuration Management**:
- - Save configurations frequently
- - Version control config files
- - Document custom settings
- - Share team configurations
-
-2. **Testing**:
- - Test setup before experiments
- - Run trial recordings
- - Verify all components
- - Check file outputs
-
-3. **Troubleshooting**:
- - Check status messages
- - Monitor performance metrics
- - Review error dialogs carefully
- - Restart if issues persist
-
-4. **Data Organization**:
- - Consistent naming scheme
- - Separate folders per session
- - Include metadata files
- - Regular data validation
-
---
-
-## Troubleshooting Guide
-
-### Camera Issues
-
-**Problem**: Camera not detected
-- **Solution**: Click Refresh, check connections, verify drivers
-
-**Problem**: Low frame rate
-- **Solution**: Reduce resolution, increase exposure, check CPU usage
-
-**Problem**: Image too dark/bright
-- **Solution**: Adjust exposure and gain settings
-
-### DLCLive Issues
-
-**Problem**: Model fails to load
-- **Solution**: Verify path, check model type, install dependencies
-
-**Problem**: Slow inference
-- **Solution**: Enable GPU, reduce resolution, use resize option
-
-**Problem**: Poor tracking
-- **Solution**: Check lighting, enable visualization, verify model quality
-
-### Recording Issues
-
-**Problem**: Dropped frames
-- **Solution**: Use GPU encoding, increase CRF, reduce FPS
-
-**Problem**: Large file sizes
-- **Solution**: Increase CRF value, use better codec
-
-**Problem**: Recording won't start
-- **Solution**: Check disk space, verify path permissions
-
----
-
-## Keyboard Reference
-
-| Action | Shortcut |
-|--------|----------|
-| Load configuration | Ctrl+O |
-| Save configuration | Ctrl+S |
-| Save configuration as | Ctrl+Shift+S |
-| Quit application | Ctrl+Q |
-
----
-
## Next Steps
- Explore [Features Documentation](features.md) for detailed capabilities
@@ -622,12 +280,3 @@ configs/
- See [Aravis Backend](aravis_backend.md) for Linux industrial cameras
---
-
-## Getting Help
-
-If you encounter issues:
-1. Check status messages in GUI
-2. Review this user guide
-3. Consult technical documentation
-4. Check GitHub issues
-5. Contact support team
From 7b70c24dac9bdc77ee304de4719917fc50d83330 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Fri, 5 Dec 2025 16:19:04 +0100
Subject: [PATCH 024/132] updated docs
---
README.md | 67 +++++--------------------------------------------------
1 file changed, 5 insertions(+), 62 deletions(-)
diff --git a/README.md b/README.md
index 34a2682..a330e0b 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A modern PyQt6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/D
- **Live Preview**: Real-time camera feed with rotation support (0°, 90°, 180°, 270°)
### DLCLive Features
-- **Model Support**: TensorFlow (base) and PyTorch models
+- **Model Support**: Only PyTorch models! (in theory also tensorflow models work)
- **Processor System**: Plugin architecture for custom pose processing
- **Auto-Recording**: Automatic video recording triggered by processor commands
- **Performance Metrics**: Real-time FPS, latency, and queue monitoring
@@ -141,11 +141,7 @@ The GUI uses a single JSON configuration file containing all experiment settings
},
"dlc": {
"model_path": "/path/to/exported-model",
- "model_type": "base",
- "additional_options": {
- "resize": 0.5,
- "processor": "cpu"
- }
+ "model_type": "pytorch",
},
"recording": {
"enabled": true,
@@ -206,34 +202,11 @@ All GUI fields are automatically synchronized with the configuration file.
"index": 0,
"fps": 60.0,
"exposure": 15000,
- "gain": 8.0,
- "properties": {
- "cti_file": "C:\\Path\\To\\Producer.cti",
- "serial_number": "12345678",
- "pixel_format": "Mono8"
- }
+ "gain": 8.0,
}
}
```
-#### Aravis
-```json
-{
- "camera": {
- "backend": "aravis",
- "index": 0,
- "fps": 60.0,
- "exposure": 10000,
- "gain": 5.0,
- "properties": {
- "camera_id": "TheImagingSource-12345678",
- "pixel_format": "Mono8",
- "n_buffers": 10,
- "timeout": 2000000
- }
- }
-}
-```
See [Camera Backend Documentation](docs/camera_support.md) for detailed setup instructions.
@@ -241,10 +214,9 @@ See [Camera Backend Documentation](docs/camera_support.md) for detailed setup in
### Model Types
-The GUI supports both TensorFlow and PyTorch DLCLive models:
+The GUI supports PyTorch DLCLive models:
-1. **Base (TensorFlow)**: Original DLC models exported for live inference
-2. **PyTorch**: PyTorch-based models (requires PyTorch installation)
+1. **PyTorch**: PyTorch-based models (requires PyTorch installation)
Select the model type from the dropdown before starting inference.
@@ -284,15 +256,6 @@ Enable "Auto-record video on processor command" to automatically start/stop reco
4. **Disable Visualization**: Uncheck "Display pose predictions" during recording
5. **Crop Region**: Use cropping to reduce frame size before inference
-### Recommended Settings by FPS
-
-| FPS Range | Codec | CRF | Buffers | Notes |
-|-----------|-------|-----|---------|-------|
-| 30-60 | libx264 | 23 | 10 | Standard quality |
-| 60-120 | h264_nvenc | 23 | 15 | GPU encoding |
-| 120-200 | h264_nvenc | 28 | 20 | Higher compression |
-| 200+ | h264_nvenc | 30 | 30 | Max performance |
-
### Project Structure
```
@@ -315,26 +278,6 @@ dlclivegui/
└── dlc_processor_socket.py
```
-### Running Tests
-
-```bash
-# Syntax check
-python -m compileall dlclivegui
-
-# Type checking (optional)
-mypy dlclivegui
-
-```
-
-### Adding New Camera Backends
-
-1. Create new backend inheriting from `CameraBackend`
-2. Implement required methods: `open()`, `read()`, `close()`
-3. Optional: Implement `get_device_count()` for smart detection
-4. Register in `cameras/factory.py`
-
-See [Camera Backend Development](docs/camera_support.md) for detailed instructions.
-
## Documentation
From 94ccc7b581f5e91fb344429cef1e1c5988cd079a Mon Sep 17 00:00:00 2001
From: Mackenzie Mathis
Date: Fri, 5 Dec 2025 17:48:34 +0100
Subject: [PATCH 025/132] Update dlclivegui/gui.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
dlclivegui/gui.py | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index c4d5781..9c27a1b 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -686,29 +686,6 @@ def _current_camera_index_value(self) -> Optional[int]:
self.camera_index.setEditText("")
self.camera_index.blockSignals(False)
- def _select_camera_by_index(self, index: int, fallback_text: Optional[str] = None) -> None:
- self.camera_index.blockSignals(True)
- for row in range(self.camera_index.count()):
- if self.camera_index.itemData(row) == index:
- self.camera_index.setCurrentIndex(row)
- break
- else:
- text = fallback_text if fallback_text is not None else str(index)
- self.camera_index.setEditText(text)
- self.camera_index.blockSignals(False)
-
- def _current_camera_index_value(self) -> Optional[int]:
- data = self.camera_index.currentData()
- if isinstance(data, int):
- return data
- text = self.camera_index.currentText().strip()
- if not text:
- return None
- try:
- return int(text)
- except ValueError:
- return None
-
def _parse_json(self, value: str) -> dict:
text = value.strip()
if not text:
From c5659d7f0c8fa950e49b53ae3ca0213d6e652bf6 Mon Sep 17 00:00:00 2001
From: Mackenzie Mathis
Date: Fri, 5 Dec 2025 18:15:45 +0100
Subject: [PATCH 026/132] Rename DLC Processor to DeepLabCut Processor
---
dlclivegui/processors/PLUGIN_SYSTEM.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlclivegui/processors/PLUGIN_SYSTEM.md b/dlclivegui/processors/PLUGIN_SYSTEM.md
index fc9cab4..0c0351d 100644
--- a/dlclivegui/processors/PLUGIN_SYSTEM.md
+++ b/dlclivegui/processors/PLUGIN_SYSTEM.md
@@ -1,4 +1,4 @@
-# DLC Processor Plugin System
+# DeepLabCut Processor Plugin System
This folder contains a plugin-style architecture for DLC processors that allows GUI tools to discover and instantiate processors dynamically.
From 89cc84ae42c9bae9aaac0a5d70d989cebd8394d9 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 9 Dec 2025 10:36:08 +0100
Subject: [PATCH 027/132] Moved path2models as well as optional device and
further DLCProcessor options to config
---
README.md | 2 +-
dlclivegui/config.py | 16 ++++++++++++++++
dlclivegui/dlc_processor.py | 10 ++++++----
dlclivegui/gui.py | 13 ++++++++-----
4 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index a330e0b..1ccf828 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ All GUI fields are automatically synchronized with the configuration file.
"index": 0,
"fps": 60.0,
"exposure": 15000,
- "gain": 8.0,
+ "gain": 8.0,
}
}
```
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index 7cc629a..6c0b7be 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -49,6 +49,11 @@ class DLCProcessorSettings:
"""Configuration for DLCLive processing."""
model_path: str = ""
+ model_directory: str = "." # Default directory for model browser (current dir if not set)
+ device: Optional[str] = None # Device for inference (e.g., "cuda:0", "cpu"). None = auto
+ dynamic: tuple = (False, 0.5, 10) # Dynamic cropping: (enabled, margin, max_missing_frames)
+ resize: float = 1.0 # Resize factor for input frames
+ precision: str = "FP32" # Inference precision ("FP32", "FP16")
additional_options: Dict[str, Any] = field(default_factory=dict)
model_type: str = "pytorch" # Only PyTorch models are supported
@@ -131,8 +136,19 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
camera = CameraSettings(**data.get("camera", {})).apply_defaults()
dlc_data = dict(data.get("dlc", {}))
+ # Parse dynamic parameter - can be list or tuple in JSON
+ dynamic_raw = dlc_data.get("dynamic", [False, 0.5, 10])
+ if isinstance(dynamic_raw, (list, tuple)) and len(dynamic_raw) == 3:
+ dynamic = tuple(dynamic_raw)
+ else:
+ dynamic = (False, 0.5, 10)
dlc = DLCProcessorSettings(
model_path=str(dlc_data.get("model_path", "")),
+ model_directory=str(dlc_data.get("model_directory", ".")),
+ device=dlc_data.get("device"), # None if not specified
+ dynamic=dynamic,
+ resize=float(dlc_data.get("resize", 1.0)),
+ precision=str(dlc_data.get("precision", "FP32")),
additional_options=dict(dlc_data.get("additional_options", {})),
)
recording_data = dict(data.get("recording", {}))
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 03a9b70..801009a 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -247,11 +247,13 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
"model_path": self._settings.model_path,
"model_type": self._settings.model_type,
"processor": self._processor,
- "dynamic": [False, 0.5, 10],
- "resize": 1.0,
- "precision": "FP32",
+ "dynamic": list(self._settings.dynamic),
+ "resize": self._settings.resize,
+ "precision": self._settings.precision,
}
- # todo expose more parameters from settings
+ # Add device if specified in settings
+ if self._settings.device is not None:
+ options["device"] = self._settings.device
self._dlc = DLCLive(**options)
init_inference_start = time.perf_counter()
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 9c27a1b..17f6846 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -54,12 +54,8 @@
from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
-os.environ["CUDA_VISIBLE_DEVICES"] = "1"
-
logging.basicConfig(level=logging.INFO)
-PATH2MODELS = "C:\\Users\\User\\Repos\\DeepLabCut-live-GUI\\dlc_training\\dlclive"
-
class MainWindow(QMainWindow):
"""Main application window."""
@@ -695,6 +691,11 @@ def _parse_json(self, value: str) -> dict:
def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
return DLCProcessorSettings(
model_path=self.model_path_edit.text().strip(),
+ model_directory=self._config.dlc.model_directory, # Preserve from config
+ device=self._config.dlc.device, # Preserve from config
+ dynamic=self._config.dlc.dynamic, # Preserve from config
+ resize=self._config.dlc.resize, # Preserve from config
+ precision=self._config.dlc.precision, # Preserve from config
model_type="pytorch",
additional_options=self._parse_json(self.additional_options_edit.toPlainText()),
)
@@ -770,10 +771,12 @@ def _save_config_to_path(self, path: Path) -> None:
self.statusBar().showMessage(f"Saved configuration to {path}", 5000)
def _action_browse_model(self) -> None:
+ # Use model_directory from config, default to current directory
+ start_dir = self._config.dlc.model_directory or "."
file_path, _ = QFileDialog.getOpenFileName(
self,
"Select DLCLive model file",
- PATH2MODELS,
+ start_dir,
"Model files (*.pt *.pb);;All files (*.*)",
)
if file_path:
From edf6b8070240b6465d6b373cecd0c43c41c71fb3 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 9 Dec 2025 11:27:29 +0100
Subject: [PATCH 028/132] remove path from docstring
---
dlclivegui/processors/processor_utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlclivegui/processors/processor_utils.py b/dlclivegui/processors/processor_utils.py
index b69b3a7..448fa3a 100644
--- a/dlclivegui/processors/processor_utils.py
+++ b/dlclivegui/processors/processor_utils.py
@@ -10,7 +10,7 @@ def load_processors_from_file(file_path):
Args:
file_path: Path to Python file containing processors
- Returns:/home/as153/work_geneva/mice_ar_tasks/mouse_ar/ctrl/dlc_processors/GUI_INTEGRATION.md
+ Returns:
dict: Dictionary of available processors
"""
# Load module from file
From 37ca392a0faf6ad0b2ccae752db1eaa80933bc3a Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 9 Dec 2025 18:34:40 +0100
Subject: [PATCH 029/132] fix exposure settings in gentl backend
---
dlclivegui/cameras/gentl_backend.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index cdc798e..87064a5 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -42,8 +42,11 @@ def __init__(self, settings):
self._pixel_format: str = props.get("pixel_format", "Mono8")
self._rotate: int = int(props.get("rotate", 0)) % 360
self._crop: Optional[Tuple[int, int, int, int]] = self._parse_crop(props.get("crop"))
- self._exposure: Optional[float] = props.get("exposure")
- self._gain: Optional[float] = props.get("gain")
+ # Check settings first (from config), then properties (for backward compatibility)
+ self._exposure: Optional[float] = (
+ settings.exposure if settings.exposure else props.get("exposure")
+ )
+ self._gain: Optional[float] = settings.gain if settings.gain else props.get("gain")
self._timeout: float = float(props.get("timeout", 2.0))
self._cti_search_paths: Tuple[str, ...] = self._parse_cti_paths(
props.get("cti_search_paths")
From 05ff126ac58e4950be9a942e2c69dda04299ad4f Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 18 Dec 2025 14:18:08 +0100
Subject: [PATCH 030/132] Add logging for camera configuration and error
handling in backends - Update configuration settings to include support for
single-animal models in DLCProcessorSettings. - Improve user guide with a
link to DLC documentation for model export.
---
dlclivegui/cameras/aravis_backend.py | 47 ++++++---
dlclivegui/cameras/basler_backend.py | 63 ++++++++++--
dlclivegui/cameras/gentl_backend.py | 142 ++++++++++++++++++++++-----
dlclivegui/cameras/opencv_backend.py | 35 +++++--
dlclivegui/config.py | 1 +
dlclivegui/dlc_processor.py | 3 +-
docs/user_guide.md | 2 +-
7 files changed, 240 insertions(+), 53 deletions(-)
diff --git a/dlclivegui/cameras/aravis_backend.py b/dlclivegui/cameras/aravis_backend.py
index e033096..e04ad60 100644
--- a/dlclivegui/cameras/aravis_backend.py
+++ b/dlclivegui/cameras/aravis_backend.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import logging
import time
from typing import Optional, Tuple
@@ -10,6 +11,8 @@
from .base import CameraBackend
+LOG = logging.getLogger(__name__)
+
try: # pragma: no cover - optional dependency
import gi
@@ -231,12 +234,13 @@ def _configure_pixel_format(self) -> None:
if self._pixel_format in format_map:
self._camera.set_pixel_format(format_map[self._pixel_format])
+ LOG.info(f"Pixel format set to '{self._pixel_format}'")
else:
# Try setting as string
self._camera.set_pixel_format_from_string(self._pixel_format)
- except Exception:
- # If pixel format setting fails, continue with default
- pass
+ LOG.info(f"Pixel format set to '{self._pixel_format}' (from string)")
+ except Exception as e:
+ LOG.warning(f"Failed to set pixel format '{self._pixel_format}': {e}")
def _configure_exposure(self) -> None:
"""Configure camera exposure time."""
@@ -255,13 +259,19 @@ def _configure_exposure(self) -> None:
# Disable auto exposure
try:
self._camera.set_exposure_time_auto(Aravis.Auto.OFF)
- except Exception:
- pass
+ LOG.info("Auto exposure disabled")
+ except Exception as e:
+ LOG.warning(f"Failed to disable auto exposure: {e}")
# Set exposure time (in microseconds)
self._camera.set_exposure_time(exposure)
- except Exception:
- pass
+ actual = self._camera.get_exposure_time()
+ if abs(actual - exposure) > 1.0: # Allow 1μs tolerance
+ LOG.warning(f"Exposure mismatch: requested {exposure}μs, got {actual}μs")
+ else:
+ LOG.info(f"Exposure set to {actual}μs")
+ except Exception as e:
+ LOG.warning(f"Failed to set exposure to {exposure}μs: {e}")
def _configure_gain(self) -> None:
"""Configure camera gain."""
@@ -280,13 +290,19 @@ def _configure_gain(self) -> None:
# Disable auto gain
try:
self._camera.set_gain_auto(Aravis.Auto.OFF)
- except Exception:
- pass
+ LOG.info("Auto gain disabled")
+ except Exception as e:
+ LOG.warning(f"Failed to disable auto gain: {e}")
# Set gain value
self._camera.set_gain(gain)
- except Exception:
- pass
+ actual = self._camera.get_gain()
+ if abs(actual - gain) > 0.1: # Allow 0.1 tolerance
+ LOG.warning(f"Gain mismatch: requested {gain}, got {actual}")
+ else:
+ LOG.info(f"Gain set to {actual}")
+ except Exception as e:
+ LOG.warning(f"Failed to set gain to {gain}: {e}")
def _configure_frame_rate(self) -> None:
"""Configure camera frame rate."""
@@ -296,8 +312,13 @@ def _configure_frame_rate(self) -> None:
try:
target_fps = float(self.settings.fps)
self._camera.set_frame_rate(target_fps)
- except Exception:
- pass
+ actual_fps = self._camera.get_frame_rate()
+ if abs(actual_fps - target_fps) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {target_fps:.2f}, got {actual_fps:.2f}")
+ else:
+ LOG.info(f"Frame rate set to {actual_fps:.2f} FPS")
+ except Exception as e:
+ LOG.warning(f"Failed to set frame rate to {self.settings.fps}: {e}")
def _resolve_device_label(self) -> Optional[str]:
"""Get a human-readable device label."""
diff --git a/dlclivegui/cameras/basler_backend.py b/dlclivegui/cameras/basler_backend.py
index ec23806..307fa96 100644
--- a/dlclivegui/cameras/basler_backend.py
+++ b/dlclivegui/cameras/basler_backend.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import logging
import time
from typing import Optional, Tuple
@@ -9,6 +10,8 @@
from .base import CameraBackend
+LOG = logging.getLogger(__name__)
+
try: # pragma: no cover - optional dependency
from pypylon import pylon
except Exception: # pragma: no cover - optional dependency
@@ -37,29 +40,70 @@ def open(self) -> None:
self._camera = pylon.InstantCamera(pylon.TlFactory.GetInstance().CreateDevice(device))
self._camera.Open()
+ # Configure exposure
exposure = self._settings_value("exposure", self.settings.properties)
if exposure is not None:
- self._camera.ExposureTime.SetValue(float(exposure))
+ try:
+ self._camera.ExposureTime.SetValue(float(exposure))
+ actual = self._camera.ExposureTime.GetValue()
+ if abs(actual - float(exposure)) > 1.0: # Allow 1μs tolerance
+ LOG.warning(f"Exposure mismatch: requested {exposure}μs, got {actual}μs")
+ else:
+ LOG.info(f"Exposure set to {actual}μs")
+ except Exception as e:
+ LOG.warning(f"Failed to set exposure to {exposure}μs: {e}")
+
+ # Configure gain
gain = self._settings_value("gain", self.settings.properties)
if gain is not None:
- self._camera.Gain.SetValue(float(gain))
- width = int(self.settings.properties.get("width", self.settings.width))
- height = int(self.settings.properties.get("height", self.settings.height))
- self._camera.Width.SetValue(width)
- self._camera.Height.SetValue(height)
+ try:
+ self._camera.Gain.SetValue(float(gain))
+ actual = self._camera.Gain.GetValue()
+ if abs(actual - float(gain)) > 0.1: # Allow 0.1 tolerance
+ LOG.warning(f"Gain mismatch: requested {gain}, got {actual}")
+ else:
+ LOG.info(f"Gain set to {actual}")
+ except Exception as e:
+ LOG.warning(f"Failed to set gain to {gain}: {e}")
+
+ # Configure resolution
+ requested_width = int(self.settings.properties.get("width", self.settings.width))
+ requested_height = int(self.settings.properties.get("height", self.settings.height))
+ try:
+ self._camera.Width.SetValue(requested_width)
+ self._camera.Height.SetValue(requested_height)
+ actual_width = self._camera.Width.GetValue()
+ actual_height = self._camera.Height.GetValue()
+ if actual_width != requested_width or actual_height != requested_height:
+ LOG.warning(
+ f"Resolution mismatch: requested {requested_width}x{requested_height}, "
+ f"got {actual_width}x{actual_height}"
+ )
+ else:
+ LOG.info(f"Resolution set to {actual_width}x{actual_height}")
+ except Exception as e:
+ LOG.warning(f"Failed to set resolution to {requested_width}x{requested_height}: {e}")
+
+ # Configure frame rate
fps = self._settings_value("fps", self.settings.properties, fallback=self.settings.fps)
if fps is not None:
try:
self._camera.AcquisitionFrameRateEnable.SetValue(True)
self._camera.AcquisitionFrameRate.SetValue(float(fps))
- except Exception:
- # Some cameras expose different frame-rate features; ignore errors.
- pass
+ actual_fps = self._camera.AcquisitionFrameRate.GetValue()
+ if abs(actual_fps - float(fps)) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {fps:.2f}, got {actual_fps:.2f}")
+ else:
+ LOG.info(f"Frame rate set to {actual_fps:.2f} FPS")
+ except Exception as e:
+ LOG.warning(f"Failed to set frame rate to {fps}: {e}")
self._camera.StartGrabbing(pylon.GrabStrategy_LatestImageOnly)
self._converter = pylon.ImageFormatConverter()
self._converter.OutputPixelFormat = pylon.PixelType_BGR8packed
self._converter.OutputBitAlignment = pylon.OutputBitAlignment_MsbAligned
+
+ # Read back final settings
try:
self.settings.width = int(self._camera.Width.GetValue())
self.settings.height = int(self._camera.Height.GetValue())
@@ -67,6 +111,7 @@ def open(self) -> None:
pass
try:
self.settings.fps = float(self._camera.ResultingFrameRateAbs.GetValue())
+ LOG.info(f"Camera configured with resulting FPS: {self.settings.fps:.2f}")
except Exception:
pass
diff --git a/dlclivegui/cameras/gentl_backend.py b/dlclivegui/cameras/gentl_backend.py
index 87064a5..274da7a 100644
--- a/dlclivegui/cameras/gentl_backend.py
+++ b/dlclivegui/cameras/gentl_backend.py
@@ -3,6 +3,7 @@
from __future__ import annotations
import glob
+import logging
import os
import time
from typing import Iterable, List, Optional, Tuple
@@ -12,6 +13,8 @@
from .base import CameraBackend
+LOG = logging.getLogger(__name__)
+
try: # pragma: no cover - optional dependency
from harvesters.core import Harvester # type: ignore
@@ -342,15 +345,28 @@ def _configure_pixel_format(self, node_map) -> None:
try:
if self._pixel_format in node_map.PixelFormat.symbolics:
node_map.PixelFormat.value = self._pixel_format
- except Exception:
- pass
+ actual = node_map.PixelFormat.value
+ if actual != self._pixel_format:
+ LOG.warning(
+ f"Pixel format mismatch: requested '{self._pixel_format}', got '{actual}'"
+ )
+ else:
+ LOG.info(f"Pixel format set to '{actual}'")
+ else:
+ LOG.warning(
+ f"Pixel format '{self._pixel_format}' not in available formats: "
+ f"{node_map.PixelFormat.symbolics}"
+ )
+ except Exception as e:
+ LOG.warning(f"Failed to set pixel format '{self._pixel_format}': {e}")
def _configure_resolution(self, node_map) -> None:
"""Configure camera resolution (width and height)."""
if self._resolution is None:
return
- width, height = self._resolution
+ requested_width, requested_height = self._resolution
+ actual_width, actual_height = None, None
# Try to set width
for width_attr in ("Width", "WidthMax"):
@@ -363,15 +379,23 @@ def _configure_resolution(self, node_map) -> None:
max_w = node.max
inc_w = getattr(node, "inc", 1)
# Adjust to valid value
- width = self._adjust_to_increment(width, min_w, max_w, inc_w)
+ width = self._adjust_to_increment(requested_width, min_w, max_w, inc_w)
+ if width != requested_width:
+ LOG.info(
+ f"Width adjusted from {requested_width} to {width} "
+ f"(min={min_w}, max={max_w}, inc={inc_w})"
+ )
node.value = int(width)
+ actual_width = node.value
break
- except Exception:
+ except Exception as e:
# Try setting without adjustment
try:
- node.value = int(width)
+ node.value = int(requested_width)
+ actual_width = node.value
break
except Exception:
+ LOG.warning(f"Failed to set width via {width_attr}: {e}")
continue
except AttributeError:
continue
@@ -387,64 +411,130 @@ def _configure_resolution(self, node_map) -> None:
max_h = node.max
inc_h = getattr(node, "inc", 1)
# Adjust to valid value
- height = self._adjust_to_increment(height, min_h, max_h, inc_h)
+ height = self._adjust_to_increment(requested_height, min_h, max_h, inc_h)
+ if height != requested_height:
+ LOG.info(
+ f"Height adjusted from {requested_height} to {height} "
+ f"(min={min_h}, max={max_h}, inc={inc_h})"
+ )
node.value = int(height)
+ actual_height = node.value
break
- except Exception:
+ except Exception as e:
# Try setting without adjustment
try:
- node.value = int(height)
+ node.value = int(requested_height)
+ actual_height = node.value
break
except Exception:
+ LOG.warning(f"Failed to set height via {height_attr}: {e}")
continue
except AttributeError:
continue
+ # Log final resolution
+ if actual_width is not None and actual_height is not None:
+ if actual_width != requested_width or actual_height != requested_height:
+ LOG.warning(
+ f"Resolution mismatch: requested {requested_width}x{requested_height}, "
+ f"got {actual_width}x{actual_height}"
+ )
+ else:
+ LOG.info(f"Resolution set to {actual_width}x{actual_height}")
+ else:
+ LOG.warning(
+ f"Could not verify resolution setting "
+ f"(width={actual_width}, height={actual_height})"
+ )
+
def _configure_exposure(self, node_map) -> None:
if self._exposure is None:
return
- for attr in ("ExposureAuto", "ExposureTime", "Exposure"):
+
+ # Try to disable auto exposure first
+ for attr in ("ExposureAuto",):
try:
node = getattr(node_map, attr)
+ node.value = "Off"
+ LOG.info("Auto exposure disabled")
+ break
except AttributeError:
continue
+ except Exception as e:
+ LOG.warning(f"Failed to disable auto exposure: {e}")
+
+ # Set exposure value
+ for attr in ("ExposureTime", "Exposure"):
try:
- if attr == "ExposureAuto":
- node.value = "Off"
+ node = getattr(node_map, attr)
+ except AttributeError:
+ continue
+ try:
+ node.value = float(self._exposure)
+ actual = node.value
+ if abs(actual - self._exposure) > 1.0: # Allow 1μs tolerance
+ LOG.warning(f"Exposure mismatch: requested {self._exposure}μs, got {actual}μs")
else:
- node.value = float(self._exposure)
- return
- except Exception:
+ LOG.info(f"Exposure set to {actual}μs")
+ return
+ except Exception as e:
+ LOG.warning(f"Failed to set exposure via {attr}: {e}")
continue
+ LOG.warning(f"Could not set exposure to {self._exposure}μs (no compatible attribute found)")
+
def _configure_gain(self, node_map) -> None:
if self._gain is None:
return
- for attr in ("GainAuto", "Gain"):
+
+ # Try to disable auto gain first
+ for attr in ("GainAuto",):
+ try:
+ node = getattr(node_map, attr)
+ node.value = "Off"
+ LOG.info("Auto gain disabled")
+ break
+ except AttributeError:
+ continue
+ except Exception as e:
+ LOG.warning(f"Failed to disable auto gain: {e}")
+
+ # Set gain value
+ for attr in ("Gain",):
try:
node = getattr(node_map, attr)
except AttributeError:
continue
try:
- if attr == "GainAuto":
- node.value = "Off"
+ node.value = float(self._gain)
+ actual = node.value
+ if abs(actual - self._gain) > 0.1: # Allow 0.1 tolerance
+ LOG.warning(f"Gain mismatch: requested {self._gain}, got {actual}")
else:
- node.value = float(self._gain)
- return
- except Exception:
+ LOG.info(f"Gain set to {actual}")
+ return
+ except Exception as e:
+ LOG.warning(f"Failed to set gain via {attr}: {e}")
continue
+ LOG.warning(f"Could not set gain to {self._gain} (no compatible attribute found)")
+
def _configure_frame_rate(self, node_map) -> None:
if not self.settings.fps:
return
target = float(self.settings.fps)
+
+ # Try to enable frame rate control
for attr in ("AcquisitionFrameRateEnable", "AcquisitionFrameRateControlEnable"):
try:
getattr(node_map, attr).value = True
+ LOG.info(f"Frame rate control enabled via {attr}")
+ break
except Exception:
continue
+ # Set frame rate value
for attr in ("AcquisitionFrameRate", "ResultingFrameRate", "AcquisitionFrameRateAbs"):
try:
node = getattr(node_map, attr)
@@ -452,10 +542,18 @@ def _configure_frame_rate(self, node_map) -> None:
continue
try:
node.value = target
+ actual = node.value
+ if abs(actual - target) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {target:.2f}, got {actual:.2f}")
+ else:
+ LOG.info(f"Frame rate set to {actual:.2f} FPS")
return
- except Exception:
+ except Exception as e:
+ LOG.warning(f"Failed to set frame rate via {attr}: {e}")
continue
+ LOG.warning(f"Could not set frame rate to {target} FPS (no compatible attribute found)")
+
def _convert_frame(self, frame: np.ndarray) -> np.ndarray:
if frame.dtype != np.uint8:
max_val = float(frame.max()) if frame.size else 0.0
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 651eeab..74d50fc 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import logging
import time
from typing import Tuple
@@ -10,6 +11,8 @@
from .base import CameraBackend
+LOG = logging.getLogger(__name__)
+
class OpenCVCameraBackend(CameraBackend):
"""Fallback backend using :mod:`cv2.VideoCapture`."""
@@ -107,12 +110,25 @@ def _configure_capture(self) -> None:
# Set resolution (width x height)
width, height = self._resolution
- self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width))
- self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height))
+ if not self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width)):
+ LOG.warning(f"Failed to set frame width to {width}")
+ if not self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height)):
+ LOG.warning(f"Failed to set frame height to {height}")
+
+ # Verify resolution was set correctly
+ actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH))
+ actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT))
+ if actual_width != width or actual_height != height:
+ LOG.warning(
+ f"Resolution mismatch: requested {width}x{height}, "
+ f"got {actual_width}x{actual_height}"
+ )
# Set FPS if specified
- if self.settings.fps:
- self._capture.set(cv2.CAP_PROP_FPS, float(self.settings.fps))
+ requested_fps = self.settings.fps
+ if requested_fps:
+ if not self._capture.set(cv2.CAP_PROP_FPS, float(requested_fps)):
+ LOG.warning(f"Failed to set FPS to {requested_fps}")
# Set any additional properties from the properties dict
for prop, value in self.settings.properties.items():
@@ -120,14 +136,19 @@ def _configure_capture(self) -> None:
continue
try:
prop_id = int(prop)
- except (TypeError, ValueError):
+ except (TypeError, ValueError) as e:
+ LOG.warning(f"Could not parse property ID: {prop} ({e})")
continue
- self._capture.set(prop_id, float(value))
+ if not self._capture.set(prop_id, float(value)):
+ LOG.warning(f"Failed to set property {prop_id} to {value}")
- # Update actual FPS from camera
+ # Update actual FPS from camera and warn if different from requested
actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
if actual_fps:
+ if requested_fps and abs(actual_fps - requested_fps) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {actual_fps:.2f}")
self.settings.fps = float(actual_fps)
+ LOG.info(f"Camera configured with FPS: {actual_fps:.2f}")
def _resolve_backend(self, backend: str | None) -> int:
if backend is None:
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index 6c0b7be..2440955 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -56,6 +56,7 @@ class DLCProcessorSettings:
precision: str = "FP32" # Inference precision ("FP32", "FP16")
additional_options: Dict[str, Any] = field(default_factory=dict)
model_type: str = "pytorch" # Only PyTorch models are supported
+ single_animal: bool = True # Only single-animal models are supported
@dataclass
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index 801009a..b0fdd45 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -22,7 +22,8 @@
try: # pragma: no cover - optional dependency
from dlclive import DLCLive # type: ignore
-except Exception: # pragma: no cover - handled gracefully
+except Exception as e: # pragma: no cover - handled gracefully
+ LOGGER.error(f"dlclive package could not be imported: {e}")
DLCLive = None # type: ignore[assignment]
diff --git a/docs/user_guide.md b/docs/user_guide.md
index 0346d53..b6f1905 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -147,7 +147,7 @@ Select if camera is mounted at an angle:
### Prerequisites
-1. Exported DLCLive model (see DLC documentation)
+1. Exported DLCLive model (see [DLC documentation](https://github.com/DeepLabCut/DeepLabCut/blob/main/docs/HelperFunctions.md#model-export-function))
2. DeepLabCut-live installed (`pip install deeplabcut-live`)
3. Camera preview running
From 563405955abcf1e3ba8fdfbe79df80c666844eba Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Thu, 18 Dec 2025 16:33:35 +0100
Subject: [PATCH 031/132] Set default device to 'auto' in DLCProcessorSettings
and include single_animal in DLCLiveProcessor settings
---
dlclivegui/config.py | 2 +-
dlclivegui/dlc_processor.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index 2440955..b17b434 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -50,7 +50,7 @@ class DLCProcessorSettings:
model_path: str = ""
model_directory: str = "." # Default directory for model browser (current dir if not set)
- device: Optional[str] = None # Device for inference (e.g., "cuda:0", "cpu"). None = auto
+ device: Optional[str] = "auto" # Device for inference (e.g., "cuda:0", "cpu"). None should be auto, but might default to cpu
dynamic: tuple = (False, 0.5, 10) # Dynamic cropping: (enabled, margin, max_missing_frames)
resize: float = 1.0 # Resize factor for input frames
precision: str = "FP32" # Inference precision ("FP32", "FP16")
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index b0fdd45..ac8985e 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -251,6 +251,7 @@ def _worker_loop(self, init_frame: np.ndarray, init_timestamp: float) -> None:
"dynamic": list(self._settings.dynamic),
"resize": self._settings.resize,
"precision": self._settings.precision,
+ "single_animal": self._settings.single_animal,
}
# Add device if specified in settings
if self._settings.device is not None:
From 1b8622c64bffa1a570d33c08f7b93035caf7fa87 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Mon, 22 Dec 2025 12:38:12 +0100
Subject: [PATCH 032/132] Add multi-camera controller for DLC Live GUI -
Implemented MultiCameraController to manage multiple cameras simultaneously.
---
dlclivegui/__init__.py | 14 +-
dlclivegui/camera_config_dialog.py | 481 +++++++++++++++
dlclivegui/camera_controller.py | 340 -----------
dlclivegui/config.py | 91 ++-
dlclivegui/gui.py | 842 ++++++++++----------------
dlclivegui/multi_camera_controller.py | 408 +++++++++++++
6 files changed, 1302 insertions(+), 874 deletions(-)
create mode 100644 dlclivegui/camera_config_dialog.py
delete mode 100644 dlclivegui/camera_controller.py
create mode 100644 dlclivegui/multi_camera_controller.py
diff --git a/dlclivegui/__init__.py b/dlclivegui/__init__.py
index d91f23b..c803be5 100644
--- a/dlclivegui/__init__.py
+++ b/dlclivegui/__init__.py
@@ -1,13 +1,25 @@
"""DeepLabCut Live GUI package."""
-from .config import ApplicationSettings, CameraSettings, DLCProcessorSettings, RecordingSettings
+from .camera_config_dialog import CameraConfigDialog
+from .config import (
+ ApplicationSettings,
+ CameraSettings,
+ DLCProcessorSettings,
+ MultiCameraSettings,
+ RecordingSettings,
+)
from .gui import MainWindow, main
+from .multi_camera_controller import MultiCameraController, MultiFrameData
__all__ = [
"ApplicationSettings",
"CameraSettings",
"DLCProcessorSettings",
+ "MultiCameraSettings",
"RecordingSettings",
"MainWindow",
+ "MultiCameraController",
+ "MultiFrameData",
+ "CameraConfigDialog",
"main",
]
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
new file mode 100644
index 0000000..b0acb21
--- /dev/null
+++ b/dlclivegui/camera_config_dialog.py
@@ -0,0 +1,481 @@
+"""Camera configuration dialog for multi-camera setup."""
+
+from __future__ import annotations
+
+import logging
+from typing import List, Optional
+
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtWidgets import (
+ QCheckBox,
+ QComboBox,
+ QDialog,
+ QDoubleSpinBox,
+ QFormLayout,
+ QGroupBox,
+ QHBoxLayout,
+ QLabel,
+ QListWidget,
+ QListWidgetItem,
+ QMessageBox,
+ QPushButton,
+ QSpinBox,
+ QVBoxLayout,
+ QWidget,
+)
+
+from dlclivegui.cameras import CameraFactory
+from dlclivegui.cameras.factory import DetectedCamera
+from dlclivegui.config import CameraSettings, MultiCameraSettings
+
+LOGGER = logging.getLogger(__name__)
+
+
+class CameraConfigDialog(QDialog):
+ """Dialog for configuring multiple cameras."""
+
+ MAX_CAMERAS = 4
+ settings_changed = pyqtSignal(object) # MultiCameraSettings
+
+ def __init__(
+ self,
+ parent: Optional[QWidget] = None,
+ multi_camera_settings: Optional[MultiCameraSettings] = None,
+ ):
+ super().__init__(parent)
+ self.setWindowTitle("Configure Cameras")
+ self.setMinimumSize(800, 600)
+
+ self._multi_camera_settings = (
+ multi_camera_settings if multi_camera_settings else MultiCameraSettings()
+ )
+ self._detected_cameras: List[DetectedCamera] = []
+ self._current_edit_index: Optional[int] = None
+
+ self._setup_ui()
+ self._populate_from_settings()
+ self._connect_signals()
+
+ def _setup_ui(self) -> None:
+ # Main layout for the dialog
+ main_layout = QVBoxLayout(self)
+
+ # Horizontal layout for left and right panels
+ panels_layout = QHBoxLayout()
+
+ # Left panel: Camera list and controls
+ left_panel = QWidget()
+ left_layout = QVBoxLayout(left_panel)
+
+ # Active cameras list
+ active_group = QGroupBox("Active Cameras")
+ active_layout = QVBoxLayout(active_group)
+
+ self.active_cameras_list = QListWidget()
+ self.active_cameras_list.setMinimumWidth(250)
+ active_layout.addWidget(self.active_cameras_list)
+
+ # Buttons for managing active cameras
+ list_buttons = QHBoxLayout()
+ self.remove_camera_btn = QPushButton("Remove")
+ self.remove_camera_btn.setEnabled(False)
+ self.move_up_btn = QPushButton("↑")
+ self.move_up_btn.setEnabled(False)
+ self.move_down_btn = QPushButton("↓")
+ self.move_down_btn.setEnabled(False)
+ list_buttons.addWidget(self.remove_camera_btn)
+ list_buttons.addWidget(self.move_up_btn)
+ list_buttons.addWidget(self.move_down_btn)
+ active_layout.addLayout(list_buttons)
+
+ left_layout.addWidget(active_group)
+
+ # Available cameras section
+ available_group = QGroupBox("Available Cameras")
+ available_layout = QVBoxLayout(available_group)
+
+ # Backend selection
+ backend_layout = QHBoxLayout()
+ backend_layout.addWidget(QLabel("Backend:"))
+ self.backend_combo = QComboBox()
+ availability = CameraFactory.available_backends()
+ for backend in CameraFactory.backend_names():
+ label = backend
+ if not availability.get(backend, True):
+ label = f"{backend} (unavailable)"
+ self.backend_combo.addItem(label, backend)
+ backend_layout.addWidget(self.backend_combo)
+ self.refresh_btn = QPushButton("Refresh")
+ backend_layout.addWidget(self.refresh_btn)
+ available_layout.addLayout(backend_layout)
+
+ self.available_cameras_list = QListWidget()
+ available_layout.addWidget(self.available_cameras_list)
+
+ self.add_camera_btn = QPushButton("Add Selected Camera →")
+ self.add_camera_btn.setEnabled(False)
+ available_layout.addWidget(self.add_camera_btn)
+
+ left_layout.addWidget(available_group)
+
+ # Right panel: Camera settings editor
+ right_panel = QWidget()
+ right_layout = QVBoxLayout(right_panel)
+
+ settings_group = QGroupBox("Camera Settings")
+ self.settings_form = QFormLayout(settings_group)
+
+ self.cam_enabled_checkbox = QCheckBox("Enabled")
+ self.cam_enabled_checkbox.setChecked(True)
+ self.settings_form.addRow(self.cam_enabled_checkbox)
+
+ self.cam_name_label = QLabel("Camera 0")
+ self.cam_name_label.setStyleSheet("font-weight: bold; font-size: 14px;")
+ self.settings_form.addRow("Name:", self.cam_name_label)
+
+ self.cam_index_label = QLabel("0")
+ self.settings_form.addRow("Index:", self.cam_index_label)
+
+ self.cam_backend_label = QLabel("opencv")
+ self.settings_form.addRow("Backend:", self.cam_backend_label)
+
+ self.cam_fps = QDoubleSpinBox()
+ self.cam_fps.setRange(1.0, 240.0)
+ self.cam_fps.setDecimals(2)
+ self.cam_fps.setValue(30.0)
+ self.settings_form.addRow("Frame Rate:", self.cam_fps)
+
+ self.cam_exposure = QSpinBox()
+ self.cam_exposure.setRange(0, 1000000)
+ self.cam_exposure.setValue(0)
+ self.cam_exposure.setSpecialValueText("Auto")
+ self.cam_exposure.setSuffix(" μs")
+ self.settings_form.addRow("Exposure:", self.cam_exposure)
+
+ self.cam_gain = QDoubleSpinBox()
+ self.cam_gain.setRange(0.0, 100.0)
+ self.cam_gain.setValue(0.0)
+ self.cam_gain.setSpecialValueText("Auto")
+ self.cam_gain.setDecimals(2)
+ self.settings_form.addRow("Gain:", self.cam_gain)
+
+ # Rotation
+ self.cam_rotation = QComboBox()
+ self.cam_rotation.addItem("0° (default)", 0)
+ self.cam_rotation.addItem("90°", 90)
+ self.cam_rotation.addItem("180°", 180)
+ self.cam_rotation.addItem("270°", 270)
+ self.settings_form.addRow("Rotation:", self.cam_rotation)
+
+ # Crop settings
+ crop_widget = QWidget()
+ crop_layout = QHBoxLayout(crop_widget)
+ crop_layout.setContentsMargins(0, 0, 0, 0)
+
+ self.cam_crop_x0 = QSpinBox()
+ self.cam_crop_x0.setRange(0, 7680)
+ self.cam_crop_x0.setPrefix("x0:")
+ self.cam_crop_x0.setSpecialValueText("x0:None")
+ crop_layout.addWidget(self.cam_crop_x0)
+
+ self.cam_crop_y0 = QSpinBox()
+ self.cam_crop_y0.setRange(0, 4320)
+ self.cam_crop_y0.setPrefix("y0:")
+ self.cam_crop_y0.setSpecialValueText("y0:None")
+ crop_layout.addWidget(self.cam_crop_y0)
+
+ self.cam_crop_x1 = QSpinBox()
+ self.cam_crop_x1.setRange(0, 7680)
+ self.cam_crop_x1.setPrefix("x1:")
+ self.cam_crop_x1.setSpecialValueText("x1:None")
+ crop_layout.addWidget(self.cam_crop_x1)
+
+ self.cam_crop_y1 = QSpinBox()
+ self.cam_crop_y1.setRange(0, 4320)
+ self.cam_crop_y1.setPrefix("y1:")
+ self.cam_crop_y1.setSpecialValueText("y1:None")
+ crop_layout.addWidget(self.cam_crop_y1)
+
+ self.settings_form.addRow("Crop (x0,y0,x1,y1):", crop_widget)
+
+ self.apply_settings_btn = QPushButton("Apply Settings")
+ self.apply_settings_btn.setEnabled(False)
+ self.settings_form.addRow(self.apply_settings_btn)
+
+ right_layout.addWidget(settings_group)
+ right_layout.addStretch(1)
+
+ # Dialog buttons
+ button_layout = QHBoxLayout()
+ self.ok_btn = QPushButton("OK")
+ self.cancel_btn = QPushButton("Cancel")
+ button_layout.addStretch(1)
+ button_layout.addWidget(self.ok_btn)
+ button_layout.addWidget(self.cancel_btn)
+
+ # Add panels to horizontal layout
+ panels_layout.addWidget(left_panel, stretch=1)
+ panels_layout.addWidget(right_panel, stretch=1)
+
+ # Add everything to main layout
+ main_layout.addLayout(panels_layout)
+ main_layout.addLayout(button_layout)
+
+ def _connect_signals(self) -> None:
+ self.backend_combo.currentIndexChanged.connect(self._on_backend_changed)
+ self.refresh_btn.clicked.connect(self._refresh_available_cameras)
+ self.add_camera_btn.clicked.connect(self._add_selected_camera)
+ self.remove_camera_btn.clicked.connect(self._remove_selected_camera)
+ self.move_up_btn.clicked.connect(self._move_camera_up)
+ self.move_down_btn.clicked.connect(self._move_camera_down)
+ self.active_cameras_list.currentRowChanged.connect(self._on_active_camera_selected)
+ self.available_cameras_list.currentRowChanged.connect(self._on_available_camera_selected)
+ self.apply_settings_btn.clicked.connect(self._apply_camera_settings)
+ self.ok_btn.clicked.connect(self._on_ok_clicked)
+ self.cancel_btn.clicked.connect(self.reject)
+
+ def _populate_from_settings(self) -> None:
+ """Populate the dialog from existing settings."""
+ self.active_cameras_list.clear()
+ for cam in self._multi_camera_settings.cameras:
+ item = QListWidgetItem(self._format_camera_label(cam))
+ item.setData(Qt.ItemDataRole.UserRole, cam)
+ if not cam.enabled:
+ item.setForeground(Qt.GlobalColor.gray)
+ self.active_cameras_list.addItem(item)
+
+ self._refresh_available_cameras()
+ self._update_button_states()
+
+ def _format_camera_label(self, cam: CameraSettings) -> str:
+ """Format camera label for display."""
+ status = "✓" if cam.enabled else "○"
+ return f"{status} {cam.name} [{cam.backend}:{cam.index}]"
+
+ def _on_backend_changed(self, _index: int) -> None:
+ self._refresh_available_cameras()
+
+ def _refresh_available_cameras(self) -> None:
+ """Refresh the list of available cameras."""
+ backend = self.backend_combo.currentData()
+ if not backend:
+ backend = self.backend_combo.currentText().split()[0]
+
+ self.available_cameras_list.clear()
+ self._detected_cameras = CameraFactory.detect_cameras(backend, max_devices=10)
+
+ for cam in self._detected_cameras:
+ item = QListWidgetItem(f"{cam.label} (index {cam.index})")
+ item.setData(Qt.ItemDataRole.UserRole, cam)
+ self.available_cameras_list.addItem(item)
+
+ self._update_button_states()
+
+ def _on_available_camera_selected(self, row: int) -> None:
+ self.add_camera_btn.setEnabled(row >= 0)
+
+ def _on_active_camera_selected(self, row: int) -> None:
+ """Handle selection of an active camera."""
+ self._current_edit_index = row
+ self._update_button_states()
+
+ if row < 0 or row >= self.active_cameras_list.count():
+ self._clear_settings_form()
+ return
+
+ item = self.active_cameras_list.item(row)
+ cam = item.data(Qt.ItemDataRole.UserRole)
+ if cam:
+ self._load_camera_to_form(cam)
+
+ def _load_camera_to_form(self, cam: CameraSettings) -> None:
+ """Load camera settings into the form."""
+ self.cam_enabled_checkbox.setChecked(cam.enabled)
+ self.cam_name_label.setText(cam.name)
+ self.cam_index_label.setText(str(cam.index))
+ self.cam_backend_label.setText(cam.backend)
+ self.cam_fps.setValue(cam.fps)
+ self.cam_exposure.setValue(cam.exposure)
+ self.cam_gain.setValue(cam.gain)
+
+ # Set rotation
+ rot_index = self.cam_rotation.findData(cam.rotation)
+ if rot_index >= 0:
+ self.cam_rotation.setCurrentIndex(rot_index)
+
+ self.cam_crop_x0.setValue(cam.crop_x0)
+ self.cam_crop_y0.setValue(cam.crop_y0)
+ self.cam_crop_x1.setValue(cam.crop_x1)
+ self.cam_crop_y1.setValue(cam.crop_y1)
+
+ self.apply_settings_btn.setEnabled(True)
+
+ def _clear_settings_form(self) -> None:
+ """Clear the settings form."""
+ self.cam_enabled_checkbox.setChecked(True)
+ self.cam_name_label.setText("")
+ self.cam_index_label.setText("")
+ self.cam_backend_label.setText("")
+ self.cam_fps.setValue(30.0)
+ self.cam_exposure.setValue(0)
+ self.cam_gain.setValue(0.0)
+ self.cam_rotation.setCurrentIndex(0)
+ self.cam_crop_x0.setValue(0)
+ self.cam_crop_y0.setValue(0)
+ self.cam_crop_x1.setValue(0)
+ self.cam_crop_y1.setValue(0)
+ self.apply_settings_btn.setEnabled(False)
+
+ def _add_selected_camera(self) -> None:
+ """Add the selected available camera to active cameras."""
+ row = self.available_cameras_list.currentRow()
+ if row < 0:
+ return
+
+ # Check limit
+ active_count = len(
+ [
+ i
+ for i in range(self.active_cameras_list.count())
+ if self.active_cameras_list.item(i).data(Qt.ItemDataRole.UserRole).enabled
+ ]
+ )
+ if active_count >= self.MAX_CAMERAS:
+ QMessageBox.warning(
+ self,
+ "Maximum Cameras",
+ f"Maximum of {self.MAX_CAMERAS} active cameras allowed.",
+ )
+ return
+
+ item = self.available_cameras_list.item(row)
+ detected = item.data(Qt.ItemDataRole.UserRole)
+ backend = self.backend_combo.currentData() or "opencv"
+
+ # Create new camera settings
+ new_cam = CameraSettings(
+ name=detected.label,
+ index=detected.index,
+ fps=30.0,
+ backend=backend,
+ exposure=0,
+ gain=0.0,
+ enabled=True,
+ )
+
+ self._multi_camera_settings.cameras.append(new_cam)
+
+ # Add to list
+ new_item = QListWidgetItem(self._format_camera_label(new_cam))
+ new_item.setData(Qt.ItemDataRole.UserRole, new_cam)
+ self.active_cameras_list.addItem(new_item)
+ self.active_cameras_list.setCurrentItem(new_item)
+
+ self._update_button_states()
+
+ def _remove_selected_camera(self) -> None:
+ """Remove the selected camera from active cameras."""
+ row = self.active_cameras_list.currentRow()
+ if row < 0:
+ return
+
+ self.active_cameras_list.takeItem(row)
+ if row < len(self._multi_camera_settings.cameras):
+ del self._multi_camera_settings.cameras[row]
+
+ self._current_edit_index = None
+ self._clear_settings_form()
+ self._update_button_states()
+
+ def _move_camera_up(self) -> None:
+ """Move selected camera up in the list."""
+ row = self.active_cameras_list.currentRow()
+ if row <= 0:
+ return
+
+ item = self.active_cameras_list.takeItem(row)
+ self.active_cameras_list.insertItem(row - 1, item)
+ self.active_cameras_list.setCurrentRow(row - 1)
+
+ # Update settings list
+ cams = self._multi_camera_settings.cameras
+ cams[row], cams[row - 1] = cams[row - 1], cams[row]
+
+ def _move_camera_down(self) -> None:
+ """Move selected camera down in the list."""
+ row = self.active_cameras_list.currentRow()
+ if row < 0 or row >= self.active_cameras_list.count() - 1:
+ return
+
+ item = self.active_cameras_list.takeItem(row)
+ self.active_cameras_list.insertItem(row + 1, item)
+ self.active_cameras_list.setCurrentRow(row + 1)
+
+ # Update settings list
+ cams = self._multi_camera_settings.cameras
+ cams[row], cams[row + 1] = cams[row + 1], cams[row]
+
+ def _apply_camera_settings(self) -> None:
+ """Apply current form settings to the selected camera."""
+ if self._current_edit_index is None:
+ return
+
+ row = self._current_edit_index
+ if row < 0 or row >= len(self._multi_camera_settings.cameras):
+ return
+
+ cam = self._multi_camera_settings.cameras[row]
+ cam.enabled = self.cam_enabled_checkbox.isChecked()
+ cam.fps = self.cam_fps.value()
+ cam.exposure = self.cam_exposure.value()
+ cam.gain = self.cam_gain.value()
+ cam.rotation = self.cam_rotation.currentData() or 0
+ cam.crop_x0 = self.cam_crop_x0.value()
+ cam.crop_y0 = self.cam_crop_y0.value()
+ cam.crop_x1 = self.cam_crop_x1.value()
+ cam.crop_y1 = self.cam_crop_y1.value()
+
+ # Update list item
+ item = self.active_cameras_list.item(row)
+ item.setText(self._format_camera_label(cam))
+ item.setData(Qt.ItemDataRole.UserRole, cam)
+ if not cam.enabled:
+ item.setForeground(Qt.GlobalColor.gray)
+ else:
+ item.setForeground(Qt.GlobalColor.black)
+
+ self._update_button_states()
+
+ def _update_button_states(self) -> None:
+ """Update button enabled states."""
+ active_row = self.active_cameras_list.currentRow()
+ has_active_selection = active_row >= 0
+
+ self.remove_camera_btn.setEnabled(has_active_selection)
+ self.move_up_btn.setEnabled(has_active_selection and active_row > 0)
+ self.move_down_btn.setEnabled(
+ has_active_selection and active_row < self.active_cameras_list.count() - 1
+ )
+
+ available_row = self.available_cameras_list.currentRow()
+ self.add_camera_btn.setEnabled(available_row >= 0)
+
+ def _on_ok_clicked(self) -> None:
+ """Handle OK button click."""
+ # Validate that we have at least one enabled camera if any cameras are configured
+ if self._multi_camera_settings.cameras:
+ active = self._multi_camera_settings.get_active_cameras()
+ if not active:
+ QMessageBox.warning(
+ self,
+ "No Active Cameras",
+ "Please enable at least one camera or remove all cameras.",
+ )
+ return
+
+ self.settings_changed.emit(self._multi_camera_settings)
+ self.accept()
+
+ def get_settings(self) -> MultiCameraSettings:
+ """Get the current multi-camera settings."""
+ return self._multi_camera_settings
diff --git a/dlclivegui/camera_controller.py b/dlclivegui/camera_controller.py
deleted file mode 100644
index 7c80df1..0000000
--- a/dlclivegui/camera_controller.py
+++ /dev/null
@@ -1,340 +0,0 @@
-"""Camera management for the DLC Live GUI."""
-
-from __future__ import annotations
-
-import logging
-import time
-from dataclasses import dataclass
-from threading import Event
-from typing import Optional
-
-import numpy as np
-from PyQt6.QtCore import QMetaObject, QObject, Qt, QThread, pyqtSignal, pyqtSlot
-
-from dlclivegui.cameras import CameraFactory
-from dlclivegui.cameras.base import CameraBackend
-from dlclivegui.config import CameraSettings
-
-LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class FrameData:
- """Container for a captured frame."""
-
- image: np.ndarray
- timestamp: float
-
-
-class CameraWorker(QObject):
- """Worker object running inside a :class:`QThread`."""
-
- frame_captured = pyqtSignal(object)
- started = pyqtSignal(object)
- error_occurred = pyqtSignal(str)
- warning_occurred = pyqtSignal(str)
- finished = pyqtSignal()
-
- def __init__(self, settings: CameraSettings):
- super().__init__()
- self._settings = settings
- self._stop_event = Event()
- self._backend: Optional[CameraBackend] = None
-
- # Error recovery settings
- self._max_consecutive_errors = 5
- self._max_reconnect_attempts = 3
- self._retry_delay = 0.1 # seconds
- self._reconnect_delay = 1.0 # seconds
-
- # Frame validation
- self._expected_frame_size: Optional[tuple[int, int]] = None # (height, width)
-
- @pyqtSlot()
- def run(self) -> None:
- self._stop_event.clear()
-
- # Initialize camera
- if not self._initialize_camera():
- self.finished.emit()
- return
-
- self.started.emit(self._settings)
-
- consecutive_errors = 0
- reconnect_attempts = 0
-
- while not self._stop_event.is_set():
- try:
- frame, timestamp = self._backend.read()
-
- # Validate frame size
- if not self._validate_frame_size(frame):
- consecutive_errors += 1
- LOGGER.warning(
- f"Frame size validation failed ({consecutive_errors}/{self._max_consecutive_errors})"
- )
- if consecutive_errors >= self._max_consecutive_errors:
- self.error_occurred.emit("Too many frames with incorrect size")
- break
- time.sleep(self._retry_delay)
- continue
-
- consecutive_errors = 0 # Reset error count on success
- reconnect_attempts = 0 # Reset reconnect attempts on success
-
- except TimeoutError as exc:
- consecutive_errors += 1
- LOGGER.warning(
- f"Camera frame timeout ({consecutive_errors}/{self._max_consecutive_errors}): {exc}"
- )
-
- if self._stop_event.is_set():
- break
-
- # Handle timeout with retry logic
- if consecutive_errors < self._max_consecutive_errors:
- self.warning_occurred.emit(
- f"Frame timeout (retry {consecutive_errors}/{self._max_consecutive_errors})"
- )
- time.sleep(self._retry_delay)
- continue
- else:
- # Too many consecutive errors, try to reconnect
- LOGGER.error(f"Too many consecutive timeouts, attempting reconnection...")
- if self._attempt_reconnection():
- consecutive_errors = 0
- reconnect_attempts += 1
- self.warning_occurred.emit(
- f"Camera reconnected (attempt {reconnect_attempts})"
- )
- continue
- else:
- reconnect_attempts += 1
- if reconnect_attempts >= self._max_reconnect_attempts:
- self.error_occurred.emit(
- f"Camera reconnection failed after {reconnect_attempts} attempts"
- )
- break
- else:
- consecutive_errors = 0 # Reset to try again
- self.warning_occurred.emit(
- f"Reconnection attempt {reconnect_attempts} failed, retrying..."
- )
- time.sleep(self._reconnect_delay)
- continue
-
- except Exception as exc:
- consecutive_errors += 1
- LOGGER.warning(
- f"Camera read error ({consecutive_errors}/{self._max_consecutive_errors}): {exc}"
- )
-
- if self._stop_event.is_set():
- break
-
- # Handle general errors with retry logic
- if consecutive_errors < self._max_consecutive_errors:
- self.warning_occurred.emit(
- f"Frame read error (retry {consecutive_errors}/{self._max_consecutive_errors})"
- )
- time.sleep(self._retry_delay)
- continue
- else:
- # Too many consecutive errors, try to reconnect
- LOGGER.error(f"Too many consecutive errors, attempting reconnection...")
- if self._attempt_reconnection():
- consecutive_errors = 0
- reconnect_attempts += 1
- self.warning_occurred.emit(
- f"Camera reconnected (attempt {reconnect_attempts})"
- )
- continue
- else:
- reconnect_attempts += 1
- if reconnect_attempts >= self._max_reconnect_attempts:
- self.error_occurred.emit(
- f"Camera failed after {reconnect_attempts} reconnection attempts: {exc}"
- )
- break
- else:
- consecutive_errors = 0 # Reset to try again
- self.warning_occurred.emit(
- f"Reconnection attempt {reconnect_attempts} failed, retrying..."
- )
- time.sleep(self._reconnect_delay)
- continue
-
- if self._stop_event.is_set():
- break
-
- self.frame_captured.emit(FrameData(frame, timestamp))
-
- # Cleanup
- self._cleanup_camera()
- self.finished.emit()
-
- def _initialize_camera(self) -> bool:
- """Initialize the camera backend. Returns True on success, False on failure."""
- try:
- self._backend = CameraFactory.create(self._settings)
- self._backend.open()
- # Don't set expected frame size - will be established from first frame
- self._expected_frame_size = None
- LOGGER.info(
- "Camera initialized successfully, frame size will be determined from camera"
- )
- return True
- except Exception as exc:
- LOGGER.exception("Failed to initialize camera", exc_info=exc)
- self.error_occurred.emit(f"Failed to initialize camera: {exc}")
- return False
-
- def _validate_frame_size(self, frame: np.ndarray) -> bool:
- """Validate that the frame has the expected size. Returns True if valid."""
- if frame is None or frame.size == 0:
- LOGGER.warning("Received empty frame")
- return False
-
- actual_size = (frame.shape[0], frame.shape[1]) # (height, width)
-
- if self._expected_frame_size is None:
- # First frame - establish expected size
- self._expected_frame_size = actual_size
- LOGGER.info(
- f"Established expected frame size: (h={actual_size[0]}, w={actual_size[1]})"
- )
- return True
-
- if actual_size != self._expected_frame_size:
- LOGGER.warning(
- f"Frame size mismatch: expected (h={self._expected_frame_size[0]}, w={self._expected_frame_size[1]}), "
- f"got (h={actual_size[0]}, w={actual_size[1]}). Camera may have reconnected with different resolution."
- )
- # Update expected size for future frames after reconnection
- self._expected_frame_size = actual_size
- LOGGER.info(f"Updated expected frame size to: (h={actual_size[0]}, w={actual_size[1]})")
- # Emit warning so GUI can restart recording if needed
- self.warning_occurred.emit(
- f"Camera resolution changed to {actual_size[1]}x{actual_size[0]}"
- )
- return True # Accept the new size
-
- return True
-
- def _attempt_reconnection(self) -> bool:
- """Attempt to reconnect to the camera. Returns True on success, False on failure."""
- if self._stop_event.is_set():
- return False
-
- LOGGER.info("Attempting camera reconnection...")
-
- # Close existing connection
- self._cleanup_camera()
-
- # Wait longer before reconnecting to let the device fully release
- LOGGER.info(f"Waiting {self._reconnect_delay}s before reconnecting...")
- time.sleep(self._reconnect_delay)
-
- if self._stop_event.is_set():
- return False
-
- # Try to reinitialize (this will also reset expected frame size)
- try:
- self._backend = CameraFactory.create(self._settings)
- self._backend.open()
- # Reset expected frame size - will be re-established on first frame
- self._expected_frame_size = None
- LOGGER.info("Camera reconnection successful, frame size will be determined from camera")
- return True
- except Exception as exc:
- LOGGER.warning(f"Camera reconnection failed: {exc}")
- return False
-
- def _cleanup_camera(self) -> None:
- """Clean up camera backend resources."""
- if self._backend is not None:
- try:
- self._backend.close()
- except Exception as exc:
- LOGGER.warning(f"Error closing camera: {exc}")
- self._backend = None
-
- @pyqtSlot()
- def stop(self) -> None:
- self._stop_event.set()
- if self._backend is not None:
- try:
- self._backend.stop()
- except Exception:
- pass
-
-
-class CameraController(QObject):
- """High level controller that manages a camera worker thread."""
-
- frame_ready = pyqtSignal(object)
- started = pyqtSignal(object)
- stopped = pyqtSignal()
- error = pyqtSignal(str)
- warning = pyqtSignal(str)
-
- def __init__(self) -> None:
- super().__init__()
- self._thread: Optional[QThread] = None
- self._worker: Optional[CameraWorker] = None
- self._pending_settings: Optional[CameraSettings] = None
-
- def is_running(self) -> bool:
- return self._thread is not None and self._thread.isRunning()
-
- def start(self, settings: CameraSettings) -> None:
- if self.is_running():
- self._pending_settings = settings
- self.stop(preserve_pending=True)
- return
- self._pending_settings = None
- self._start_worker(settings)
-
- def stop(self, wait: bool = False, *, preserve_pending: bool = False) -> None:
- if not self.is_running():
- if not preserve_pending:
- self._pending_settings = None
- return
- assert self._worker is not None
- assert self._thread is not None
- if not preserve_pending:
- self._pending_settings = None
- QMetaObject.invokeMethod(
- self._worker,
- "stop",
- Qt.ConnectionType.QueuedConnection,
- )
- self._worker.stop()
- self._thread.quit()
- if wait:
- self._thread.wait()
-
- def _start_worker(self, settings: CameraSettings) -> None:
- self._thread = QThread()
- self._worker = CameraWorker(settings)
- self._worker.moveToThread(self._thread)
- self._thread.started.connect(self._worker.run)
- self._worker.frame_captured.connect(self.frame_ready)
- self._worker.started.connect(self.started)
- self._worker.error_occurred.connect(self.error)
- self._worker.warning_occurred.connect(self.warning)
- self._worker.finished.connect(self._thread.quit)
- self._worker.finished.connect(self._worker.deleteLater)
- self._thread.finished.connect(self._cleanup)
- self._thread.start()
-
- @pyqtSlot()
- def _cleanup(self) -> None:
- self._thread = None
- self._worker = None
- self.stopped.emit()
- if self._pending_settings is not None:
- pending = self._pending_settings
- self._pending_settings = None
- self.start(pending)
diff --git a/dlclivegui/config.py b/dlclivegui/config.py
index b17b434..9e32a20 100644
--- a/dlclivegui/config.py
+++ b/dlclivegui/config.py
@@ -23,6 +23,8 @@ class CameraSettings:
crop_x1: int = 0 # Right edge of crop region (0 = no crop)
crop_y1: int = 0 # Bottom edge of crop region (0 = no crop)
max_devices: int = 3 # Maximum number of devices to probe during detection
+ rotation: int = 0 # Rotation degrees (0, 90, 180, 270)
+ enabled: bool = True # Whether this camera is active in multi-camera mode
properties: Dict[str, Any] = field(default_factory=dict)
def apply_defaults(self) -> "CameraSettings":
@@ -43,6 +45,74 @@ def get_crop_region(self) -> Optional[tuple[int, int, int, int]]:
return None
return (self.crop_x0, self.crop_y0, self.crop_x1, self.crop_y1)
+ def copy(self) -> "CameraSettings":
+ """Create a copy of this settings object."""
+ return CameraSettings(
+ name=self.name,
+ index=self.index,
+ fps=self.fps,
+ backend=self.backend,
+ exposure=self.exposure,
+ gain=self.gain,
+ crop_x0=self.crop_x0,
+ crop_y0=self.crop_y0,
+ crop_x1=self.crop_x1,
+ crop_y1=self.crop_y1,
+ max_devices=self.max_devices,
+ rotation=self.rotation,
+ enabled=self.enabled,
+ properties=dict(self.properties),
+ )
+
+
+@dataclass
+class MultiCameraSettings:
+ """Configuration for multiple cameras."""
+
+ cameras: list = field(default_factory=list) # List of CameraSettings
+ max_cameras: int = 4 # Maximum number of cameras that can be active
+ tile_layout: str = "auto" # "auto", "2x2", "1x4", "4x1"
+
+ def get_active_cameras(self) -> list:
+ """Get list of enabled cameras."""
+ return [cam for cam in self.cameras if cam.enabled]
+
+ def add_camera(self, settings: CameraSettings) -> bool:
+ """Add a camera to the configuration. Returns True if successful."""
+ if len(self.get_active_cameras()) >= self.max_cameras and settings.enabled:
+ return False
+ self.cameras.append(settings)
+ return True
+
+ def remove_camera(self, index: int) -> bool:
+ """Remove camera at the given list index."""
+ if 0 <= index < len(self.cameras):
+ del self.cameras[index]
+ return True
+ return False
+
+ @classmethod
+ def from_dict(cls, data: Dict[str, Any]) -> "MultiCameraSettings":
+ """Create MultiCameraSettings from a dictionary."""
+ cameras = []
+ for cam_data in data.get("cameras", []):
+ cam = CameraSettings(**cam_data)
+ cam.apply_defaults()
+ cameras.append(cam)
+ return cls(
+ cameras=cameras,
+ max_cameras=data.get("max_cameras", 4),
+ tile_layout=data.get("tile_layout", "auto"),
+ )
+
+ def to_dict(self) -> Dict[str, Any]:
+ """Convert to dictionary for serialization."""
+ return {
+ "cameras": [asdict(cam) for cam in self.cameras],
+ "max_cameras": self.max_cameras,
+ "tile_layout": self.tile_layout,
+ }
+
@dataclass
class DLCProcessorSettings:
@@ -50,7 +120,9 @@ class DLCProcessorSettings:
model_path: str = ""
model_directory: str = "." # Default directory for model browser (current dir if not set)
- device: Optional[str] = "auto" # Device for inference (e.g., "cuda:0", "cpu"). None should be auto, but might default to cpu
+ device: Optional[str] = (
+ "auto" # Device for inference (e.g., "cuda:0", "cpu"). None should be auto, but might default to cpu
+ )
dynamic: tuple = (False, 0.5, 10) # Dynamic cropping: (enabled, margin, max_missing_frames)
resize: float = 1.0 # Resize factor for input frames
precision: str = "FP32" # Inference precision ("FP32", "FP16")
@@ -126,6 +198,7 @@ class ApplicationSettings:
"""Top level application configuration."""
camera: CameraSettings = field(default_factory=CameraSettings)
+ multi_camera: MultiCameraSettings = field(default_factory=MultiCameraSettings)
dlc: DLCProcessorSettings = field(default_factory=DLCProcessorSettings)
recording: RecordingSettings = field(default_factory=RecordingSettings)
bbox: BoundingBoxSettings = field(default_factory=BoundingBoxSettings)
@@ -136,6 +209,14 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
"""Create an :class:`ApplicationSettings` from a dictionary."""
camera = CameraSettings(**data.get("camera", {})).apply_defaults()
+
+ # Parse multi-camera settings
+ multi_camera_data = data.get("multi_camera", {})
+ if multi_camera_data:
+ multi_camera = MultiCameraSettings.from_dict(multi_camera_data)
+ else:
+ multi_camera = MultiCameraSettings()
+
dlc_data = dict(data.get("dlc", {}))
# Parse dynamic parameter - can be list or tuple in JSON
dynamic_raw = dlc_data.get("dynamic", [False, 0.5, 10])
@@ -158,7 +239,12 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApplicationSettings":
bbox = BoundingBoxSettings(**data.get("bbox", {}))
visualization = VisualizationSettings(**data.get("visualization", {}))
return cls(
- camera=camera, dlc=dlc, recording=recording, bbox=bbox, visualization=visualization
+ camera=camera,
+ multi_camera=multi_camera,
+ dlc=dlc,
+ recording=recording,
+ bbox=bbox,
+ visualization=visualization,
)
def to_dict(self) -> Dict[str, Any]:
@@ -166,6 +252,7 @@ def to_dict(self) -> Dict[str, Any]:
return {
"camera": asdict(self.camera),
+ "multi_camera": self.multi_camera.to_dict(),
"dlc": asdict(self.dlc),
"recording": asdict(self.recording),
"bbox": asdict(self.bbox),
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 17f6846..a65147d 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -38,19 +38,19 @@
QWidget,
)
-from dlclivegui.camera_controller import CameraController, FrameData
-from dlclivegui.cameras import CameraFactory
-from dlclivegui.cameras.factory import DetectedCamera
+from dlclivegui.camera_config_dialog import CameraConfigDialog
from dlclivegui.config import (
DEFAULT_CONFIG,
ApplicationSettings,
BoundingBoxSettings,
CameraSettings,
DLCProcessorSettings,
+ MultiCameraSettings,
RecordingSettings,
VisualizationSettings,
)
from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
+from dlclivegui.multi_camera_controller import MultiCameraController, MultiFrameData
from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
@@ -87,9 +87,6 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._raw_frame: Optional[np.ndarray] = None
self._last_pose: Optional[PoseResult] = None
self._dlc_active: bool = False
- self._video_recorder: Optional[VideoRecorder] = None
- self._rotation_degrees: int = 0
- self._detected_cameras: list[DetectedCamera] = []
self._active_camera_settings: Optional[CameraSettings] = None
self._camera_frame_times: deque[float] = deque(maxlen=240)
self._last_drop_warning = 0.0
@@ -112,9 +109,14 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._colormap = "hot"
self._bbox_color = (0, 0, 255) # BGR: red
- self.camera_controller = CameraController()
+ self.multi_camera_controller = MultiCameraController()
self.dlc_processor = DLCLiveProcessor()
+ # Multi-camera state
+ self._multi_camera_mode = False
+ self._multi_camera_recorders: dict[int, VideoRecorder] = {}
+ self._multi_camera_frames: dict[int, np.ndarray] = {}
+
self._setup_ui()
self._connect_signals()
self._apply_config(self._config)
@@ -247,76 +249,17 @@ def _build_camera_group(self) -> QGroupBox:
group = QGroupBox("Camera settings")
form = QFormLayout(group)
- self.camera_backend = QComboBox()
- availability = CameraFactory.available_backends()
- for backend in CameraFactory.backend_names():
- label = backend
- if not availability.get(backend, True):
- label = f"{backend} (unavailable)"
- self.camera_backend.addItem(label, backend)
- form.addRow("Backend", self.camera_backend)
-
- index_layout = QHBoxLayout()
- self.camera_index = QComboBox()
- self.camera_index.setEditable(True)
- index_layout.addWidget(self.camera_index)
- self.refresh_cameras_button = QPushButton("Refresh")
- index_layout.addWidget(self.refresh_cameras_button)
- form.addRow("Camera", index_layout)
-
- self.camera_fps = QDoubleSpinBox()
- self.camera_fps.setRange(1.0, 240.0)
- self.camera_fps.setDecimals(2)
- form.addRow("Frame rate", self.camera_fps)
-
- self.camera_exposure = QSpinBox()
- self.camera_exposure.setRange(0, 1000000)
- self.camera_exposure.setValue(0)
- self.camera_exposure.setSpecialValueText("Auto")
- self.camera_exposure.setSuffix(" μs")
- form.addRow("Exposure", self.camera_exposure)
-
- self.camera_gain = QDoubleSpinBox()
- self.camera_gain.setRange(0.0, 100.0)
- self.camera_gain.setValue(0.0)
- self.camera_gain.setSpecialValueText("Auto")
- self.camera_gain.setDecimals(2)
- form.addRow("Gain", self.camera_gain)
-
- # Crop settings
- crop_layout = QHBoxLayout()
- self.crop_x0 = QSpinBox()
- self.crop_x0.setRange(0, 7680)
- self.crop_x0.setPrefix("x0:")
- self.crop_x0.setSpecialValueText("x0:None")
- crop_layout.addWidget(self.crop_x0)
-
- self.crop_y0 = QSpinBox()
- self.crop_y0.setRange(0, 4320)
- self.crop_y0.setPrefix("y0:")
- self.crop_y0.setSpecialValueText("y0:None")
- crop_layout.addWidget(self.crop_y0)
-
- self.crop_x1 = QSpinBox()
- self.crop_x1.setRange(0, 7680)
- self.crop_x1.setPrefix("x1:")
- self.crop_x1.setSpecialValueText("x1:None")
- crop_layout.addWidget(self.crop_x1)
-
- self.crop_y1 = QSpinBox()
- self.crop_y1.setRange(0, 4320)
- self.crop_y1.setPrefix("y1:")
- self.crop_y1.setSpecialValueText("y1:None")
- crop_layout.addWidget(self.crop_y1)
-
- form.addRow("Crop (x0,y0,x1,y1)", crop_layout)
-
- self.rotation_combo = QComboBox()
- self.rotation_combo.addItem("0° (default)", 0)
- self.rotation_combo.addItem("90°", 90)
- self.rotation_combo.addItem("180°", 180)
- self.rotation_combo.addItem("270°", 270)
- form.addRow("Rotation", self.rotation_combo)
+ # Camera config button - opens dialog for all camera configuration
+ config_layout = QHBoxLayout()
+ self.config_cameras_button = QPushButton("Configure Cameras...")
+ self.config_cameras_button.setToolTip("Configure camera settings (single or multi-camera)")
+ config_layout.addWidget(self.config_cameras_button)
+ form.addRow(config_layout)
+
+ # Active cameras display label
+ self.active_cameras_label = QLabel("No cameras configured")
+ self.active_cameras_label.setWordWrap(True)
+ form.addRow("Active:", self.active_cameras_label)
return group
@@ -409,8 +352,11 @@ def _build_recording_group(self) -> QGroupBox:
form.addRow("Container", self.container_combo)
self.codec_combo = QComboBox()
- self.codec_combo.addItems(["h264_nvenc", "libx264"])
- self.codec_combo.setCurrentText("h264_nvenc")
+ if os.sys.platform == "darwin":
+ self.codec_combo.addItems(["h264_videotoolbox", "libx264", "hevc_videotoolbox"])
+ else:
+ self.codec_combo.addItems(["h264_nvenc", "libx264", "hevc_nvenc"])
+ self.codec_combo.setCurrentText("libx264")
form.addRow("Codec", self.codec_combo)
self.crf_spin = QSpinBox()
@@ -478,16 +424,13 @@ def _connect_signals(self) -> None:
self.stop_preview_button.clicked.connect(self._stop_preview)
self.start_record_button.clicked.connect(self._start_recording)
self.stop_record_button.clicked.connect(self._stop_recording)
- self.refresh_cameras_button.clicked.connect(
- lambda: self._refresh_camera_indices(keep_current=True)
- )
- self.camera_backend.currentIndexChanged.connect(self._on_backend_changed)
- self.camera_backend.currentIndexChanged.connect(self._update_backend_specific_controls)
- self.rotation_combo.currentIndexChanged.connect(self._on_rotation_changed)
self.start_inference_button.clicked.connect(self._start_inference)
self.stop_inference_button.clicked.connect(lambda: self._stop_inference())
self.show_predictions_checkbox.stateChanged.connect(self._on_show_predictions_changed)
+ # Camera config dialog
+ self.config_cameras_button.clicked.connect(self._open_camera_config_dialog)
+
# Connect bounding box controls
self.bbox_enabled_checkbox.stateChanged.connect(self._on_bbox_changed)
self.bbox_x0_spin.valueChanged.connect(self._on_bbox_changed)
@@ -495,11 +438,11 @@ def _connect_signals(self) -> None:
self.bbox_x1_spin.valueChanged.connect(self._on_bbox_changed)
self.bbox_y1_spin.valueChanged.connect(self._on_bbox_changed)
- self.camera_controller.frame_ready.connect(self._on_frame_ready)
- self.camera_controller.started.connect(self._on_camera_started)
- self.camera_controller.error.connect(self._show_error)
- self.camera_controller.warning.connect(self._show_warning)
- self.camera_controller.stopped.connect(self._on_camera_stopped)
+ # Multi-camera controller signals (used for both single and multi-camera modes)
+ self.multi_camera_controller.frame_ready.connect(self._on_multi_frame_ready)
+ self.multi_camera_controller.all_started.connect(self._on_multi_camera_started)
+ self.multi_camera_controller.all_stopped.connect(self._on_multi_camera_stopped)
+ self.multi_camera_controller.camera_error.connect(self._on_multi_camera_error)
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
self.dlc_processor.error.connect(self._on_dlc_error)
@@ -507,32 +450,8 @@ def _connect_signals(self) -> None:
# ------------------------------------------------------------------ config
def _apply_config(self, config: ApplicationSettings) -> None:
- camera = config.camera
- self.camera_fps.setValue(float(camera.fps))
-
- # Set exposure and gain from config
- self.camera_exposure.setValue(int(camera.exposure))
- self.camera_gain.setValue(float(camera.gain))
-
- # Set crop settings from config
- self.crop_x0.setValue(int(camera.crop_x0) if hasattr(camera, "crop_x0") else 0)
- self.crop_y0.setValue(int(camera.crop_y0) if hasattr(camera, "crop_y0") else 0)
- self.crop_x1.setValue(int(camera.crop_x1) if hasattr(camera, "crop_x1") else 0)
- self.crop_y1.setValue(int(camera.crop_y1) if hasattr(camera, "crop_y1") else 0)
-
- backend_name = camera.backend or "opencv"
- self.camera_backend.blockSignals(True)
- index = self.camera_backend.findData(backend_name)
- if index >= 0:
- self.camera_backend.setCurrentIndex(index)
- else:
- self.camera_backend.setEditText(backend_name)
- self.camera_backend.blockSignals(False)
- self._refresh_camera_indices(keep_current=False)
- self._select_camera_by_index(camera.index, fallback_text=camera.name or str(camera.index))
-
- self._active_camera_settings = None
- self._update_backend_specific_controls()
+ # Update active cameras label
+ self._update_active_cameras_label()
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
@@ -566,122 +485,19 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self._bbox_color = viz.get_bbox_color_bgr()
def _current_config(self) -> ApplicationSettings:
+ # Get the first camera from multi-camera config for backward compatibility
+ active_cameras = self._config.multi_camera.get_active_cameras()
+ camera = active_cameras[0] if active_cameras else CameraSettings()
+
return ApplicationSettings(
- camera=self._camera_settings_from_ui(),
+ camera=camera,
+ multi_camera=self._config.multi_camera,
dlc=self._dlc_settings_from_ui(),
recording=self._recording_settings_from_ui(),
bbox=self._bbox_settings_from_ui(),
visualization=self._visualization_settings_from_ui(),
)
- def _camera_settings_from_ui(self) -> CameraSettings:
- index = self._current_camera_index_value()
- if index is None:
- raise ValueError("Camera selection must provide a numeric index")
- backend_text = self._current_backend_name()
-
- # Get exposure and gain from explicit UI fields
- exposure = self.camera_exposure.value()
- gain = self.camera_gain.value()
-
- # Get crop settings from UI
- crop_x0 = self.crop_x0.value()
- crop_y0 = self.crop_y0.value()
- crop_x1 = self.crop_x1.value()
- crop_y1 = self.crop_y1.value()
-
- name_text = self.camera_index.currentText().strip()
- settings = CameraSettings(
- name=name_text or f"Camera {index}",
- index=index,
- fps=self.camera_fps.value(),
- backend=backend_text or "opencv",
- exposure=exposure,
- gain=gain,
- crop_x0=crop_x0,
- crop_y0=crop_y0,
- crop_x1=crop_x1,
- crop_y1=crop_y1,
- properties={},
- )
- return settings.apply_defaults()
-
- def _current_backend_name(self) -> str:
- backend_data = self.camera_backend.currentData()
- if isinstance(backend_data, str) and backend_data:
- return backend_data
- text = self.camera_backend.currentText().strip()
- return text or "opencv"
-
- def _refresh_camera_indices(self, *_args: object, keep_current: bool = True) -> None:
- backend = self._current_backend_name()
- # Get max_devices from config, default to 3
- max_devices = (
- self._config.camera.max_devices if hasattr(self._config.camera, "max_devices") else 3
- )
- detected = CameraFactory.detect_cameras(backend, max_devices=max_devices)
- debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- logging.info(f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}")
- self._detected_cameras = detected
- previous_index = self._current_camera_index_value()
- previous_text = self.camera_index.currentText()
- self.camera_index.blockSignals(True)
- self.camera_index.clear()
- for camera in detected:
- self.camera_index.addItem(camera.label, camera.index)
- if keep_current and previous_index is not None:
- self._select_camera_by_index(previous_index, fallback_text=previous_text)
- elif detected:
- self.camera_index.setCurrentIndex(0)
- else:
- if keep_current and previous_text:
- self.camera_index.setEditText(previous_text)
- else:
- self.camera_index.setEditText("")
- self.camera_index.blockSignals(False)
-
- def _select_camera_by_index(self, index: int, fallback_text: Optional[str] = None) -> None:
- self.camera_index.blockSignals(True)
- for row in range(self.camera_index.count()):
- if self.camera_index.itemData(row) == index:
- self.camera_index.setCurrentIndex(row)
- break
- else:
- text = fallback_text if fallback_text is not None else str(index)
- self.camera_index.setEditText(text)
- self.camera_index.blockSignals(False)
-
- def _current_camera_index_value(self) -> Optional[int]:
- data = self.camera_index.currentData()
- if isinstance(data, int):
- return data
- text = self.camera_index.currentText().strip()
- if not text:
- return None
- try:
- return int(text)
- except ValueError:
- return None
- debug_info = [f"{camera.index}:{camera.label}" for camera in detected]
- logging.info(f"[CameraDetection] Available cameras for backend '{backend}': {debug_info}")
- self._detected_cameras = detected
- previous_index = self._current_camera_index_value()
- previous_text = self.camera_index.currentText()
- self.camera_index.blockSignals(True)
- self.camera_index.clear()
- for camera in detected:
- self.camera_index.addItem(camera.label, camera.index)
- if keep_current and previous_index is not None:
- self._select_camera_by_index(previous_index, fallback_text=previous_text)
- elif detected:
- self.camera_index.setCurrentIndex(0)
- else:
- if keep_current and previous_text:
- self.camera_index.setEditText(previous_text)
- else:
- self.camera_index.setEditText("")
- self.camera_index.blockSignals(False)
-
def _parse_json(self, value: str) -> dict:
text = value.strip()
if not text:
@@ -826,110 +642,221 @@ def _refresh_processors(self) -> None:
self._scanned_processors = {}
self._processor_keys = []
- def _on_backend_changed(self, *_args: object) -> None:
- self._refresh_camera_indices(keep_current=False)
+ # ------------------------------------------------------------------ multi-camera
+ def _open_camera_config_dialog(self) -> None:
+ """Open the camera configuration dialog."""
+ dialog = CameraConfigDialog(self, self._config.multi_camera)
+ dialog.settings_changed.connect(self._on_multi_camera_settings_changed)
+ dialog.exec()
+
+ def _on_multi_camera_settings_changed(self, settings: MultiCameraSettings) -> None:
+ """Handle changes to multi-camera settings."""
+ self._config.multi_camera = settings
+ self._update_active_cameras_label()
+ active_count = len(settings.get_active_cameras())
+ self.statusBar().showMessage(
+ f"Camera configuration updated: {active_count} active camera(s)", 3000
+ )
- def _update_backend_specific_controls(self) -> None:
- """Enable/disable controls based on selected backend."""
- backend = self._current_backend_name()
- is_opencv = backend.lower() == "opencv"
+ def _update_active_cameras_label(self) -> None:
+ """Update the label showing active cameras."""
+ active_cams = self._config.multi_camera.get_active_cameras()
+ if not active_cams:
+ self.active_cameras_label.setText("No cameras configured")
+ elif len(active_cams) == 1:
+ cam = active_cams[0]
+ self.active_cameras_label.setText(
+ f"{cam.name} [{cam.backend}:{cam.index}] @ {cam.fps:.1f} fps"
+ )
+ else:
+ cam_names = [f"{c.name}" for c in active_cams]
+ self.active_cameras_label.setText(f"{len(active_cams)} cameras: {', '.join(cam_names)}")
+
+ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
+ """Handle frames from multiple cameras."""
+ self._multi_camera_frames = frame_data.frames
+ self._track_camera_frame() # Track FPS
+
+ # For single camera mode, also set raw_frame for DLC processing
+ if len(frame_data.frames) == 1:
+ cam_idx = next(iter(frame_data.frames.keys()))
+ self._raw_frame = frame_data.frames[cam_idx]
+
+ # Record individual camera feeds if recording is active
+ if self._multi_camera_recorders:
+ for cam_idx, frame in frame_data.frames.items():
+ if cam_idx in self._multi_camera_recorders:
+ recorder = self._multi_camera_recorders[cam_idx]
+ if recorder.is_running:
+ timestamp = frame_data.timestamps.get(cam_idx, time.time())
+ try:
+ recorder.write(frame, timestamp=timestamp)
+ except Exception as exc:
+ logging.warning(f"Failed to write frame for camera {cam_idx}: {exc}")
+
+ # Display tiled frame (or single frame for 1 camera)
+ if frame_data.tiled_frame is not None:
+ self._current_frame = frame_data.tiled_frame
+ self._display_frame(frame_data.tiled_frame)
+
+ # For DLC processing, use single frame if only one camera
+ if self._dlc_active and len(frame_data.frames) == 1:
+ cam_idx = next(iter(frame_data.frames.keys()))
+ frame = frame_data.frames[cam_idx]
+ timestamp = frame_data.timestamps.get(cam_idx, time.time())
+ self.dlc_processor.enqueue_frame(frame, timestamp)
+
+ def _on_multi_camera_started(self) -> None:
+ """Handle all cameras started event."""
+ self.preview_button.setEnabled(False)
+ self.stop_preview_button.setEnabled(True)
+ active_count = self.multi_camera_controller.get_active_count()
+ self.statusBar().showMessage(
+ f"Multi-camera preview started: {active_count} camera(s)", 5000
+ )
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
- # Disable exposure and gain controls for OpenCV backend
- self.camera_exposure.setEnabled(not is_opencv)
- self.camera_gain.setEnabled(not is_opencv)
+ def _on_multi_camera_stopped(self) -> None:
+ """Handle all cameras stopped event."""
+ # Stop all multi-camera recorders
+ self._stop_multi_camera_recording()
- # Set tooltip to explain why controls are disabled
- if is_opencv:
- tooltip = "Exposure and gain control not supported with OpenCV backend"
- self.camera_exposure.setToolTip(tooltip)
- self.camera_gain.setToolTip(tooltip)
- else:
- self.camera_exposure.setToolTip("")
- self.camera_gain.setToolTip("")
-
- def _on_rotation_changed(self, _index: int) -> None:
- data = self.rotation_combo.currentData()
- self._rotation_degrees = int(data) if isinstance(data, int) else 0
- if self._raw_frame is not None:
- rotated = self._apply_rotation(self._raw_frame)
- self._current_frame = rotated
- self._last_pose = None
- self._display_frame(rotated, force=False)
+ self.preview_button.setEnabled(True)
+ self.stop_preview_button.setEnabled(False)
+ self._current_frame = None
+ self._multi_camera_frames.clear()
+ self.video_label.setPixmap(QPixmap())
+ self.video_label.setText("Camera preview not started")
+ self.statusBar().showMessage("Multi-camera preview stopped", 3000)
+ self._update_inference_buttons()
+ self._update_camera_controls_enabled()
+
+ def _on_multi_camera_error(self, camera_index: int, message: str) -> None:
+ """Handle error from a camera in multi-camera mode."""
+ self._show_warning(f"Camera {camera_index} error: {message}")
+
+ def _start_multi_camera_recording(self) -> None:
+ """Start recording from all active cameras."""
+ if self._multi_camera_recorders:
+ return # Already recording
+
+ recording = self._recording_settings_from_ui()
+ if not recording.enabled:
+ self._show_error("Recording is disabled in the configuration.")
+ return
+
+ active_cams = self._config.multi_camera.get_active_cameras()
+ if not active_cams:
+ self._show_error("No active cameras configured.")
+ return
+
+ base_path = recording.output_path()
+ base_stem = base_path.stem
+
+ for cam in active_cams:
+ cam_idx = cam.index
+ # Create unique filename for each camera
+ cam_filename = f"{base_stem}_cam{cam_idx}{base_path.suffix}"
+ cam_path = base_path.parent / cam_filename
+
+ # Get frame from current frames if available
+ frame = self._multi_camera_frames.get(cam_idx)
+ frame_size = (frame.shape[0], frame.shape[1]) if frame is not None else None
+
+ recorder = VideoRecorder(
+ cam_path,
+ frame_size=frame_size,
+ frame_rate=float(cam.fps),
+ codec=recording.codec,
+ crf=recording.crf,
+ )
+
+ try:
+ recorder.start()
+ self._multi_camera_recorders[cam_idx] = recorder
+ logging.info(f"Started recording camera {cam_idx} to {cam_path}")
+ except Exception as exc:
+ self._show_error(f"Failed to start recording for camera {cam_idx}: {exc}")
+
+ if self._multi_camera_recorders:
+ self.start_record_button.setEnabled(False)
+ self.stop_record_button.setEnabled(True)
+ self.statusBar().showMessage(
+ f"Recording {len(self._multi_camera_recorders)} camera(s) to {recording.directory}",
+ 5000,
+ )
+ self._update_camera_controls_enabled()
+
+ def _stop_multi_camera_recording(self) -> None:
+ """Stop recording from all cameras."""
+ if not self._multi_camera_recorders:
+ return
+
+ for cam_idx, recorder in self._multi_camera_recorders.items():
+ try:
+ recorder.stop()
+ logging.info(f"Stopped recording camera {cam_idx}")
+ except Exception as exc:
+ logging.warning(f"Error stopping recorder for camera {cam_idx}: {exc}")
+
+ self._multi_camera_recorders.clear()
+ self.start_record_button.setEnabled(True)
+ self.stop_record_button.setEnabled(False)
+ self.statusBar().showMessage("Multi-camera recording stopped", 3000)
+ self._update_camera_controls_enabled()
# ------------------------------------------------------------------ camera control
def _start_preview(self) -> None:
- try:
- settings = self._camera_settings_from_ui()
- except ValueError as exc:
- self._show_error(str(exc))
+ """Start camera preview - uses multi-camera controller for all configurations."""
+ active_cams = self._config.multi_camera.get_active_cameras()
+ if not active_cams:
+ self._show_error("No cameras configured. Use 'Configure Cameras...' to add cameras.")
return
- self._active_camera_settings = settings
- self.camera_controller.start(settings)
+
+ # Determine if we're in single or multi-camera mode
+ self._multi_camera_mode = len(active_cams) > 1
+
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(True)
self._current_frame = None
self._raw_frame = None
self._last_pose = None
- self._dlc_active = False
+ self._multi_camera_frames.clear()
self._camera_frame_times.clear()
self._last_display_time = 0.0
+
if hasattr(self, "camera_stats_label"):
- self.camera_stats_label.setText("Camera starting…")
- self.statusBar().showMessage("Starting camera preview…", 3000)
+ self.camera_stats_label.setText(f"Starting {len(active_cams)} camera(s)…")
+ self.statusBar().showMessage(f"Starting preview ({len(active_cams)} camera(s))…", 3000)
+
+ # Store active settings for single camera mode (for DLC, recording frame rate, etc.)
+ self._active_camera_settings = active_cams[0] if active_cams else None
+
+ self.multi_camera_controller.start(active_cams)
self._update_inference_buttons()
self._update_camera_controls_enabled()
def _stop_preview(self) -> None:
- if not self.camera_controller.is_running():
+ """Stop camera preview."""
+ if not self.multi_camera_controller.is_running():
return
+
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(False)
self.start_inference_button.setEnabled(False)
self.stop_inference_button.setEnabled(False)
- self.statusBar().showMessage("Stopping camera preview…", 3000)
- self.camera_controller.stop()
- self._stop_inference(show_message=False)
- self._camera_frame_times.clear()
- self._last_display_time = 0.0
- if hasattr(self, "camera_stats_label"):
- self.camera_stats_label.setText("Camera idle")
+ self.statusBar().showMessage("Stopping preview…", 3000)
- def _on_camera_started(self, settings: CameraSettings) -> None:
- self._active_camera_settings = settings
- self.preview_button.setEnabled(False)
- self.stop_preview_button.setEnabled(True)
- if getattr(settings, "fps", None):
- self.camera_fps.blockSignals(True)
- self.camera_fps.setValue(float(settings.fps))
- self.camera_fps.blockSignals(False)
- # Resolution will be determined from actual camera frames
- if getattr(settings, "fps", None):
- fps_text = f"{float(settings.fps):.2f} FPS"
- else:
- fps_text = "unknown FPS"
- self.statusBar().showMessage(f"Camera preview started @ {fps_text}", 5000)
- self._update_inference_buttons()
- self._update_camera_controls_enabled()
+ # Stop any active recording first
+ self._stop_multi_camera_recording()
- def _on_camera_stopped(self) -> None:
- if self._video_recorder and self._video_recorder.is_running:
- self._stop_recording()
- self.preview_button.setEnabled(True)
- self.stop_preview_button.setEnabled(False)
+ self.multi_camera_controller.stop()
self._stop_inference(show_message=False)
- self._current_frame = None
- self._raw_frame = None
- self._last_pose = None
- self._active_camera_settings = None
- self.video_label.setPixmap(QPixmap())
- self.video_label.setText("Camera preview not started")
- self.statusBar().showMessage("Camera preview stopped", 3000)
self._camera_frame_times.clear()
self._last_display_time = 0.0
if hasattr(self, "camera_stats_label"):
self.camera_stats_label.setText("Camera idle")
- self._update_inference_buttons()
- self._update_camera_controls_enabled()
def _configure_dlc(self) -> bool:
try:
@@ -962,7 +889,7 @@ def _configure_dlc(self) -> bool:
return True
def _update_inference_buttons(self) -> None:
- preview_running = self.camera_controller.is_running()
+ preview_running = self.multi_camera_controller.is_running()
self.start_inference_button.setEnabled(preview_running and not self._dlc_active)
self.stop_inference_button.setEnabled(preview_running and self._dlc_active)
@@ -982,29 +909,20 @@ def _update_dlc_controls_enabled(self) -> None:
widget.setEnabled(allow_changes)
def _update_camera_controls_enabled(self) -> None:
- recording_active = self._video_recorder is not None and self._video_recorder.is_running
- allow_changes = (
- not self.camera_controller.is_running()
- and not self._dlc_active
- and not recording_active
- )
- widgets = [
- self.camera_backend,
- self.camera_index,
- self.refresh_cameras_button,
- self.camera_fps,
- self.camera_exposure,
- self.camera_gain,
- self.crop_x0,
- self.crop_y0,
- self.crop_x1,
- self.crop_y1,
- self.rotation_combo,
- self.codec_combo,
- self.crf_spin,
- ]
- for widget in widgets:
- widget.setEnabled(allow_changes)
+ multi_cam_recording = bool(self._multi_camera_recorders)
+
+ # Check if preview is running
+ preview_running = self.multi_camera_controller.is_running()
+
+ allow_changes = not preview_running and not self._dlc_active and not multi_cam_recording
+
+ # Recording settings (codec, crf) should be editable when not recording
+ recording_editable = not multi_cam_recording
+ self.codec_combo.setEnabled(recording_editable)
+ self.crf_spin.setEnabled(recording_editable)
+
+ # Config cameras button should be available when not in preview/recording
+ self.config_cameras_button.setEnabled(allow_changes)
def _track_camera_frame(self) -> None:
now = time.perf_counter()
@@ -1081,12 +999,23 @@ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
def _update_metrics(self) -> None:
if hasattr(self, "camera_stats_label"):
- if self.camera_controller.is_running():
+ running = self.multi_camera_controller.is_running()
+
+ if running:
+ active_count = self.multi_camera_controller.get_active_count()
fps = self._compute_fps(self._camera_frame_times)
if fps > 0:
- self.camera_stats_label.setText(f"{fps:.1f} fps (last 5 s)")
+ if active_count > 1:
+ self.camera_stats_label.setText(
+ f"{active_count} cameras | {fps:.1f} fps (last 5 s)"
+ )
+ else:
+ self.camera_stats_label.setText(f"{fps:.1f} fps (last 5 s)")
else:
- self.camera_stats_label.setText("Measuring…")
+ if active_count > 1:
+ self.camera_stats_label.setText(f"{active_count} cameras | Measuring…")
+ else:
+ self.camera_stats_label.setText("Measuring…")
else:
self.camera_stats_label.setText("Camera idle")
@@ -1103,15 +1032,40 @@ def _update_metrics(self) -> None:
self._update_processor_status()
if hasattr(self, "recording_stats_label"):
- if self._video_recorder is not None:
- stats = self._video_recorder.get_stats()
- if stats is not None:
- summary = self._format_recorder_stats(stats)
- self._last_recorder_summary = summary
- self.recording_stats_label.setText(summary)
- elif not self._video_recorder.is_running:
- self._last_recorder_summary = "Recorder idle"
- self.recording_stats_label.setText(self._last_recorder_summary)
+ # Handle multi-camera recording stats
+ if self._multi_camera_recorders:
+ num_recorders = len(self._multi_camera_recorders)
+ if num_recorders == 1:
+ # Single camera - show detailed stats
+ recorder = next(iter(self._multi_camera_recorders.values()))
+ stats = recorder.get_stats()
+ if stats:
+ summary = self._format_recorder_stats(stats)
+ else:
+ summary = "Recording..."
+ else:
+ # Multiple cameras - show aggregated stats with per-camera details
+ total_written = 0
+ total_dropped = 0
+ total_queue = 0
+ max_latency = 0.0
+ avg_latencies = []
+ for recorder in self._multi_camera_recorders.values():
+ stats = recorder.get_stats()
+ if stats:
+ total_written += stats.frames_written
+ total_dropped += stats.dropped_frames
+ total_queue += stats.queue_size
+ max_latency = max(max_latency, stats.last_latency)
+ avg_latencies.append(stats.average_latency)
+ avg_latency = sum(avg_latencies) / len(avg_latencies) if avg_latencies else 0.0
+ summary = (
+ f"{num_recorders} cams | {total_written} frames | "
+ f"latency {max_latency*1000:.1f}ms (avg {avg_latency*1000:.1f}ms) | "
+ f"queue {total_queue} | dropped {total_dropped}"
+ )
+ self._last_recorder_summary = summary
+ self.recording_stats_label.setText(summary)
else:
self.recording_stats_label.setText(self._last_recorder_summary)
@@ -1150,7 +1104,7 @@ def _update_processor_status(self) -> None:
if current_vid_recording != self._last_processor_vid_recording:
if current_vid_recording:
# Start video recording
- if not self._video_recorder or not self._video_recorder.is_running:
+ if not self._multi_camera_recorders:
# Get session name from processor
session_name = getattr(processor, "session_name", "auto_session")
self._auto_record_session_name = session_name
@@ -1166,7 +1120,7 @@ def _update_processor_status(self) -> None:
logging.info(f"Auto-recording started for session: {session_name}")
else:
# Stop video recording
- if self._video_recorder and self._video_recorder.is_running:
+ if self._multi_camera_recorders:
self._stop_recording()
self.statusBar().showMessage("Auto-stopped recording", 3000)
logging.info("Auto-recording stopped")
@@ -1177,7 +1131,7 @@ def _start_inference(self) -> None:
if self._dlc_active:
self.statusBar().showMessage("Pose inference already running", 3000)
return
- if not self.camera_controller.is_running():
+ if not self.multi_camera_controller.is_running():
self._show_error("Start the camera preview before running pose inference.")
return
if not self._configure_dlc():
@@ -1221,166 +1175,23 @@ def _stop_inference(self, show_message: bool = True) -> None:
# ------------------------------------------------------------------ recording
def _start_recording(self) -> None:
- # If recorder already running, nothing to do
- if self._video_recorder and self._video_recorder.is_running:
+ """Start recording from all active cameras."""
+ # Auto-start preview if not running
+ if not self.multi_camera_controller.is_running():
+ self._start_preview()
+ # Wait a moment for cameras to initialize before recording
+ # The recording will start after preview is confirmed running
+ self.statusBar().showMessage("Starting preview before recording...", 3000)
+ # Use a single-shot timer to start recording after preview starts
+ QTimer.singleShot(500, self._start_multi_camera_recording)
return
- # If camera not running, start it automatically so frames will arrive.
- # This allows starting recording without the user manually pressing "Start Preview".
- if not self.camera_controller.is_running():
- try:
- settings = self._camera_settings_from_ui()
- except ValueError as exc:
- self._show_error(str(exc))
- return
- # Store active settings and start camera preview in background
- self._active_camera_settings = settings
- self.camera_controller.start(settings)
- self.preview_button.setEnabled(False)
- self.stop_preview_button.setEnabled(True)
- self._current_frame = None
- self._raw_frame = None
- self._last_pose = None
- self._dlc_active = False
- self._camera_frame_times.clear()
- self._last_display_time = 0.0
- if hasattr(self, "camera_stats_label"):
- self.camera_stats_label.setText("Camera starting…")
- self.statusBar().showMessage("Starting camera preview…", 3000)
- self._update_inference_buttons()
- self._update_camera_controls_enabled()
- recording = self._recording_settings_from_ui()
- if not recording.enabled:
- self._show_error("Recording is disabled in the configuration.")
- return
-
- # If we already have a current frame, use its shape to set the recorder stream.
- # Otherwise start the recorder without a fixed frame_size and configure it
- # once the first frame arrives (see _on_frame_ready).
- frame = self._current_frame
- if frame is not None:
- height, width = frame.shape[:2]
- frame_size = (height, width)
- else:
- frame_size = None
-
- frame_rate = (
- self._active_camera_settings.fps
- if self._active_camera_settings is not None
- else self.camera_fps.value()
- )
-
- output_path = recording.output_path()
- self._video_recorder = VideoRecorder(
- output_path,
- frame_size=frame_size, # None allowed; will be configured on first frame
- frame_rate=float(frame_rate) if frame_rate is not None else None,
- codec=recording.codec,
- crf=recording.crf,
- )
- self._last_drop_warning = 0.0
- try:
- self._video_recorder.start()
- except Exception as exc: # pragma: no cover - runtime error
- self._show_error(str(exc))
- self._video_recorder = None
- return
- self.start_record_button.setEnabled(False)
- self.stop_record_button.setEnabled(True)
- if hasattr(self, "recording_stats_label"):
- self._last_recorder_summary = "Recorder running…"
- self.recording_stats_label.setText(self._last_recorder_summary)
- self.statusBar().showMessage(f"Recording to {output_path}", 5000)
- self._update_camera_controls_enabled()
+ # Preview already running, start recording immediately
+ self._start_multi_camera_recording()
def _stop_recording(self) -> None:
- if not self._video_recorder:
- return
- recorder = self._video_recorder
- recorder.stop()
- stats = recorder.get_stats() if recorder is not None else None
- self._video_recorder = None
- self.start_record_button.setEnabled(True)
- self.stop_record_button.setEnabled(False)
- if hasattr(self, "recording_stats_label"):
- if stats is not None:
- summary = self._format_recorder_stats(stats)
- else:
- summary = "Recorder idle"
- self._last_recorder_summary = summary
- self.recording_stats_label.setText(summary)
- else:
- self._last_recorder_summary = (
- self._format_recorder_stats(stats) if stats is not None else "Recorder idle"
- )
- self._last_drop_warning = 0.0
- self.statusBar().showMessage("Recording stopped", 3000)
- self._update_camera_controls_enabled()
-
- # ------------------------------------------------------------------ frame handling
- def _on_frame_ready(self, frame_data: FrameData) -> None:
- raw_frame = frame_data.image
- self._raw_frame = raw_frame
-
- # Apply cropping before rotation
- frame = self._apply_crop(raw_frame)
-
- # Apply rotation
- frame = self._apply_rotation(frame)
- frame = np.ascontiguousarray(frame)
- self._current_frame = frame
- self._track_camera_frame()
- # If recorder is running but was started without a fixed frame_size, configure
- # the stream now that we know the actual frame dimensions.
- if self._video_recorder and self._video_recorder.is_running:
- # Configure stream if recorder was started without a frame_size
- try:
- current_frame_size = getattr(self._video_recorder, "_frame_size", None)
- except Exception:
- current_frame_size = None
- if current_frame_size is None:
- try:
- fps_value = (
- self._active_camera_settings.fps
- if self._active_camera_settings is not None
- else self.camera_fps.value()
- )
- except Exception:
- fps_value = None
- h, w = frame.shape[:2]
- try:
- # configure_stream expects (height, width)
- self._video_recorder.configure_stream(
- (h, w), float(fps_value) if fps_value is not None else None
- )
- except Exception:
- # Non-fatal: continue and attempt to write anyway
- pass
- try:
- success = self._video_recorder.write(frame, timestamp=frame_data.timestamp)
- if not success:
- now = time.perf_counter()
- if now - self._last_drop_warning > 1.0:
- self.statusBar().showMessage("Recorder backlog full; dropping frames", 2000)
- self._last_drop_warning = now
- except RuntimeError as exc:
- # Check if it's a frame size error
- if "Frame size changed" in str(exc):
- self._show_warning(f"Camera resolution changed - restarting recording: {exc}")
- was_recording = self._video_recorder and self._video_recorder.is_running
- self._stop_recording()
- # Restart recording with new resolution if it was already running
- if was_recording:
- try:
- self._start_recording()
- except Exception as restart_exc:
- self._show_error(f"Failed to restart recording: {restart_exc}")
- else:
- self._show_error(str(exc))
- self._stop_recording()
- if self._dlc_active:
- self.dlc_processor.enqueue_frame(frame, frame_data.timestamp)
- self._display_frame(frame)
+ """Stop recording from all cameras."""
+ self._stop_multi_camera_recording()
def _on_pose_ready(self, result: PoseResult) -> None:
if not self._dlc_active:
@@ -1413,40 +1224,6 @@ def _update_video_display(self, frame: np.ndarray) -> None:
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
self.video_label.setPixmap(QPixmap.fromImage(image))
- def _apply_crop(self, frame: np.ndarray) -> np.ndarray:
- """Apply cropping to the frame based on settings."""
- if self._active_camera_settings is None:
- return frame
-
- crop_region = self._active_camera_settings.get_crop_region()
- if crop_region is None:
- return frame
-
- x0, y0, x1, y1 = crop_region
- height, width = frame.shape[:2]
-
- # Validate and constrain crop coordinates
- x0 = max(0, min(x0, width))
- y0 = max(0, min(y0, height))
- x1 = max(x0, min(x1, width)) if x1 > 0 else width
- y1 = max(y0, min(y1, height)) if y1 > 0 else height
-
- # Apply crop
- if x0 < x1 and y0 < y1:
- return frame[y0:y1, x0:x1]
- else:
- # Invalid crop region, return original frame
- return frame
-
- def _apply_rotation(self, frame: np.ndarray) -> np.ndarray:
- if self._rotation_degrees == 90:
- return cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
- if self._rotation_degrees == 180:
- return cv2.rotate(frame, cv2.ROTATE_180)
- if self._rotation_degrees == 270:
- return cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE)
- return frame
-
def _on_show_predictions_changed(self, _state: int) -> None:
if self._current_frame is not None:
self._display_frame(self._current_frame, force=True)
@@ -1539,10 +1316,13 @@ def _show_warning(self, message: str) -> None:
# ------------------------------------------------------------------ Qt overrides
def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
- if self.camera_controller.is_running():
- self.camera_controller.stop(wait=True)
- if self._video_recorder and self._video_recorder.is_running:
- self._video_recorder.stop()
+ if self.multi_camera_controller.is_running():
+ self.multi_camera_controller.stop(wait=True)
+ # Stop all multi-camera recorders
+ for recorder in self._multi_camera_recorders.values():
+ if recorder.is_running:
+ recorder.stop()
+ self._multi_camera_recorders.clear()
self.dlc_processor.shutdown()
if hasattr(self, "_metrics_timer"):
self._metrics_timer.stop()
diff --git a/dlclivegui/multi_camera_controller.py b/dlclivegui/multi_camera_controller.py
new file mode 100644
index 0000000..6d6b9b8
--- /dev/null
+++ b/dlclivegui/multi_camera_controller.py
@@ -0,0 +1,408 @@
+"""Multi-camera management for the DLC Live GUI."""
+
+from __future__ import annotations
+
+import logging
+import time
+from dataclasses import dataclass
+from threading import Event, Lock
+from typing import Dict, List, Optional
+
+import cv2
+import numpy as np
+from PyQt6.QtCore import QObject, QThread, pyqtSignal, pyqtSlot
+
+from dlclivegui.cameras import CameraFactory
+from dlclivegui.cameras.base import CameraBackend
+from dlclivegui.config import CameraSettings, MultiCameraSettings
+
+LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class MultiFrameData:
+ """Container for frames from multiple cameras."""
+
+ frames: Dict[int, np.ndarray] # camera_index -> frame
+ timestamps: Dict[int, float] # camera_index -> timestamp
+ tiled_frame: Optional[np.ndarray] = None # Combined tiled frame
+
+
+class SingleCameraWorker(QObject):
+ """Worker for a single camera in multi-camera mode."""
+
+ frame_captured = pyqtSignal(int, object, float) # camera_index, frame, timestamp
+ error_occurred = pyqtSignal(int, str) # camera_index, error_message
+ started = pyqtSignal(int) # camera_index
+ stopped = pyqtSignal(int) # camera_index
+
+ def __init__(self, camera_index: int, settings: CameraSettings):
+ super().__init__()
+ self._camera_index = camera_index
+ self._settings = settings
+ self._stop_event = Event()
+ self._backend: Optional[CameraBackend] = None
+ self._max_consecutive_errors = 5
+ self._retry_delay = 0.1
+
+ @pyqtSlot()
+ def run(self) -> None:
+ self._stop_event.clear()
+
+ try:
+ self._backend = CameraFactory.create(self._settings)
+ self._backend.open()
+ except Exception as exc:
+ LOGGER.exception(f"Failed to initialize camera {self._camera_index}", exc_info=exc)
+ self.error_occurred.emit(self._camera_index, f"Failed to initialize camera: {exc}")
+ self.stopped.emit(self._camera_index)
+ return
+
+ self.started.emit(self._camera_index)
+ consecutive_errors = 0
+
+ while not self._stop_event.is_set():
+ try:
+ frame, timestamp = self._backend.read()
+ if frame is None or frame.size == 0:
+ consecutive_errors += 1
+ if consecutive_errors >= self._max_consecutive_errors:
+ self.error_occurred.emit(self._camera_index, "Too many empty frames")
+ break
+ time.sleep(self._retry_delay)
+ continue
+
+ consecutive_errors = 0
+ self.frame_captured.emit(self._camera_index, frame, timestamp)
+
+ except Exception as exc:
+ consecutive_errors += 1
+ if self._stop_event.is_set():
+ break
+ if consecutive_errors >= self._max_consecutive_errors:
+ self.error_occurred.emit(self._camera_index, f"Camera read error: {exc}")
+ break
+ time.sleep(self._retry_delay)
+ continue
+
+ # Cleanup
+ if self._backend is not None:
+ try:
+ self._backend.close()
+ except Exception:
+ pass
+ self.stopped.emit(self._camera_index)
+
+ def stop(self) -> None:
+ self._stop_event.set()
+
+
+class MultiCameraController(QObject):
+ """Controller for managing multiple cameras simultaneously."""
+
+ # Signals
+ frame_ready = pyqtSignal(object) # MultiFrameData
+ camera_started = pyqtSignal(int, object) # camera_index, settings
+ camera_stopped = pyqtSignal(int) # camera_index
+ camera_error = pyqtSignal(int, str) # camera_index, error_message
+ all_started = pyqtSignal()
+ all_stopped = pyqtSignal()
+
+ MAX_CAMERAS = 4
+
+ def __init__(self):
+ super().__init__()
+ self._workers: Dict[int, SingleCameraWorker] = {}
+ self._threads: Dict[int, QThread] = {}
+ self._settings: Dict[int, CameraSettings] = {}
+ self._frames: Dict[int, np.ndarray] = {}
+ self._timestamps: Dict[int, float] = {}
+ self._frame_lock = Lock()
+ self._running = False
+ self._started_cameras: set = set()
+
+ def is_running(self) -> bool:
+ """Check if any camera is currently running."""
+ return self._running and len(self._started_cameras) > 0
+
+ def get_active_count(self) -> int:
+ """Get the number of active cameras."""
+ return len(self._started_cameras)
+
+ def start(self, camera_settings: List[CameraSettings]) -> None:
+ """Start multiple cameras.
+
+ Parameters
+ ----------
+ camera_settings : List[CameraSettings]
+ List of camera settings for each camera to start.
+ Maximum of MAX_CAMERAS cameras allowed.
+ """
+ if self._running:
+ LOGGER.warning("Multi-camera controller already running")
+ return
+
+ # Limit to MAX_CAMERAS
+ active_settings = [s for s in camera_settings if s.enabled][: self.MAX_CAMERAS]
+ if not active_settings:
+ LOGGER.warning("No active cameras to start")
+ return
+
+ self._running = True
+ self._frames.clear()
+ self._timestamps.clear()
+ self._started_cameras.clear()
+
+ for settings in active_settings:
+ self._start_camera(settings)
+
+ def _start_camera(self, settings: CameraSettings) -> None:
+ """Start a single camera."""
+ cam_idx = settings.index
+ if cam_idx in self._workers:
+ LOGGER.warning(f"Camera {cam_idx} already has a worker")
+ return
+
+ self._settings[cam_idx] = settings
+ worker = SingleCameraWorker(cam_idx, settings)
+ thread = QThread()
+ worker.moveToThread(thread)
+
+ # Connect signals
+ thread.started.connect(worker.run)
+ worker.frame_captured.connect(self._on_frame_captured)
+ worker.started.connect(self._on_camera_started)
+ worker.stopped.connect(self._on_camera_stopped)
+ worker.error_occurred.connect(self._on_camera_error)
+
+ self._workers[cam_idx] = worker
+ self._threads[cam_idx] = thread
+ thread.start()
+
+ def stop(self, wait: bool = True) -> None:
+ """Stop all cameras."""
+ if not self._running:
+ return
+
+ self._running = False
+
+ # Signal all workers to stop
+ for worker in self._workers.values():
+ worker.stop()
+
+ # Wait for threads to finish
+ if wait:
+ for thread in self._threads.values():
+ if thread.isRunning():
+ thread.quit()
+ thread.wait(5000)
+
+ self._workers.clear()
+ self._threads.clear()
+ self._settings.clear()
+ self._started_cameras.clear()
+ self.all_stopped.emit()
+
+ def _on_frame_captured(self, camera_index: int, frame: np.ndarray, timestamp: float) -> None:
+ """Handle a frame from one camera."""
+ # Apply rotation if configured
+ settings = self._settings.get(camera_index)
+ if settings and settings.rotation:
+ frame = self._apply_rotation(frame, settings.rotation)
+
+ # Apply cropping if configured
+ if settings:
+ crop_region = settings.get_crop_region()
+ if crop_region:
+ frame = self._apply_crop(frame, crop_region)
+
+ with self._frame_lock:
+ self._frames[camera_index] = frame
+ self._timestamps[camera_index] = timestamp
+
+ # Create tiled frame whenever we have at least one frame
+ # This ensures smoother updates even if cameras have different frame rates
+ if self._frames:
+ tiled = self._create_tiled_frame()
+ frame_data = MultiFrameData(
+ frames=dict(self._frames),
+ timestamps=dict(self._timestamps),
+ tiled_frame=tiled,
+ )
+ self.frame_ready.emit(frame_data)
+
+ def _apply_rotation(self, frame: np.ndarray, degrees: int) -> np.ndarray:
+ """Apply rotation to frame."""
+ if degrees == 90:
+ return cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
+ elif degrees == 180:
+ return cv2.rotate(frame, cv2.ROTATE_180)
+ elif degrees == 270:
+ return cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE)
+ return frame
+
+ def _apply_crop(self, frame: np.ndarray, crop_region: tuple[int, int, int, int]) -> np.ndarray:
+ """Apply crop to frame."""
+ x0, y0, x1, y1 = crop_region
+ height, width = frame.shape[:2]
+
+ x0 = max(0, min(x0, width))
+ y0 = max(0, min(y0, height))
+ x1 = max(x0, min(x1, width)) if x1 > 0 else width
+ y1 = max(y0, min(y1, height)) if y1 > 0 else height
+
+ if x0 < x1 and y0 < y1:
+ return frame[y0:y1, x0:x1]
+ return frame
+
+ def _create_tiled_frame(self) -> np.ndarray:
+ """Create a tiled frame from all camera frames.
+
+ The tiled frame is scaled to fit within a maximum canvas size
+ while maintaining aspect ratio of individual camera frames.
+ """
+ if not self._frames:
+ return np.zeros((480, 640, 3), dtype=np.uint8)
+
+ frames_list = [self._frames[idx] for idx in sorted(self._frames.keys())]
+ num_frames = len(frames_list)
+
+ if num_frames == 0:
+ return np.zeros((480, 640, 3), dtype=np.uint8)
+
+ # Determine grid layout
+ if num_frames == 1:
+ rows, cols = 1, 1
+ elif num_frames == 2:
+ rows, cols = 1, 2
+ elif num_frames <= 4:
+ rows, cols = 2, 2
+ else:
+ rows, cols = 2, 2 # Limit to 4
+
+ # Maximum canvas size to fit on screen (leaving room for UI elements)
+ max_canvas_width = 1200
+ max_canvas_height = 800
+
+ # Calculate tile size based on frame aspect ratio and available space
+ first_frame = frames_list[0]
+ frame_h, frame_w = first_frame.shape[:2]
+ frame_aspect = frame_w / frame_h if frame_h > 0 else 1.0
+
+ # Calculate tile dimensions that fit within the canvas
+ tile_w = max_canvas_width // cols
+ tile_h = max_canvas_height // rows
+
+ # Maintain aspect ratio of original frames
+ tile_aspect = tile_w / tile_h if tile_h > 0 else 1.0
+
+ if frame_aspect > tile_aspect:
+ # Frame is wider than tile slot - constrain by width
+ tile_h = int(tile_w / frame_aspect)
+ else:
+ # Frame is taller than tile slot - constrain by height
+ tile_w = int(tile_h * frame_aspect)
+
+ # Ensure minimum size
+ tile_w = max(160, tile_w)
+ tile_h = max(120, tile_h)
+
+ # Create canvas
+ canvas = np.zeros((rows * tile_h, cols * tile_w, 3), dtype=np.uint8)
+
+ # Place each frame in the grid
+ for idx, frame in enumerate(frames_list[: rows * cols]):
+ row = idx // cols
+ col = idx % cols
+
+ # Ensure frame is 3-channel
+ if frame.ndim == 2:
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+ elif frame.shape[2] == 4:
+ frame = cv2.cvtColor(frame, cv2.COLOR_BGRA2BGR)
+
+ # Resize to tile size
+ resized = cv2.resize(frame, (tile_w, tile_h))
+
+ # Add camera index label
+ cam_indices = sorted(self._frames.keys())
+ if idx < len(cam_indices):
+ label = f"Cam {cam_indices[idx]}"
+ cv2.putText(
+ resized,
+ label,
+ (10, 30),
+ cv2.FONT_HERSHEY_SIMPLEX,
+ 1.0,
+ (0, 255, 0),
+ 2,
+ )
+
+ # Place in canvas
+ y_start = row * tile_h
+ y_end = y_start + tile_h
+ x_start = col * tile_w
+ x_end = x_start + tile_w
+ canvas[y_start:y_end, x_start:x_end] = resized
+
+ return canvas
+
+ def _on_camera_started(self, camera_index: int) -> None:
+ """Handle camera start event."""
+ self._started_cameras.add(camera_index)
+ settings = self._settings.get(camera_index)
+ self.camera_started.emit(camera_index, settings)
+ LOGGER.info(f"Camera {camera_index} started")
+
+ # Check if all cameras have started
+ if len(self._started_cameras) == len(self._settings):
+ self.all_started.emit()
+
+ def _on_camera_stopped(self, camera_index: int) -> None:
+ """Handle camera stop event."""
+ self._started_cameras.discard(camera_index)
+ self.camera_stopped.emit(camera_index)
+ LOGGER.info(f"Camera {camera_index} stopped")
+
+ # Cleanup thread
+ if camera_index in self._threads:
+ thread = self._threads[camera_index]
+ if thread.isRunning():
+ thread.quit()
+ thread.wait(1000)
+ del self._threads[camera_index]
+
+ if camera_index in self._workers:
+ del self._workers[camera_index]
+
+ # Remove frame data
+ with self._frame_lock:
+ self._frames.pop(camera_index, None)
+ self._timestamps.pop(camera_index, None)
+
+ # Check if all cameras have stopped
+ if not self._started_cameras and self._running:
+ self._running = False
+ self.all_stopped.emit()
+
+ def _on_camera_error(self, camera_index: int, message: str) -> None:
+ """Handle camera error event."""
+ LOGGER.error(f"Camera {camera_index} error: {message}")
+ self.camera_error.emit(camera_index, message)
+
+ def get_frame(self, camera_index: int) -> Optional[np.ndarray]:
+ """Get the latest frame from a specific camera."""
+ with self._frame_lock:
+ return self._frames.get(camera_index)
+
+ def get_all_frames(self) -> Dict[int, np.ndarray]:
+ """Get the latest frames from all cameras."""
+ with self._frame_lock:
+ return dict(self._frames)
+
+ def get_tiled_frame(self) -> Optional[np.ndarray]:
+ """Get a tiled view of all camera frames."""
+ with self._frame_lock:
+ if self._frames:
+ return self._create_tiled_frame()
+ return None
From 5c7ee50b76d1e555165725f9b6a244dcce1b3a31 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Mon, 22 Dec 2025 13:17:42 +0100
Subject: [PATCH 033/132] Refactor multi-camera handling to use camera IDs
instead of indices; fix for basler backend
---
dlclivegui/camera_config_dialog.py | 26 +++++
dlclivegui/cameras/basler_backend.py | 27 +++++-
dlclivegui/gui.py | 78 ++++++++++-----
dlclivegui/multi_camera_controller.py | 132 ++++++++++++++------------
4 files changed, 175 insertions(+), 88 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index b0acb21..110c141 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -20,6 +20,7 @@
QMessageBox,
QPushButton,
QSpinBox,
+ QStyle,
QVBoxLayout,
QWidget,
)
@@ -78,10 +79,15 @@ def _setup_ui(self) -> None:
# Buttons for managing active cameras
list_buttons = QHBoxLayout()
self.remove_camera_btn = QPushButton("Remove")
+ self.remove_camera_btn.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_TrashIcon)
+ )
self.remove_camera_btn.setEnabled(False)
self.move_up_btn = QPushButton("↑")
+ self.move_up_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowUp))
self.move_up_btn.setEnabled(False)
self.move_down_btn = QPushButton("↓")
+ self.move_down_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowDown))
self.move_down_btn.setEnabled(False)
list_buttons.addWidget(self.remove_camera_btn)
list_buttons.addWidget(self.move_up_btn)
@@ -106,6 +112,7 @@ def _setup_ui(self) -> None:
self.backend_combo.addItem(label, backend)
backend_layout.addWidget(self.backend_combo)
self.refresh_btn = QPushButton("Refresh")
+ self.refresh_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserReload))
backend_layout.addWidget(self.refresh_btn)
available_layout.addLayout(backend_layout)
@@ -113,6 +120,7 @@ def _setup_ui(self) -> None:
available_layout.addWidget(self.available_cameras_list)
self.add_camera_btn = QPushButton("Add Selected Camera →")
+ self.add_camera_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowRight))
self.add_camera_btn.setEnabled(False)
available_layout.addWidget(self.add_camera_btn)
@@ -199,6 +207,9 @@ def _setup_ui(self) -> None:
self.settings_form.addRow("Crop (x0,y0,x1,y1):", crop_widget)
self.apply_settings_btn = QPushButton("Apply Settings")
+ self.apply_settings_btn.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DialogApplyButton)
+ )
self.apply_settings_btn.setEnabled(False)
self.settings_form.addRow(self.apply_settings_btn)
@@ -208,7 +219,11 @@ def _setup_ui(self) -> None:
# Dialog buttons
button_layout = QHBoxLayout()
self.ok_btn = QPushButton("OK")
+ self.ok_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogOkButton))
self.cancel_btn = QPushButton("Cancel")
+ self.cancel_btn.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DialogCancelButton)
+ )
button_layout.addStretch(1)
button_layout.addWidget(self.ok_btn)
button_layout.addWidget(self.cancel_btn)
@@ -352,6 +367,17 @@ def _add_selected_camera(self) -> None:
detected = item.data(Qt.ItemDataRole.UserRole)
backend = self.backend_combo.currentData() or "opencv"
+ # Check if this camera (same backend + index) is already added
+ for i in range(self.active_cameras_list.count()):
+ existing_cam = self.active_cameras_list.item(i).data(Qt.ItemDataRole.UserRole)
+ if existing_cam.backend == backend and existing_cam.index == detected.index:
+ QMessageBox.warning(
+ self,
+ "Duplicate Camera",
+ f"Camera '{backend}:{detected.index}' is already in the active list.",
+ )
+ return
+
# Create new camera settings
new_cam = CameraSettings(
name=detected.label,
diff --git a/dlclivegui/cameras/basler_backend.py b/dlclivegui/cameras/basler_backend.py
index 307fa96..7517f6c 100644
--- a/dlclivegui/cameras/basler_backend.py
+++ b/dlclivegui/cameras/basler_backend.py
@@ -25,6 +25,10 @@ def __init__(self, settings):
super().__init__(settings)
self._camera: Optional["pylon.InstantCamera"] = None
self._converter: Optional["pylon.ImageFormatConverter"] = None
+ # Parse resolution with defaults (720x540)
+ self._resolution: Tuple[int, int] = self._parse_resolution(
+ settings.properties.get("resolution")
+ )
@classmethod
def is_available(cls) -> bool:
@@ -67,8 +71,7 @@ def open(self) -> None:
LOG.warning(f"Failed to set gain to {gain}: {e}")
# Configure resolution
- requested_width = int(self.settings.properties.get("width", self.settings.width))
- requested_height = int(self.settings.properties.get("height", self.settings.height))
+ requested_width, requested_height = self._resolution
try:
self._camera.Width.SetValue(requested_width)
self._camera.Height.SetValue(requested_height)
@@ -181,6 +184,26 @@ def _rotate(self, frame: np.ndarray, angle: float) -> np.ndarray:
) from exc
return rotate_bound(frame, angle)
+ def _parse_resolution(self, resolution) -> Tuple[int, int]:
+ """Parse resolution setting.
+
+ Args:
+ resolution: Can be a tuple/list [width, height], or None
+
+ Returns:
+ Tuple of (width, height), defaults to (720, 540)
+ """
+ if resolution is None:
+ return (720, 540) # Default resolution
+
+ if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
+ try:
+ return (int(resolution[0]), int(resolution[1]))
+ except (ValueError, TypeError):
+ return (720, 540)
+
+ return (720, 540)
+
@staticmethod
def _settings_value(key: str, source: dict, fallback: Optional[float] = None):
value = source.get(key, fallback)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index a65147d..90aeb15 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -34,6 +34,7 @@
QSizePolicy,
QSpinBox,
QStatusBar,
+ QStyle,
QVBoxLayout,
QWidget,
)
@@ -50,7 +51,7 @@
VisualizationSettings,
)
from dlclivegui.dlc_processor import DLCLiveProcessor, PoseResult, ProcessorStats
-from dlclivegui.multi_camera_controller import MultiCameraController, MultiFrameData
+from dlclivegui.multi_camera_controller import MultiCameraController, MultiFrameData, get_camera_id
from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
@@ -114,8 +115,8 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
# Multi-camera state
self._multi_camera_mode = False
- self._multi_camera_recorders: dict[int, VideoRecorder] = {}
- self._multi_camera_frames: dict[int, np.ndarray] = {}
+ self._multi_camera_recorders: dict[str, VideoRecorder] = {}
+ self._multi_camera_frames: dict[str, np.ndarray] = {}
self._setup_ui()
self._connect_signals()
@@ -208,8 +209,12 @@ def _setup_ui(self) -> None:
button_bar = QHBoxLayout(button_bar_widget)
button_bar.setContentsMargins(0, 5, 0, 5)
self.preview_button = QPushButton("Start Preview")
+ self.preview_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
self.preview_button.setMinimumWidth(150)
self.stop_preview_button = QPushButton("Stop Preview")
+ self.stop_preview_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop)
+ )
self.stop_preview_button.setEnabled(False)
self.stop_preview_button.setMinimumWidth(150)
button_bar.addWidget(self.preview_button)
@@ -252,6 +257,9 @@ def _build_camera_group(self) -> QGroupBox:
# Camera config button - opens dialog for all camera configuration
config_layout = QHBoxLayout()
self.config_cameras_button = QPushButton("Configure Cameras...")
+ self.config_cameras_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_ComputerIcon)
+ )
self.config_cameras_button.setToolTip("Configure camera settings (single or multi-camera)")
config_layout.addWidget(self.config_cameras_button)
form.addRow(config_layout)
@@ -272,6 +280,9 @@ def _build_dlc_group(self) -> QGroupBox:
self.model_path_edit.setPlaceholderText("/path/to/exported/model")
path_layout.addWidget(self.model_path_edit)
self.browse_model_button = QPushButton("Browse…")
+ self.browse_model_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon)
+ )
self.browse_model_button.clicked.connect(self._action_browse_model)
path_layout.addWidget(self.browse_model_button)
form.addRow("Model file", path_layout)
@@ -283,10 +294,16 @@ def _build_dlc_group(self) -> QGroupBox:
processor_path_layout.addWidget(self.processor_folder_edit)
self.browse_processor_folder_button = QPushButton("Browse...")
+ self.browse_processor_folder_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon)
+ )
self.browse_processor_folder_button.clicked.connect(self._action_browse_processor_folder)
processor_path_layout.addWidget(self.browse_processor_folder_button)
self.refresh_processors_button = QPushButton("Refresh")
+ self.refresh_processors_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserReload)
+ )
self.refresh_processors_button.clicked.connect(self._refresh_processors)
processor_path_layout.addWidget(self.refresh_processors_button)
form.addRow("Processor folder", processor_path_layout)
@@ -305,10 +322,16 @@ def _build_dlc_group(self) -> QGroupBox:
inference_buttons = QHBoxLayout(inference_button_widget)
inference_buttons.setContentsMargins(0, 0, 0, 0)
self.start_inference_button = QPushButton("Start pose inference")
+ self.start_inference_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowRight)
+ )
self.start_inference_button.setEnabled(False)
self.start_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.start_inference_button)
self.stop_inference_button = QPushButton("Stop pose inference")
+ self.stop_inference_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserStop)
+ )
self.stop_inference_button.setEnabled(False)
self.stop_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.stop_inference_button)
@@ -339,6 +362,7 @@ def _build_recording_group(self) -> QGroupBox:
self.output_directory_edit = QLineEdit()
dir_layout.addWidget(self.output_directory_edit)
browse_dir = QPushButton("Browse…")
+ browse_dir.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon))
browse_dir.clicked.connect(self._action_browse_directory)
dir_layout.addWidget(browse_dir)
form.addRow("Output directory", dir_layout)
@@ -369,9 +393,15 @@ def _build_recording_group(self) -> QGroupBox:
buttons = QHBoxLayout(recording_button_widget)
buttons.setContentsMargins(0, 0, 0, 0)
self.start_record_button = QPushButton("Start recording")
+ self.start_record_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DialogYesButton)
+ )
self.start_record_button.setMinimumWidth(150)
buttons.addWidget(self.start_record_button)
self.stop_record_button = QPushButton("Stop recording")
+ self.stop_record_button.setIcon(
+ self.style().standardIcon(QStyle.StandardPixmap.SP_DialogNoButton)
+ )
self.stop_record_button.setEnabled(False)
self.stop_record_button.setMinimumWidth(150)
buttons.addWidget(self.stop_record_button)
@@ -679,20 +709,20 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
# For single camera mode, also set raw_frame for DLC processing
if len(frame_data.frames) == 1:
- cam_idx = next(iter(frame_data.frames.keys()))
- self._raw_frame = frame_data.frames[cam_idx]
+ cam_id = next(iter(frame_data.frames.keys()))
+ self._raw_frame = frame_data.frames[cam_id]
# Record individual camera feeds if recording is active
if self._multi_camera_recorders:
- for cam_idx, frame in frame_data.frames.items():
- if cam_idx in self._multi_camera_recorders:
- recorder = self._multi_camera_recorders[cam_idx]
+ for cam_id, frame in frame_data.frames.items():
+ if cam_id in self._multi_camera_recorders:
+ recorder = self._multi_camera_recorders[cam_id]
if recorder.is_running:
- timestamp = frame_data.timestamps.get(cam_idx, time.time())
+ timestamp = frame_data.timestamps.get(cam_id, time.time())
try:
recorder.write(frame, timestamp=timestamp)
except Exception as exc:
- logging.warning(f"Failed to write frame for camera {cam_idx}: {exc}")
+ logging.warning(f"Failed to write frame for camera {cam_id}: {exc}")
# Display tiled frame (or single frame for 1 camera)
if frame_data.tiled_frame is not None:
@@ -701,9 +731,9 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
# For DLC processing, use single frame if only one camera
if self._dlc_active and len(frame_data.frames) == 1:
- cam_idx = next(iter(frame_data.frames.keys()))
- frame = frame_data.frames[cam_idx]
- timestamp = frame_data.timestamps.get(cam_idx, time.time())
+ cam_id = next(iter(frame_data.frames.keys()))
+ frame = frame_data.frames[cam_id]
+ timestamp = frame_data.timestamps.get(cam_id, time.time())
self.dlc_processor.enqueue_frame(frame, timestamp)
def _on_multi_camera_started(self) -> None:
@@ -732,9 +762,9 @@ def _on_multi_camera_stopped(self) -> None:
self._update_inference_buttons()
self._update_camera_controls_enabled()
- def _on_multi_camera_error(self, camera_index: int, message: str) -> None:
+ def _on_multi_camera_error(self, camera_id: str, message: str) -> None:
"""Handle error from a camera in multi-camera mode."""
- self._show_warning(f"Camera {camera_index} error: {message}")
+ self._show_warning(f"Camera {camera_id} error: {message}")
def _start_multi_camera_recording(self) -> None:
"""Start recording from all active cameras."""
@@ -755,13 +785,13 @@ def _start_multi_camera_recording(self) -> None:
base_stem = base_path.stem
for cam in active_cams:
- cam_idx = cam.index
+ cam_id = get_camera_id(cam)
# Create unique filename for each camera
- cam_filename = f"{base_stem}_cam{cam_idx}{base_path.suffix}"
+ cam_filename = f"{base_stem}_{cam.backend}_cam{cam.index}{base_path.suffix}"
cam_path = base_path.parent / cam_filename
# Get frame from current frames if available
- frame = self._multi_camera_frames.get(cam_idx)
+ frame = self._multi_camera_frames.get(cam_id)
frame_size = (frame.shape[0], frame.shape[1]) if frame is not None else None
recorder = VideoRecorder(
@@ -774,10 +804,10 @@ def _start_multi_camera_recording(self) -> None:
try:
recorder.start()
- self._multi_camera_recorders[cam_idx] = recorder
- logging.info(f"Started recording camera {cam_idx} to {cam_path}")
+ self._multi_camera_recorders[cam_id] = recorder
+ logging.info(f"Started recording camera {cam_id} to {cam_path}")
except Exception as exc:
- self._show_error(f"Failed to start recording for camera {cam_idx}: {exc}")
+ self._show_error(f"Failed to start recording for camera {cam_id}: {exc}")
if self._multi_camera_recorders:
self.start_record_button.setEnabled(False)
@@ -793,12 +823,12 @@ def _stop_multi_camera_recording(self) -> None:
if not self._multi_camera_recorders:
return
- for cam_idx, recorder in self._multi_camera_recorders.items():
+ for cam_id, recorder in self._multi_camera_recorders.items():
try:
recorder.stop()
- logging.info(f"Stopped recording camera {cam_idx}")
+ logging.info(f"Stopped recording camera {cam_id}")
except Exception as exc:
- logging.warning(f"Error stopping recorder for camera {cam_idx}: {exc}")
+ logging.warning(f"Error stopping recorder for camera {cam_id}: {exc}")
self._multi_camera_recorders.clear()
self.start_record_button.setEnabled(True)
diff --git a/dlclivegui/multi_camera_controller.py b/dlclivegui/multi_camera_controller.py
index 6d6b9b8..e2352e3 100644
--- a/dlclivegui/multi_camera_controller.py
+++ b/dlclivegui/multi_camera_controller.py
@@ -23,22 +23,22 @@
class MultiFrameData:
"""Container for frames from multiple cameras."""
- frames: Dict[int, np.ndarray] # camera_index -> frame
- timestamps: Dict[int, float] # camera_index -> timestamp
+ frames: Dict[str, np.ndarray] # camera_id -> frame
+ timestamps: Dict[str, float] # camera_id -> timestamp
tiled_frame: Optional[np.ndarray] = None # Combined tiled frame
class SingleCameraWorker(QObject):
"""Worker for a single camera in multi-camera mode."""
- frame_captured = pyqtSignal(int, object, float) # camera_index, frame, timestamp
- error_occurred = pyqtSignal(int, str) # camera_index, error_message
- started = pyqtSignal(int) # camera_index
- stopped = pyqtSignal(int) # camera_index
+ frame_captured = pyqtSignal(str, object, float) # camera_id, frame, timestamp
+ error_occurred = pyqtSignal(str, str) # camera_id, error_message
+ started = pyqtSignal(str) # camera_id
+ stopped = pyqtSignal(str) # camera_id
- def __init__(self, camera_index: int, settings: CameraSettings):
+ def __init__(self, camera_id: str, settings: CameraSettings):
super().__init__()
- self._camera_index = camera_index
+ self._camera_id = camera_id
self._settings = settings
self._stop_event = Event()
self._backend: Optional[CameraBackend] = None
@@ -53,12 +53,12 @@ def run(self) -> None:
self._backend = CameraFactory.create(self._settings)
self._backend.open()
except Exception as exc:
- LOGGER.exception(f"Failed to initialize camera {self._camera_index}", exc_info=exc)
- self.error_occurred.emit(self._camera_index, f"Failed to initialize camera: {exc}")
- self.stopped.emit(self._camera_index)
+ LOGGER.exception(f"Failed to initialize camera {self._camera_id}", exc_info=exc)
+ self.error_occurred.emit(self._camera_id, f"Failed to initialize camera: {exc}")
+ self.stopped.emit(self._camera_id)
return
- self.started.emit(self._camera_index)
+ self.started.emit(self._camera_id)
consecutive_errors = 0
while not self._stop_event.is_set():
@@ -67,20 +67,20 @@ def run(self) -> None:
if frame is None or frame.size == 0:
consecutive_errors += 1
if consecutive_errors >= self._max_consecutive_errors:
- self.error_occurred.emit(self._camera_index, "Too many empty frames")
+ self.error_occurred.emit(self._camera_id, "Too many empty frames")
break
time.sleep(self._retry_delay)
continue
consecutive_errors = 0
- self.frame_captured.emit(self._camera_index, frame, timestamp)
+ self.frame_captured.emit(self._camera_id, frame, timestamp)
except Exception as exc:
consecutive_errors += 1
if self._stop_event.is_set():
break
if consecutive_errors >= self._max_consecutive_errors:
- self.error_occurred.emit(self._camera_index, f"Camera read error: {exc}")
+ self.error_occurred.emit(self._camera_id, f"Camera read error: {exc}")
break
time.sleep(self._retry_delay)
continue
@@ -91,20 +91,25 @@ def run(self) -> None:
self._backend.close()
except Exception:
pass
- self.stopped.emit(self._camera_index)
+ self.stopped.emit(self._camera_id)
def stop(self) -> None:
self._stop_event.set()
+def get_camera_id(settings: CameraSettings) -> str:
+ """Generate a unique camera ID from settings."""
+ return f"{settings.backend}:{settings.index}"
+
+
class MultiCameraController(QObject):
"""Controller for managing multiple cameras simultaneously."""
# Signals
frame_ready = pyqtSignal(object) # MultiFrameData
- camera_started = pyqtSignal(int, object) # camera_index, settings
- camera_stopped = pyqtSignal(int) # camera_index
- camera_error = pyqtSignal(int, str) # camera_index, error_message
+ camera_started = pyqtSignal(str, object) # camera_id, settings
+ camera_stopped = pyqtSignal(str) # camera_id
+ camera_error = pyqtSignal(str, str) # camera_id, error_message
all_started = pyqtSignal()
all_stopped = pyqtSignal()
@@ -112,11 +117,11 @@ class MultiCameraController(QObject):
def __init__(self):
super().__init__()
- self._workers: Dict[int, SingleCameraWorker] = {}
- self._threads: Dict[int, QThread] = {}
- self._settings: Dict[int, CameraSettings] = {}
- self._frames: Dict[int, np.ndarray] = {}
- self._timestamps: Dict[int, float] = {}
+ self._workers: Dict[str, SingleCameraWorker] = {}
+ self._threads: Dict[str, QThread] = {}
+ self._settings: Dict[str, CameraSettings] = {}
+ self._frames: Dict[str, np.ndarray] = {}
+ self._timestamps: Dict[str, float] = {}
self._frame_lock = Lock()
self._running = False
self._started_cameras: set = set()
@@ -158,13 +163,13 @@ def start(self, camera_settings: List[CameraSettings]) -> None:
def _start_camera(self, settings: CameraSettings) -> None:
"""Start a single camera."""
- cam_idx = settings.index
- if cam_idx in self._workers:
- LOGGER.warning(f"Camera {cam_idx} already has a worker")
+ cam_id = get_camera_id(settings)
+ if cam_id in self._workers:
+ LOGGER.warning(f"Camera {cam_id} already has a worker")
return
- self._settings[cam_idx] = settings
- worker = SingleCameraWorker(cam_idx, settings)
+ self._settings[cam_id] = settings
+ worker = SingleCameraWorker(cam_id, settings)
thread = QThread()
worker.moveToThread(thread)
@@ -175,8 +180,8 @@ def _start_camera(self, settings: CameraSettings) -> None:
worker.stopped.connect(self._on_camera_stopped)
worker.error_occurred.connect(self._on_camera_error)
- self._workers[cam_idx] = worker
- self._threads[cam_idx] = thread
+ self._workers[cam_id] = worker
+ self._threads[cam_id] = thread
thread.start()
def stop(self, wait: bool = True) -> None:
@@ -203,10 +208,10 @@ def stop(self, wait: bool = True) -> None:
self._started_cameras.clear()
self.all_stopped.emit()
- def _on_frame_captured(self, camera_index: int, frame: np.ndarray, timestamp: float) -> None:
+ def _on_frame_captured(self, camera_id: str, frame: np.ndarray, timestamp: float) -> None:
"""Handle a frame from one camera."""
# Apply rotation if configured
- settings = self._settings.get(camera_index)
+ settings = self._settings.get(camera_id)
if settings and settings.rotation:
frame = self._apply_rotation(frame, settings.rotation)
@@ -217,8 +222,8 @@ def _on_frame_captured(self, camera_index: int, frame: np.ndarray, timestamp: fl
frame = self._apply_crop(frame, crop_region)
with self._frame_lock:
- self._frames[camera_index] = frame
- self._timestamps[camera_index] = timestamp
+ self._frames[camera_id] = frame
+ self._timestamps[camera_id] = timestamp
# Create tiled frame whenever we have at least one frame
# This ensures smoother updates even if cameras have different frame rates
@@ -310,6 +315,10 @@ def _create_tiled_frame(self) -> np.ndarray:
# Create canvas
canvas = np.zeros((rows * tile_h, cols * tile_w, 3), dtype=np.uint8)
+ # Get sorted camera IDs for consistent ordering
+ cam_ids = sorted(self._frames.keys())
+ frames_list = [self._frames[cam_id] for cam_id in cam_ids]
+
# Place each frame in the grid
for idx, frame in enumerate(frames_list[: rows * cols]):
row = idx // cols
@@ -324,16 +333,15 @@ def _create_tiled_frame(self) -> np.ndarray:
# Resize to tile size
resized = cv2.resize(frame, (tile_w, tile_h))
- # Add camera index label
- cam_indices = sorted(self._frames.keys())
- if idx < len(cam_indices):
- label = f"Cam {cam_indices[idx]}"
+ # Add camera ID label
+ if idx < len(cam_ids):
+ label = cam_ids[idx]
cv2.putText(
resized,
label,
(10, 30),
cv2.FONT_HERSHEY_SIMPLEX,
- 1.0,
+ 0.7,
(0, 255, 0),
2,
)
@@ -347,55 +355,55 @@ def _create_tiled_frame(self) -> np.ndarray:
return canvas
- def _on_camera_started(self, camera_index: int) -> None:
+ def _on_camera_started(self, camera_id: str) -> None:
"""Handle camera start event."""
- self._started_cameras.add(camera_index)
- settings = self._settings.get(camera_index)
- self.camera_started.emit(camera_index, settings)
- LOGGER.info(f"Camera {camera_index} started")
+ self._started_cameras.add(camera_id)
+ settings = self._settings.get(camera_id)
+ self.camera_started.emit(camera_id, settings)
+ LOGGER.info(f"Camera {camera_id} started")
# Check if all cameras have started
if len(self._started_cameras) == len(self._settings):
self.all_started.emit()
- def _on_camera_stopped(self, camera_index: int) -> None:
+ def _on_camera_stopped(self, camera_id: str) -> None:
"""Handle camera stop event."""
- self._started_cameras.discard(camera_index)
- self.camera_stopped.emit(camera_index)
- LOGGER.info(f"Camera {camera_index} stopped")
+ self._started_cameras.discard(camera_id)
+ self.camera_stopped.emit(camera_id)
+ LOGGER.info(f"Camera {camera_id} stopped")
# Cleanup thread
- if camera_index in self._threads:
- thread = self._threads[camera_index]
+ if camera_id in self._threads:
+ thread = self._threads[camera_id]
if thread.isRunning():
thread.quit()
thread.wait(1000)
- del self._threads[camera_index]
+ del self._threads[camera_id]
- if camera_index in self._workers:
- del self._workers[camera_index]
+ if camera_id in self._workers:
+ del self._workers[camera_id]
# Remove frame data
with self._frame_lock:
- self._frames.pop(camera_index, None)
- self._timestamps.pop(camera_index, None)
+ self._frames.pop(camera_id, None)
+ self._timestamps.pop(camera_id, None)
# Check if all cameras have stopped
if not self._started_cameras and self._running:
self._running = False
self.all_stopped.emit()
- def _on_camera_error(self, camera_index: int, message: str) -> None:
+ def _on_camera_error(self, camera_id: str, message: str) -> None:
"""Handle camera error event."""
- LOGGER.error(f"Camera {camera_index} error: {message}")
- self.camera_error.emit(camera_index, message)
+ LOGGER.error(f"Camera {camera_id} error: {message}")
+ self.camera_error.emit(camera_id, message)
- def get_frame(self, camera_index: int) -> Optional[np.ndarray]:
+ def get_frame(self, camera_id: str) -> Optional[np.ndarray]:
"""Get the latest frame from a specific camera."""
with self._frame_lock:
- return self._frames.get(camera_index)
+ return self._frames.get(camera_id)
- def get_all_frames(self) -> Dict[int, np.ndarray]:
+ def get_all_frames(self) -> Dict[str, np.ndarray]:
"""Get the latest frames from all cameras."""
with self._frame_lock:
return dict(self._frames)
From f33229155349c6f3a9fb8707bfe9fd3db6fad8ba Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Mon, 22 Dec 2025 15:39:57 +0100
Subject: [PATCH 034/132] Enhance multi-camera support with tiled view
rendering and display optimization
---
dlclivegui/gui.py | 145 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 124 insertions(+), 21 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 90aeb15..d709f76 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -117,6 +117,12 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._multi_camera_mode = False
self._multi_camera_recorders: dict[str, VideoRecorder] = {}
self._multi_camera_frames: dict[str, np.ndarray] = {}
+ # DLC pose rendering info for tiled view
+ self._dlc_tile_offset: tuple[int, int] = (0, 0) # (x, y) offset in tiled frame
+ self._dlc_tile_scale: tuple[float, float] = (1.0, 1.0) # (scale_x, scale_y)
+ # Pending frame for display (decoupled from frame capture for performance)
+ self._pending_display_frame: Optional[np.ndarray] = None
+ self._display_dirty: bool = False
self._setup_ui()
self._connect_signals()
@@ -130,6 +136,12 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._metrics_timer.start()
self._update_metrics()
+ # Display timer - decoupled from frame capture for performance
+ self._display_timer = QTimer(self)
+ self._display_timer.setInterval(33) # ~30 fps display rate
+ self._display_timer.timeout.connect(self._update_display_from_pending)
+ self._display_timer.start()
+
# Show status message if myconfig.json was loaded
if self._config_path and self._config_path.name == "myconfig.json":
self.statusBar().showMessage(
@@ -703,16 +715,33 @@ def _update_active_cameras_label(self) -> None:
self.active_cameras_label.setText(f"{len(active_cams)} cameras: {', '.join(cam_names)}")
def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
- """Handle frames from multiple cameras."""
+ """Handle frames from multiple cameras.
+
+ Priority order for performance:
+ 1. DLC processing (highest priority - enqueue immediately)
+ 2. Recording (queued writes, non-blocking)
+ 3. Display (lowest priority - updated on separate timer)
+ """
self._multi_camera_frames = frame_data.frames
self._track_camera_frame() # Track FPS
- # For single camera mode, also set raw_frame for DLC processing
- if len(frame_data.frames) == 1:
- cam_id = next(iter(frame_data.frames.keys()))
- self._raw_frame = frame_data.frames[cam_id]
+ # Always update tile info for pose/bbox rendering (needed even without DLC)
+ active_cams = self._config.multi_camera.get_active_cameras()
+ dlc_cam_id = None
+ if active_cams and frame_data.frames:
+ dlc_cam_id = get_camera_id(active_cams[0])
+ if dlc_cam_id in frame_data.frames:
+ frame = frame_data.frames[dlc_cam_id]
+ self._raw_frame = frame
+ self._update_dlc_tile_info(dlc_cam_id, frame, frame_data)
+
+ # PRIORITY 1: DLC processing - do this first!
+ if self._dlc_active and dlc_cam_id and dlc_cam_id in frame_data.frames:
+ frame = frame_data.frames[dlc_cam_id]
+ timestamp = frame_data.timestamps.get(dlc_cam_id, time.time())
+ self.dlc_processor.enqueue_frame(frame, timestamp)
- # Record individual camera feeds if recording is active
+ # PRIORITY 2: Recording (queued, non-blocking)
if self._multi_camera_recorders:
for cam_id, frame in frame_data.frames.items():
if cam_id in self._multi_camera_recorders:
@@ -724,17 +753,60 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
except Exception as exc:
logging.warning(f"Failed to write frame for camera {cam_id}: {exc}")
- # Display tiled frame (or single frame for 1 camera)
+ # PRIORITY 3: Store frame for display (updated on separate timer)
if frame_data.tiled_frame is not None:
self._current_frame = frame_data.tiled_frame
- self._display_frame(frame_data.tiled_frame)
+ self._pending_display_frame = frame_data.tiled_frame
+ self._display_dirty = True
+
+ def _update_dlc_tile_info(
+ self, dlc_cam_id: str, original_frame: np.ndarray, frame_data: MultiFrameData
+ ) -> None:
+ """Calculate tile offset and scale for drawing DLC poses on tiled frame."""
+ if frame_data.tiled_frame is None:
+ self._dlc_tile_offset = (0, 0)
+ self._dlc_tile_scale = (1.0, 1.0)
+ return
- # For DLC processing, use single frame if only one camera
- if self._dlc_active and len(frame_data.frames) == 1:
- cam_id = next(iter(frame_data.frames.keys()))
- frame = frame_data.frames[cam_id]
- timestamp = frame_data.timestamps.get(cam_id, time.time())
- self.dlc_processor.enqueue_frame(frame, timestamp)
+ num_cameras = len(frame_data.frames)
+
+ # Get original frame dimensions
+ orig_h, orig_w = original_frame.shape[:2]
+
+ # Calculate grid layout (must match _create_tiled_frame logic)
+ if num_cameras == 1:
+ rows, cols = 1, 1
+ elif num_cameras == 2:
+ rows, cols = 1, 2
+ else:
+ rows, cols = 2, 2
+
+ # Calculate tile dimensions from tiled frame
+ tiled_h, tiled_w = frame_data.tiled_frame.shape[:2]
+ tile_w = tiled_w // cols
+ tile_h = tiled_h // rows
+
+ # Find the position of the DLC camera in the sorted camera list
+ sorted_cam_ids = sorted(frame_data.frames.keys())
+ try:
+ dlc_cam_idx = sorted_cam_ids.index(dlc_cam_id)
+ except ValueError:
+ dlc_cam_idx = 0
+
+ # Calculate grid position
+ row = dlc_cam_idx // cols
+ col = dlc_cam_idx % cols
+
+ # Calculate offset (top-left corner of the tile)
+ offset_x = col * tile_w
+ offset_y = row * tile_h
+
+ # Calculate scale factors (always calculate, even for single camera)
+ scale_x = tile_w / orig_w if orig_w > 0 else 1.0
+ scale_y = tile_h / orig_h if orig_h > 0 else 1.0
+
+ self._dlc_tile_offset = (offset_x, offset_y)
+ self._dlc_tile_scale = (scale_x, scale_y)
def _on_multi_camera_started(self) -> None:
"""Handle all cameras started event."""
@@ -970,6 +1042,12 @@ def _display_frame(self, frame: np.ndarray, *, force: bool = False) -> None:
self._last_display_time = now
self._update_video_display(frame)
+ def _update_display_from_pending(self) -> None:
+ """Update display from pending frame (called by display timer)."""
+ if self._display_dirty and self._pending_display_frame is not None:
+ self._display_dirty = False
+ self._update_video_display(self._pending_display_frame)
+
def _compute_fps(self, times: deque[float]) -> float:
if len(times) < 2:
return 0.0
@@ -1271,8 +1349,14 @@ def _on_bbox_changed(self, _value: int = 0) -> None:
self._display_frame(self._current_frame, force=True)
def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
- """Draw bounding box on frame with red lines."""
+ """Draw bounding box on frame (on first camera tile, scaled like pose)."""
overlay = frame.copy()
+
+ # Get tile offset and scale (same as pose rendering)
+ offset_x, offset_y = self._dlc_tile_offset
+ scale_x, scale_y = self._dlc_tile_scale
+
+ # Get bbox coordinates in camera pixel space
x0 = self._bbox_x0
y0 = self._bbox_y0
x1 = self._bbox_x1
@@ -1282,24 +1366,39 @@ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
if x0 >= x1 or y0 >= y1:
return overlay
+ # Scale and offset to display coordinates
+ x0_scaled = int(x0 * scale_x + offset_x)
+ y0_scaled = int(y0 * scale_y + offset_y)
+ x1_scaled = int(x1 * scale_x + offset_x)
+ y1_scaled = int(y1 * scale_y + offset_y)
+
+ # Clamp to frame boundaries
height, width = frame.shape[:2]
- x0 = max(0, min(x0, width - 1))
- y0 = max(0, min(y0, height - 1))
- x1 = max(x0 + 1, min(x1, width))
- y1 = max(y0 + 1, min(y1, height))
+ x0_scaled = max(0, min(x0_scaled, width - 1))
+ y0_scaled = max(0, min(y0_scaled, height - 1))
+ x1_scaled = max(x0_scaled + 1, min(x1_scaled, width))
+ y1_scaled = max(y0_scaled + 1, min(y1_scaled, height))
# Draw rectangle with configured color
- cv2.rectangle(overlay, (x0, y0), (x1, y1), self._bbox_color, 2)
+ cv2.rectangle(overlay, (x0_scaled, y0_scaled), (x1_scaled, y1_scaled), self._bbox_color, 2)
return overlay
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
overlay = frame.copy()
+ # Get tile offset and scale for multi-camera mode
+ offset_x, offset_y = self._dlc_tile_offset
+ scale_x, scale_y = self._dlc_tile_scale
+
# Get the colormap from config
cmap = plt.get_cmap(self._colormap)
num_keypoints = len(np.asarray(pose))
+ # Calculate scaled radius for the keypoint circles
+ base_radius = 4
+ scaled_radius = max(2, int(base_radius * min(scale_x, scale_y)))
+
for idx, keypoint in enumerate(np.asarray(pose)):
if len(keypoint) < 2:
continue
@@ -1310,13 +1409,17 @@ def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
if confidence < self._p_cutoff:
continue
+ # Apply scale and offset for tiled view
+ x_scaled = int(x * scale_x + offset_x)
+ y_scaled = int(y * scale_y + offset_y)
+
# Get color from colormap (cycle through 0 to 1)
color_normalized = idx / max(num_keypoints - 1, 1)
rgba = cmap(color_normalized)
# Convert from RGBA [0, 1] to BGR [0, 255] for OpenCV
bgr_color = (int(rgba[2] * 255), int(rgba[1] * 255), int(rgba[0] * 255))
- cv2.circle(overlay, (int(x), int(y)), 4, bgr_color, -1)
+ cv2.circle(overlay, (x_scaled, y_scaled), scaled_radius, bgr_color, -1)
return overlay
def _on_dlc_initialised(self, success: bool) -> None:
From 009d0d5ef658f1828e9b1348e1a203ff3342b7b8 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Mon, 22 Dec 2025 16:01:24 +0100
Subject: [PATCH 035/132] Refactor multi-camera frame handling to improve
performance; emit frame data without tiling and track source camera ID
---
dlclivegui/gui.py | 162 ++++++++++++++++++++------
dlclivegui/multi_camera_controller.py | 10 +-
2 files changed, 134 insertions(+), 38 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index d709f76..feb0b80 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -120,8 +120,7 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
# DLC pose rendering info for tiled view
self._dlc_tile_offset: tuple[int, int] = (0, 0) # (x, y) offset in tiled frame
self._dlc_tile_scale: tuple[float, float] = (1.0, 1.0) # (scale_x, scale_y)
- # Pending frame for display (decoupled from frame capture for performance)
- self._pending_display_frame: Optional[np.ndarray] = None
+ # Display flag (decoupled from frame capture for performance)
self._display_dirty: bool = False
self._setup_ui()
@@ -718,25 +717,28 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
"""Handle frames from multiple cameras.
Priority order for performance:
- 1. DLC processing (highest priority - enqueue immediately)
+ 1. DLC processing (highest priority - enqueue immediately, only for DLC camera)
2. Recording (queued writes, non-blocking)
- 3. Display (lowest priority - updated on separate timer)
+ 3. Display (lowest priority - tiled and updated on separate timer)
"""
self._multi_camera_frames = frame_data.frames
self._track_camera_frame() # Track FPS
- # Always update tile info for pose/bbox rendering (needed even without DLC)
+ # Determine DLC camera (first active camera)
active_cams = self._config.multi_camera.get_active_cameras()
- dlc_cam_id = None
- if active_cams and frame_data.frames:
- dlc_cam_id = get_camera_id(active_cams[0])
- if dlc_cam_id in frame_data.frames:
- frame = frame_data.frames[dlc_cam_id]
- self._raw_frame = frame
- self._update_dlc_tile_info(dlc_cam_id, frame, frame_data)
-
- # PRIORITY 1: DLC processing - do this first!
- if self._dlc_active and dlc_cam_id and dlc_cam_id in frame_data.frames:
+ dlc_cam_id = get_camera_id(active_cams[0]) if active_cams else None
+
+ # Check if this frame is from the DLC camera
+ is_dlc_camera_frame = frame_data.source_camera_id == dlc_cam_id
+
+ # Update tile info and raw frame only when DLC camera frame arrives
+ if is_dlc_camera_frame and dlc_cam_id in frame_data.frames:
+ frame = frame_data.frames[dlc_cam_id]
+ self._raw_frame = frame
+ self._update_dlc_tile_info(dlc_cam_id, frame, frame_data.frames)
+
+ # PRIORITY 1: DLC processing - only enqueue when DLC camera frame arrives!
+ if self._dlc_active and is_dlc_camera_frame and dlc_cam_id in frame_data.frames:
frame = frame_data.frames[dlc_cam_id]
timestamp = frame_data.timestamps.get(dlc_cam_id, time.time())
self.dlc_processor.enqueue_frame(frame, timestamp)
@@ -753,23 +755,19 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
except Exception as exc:
logging.warning(f"Failed to write frame for camera {cam_id}: {exc}")
- # PRIORITY 3: Store frame for display (updated on separate timer)
- if frame_data.tiled_frame is not None:
- self._current_frame = frame_data.tiled_frame
- self._pending_display_frame = frame_data.tiled_frame
- self._display_dirty = True
+ # PRIORITY 3: Mark display dirty (tiling done in display timer)
+ self._display_dirty = True
def _update_dlc_tile_info(
- self, dlc_cam_id: str, original_frame: np.ndarray, frame_data: MultiFrameData
+ self, dlc_cam_id: str, original_frame: np.ndarray, frames: dict[str, np.ndarray]
) -> None:
"""Calculate tile offset and scale for drawing DLC poses on tiled frame."""
- if frame_data.tiled_frame is None:
+ num_cameras = len(frames)
+ if num_cameras == 0:
self._dlc_tile_offset = (0, 0)
self._dlc_tile_scale = (1.0, 1.0)
return
- num_cameras = len(frame_data.frames)
-
# Get original frame dimensions
orig_h, orig_w = original_frame.shape[:2]
@@ -781,13 +779,25 @@ def _update_dlc_tile_info(
else:
rows, cols = 2, 2
- # Calculate tile dimensions from tiled frame
- tiled_h, tiled_w = frame_data.tiled_frame.shape[:2]
- tile_w = tiled_w // cols
- tile_h = tiled_h // rows
+ # Calculate tile dimensions using same logic as _create_tiled_frame
+ max_canvas_width = 1200
+ max_canvas_height = 800
+ frame_aspect = orig_w / orig_h if orig_h > 0 else 1.0
+
+ tile_w = max_canvas_width // cols
+ tile_h = max_canvas_height // rows
+ tile_aspect = tile_w / tile_h if tile_h > 0 else 1.0
+
+ if frame_aspect > tile_aspect:
+ tile_h = int(tile_w / frame_aspect)
+ else:
+ tile_w = int(tile_h * frame_aspect)
+
+ tile_w = max(160, tile_w)
+ tile_h = max(120, tile_h)
# Find the position of the DLC camera in the sorted camera list
- sorted_cam_ids = sorted(frame_data.frames.keys())
+ sorted_cam_ids = sorted(frames.keys())
try:
dlc_cam_idx = sorted_cam_ids.index(dlc_cam_id)
except ValueError:
@@ -1043,10 +1053,96 @@ def _display_frame(self, frame: np.ndarray, *, force: bool = False) -> None:
self._update_video_display(frame)
def _update_display_from_pending(self) -> None:
- """Update display from pending frame (called by display timer)."""
- if self._display_dirty and self._pending_display_frame is not None:
- self._display_dirty = False
- self._update_video_display(self._pending_display_frame)
+ """Update display from pending frames (called by display timer)."""
+ if not self._display_dirty:
+ return
+ if not self._multi_camera_frames:
+ return
+
+ self._display_dirty = False
+
+ # Create tiled frame on demand (moved from camera thread for performance)
+ tiled = self._create_tiled_frame(self._multi_camera_frames)
+ if tiled is not None:
+ self._current_frame = tiled
+ self._update_video_display(tiled)
+
+ def _create_tiled_frame(self, frames: dict[str, np.ndarray]) -> np.ndarray:
+ """Create a tiled frame from camera frames for display."""
+ if not frames:
+ return np.zeros((480, 640, 3), dtype=np.uint8)
+
+ cam_ids = sorted(frames.keys())
+ frames_list = [frames[cam_id] for cam_id in cam_ids]
+ num_frames = len(frames_list)
+
+ if num_frames == 0:
+ return np.zeros((480, 640, 3), dtype=np.uint8)
+
+ # Determine grid layout
+ if num_frames == 1:
+ rows, cols = 1, 1
+ elif num_frames == 2:
+ rows, cols = 1, 2
+ else:
+ rows, cols = 2, 2
+
+ # Maximum canvas size
+ max_canvas_width = 1200
+ max_canvas_height = 800
+
+ # Calculate tile size based on first frame aspect ratio
+ first_frame = frames_list[0]
+ frame_h, frame_w = first_frame.shape[:2]
+ frame_aspect = frame_w / frame_h if frame_h > 0 else 1.0
+
+ tile_w = max_canvas_width // cols
+ tile_h = max_canvas_height // rows
+ tile_aspect = tile_w / tile_h if tile_h > 0 else 1.0
+
+ if frame_aspect > tile_aspect:
+ tile_h = int(tile_w / frame_aspect)
+ else:
+ tile_w = int(tile_h * frame_aspect)
+
+ tile_w = max(160, tile_w)
+ tile_h = max(120, tile_h)
+
+ # Create canvas
+ canvas = np.zeros((rows * tile_h, cols * tile_w, 3), dtype=np.uint8)
+
+ # Place each frame in the grid
+ for idx, frame in enumerate(frames_list[: rows * cols]):
+ row = idx // cols
+ col = idx % cols
+
+ # Ensure frame is 3-channel
+ if frame.ndim == 2:
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+ elif frame.shape[2] == 4:
+ frame = cv2.cvtColor(frame, cv2.COLOR_BGRA2BGR)
+
+ # Resize to tile size
+ resized = cv2.resize(frame, (tile_w, tile_h))
+
+ # Add camera ID label
+ if idx < len(cam_ids):
+ cv2.putText(
+ resized,
+ cam_ids[idx],
+ (10, 30),
+ cv2.FONT_HERSHEY_SIMPLEX,
+ 0.7,
+ (0, 255, 0),
+ 2,
+ )
+
+ # Place in canvas
+ y_start = row * tile_h
+ x_start = col * tile_w
+ canvas[y_start : y_start + tile_h, x_start : x_start + tile_w] = resized
+
+ return canvas
def _compute_fps(self, times: deque[float]) -> float:
if len(times) < 2:
diff --git a/dlclivegui/multi_camera_controller.py b/dlclivegui/multi_camera_controller.py
index e2352e3..4cfca0f 100644
--- a/dlclivegui/multi_camera_controller.py
+++ b/dlclivegui/multi_camera_controller.py
@@ -25,7 +25,8 @@ class MultiFrameData:
frames: Dict[str, np.ndarray] # camera_id -> frame
timestamps: Dict[str, float] # camera_id -> timestamp
- tiled_frame: Optional[np.ndarray] = None # Combined tiled frame
+ source_camera_id: str = "" # ID of camera that triggered this emission
+ tiled_frame: Optional[np.ndarray] = None # Combined tiled frame (deprecated, done in GUI)
class SingleCameraWorker(QObject):
@@ -225,14 +226,13 @@ def _on_frame_captured(self, camera_id: str, frame: np.ndarray, timestamp: float
self._frames[camera_id] = frame
self._timestamps[camera_id] = timestamp
- # Create tiled frame whenever we have at least one frame
- # This ensures smoother updates even if cameras have different frame rates
+ # Emit frame data without tiling (tiling done in GUI for performance)
if self._frames:
- tiled = self._create_tiled_frame()
frame_data = MultiFrameData(
frames=dict(self._frames),
timestamps=dict(self._timestamps),
- tiled_frame=tiled,
+ source_camera_id=camera_id, # Track which camera triggered this
+ tiled_frame=None,
)
self.frame_ready.emit(frame_data)
From 557403f70d1d66cd574b3d496d3bc7d91a1f8792 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 23 Dec 2025 11:01:12 +0100
Subject: [PATCH 036/132] switched to pyside as gui backend
---
README.md | 6 +++---
dlclivegui/camera_config_dialog.py | 6 +++---
dlclivegui/dlc_processor.py | 8 ++++----
dlclivegui/gui.py | 10 ++++++----
dlclivegui/multi_camera_controller.py | 24 ++++++++++++------------
pyproject.toml | 6 +++---
setup.py | 4 ++--
7 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/README.md b/README.md
index 1ccf828..b9a2785 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# DeepLabCut Live GUI
-A modern PyQt6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) experiments with real-time pose estimation. The application streams frames from industrial or consumer cameras, performs DLCLive inference, and records high-quality video with synchronized pose data.
+A modern PySide6 GUI for running [DeepLabCut-live](https://github.com/DeepLabCut/DeepLabCut-live) experiments with real-time pose estimation. The application streams frames from industrial or consumer cameras, performs DLCLive inference, and records high-quality video with synchronized pose data.
## Features
### Core Functionality
-- **Modern Python Stack**: Python 3.10+ compatible codebase with PyQt6 interface
+- **Modern Python Stack**: Python 3.10+ compatible codebase with PySide6 interface
- **Multi-Backend Camera Support**: OpenCV, GenTL (Harvesters), Aravis, and Basler (pypylon)
- **Real-Time Pose Estimation**: Live DLCLive inference with configurable models (TensorFlow, PyTorch)
- **High-Performance Recording**: Hardware-accelerated video encoding via FFmpeg
@@ -261,7 +261,7 @@ Enable "Auto-record video on processor command" to automatically start/stop reco
```
dlclivegui/
├── __init__.py
-├── gui.py # Main PyQt6 application
+├── gui.py # Main PySide6 application
├── config.py # Configuration dataclasses
├── camera_controller.py # Camera capture thread
├── dlc_processor.py # DLCLive inference thread
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 110c141..0624989 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -5,8 +5,8 @@
import logging
from typing import List, Optional
-from PyQt6.QtCore import Qt, pyqtSignal
-from PyQt6.QtWidgets import (
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtWidgets import (
QCheckBox,
QComboBox,
QDialog,
@@ -36,7 +36,7 @@ class CameraConfigDialog(QDialog):
"""Dialog for configuring multiple cameras."""
MAX_CAMERAS = 4
- settings_changed = pyqtSignal(object) # MultiCameraSettings
+ settings_changed = Signal(object) # MultiCameraSettings
def __init__(
self,
diff --git a/dlclivegui/dlc_processor.py b/dlclivegui/dlc_processor.py
index ac8985e..e5eb7d2 100644
--- a/dlclivegui/dlc_processor.py
+++ b/dlclivegui/dlc_processor.py
@@ -11,7 +11,7 @@
from typing import Any, Optional
import numpy as np
-from PyQt6.QtCore import QObject, pyqtSignal
+from PySide6.QtCore import QObject, Signal
from dlclivegui.config import DLCProcessorSettings
@@ -60,9 +60,9 @@ class ProcessorStats:
class DLCLiveProcessor(QObject):
"""Background pose estimation using DLCLive with queue-based threading."""
- pose_ready = pyqtSignal(object)
- error = pyqtSignal(str)
- initialized = pyqtSignal(bool)
+ pose_ready = Signal(object)
+ error = Signal(str)
+ initialized = Signal(bool)
def __init__(self) -> None:
super().__init__()
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index feb0b80..05c51ec 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -1,4 +1,4 @@
-"""PyQt6 based GUI for DeepLabCut Live."""
+"""PySide6 based GUI for DeepLabCut Live."""
from __future__ import annotations
@@ -11,12 +11,14 @@
from pathlib import Path
from typing import Optional
+os.environ["PYLON_CAMEMU"] = "2"
+
import cv2
import matplotlib.pyplot as plt
import numpy as np
-from PyQt6.QtCore import Qt, QTimer
-from PyQt6.QtGui import QAction, QCloseEvent, QImage, QPixmap
-from PyQt6.QtWidgets import (
+from PySide6.QtCore import Qt, QTimer
+from PySide6.QtGui import QAction, QCloseEvent, QImage, QPixmap
+from PySide6.QtWidgets import (
QApplication,
QCheckBox,
QComboBox,
diff --git a/dlclivegui/multi_camera_controller.py b/dlclivegui/multi_camera_controller.py
index 4cfca0f..d152854 100644
--- a/dlclivegui/multi_camera_controller.py
+++ b/dlclivegui/multi_camera_controller.py
@@ -10,7 +10,7 @@
import cv2
import numpy as np
-from PyQt6.QtCore import QObject, QThread, pyqtSignal, pyqtSlot
+from PySide6.QtCore import QObject, QThread, Signal, Slot
from dlclivegui.cameras import CameraFactory
from dlclivegui.cameras.base import CameraBackend
@@ -32,10 +32,10 @@ class MultiFrameData:
class SingleCameraWorker(QObject):
"""Worker for a single camera in multi-camera mode."""
- frame_captured = pyqtSignal(str, object, float) # camera_id, frame, timestamp
- error_occurred = pyqtSignal(str, str) # camera_id, error_message
- started = pyqtSignal(str) # camera_id
- stopped = pyqtSignal(str) # camera_id
+ frame_captured = Signal(str, object, float) # camera_id, frame, timestamp
+ error_occurred = Signal(str, str) # camera_id, error_message
+ started = Signal(str) # camera_id
+ stopped = Signal(str) # camera_id
def __init__(self, camera_id: str, settings: CameraSettings):
super().__init__()
@@ -46,7 +46,7 @@ def __init__(self, camera_id: str, settings: CameraSettings):
self._max_consecutive_errors = 5
self._retry_delay = 0.1
- @pyqtSlot()
+ @Slot()
def run(self) -> None:
self._stop_event.clear()
@@ -107,12 +107,12 @@ class MultiCameraController(QObject):
"""Controller for managing multiple cameras simultaneously."""
# Signals
- frame_ready = pyqtSignal(object) # MultiFrameData
- camera_started = pyqtSignal(str, object) # camera_id, settings
- camera_stopped = pyqtSignal(str) # camera_id
- camera_error = pyqtSignal(str, str) # camera_id, error_message
- all_started = pyqtSignal()
- all_stopped = pyqtSignal()
+ frame_ready = Signal(object) # MultiFrameData
+ camera_started = Signal(str, object) # camera_id, settings
+ camera_stopped = Signal(str) # camera_id
+ camera_error = Signal(str, str) # camera_id, error_message
+ all_started = Signal()
+ all_stopped = Signal()
MAX_CAMERAS = 4
diff --git a/pyproject.toml b/pyproject.toml
index edbb9d0..b989b57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "deeplabcut-live-gui"
version = "2.0"
-description = "PyQt-based GUI to run real time DeepLabCut experiments"
+description = "PySide6-based GUI to run real time DeepLabCut experiments"
readme = "README.md"
requires-python = ">=3.10"
license = {text = "GNU Lesser General Public License v3 (LGPLv3)"}
@@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
- "deeplabcut-live",
- "PyQt6",
+ "deeplabcut-live", # might be missing timm and scipy
+ "PySide6",
"numpy",
"opencv-python",
"vidgear[core]",
diff --git a/setup.py b/setup.py
index 02954f2..1c6d5fa 100644
--- a/setup.py
+++ b/setup.py
@@ -12,14 +12,14 @@
version="2.0",
author="A. & M. Mathis Labs",
author_email="adim@deeplabcut.org",
- description="PyQt-based GUI to run real time DeepLabCut experiments",
+ description="PySide6-based GUI to run real time DeepLabCut experiments",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/DeepLabCut/DeepLabCut-live-GUI",
python_requires=">=3.10",
install_requires=[
"deeplabcut-live",
- "PyQt6",
+ "PySide6",
"numpy",
"opencv-python",
"vidgear[core]",
From be9108616f602d2e5c3d0f186bae528ed384f00b Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 23 Dec 2025 11:30:44 +0100
Subject: [PATCH 037/132] Add camera availability check and handle
initialization failures in multi-camera controller
---
dlclivegui/camera_config_dialog.py | 7 +++
dlclivegui/cameras/factory.py | 36 +++++++++++++++
dlclivegui/gui.py | 65 ++++++++++++++++++++++++++-
dlclivegui/multi_camera_controller.py | 39 +++++++++++++---
4 files changed, 139 insertions(+), 8 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 0624989..581a7a3 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -245,6 +245,9 @@ def _connect_signals(self) -> None:
self.move_down_btn.clicked.connect(self._move_camera_down)
self.active_cameras_list.currentRowChanged.connect(self._on_active_camera_selected)
self.available_cameras_list.currentRowChanged.connect(self._on_available_camera_selected)
+ self.available_cameras_list.itemDoubleClicked.connect(
+ self._on_available_camera_double_clicked
+ )
self.apply_settings_btn.clicked.connect(self._apply_camera_settings)
self.ok_btn.clicked.connect(self._on_ok_clicked)
self.cancel_btn.clicked.connect(self.reject)
@@ -289,6 +292,10 @@ def _refresh_available_cameras(self) -> None:
def _on_available_camera_selected(self, row: int) -> None:
self.add_camera_btn.setEnabled(row >= 0)
+ def _on_available_camera_double_clicked(self, item: QListWidgetItem) -> None:
+ """Handle double-click on an available camera to add it."""
+ self._add_selected_camera()
+
def _on_active_camera_selected(self, row: int) -> None:
"""Handle selection of an active camera."""
self._current_edit_index = row
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index 3261ba5..fcdf679 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -127,6 +127,42 @@ def create(settings: CameraSettings) -> CameraBackend:
)
return backend_cls(settings)
+ @staticmethod
+ def check_camera_available(settings: CameraSettings) -> tuple[bool, str]:
+ """Check if a camera is available without keeping it open.
+
+ Parameters
+ ----------
+ settings : CameraSettings
+ The camera settings to check.
+
+ Returns
+ -------
+ tuple[bool, str]
+ A tuple of (is_available, error_message).
+ If available, error_message is empty.
+ """
+ backend_name = (settings.backend or "opencv").lower()
+
+ # Check if backend module is available
+ try:
+ backend_cls = CameraFactory._resolve_backend(backend_name)
+ except RuntimeError as exc:
+ return False, f"Backend '{backend_name}' not installed: {exc}"
+
+ # Check if backend reports as available (drivers installed)
+ if not backend_cls.is_available():
+ return False, f"Backend '{backend_name}' is not available (missing drivers/packages)"
+
+ # Try to actually open the camera briefly
+ try:
+ backend_instance = backend_cls(settings)
+ backend_instance.open()
+ backend_instance.close()
+ return True, ""
+ except Exception as exc:
+ return False, f"Camera not accessible: {exc}"
+
@staticmethod
def _resolve_backend(name: str) -> Type[CameraBackend]:
try:
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 05c51ec..23410d2 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -42,6 +42,7 @@
)
from dlclivegui.camera_config_dialog import CameraConfigDialog
+from dlclivegui.cameras import CameraFactory
from dlclivegui.config import (
DEFAULT_CONFIG,
ApplicationSettings,
@@ -149,6 +150,9 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
f"Auto-loaded configuration from {self._config_path}", 5000
)
+ # Validate cameras from loaded config (deferred to allow window to show first)
+ QTimer.singleShot(100, self._validate_configured_cameras)
+
# ------------------------------------------------------------------ UI
def _setup_ui(self) -> None:
central = QWidget()
@@ -486,6 +490,9 @@ def _connect_signals(self) -> None:
self.multi_camera_controller.all_started.connect(self._on_multi_camera_started)
self.multi_camera_controller.all_stopped.connect(self._on_multi_camera_stopped)
self.multi_camera_controller.camera_error.connect(self._on_multi_camera_error)
+ self.multi_camera_controller.initialization_failed.connect(
+ self._on_multi_camera_initialization_failed
+ )
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
self.dlc_processor.error.connect(self._on_dlc_error)
@@ -601,6 +608,8 @@ def _action_load_config(self) -> None:
self._config_path = Path(file_name)
self._apply_config(config)
self.statusBar().showMessage(f"Loaded configuration: {file_name}", 5000)
+ # Validate cameras after loading
+ self._validate_configured_cameras()
def _action_save_config(self) -> None:
if self._config_path is None:
@@ -715,6 +724,39 @@ def _update_active_cameras_label(self) -> None:
cam_names = [f"{c.name}" for c in active_cams]
self.active_cameras_label.setText(f"{len(active_cams)} cameras: {', '.join(cam_names)}")
+ def _validate_configured_cameras(self) -> None:
+ """Validate that configured cameras are available.
+
+ Disables unavailable cameras and shows a warning dialog.
+ """
+ active_cams = self._config.multi_camera.get_active_cameras()
+ if not active_cams:
+ return
+
+ unavailable: list[tuple[str, str, CameraSettings]] = []
+ for cam in active_cams:
+ cam_id = f"{cam.backend}:{cam.index}"
+ available, error = CameraFactory.check_camera_available(cam)
+ if not available:
+ unavailable.append((cam.name or cam_id, error, cam))
+
+ if unavailable:
+ # Disable unavailable cameras
+ for _, _, cam in unavailable:
+ cam.enabled = False
+
+ # Update the active cameras label
+ self._update_active_cameras_label()
+
+ # Build warning message
+ error_lines = ["The following camera(s) are not available and have been disabled:"]
+ for cam_name, error_msg, _ in unavailable:
+ error_lines.append(f" • {cam_name}: {error_msg}")
+ error_lines.append("")
+ error_lines.append("Please check camera connections or re-enable in camera settings.")
+ self._show_warning("\n".join(error_lines))
+ logging.warning("\n".join(error_lines))
+
def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
"""Handle frames from multiple cameras.
@@ -850,6 +892,19 @@ def _on_multi_camera_error(self, camera_id: str, message: str) -> None:
"""Handle error from a camera in multi-camera mode."""
self._show_warning(f"Camera {camera_id} error: {message}")
+ def _on_multi_camera_initialization_failed(self, failures: list) -> None:
+ """Handle complete failure to initialize cameras."""
+ # Build error message with details for each failed camera
+ error_lines = ["Failed to initialize camera(s):"]
+ for camera_id, error_msg in failures:
+ error_lines.append(f" • {camera_id}: {error_msg}")
+ error_lines.append("")
+ error_lines.append("Please check that the required camera backend is installed.")
+
+ error_message = "\n".join(error_lines)
+ self._show_error(error_message)
+ logging.error(error_message)
+
def _start_multi_camera_recording(self) -> None:
"""Start recording from all active cameras."""
if self._multi_camera_recorders:
@@ -1542,8 +1597,14 @@ def _show_error(self, message: str) -> None:
QMessageBox.critical(self, "Error", message)
def _show_warning(self, message: str) -> None:
- """Display a warning message in the status bar without blocking."""
- self.statusBar().showMessage(f"⚠ {message}", 3000)
+ """Display a warning message dialog."""
+ self.statusBar().showMessage(f"⚠ {message}", 5000)
+ QMessageBox.warning(self, "Warning", message)
+
+ def _show_info(self, message: str) -> None:
+ """Display an informational message dialog."""
+ self.statusBar().showMessage(message, 5000)
+ QMessageBox.information(self, "Information", message)
# ------------------------------------------------------------------ Qt overrides
def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
diff --git a/dlclivegui/multi_camera_controller.py b/dlclivegui/multi_camera_controller.py
index d152854..f9b4226 100644
--- a/dlclivegui/multi_camera_controller.py
+++ b/dlclivegui/multi_camera_controller.py
@@ -113,6 +113,7 @@ class MultiCameraController(QObject):
camera_error = Signal(str, str) # camera_id, error_message
all_started = Signal()
all_stopped = Signal()
+ initialization_failed = Signal(list) # List of (camera_id, error_message) tuples
MAX_CAMERAS = 4
@@ -126,6 +127,8 @@ def __init__(self):
self._frame_lock = Lock()
self._running = False
self._started_cameras: set = set()
+ self._failed_cameras: Dict[str, str] = {} # camera_id -> error message
+ self._expected_cameras: int = 0 # Number of cameras we're trying to start
def is_running(self) -> bool:
"""Check if any camera is currently running."""
@@ -158,6 +161,8 @@ def start(self, camera_settings: List[CameraSettings]) -> None:
self._frames.clear()
self._timestamps.clear()
self._started_cameras.clear()
+ self._failed_cameras.clear()
+ self._expected_cameras = len(active_settings)
for settings in active_settings:
self._start_camera(settings)
@@ -207,6 +212,8 @@ def stop(self, wait: bool = True) -> None:
self._threads.clear()
self._settings.clear()
self._started_cameras.clear()
+ self._failed_cameras.clear()
+ self._expected_cameras = 0
self.all_stopped.emit()
def _on_frame_captured(self, camera_id: str, frame: np.ndarray, timestamp: float) -> None:
@@ -362,15 +369,21 @@ def _on_camera_started(self, camera_id: str) -> None:
self.camera_started.emit(camera_id, settings)
LOGGER.info(f"Camera {camera_id} started")
- # Check if all cameras have started
- if len(self._started_cameras) == len(self._settings):
- self.all_started.emit()
+ # Check if all cameras have reported (started or failed)
+ total_reported = len(self._started_cameras) + len(self._failed_cameras)
+ if total_reported == self._expected_cameras:
+ if self._started_cameras:
+ # At least some cameras started successfully
+ self.all_started.emit()
+ # If no cameras started but all failed, that's handled in _on_camera_stopped
def _on_camera_stopped(self, camera_id: str) -> None:
"""Handle camera stop event."""
+ # Check if this camera never started (initialization failure)
+ was_started = camera_id in self._started_cameras
self._started_cameras.discard(camera_id)
self.camera_stopped.emit(camera_id)
- LOGGER.info(f"Camera {camera_id} stopped")
+ LOGGER.info(f"Camera {camera_id} stopped (was_started={was_started})")
# Cleanup thread
if camera_id in self._threads:
@@ -388,14 +401,28 @@ def _on_camera_stopped(self, camera_id: str) -> None:
self._frames.pop(camera_id, None)
self._timestamps.pop(camera_id, None)
- # Check if all cameras have stopped
- if not self._started_cameras and self._running:
+ # Check if all cameras have reported and none started
+ total_reported = len(self._started_cameras) + len(self._failed_cameras)
+ if total_reported == self._expected_cameras and not self._started_cameras:
+ # All cameras failed to start
+ if self._running and self._failed_cameras:
+ self._running = False
+ failure_list = list(self._failed_cameras.items())
+ self.initialization_failed.emit(failure_list)
+ self.all_stopped.emit()
+ return
+
+ # Check if all running cameras have stopped (normal shutdown)
+ if not self._started_cameras and self._running and not self._workers:
self._running = False
self.all_stopped.emit()
def _on_camera_error(self, camera_id: str, message: str) -> None:
"""Handle camera error event."""
LOGGER.error(f"Camera {camera_id} error: {message}")
+ # Track failed cameras (only if not already started - i.e., initialization failure)
+ if camera_id not in self._started_cameras:
+ self._failed_cameras[camera_id] = message
self.camera_error.emit(camera_id, message)
def get_frame(self, camera_id: str) -> Optional[np.ndarray]:
From 6957468925a5d9ea3fb00a3735a8a11bbb087333 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 23 Dec 2025 12:23:11 +0100
Subject: [PATCH 038/132] Add camera preview functionality with start/stop
toggle and real-time updates
---
dlclivegui/camera_config_dialog.py | 209 +++++++++++++++++++++++++++--
dlclivegui/cameras/factory.py | 63 ++++++---
2 files changed, 241 insertions(+), 31 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 581a7a3..978419e 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -5,7 +5,10 @@
import logging
from typing import List, Optional
-from PySide6.QtCore import Qt, Signal
+import cv2
+import numpy as np
+from PySide6.QtCore import Qt, QTimer, Signal
+from PySide6.QtGui import QImage, QPixmap
from PySide6.QtWidgets import (
QCheckBox,
QComboBox,
@@ -26,6 +29,7 @@
)
from dlclivegui.cameras import CameraFactory
+from dlclivegui.cameras.base import CameraBackend
from dlclivegui.cameras.factory import DetectedCamera
from dlclivegui.config import CameraSettings, MultiCameraSettings
@@ -45,13 +49,16 @@ def __init__(
):
super().__init__(parent)
self.setWindowTitle("Configure Cameras")
- self.setMinimumSize(800, 600)
+ self.setMinimumSize(960, 720)
self._multi_camera_settings = (
multi_camera_settings if multi_camera_settings else MultiCameraSettings()
)
self._detected_cameras: List[DetectedCamera] = []
self._current_edit_index: Optional[int] = None
+ self._preview_backend: Optional[CameraBackend] = None
+ self._preview_timer: Optional[QTimer] = None
+ self._preview_active: bool = False
self._setup_ui()
self._populate_from_settings()
@@ -213,7 +220,26 @@ def _setup_ui(self) -> None:
self.apply_settings_btn.setEnabled(False)
self.settings_form.addRow(self.apply_settings_btn)
+ # Preview button
+ self.preview_btn = QPushButton("Start Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
+ self.preview_btn.setEnabled(False)
+ self.settings_form.addRow(self.preview_btn)
+
right_layout.addWidget(settings_group)
+
+ # Preview widget
+ self.preview_group = QGroupBox("Camera Preview")
+ preview_layout = QVBoxLayout(self.preview_group)
+ self.preview_label = QLabel("No preview")
+ self.preview_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+ self.preview_label.setMinimumSize(320, 240)
+ self.preview_label.setMaximumSize(400, 300)
+ self.preview_label.setStyleSheet("background-color: #1a1a1a; color: #888;")
+ preview_layout.addWidget(self.preview_label)
+ self.preview_group.setVisible(False)
+ right_layout.addWidget(self.preview_group)
+
right_layout.addStretch(1)
# Dialog buttons
@@ -249,14 +275,15 @@ def _connect_signals(self) -> None:
self._on_available_camera_double_clicked
)
self.apply_settings_btn.clicked.connect(self._apply_camera_settings)
+ self.preview_btn.clicked.connect(self._toggle_preview)
self.ok_btn.clicked.connect(self._on_ok_clicked)
self.cancel_btn.clicked.connect(self.reject)
def _populate_from_settings(self) -> None:
"""Populate the dialog from existing settings."""
self.active_cameras_list.clear()
- for cam in self._multi_camera_settings.cameras:
- item = QListWidgetItem(self._format_camera_label(cam))
+ for i, cam in enumerate(self._multi_camera_settings.cameras):
+ item = QListWidgetItem(self._format_camera_label(cam, i))
item.setData(Qt.ItemDataRole.UserRole, cam)
if not cam.enabled:
item.setForeground(Qt.GlobalColor.gray)
@@ -265,10 +292,27 @@ def _populate_from_settings(self) -> None:
self._refresh_available_cameras()
self._update_button_states()
- def _format_camera_label(self, cam: CameraSettings) -> str:
- """Format camera label for display."""
+ def _format_camera_label(self, cam: CameraSettings, index: int = -1) -> str:
+ """Format camera label for display.
+
+ Parameters
+ ----------
+ cam : CameraSettings
+ The camera settings.
+ index : int
+ The index of the camera in the list. If 0 and enabled, shows DLC indicator.
+ """
status = "✓" if cam.enabled else "○"
- return f"{status} {cam.name} [{cam.backend}:{cam.index}]"
+ dlc_indicator = " [DLC]" if index == 0 and cam.enabled else ""
+ return f"{status} {cam.name} [{cam.backend}:{cam.index}]{dlc_indicator}"
+
+ def _refresh_camera_labels(self) -> None:
+ """Refresh all camera labels in the active list (e.g., after reorder)."""
+ for i in range(self.active_cameras_list.count()):
+ item = self.active_cameras_list.item(i)
+ cam = item.data(Qt.ItemDataRole.UserRole)
+ if cam:
+ item.setText(self._format_camera_label(cam, i))
def _on_backend_changed(self, _index: int) -> None:
self._refresh_available_cameras()
@@ -298,6 +342,10 @@ def _on_available_camera_double_clicked(self, item: QListWidgetItem) -> None:
def _on_active_camera_selected(self, row: int) -> None:
"""Handle selection of an active camera."""
+ # Stop any running preview when selection changes
+ if self._preview_active:
+ self._stop_preview()
+
self._current_edit_index = row
self._update_button_states()
@@ -399,11 +447,14 @@ def _add_selected_camera(self) -> None:
self._multi_camera_settings.cameras.append(new_cam)
# Add to list
- new_item = QListWidgetItem(self._format_camera_label(new_cam))
+ new_index = len(self._multi_camera_settings.cameras) - 1
+ new_item = QListWidgetItem(self._format_camera_label(new_cam, new_index))
new_item.setData(Qt.ItemDataRole.UserRole, new_cam)
self.active_cameras_list.addItem(new_item)
self.active_cameras_list.setCurrentItem(new_item)
+ # Refresh labels in case this is the first camera (gets DLC indicator)
+ self._refresh_camera_labels()
self._update_button_states()
def _remove_selected_camera(self) -> None:
@@ -418,6 +469,8 @@ def _remove_selected_camera(self) -> None:
self._current_edit_index = None
self._clear_settings_form()
+ # Refresh labels since DLC camera may have changed
+ self._refresh_camera_labels()
self._update_button_states()
def _move_camera_up(self) -> None:
@@ -434,6 +487,9 @@ def _move_camera_up(self) -> None:
cams = self._multi_camera_settings.cameras
cams[row], cams[row - 1] = cams[row - 1], cams[row]
+ # Refresh labels since DLC camera may have changed
+ self._refresh_camera_labels()
+
def _move_camera_down(self) -> None:
"""Move selected camera down in the list."""
row = self.active_cameras_list.currentRow()
@@ -448,6 +504,9 @@ def _move_camera_down(self) -> None:
cams = self._multi_camera_settings.cameras
cams[row], cams[row + 1] = cams[row + 1], cams[row]
+ # Refresh labels since DLC camera may have changed
+ self._refresh_camera_labels()
+
def _apply_camera_settings(self) -> None:
"""Apply current form settings to the selected camera."""
if self._current_edit_index is None:
@@ -470,15 +529,22 @@ def _apply_camera_settings(self) -> None:
# Update list item
item = self.active_cameras_list.item(row)
- item.setText(self._format_camera_label(cam))
+ item.setText(self._format_camera_label(cam, row))
item.setData(Qt.ItemDataRole.UserRole, cam)
if not cam.enabled:
item.setForeground(Qt.GlobalColor.gray)
else:
item.setForeground(Qt.GlobalColor.black)
+ # Refresh all labels in case enabled state changed (affects DLC indicator)
+ self._refresh_camera_labels()
self._update_button_states()
+ # Restart preview to apply new settings (exposure, gain, fps, etc.)
+ if self._preview_active:
+ self._stop_preview()
+ self._start_preview()
+
def _update_button_states(self) -> None:
"""Update button enabled states."""
active_row = self.active_cameras_list.currentRow()
@@ -489,12 +555,16 @@ def _update_button_states(self) -> None:
self.move_down_btn.setEnabled(
has_active_selection and active_row < self.active_cameras_list.count() - 1
)
+ self.preview_btn.setEnabled(has_active_selection)
available_row = self.available_cameras_list.currentRow()
self.add_camera_btn.setEnabled(available_row >= 0)
def _on_ok_clicked(self) -> None:
"""Handle OK button click."""
+ # Stop preview if running
+ self._stop_preview()
+
# Validate that we have at least one enabled camera if any cameras are configured
if self._multi_camera_settings.cameras:
active = self._multi_camera_settings.get_active_cameras()
@@ -509,6 +579,127 @@ def _on_ok_clicked(self) -> None:
self.settings_changed.emit(self._multi_camera_settings)
self.accept()
+ def reject(self) -> None:
+ """Handle dialog rejection (Cancel or close)."""
+ self._stop_preview()
+ super().reject()
+
+ def _toggle_preview(self) -> None:
+ """Toggle camera preview on/off."""
+ if self._preview_active:
+ self._stop_preview()
+ else:
+ self._start_preview()
+
+ def _start_preview(self) -> None:
+ """Start camera preview for the currently selected camera."""
+ if self._current_edit_index is None or self._current_edit_index < 0:
+ return
+
+ item = self.active_cameras_list.item(self._current_edit_index)
+ if not item:
+ return
+
+ cam = item.data(Qt.ItemDataRole.UserRole)
+ if not cam:
+ return
+
+ try:
+ self._preview_backend = CameraFactory.create(cam)
+ self._preview_backend.open()
+ except Exception as exc:
+ LOGGER.error(f"Failed to start preview: {exc}")
+ QMessageBox.warning(self, "Preview Error", f"Failed to start camera preview:\n{exc}")
+ self._preview_backend = None
+ return
+
+ self._preview_active = True
+ self.preview_btn.setText("Stop Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
+ self.preview_group.setVisible(True)
+ self.preview_label.setText("Starting...")
+
+ # Start timer to update preview
+ self._preview_timer = QTimer(self)
+ self._preview_timer.timeout.connect(self._update_preview)
+ self._preview_timer.start(33) # ~30 fps
+
+ def _stop_preview(self) -> None:
+ """Stop camera preview."""
+ if self._preview_timer:
+ self._preview_timer.stop()
+ self._preview_timer = None
+
+ if self._preview_backend:
+ try:
+ self._preview_backend.close()
+ except Exception:
+ pass
+ self._preview_backend = None
+
+ self._preview_active = False
+ self.preview_btn.setText("Start Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
+ self.preview_group.setVisible(False)
+ self.preview_label.setText("No preview")
+ self.preview_label.setPixmap(QPixmap())
+
+ def _update_preview(self) -> None:
+ """Update preview frame."""
+ if not self._preview_backend or not self._preview_active:
+ return
+
+ try:
+ frame, _ = self._preview_backend.read()
+ if frame is None or frame.size == 0:
+ return
+
+ # Apply rotation if set in the form (real-time from UI)
+ rotation = self.cam_rotation.currentData()
+ if rotation == 90:
+ frame = cv2.rotate(frame, cv2.ROTATE_90_CLOCKWISE)
+ elif rotation == 180:
+ frame = cv2.rotate(frame, cv2.ROTATE_180)
+ elif rotation == 270:
+ frame = cv2.rotate(frame, cv2.ROTATE_90_COUNTERCLOCKWISE)
+
+ # Apply crop if set in the form (real-time from UI)
+ h, w = frame.shape[:2]
+ x0 = self.cam_crop_x0.value()
+ y0 = self.cam_crop_y0.value()
+ x1 = self.cam_crop_x1.value() or w
+ y1 = self.cam_crop_y1.value() or h
+ # Clamp to frame bounds
+ x0 = max(0, min(x0, w))
+ y0 = max(0, min(y0, h))
+ x1 = max(x0, min(x1, w))
+ y1 = max(y0, min(y1, h))
+ if x1 > x0 and y1 > y0:
+ frame = frame[y0:y1, x0:x1]
+
+ # Resize to fit preview label
+ h, w = frame.shape[:2]
+ max_w, max_h = 400, 300
+ scale = min(max_w / w, max_h / h)
+ new_w, new_h = int(w * scale), int(h * scale)
+ frame = cv2.resize(frame, (new_w, new_h))
+
+ # Convert to QImage and display
+ if frame.ndim == 2:
+ frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2RGB)
+ elif frame.shape[2] == 4:
+ frame = cv2.cvtColor(frame, cv2.COLOR_BGRA2RGB)
+ else:
+ frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+
+ h, w, ch = frame.shape
+ bytes_per_line = ch * w
+ q_img = QImage(frame.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
+ self.preview_label.setPixmap(QPixmap.fromImage(q_img))
+
+ except Exception as exc:
+ LOGGER.warning(f"Preview frame error: {exc}")
+
def get_settings(self) -> MultiCameraSettings:
"""Get the current multi-camera settings."""
return self._multi_camera_settings
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index fcdf679..3a98d7c 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -3,13 +3,30 @@
from __future__ import annotations
import importlib
+from contextlib import contextmanager
from dataclasses import dataclass
-from typing import Dict, Iterable, List, Tuple, Type
+from typing import Dict, Generator, Iterable, List, Tuple, Type
from ..config import CameraSettings
from .base import CameraBackend
+@contextmanager
+def _suppress_opencv_logging() -> Generator[None, None, None]:
+ """Temporarily suppress OpenCV logging during camera probing."""
+ try:
+ import cv2
+
+ old_level = cv2.getLogLevel()
+ cv2.setLogLevel(0) # LOG_LEVEL_SILENT
+ try:
+ yield
+ finally:
+ cv2.setLogLevel(old_level)
+ except ImportError:
+ yield
+
+
@dataclass
class DetectedCamera:
"""Information about a camera discovered during probing."""
@@ -85,29 +102,31 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
pass
detected: List[DetectedCamera] = []
- for index in range(num_devices):
- settings = CameraSettings(
- name=f"Probe {index}",
- index=index,
- fps=30.0,
- backend=backend,
- properties={},
- )
- backend_instance = backend_cls(settings)
- try:
- backend_instance.open()
- except Exception:
- continue
- else:
- label = backend_instance.device_name()
- if not label:
- label = f"{backend.title()} #{index}"
- detected.append(DetectedCamera(index=index, label=label))
- finally:
+ # Suppress OpenCV warnings/errors during probing (e.g., "can't open camera by index")
+ with _suppress_opencv_logging():
+ for index in range(num_devices):
+ settings = CameraSettings(
+ name=f"Probe {index}",
+ index=index,
+ fps=30.0,
+ backend=backend,
+ properties={},
+ )
+ backend_instance = backend_cls(settings)
try:
- backend_instance.close()
+ backend_instance.open()
except Exception:
- pass
+ continue
+ else:
+ label = backend_instance.device_name()
+ if not label:
+ label = f"{backend.title()} #{index}"
+ detected.append(DetectedCamera(index=index, label=label))
+ finally:
+ try:
+ backend_instance.close()
+ except Exception:
+ pass
detected.sort(key=lambda camera: camera.index)
return detected
From 51fed8abb77a7a22efe7ff10acb8c5640057503e Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Tue, 23 Dec 2025 12:58:29 +0100
Subject: [PATCH 039/132] support multi-animal poses with distinct markers
---
dlclivegui/gui.py | 88 +++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 81 insertions(+), 7 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 23410d2..c1684fe 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -1538,21 +1538,93 @@ def _draw_bbox(self, frame: np.ndarray) -> np.ndarray:
return overlay
def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
+ """Draw pose predictions on frame using colormap.
+
+ Supports both single-animal poses (shape: num_keypoints x 3) and
+ multi-animal poses (shape: num_animals x num_keypoints x 3).
+ """
overlay = frame.copy()
+ pose_arr = np.asarray(pose)
# Get tile offset and scale for multi-camera mode
offset_x, offset_y = self._dlc_tile_offset
scale_x, scale_y = self._dlc_tile_scale
- # Get the colormap from config
- cmap = plt.get_cmap(self._colormap)
- num_keypoints = len(np.asarray(pose))
-
# Calculate scaled radius for the keypoint circles
base_radius = 4
scaled_radius = max(2, int(base_radius * min(scale_x, scale_y)))
- for idx, keypoint in enumerate(np.asarray(pose)):
+ # Get colormap from config
+ cmap = plt.get_cmap(self._colormap)
+
+ # Detect multi-animal pose: shape (num_animals, num_keypoints, 3)
+ # vs single-animal pose: shape (num_keypoints, 3)
+ if pose_arr.ndim == 3:
+ # Multi-animal pose - use different markers per animal
+ num_animals = pose_arr.shape[0]
+ num_keypoints = pose_arr.shape[1]
+ # Cycle through different marker types for each animal
+ marker_types = [
+ cv2.MARKER_CROSS,
+ cv2.MARKER_TILTED_CROSS,
+ cv2.MARKER_STAR,
+ cv2.MARKER_DIAMOND,
+ cv2.MARKER_SQUARE,
+ cv2.MARKER_TRIANGLE_UP,
+ cv2.MARKER_TRIANGLE_DOWN,
+ ]
+ for animal_idx in range(num_animals):
+ marker = marker_types[animal_idx % len(marker_types)]
+ animal_pose = pose_arr[animal_idx]
+ self._draw_keypoints(
+ overlay,
+ animal_pose,
+ num_keypoints,
+ cmap,
+ offset_x,
+ offset_y,
+ scale_x,
+ scale_y,
+ scaled_radius,
+ marker=marker,
+ )
+ else:
+ # Single-animal pose - use circles (marker=None)
+ num_keypoints = len(pose_arr)
+ self._draw_keypoints(
+ overlay,
+ pose_arr,
+ num_keypoints,
+ cmap,
+ offset_x,
+ offset_y,
+ scale_x,
+ scale_y,
+ scaled_radius,
+ marker=None,
+ )
+
+ return overlay
+
+ def _draw_keypoints(
+ self,
+ overlay: np.ndarray,
+ keypoints: np.ndarray,
+ num_keypoints: int,
+ cmap,
+ offset_x: int,
+ offset_y: int,
+ scale_x: float,
+ scale_y: float,
+ radius: int,
+ marker: int | None = None,
+ ) -> None:
+ """Draw keypoints for a single animal on the overlay.
+
+ Args:
+ marker: OpenCV marker type (e.g., cv2.MARKER_CROSS). If None, draws circles.
+ """
+ for idx, keypoint in enumerate(keypoints):
if len(keypoint) < 2:
continue
x, y = keypoint[:2]
@@ -1572,8 +1644,10 @@ def _draw_pose(self, frame: np.ndarray, pose: np.ndarray) -> np.ndarray:
# Convert from RGBA [0, 1] to BGR [0, 255] for OpenCV
bgr_color = (int(rgba[2] * 255), int(rgba[1] * 255), int(rgba[0] * 255))
- cv2.circle(overlay, (x_scaled, y_scaled), scaled_radius, bgr_color, -1)
- return overlay
+ if marker is None:
+ cv2.circle(overlay, (x_scaled, y_scaled), radius, bgr_color, -1)
+ else:
+ cv2.drawMarker(overlay, (x_scaled, y_scaled), bgr_color, marker, radius * 2, 2)
def _on_dlc_initialised(self, success: bool) -> None:
if success:
From b083a35214cf0468826a7c5aad36840f9a1e97d9 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Fri, 23 Jan 2026 10:18:03 +0100
Subject: [PATCH 040/132] Update .gitignore
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index d2ee717..e5d2f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,5 @@ venv.bak/
.vscode
!dlclivegui/config.py
+# uv package files
+uv.lock
From 88c883e979c4cb2498128ae82dff9987a14e4981 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Fri, 23 Jan 2026 10:18:23 +0100
Subject: [PATCH 041/132] Update opencv_backend.py
---
dlclivegui/cameras/opencv_backend.py | 83 ++++++++++++----------------
1 file changed, 36 insertions(+), 47 deletions(-)
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 74d50fc..7110579 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -1,26 +1,22 @@
-"""OpenCV based camera backend."""
-from __future__ import annotations
+"""OpenCV based camera backend with MJPG enforcement for WSL2."""
+from __future__ import annotations
import logging
import time
from typing import Tuple
-
import cv2
import numpy as np
-
from .base import CameraBackend
LOG = logging.getLogger(__name__)
-
class OpenCVCameraBackend(CameraBackend):
- """Fallback backend using :mod:`cv2.VideoCapture`."""
+ """Fallback backend using :mod:`cv2.VideoCapture` with MJPG optimization."""
def __init__(self, settings):
super().__init__(settings)
self._capture: cv2.VideoCapture | None = None
- # Parse resolution with defaults (720x540)
self._resolution: Tuple[int, int] = self._parse_resolution(
settings.properties.get("resolution")
)
@@ -36,16 +32,11 @@ def read(self) -> Tuple[np.ndarray, float]:
if self._capture is None:
raise RuntimeError("Camera has not been opened")
- # Try grab first - this is non-blocking and helps detect connection issues faster
- grabbed = self._capture.grab()
- if not grabbed:
- # Check if camera is still opened - if not, it's a serious error
+ if not self._capture.grab():
if not self._capture.isOpened():
raise RuntimeError("OpenCV camera connection lost")
- # Otherwise treat as temporary frame read failure (timeout-like)
raise TimeoutError("Failed to grab frame from OpenCV camera (temporary)")
- # Now retrieve the frame
success, frame = self._capture.retrieve()
if not success or frame is None:
raise TimeoutError("Failed to retrieve frame from OpenCV camera (temporary)")
@@ -53,19 +44,17 @@ def read(self) -> Tuple[np.ndarray, float]:
return frame, time.time()
def close(self) -> None:
- if self._capture is not None:
+ if self._capture:
try:
- # Try to release properly
self._capture.release()
except Exception:
pass
finally:
self._capture = None
- # Give the system a moment to fully release the device
time.sleep(0.1)
def stop(self) -> None:
- if self._capture is not None:
+ if self._capture:
try:
self._capture.release()
except Exception:
@@ -75,62 +64,70 @@ def stop(self) -> None:
def device_name(self) -> str:
base_name = "OpenCV"
- if self._capture is not None and hasattr(self._capture, "getBackendName"):
+ if self._capture and hasattr(self._capture, "getBackendName"):
try:
backend_name = self._capture.getBackendName()
- except Exception: # pragma: no cover - backend specific
+ except Exception:
backend_name = ""
if backend_name:
base_name = backend_name
return f"{base_name} camera #{self.settings.index}"
def _parse_resolution(self, resolution) -> Tuple[int, int]:
- """Parse resolution setting.
-
- Args:
- resolution: Can be a tuple/list [width, height], or None
-
- Returns:
- Tuple of (width, height), defaults to (720, 540)
- """
if resolution is None:
- return (720, 540) # Default resolution
-
+ return (720, 540)
if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
try:
return (int(resolution[0]), int(resolution[1]))
except (ValueError, TypeError):
+ LOG.debug(f"Invalid resolution values: {resolution}, defaulting to 720x540")
return (720, 540)
-
return (720, 540)
def _configure_capture(self) -> None:
- if self._capture is None:
+ if not self._capture:
return
- # Set resolution (width x height)
+ # Use MJPG if available
+ if not self._capture.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*'MJPG')):
+ LOG.warning("Failed to set MJPG format, falling back to default")
+
+ # Log actual codec
+ fourcc = int(self._capture.get(cv2.CAP_PROP_FOURCC))
+ codec = "".join([chr((fourcc >> 8 * i) & 0xFF) for i in range(4)])
+ LOG.info(f"Camera using codec: {codec}")
+
+ # Set resolution
width, height = self._resolution
if not self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width)):
LOG.warning(f"Failed to set frame width to {width}")
if not self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height)):
LOG.warning(f"Failed to set frame height to {height}")
- # Verify resolution was set correctly
actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH))
actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT))
if actual_width != width or actual_height != height:
- LOG.warning(
- f"Resolution mismatch: requested {width}x{height}, "
- f"got {actual_width}x{actual_height}"
- )
+ LOG.warning(f"Resolution mismatch: requested {width}x{height}, got {actual_width}x{actual_height}")
+ try:
+ self._resolution = (actual_width, actual_height)
+ except Exception:
+ LOG.warning("Failed to update internal resolution state")
+ LOG.info(f"Camera configured with resolution: {self._resolution[0]}x{self._resolution[1]}")
- # Set FPS if specified
+ # Set FPS
requested_fps = self.settings.fps
if requested_fps:
if not self._capture.set(cv2.CAP_PROP_FPS, float(requested_fps)):
LOG.warning(f"Failed to set FPS to {requested_fps}")
- # Set any additional properties from the properties dict
+ actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
+ if actual_fps:
+ if requested_fps and abs(actual_fps - requested_fps) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {actual_fps:.2f}")
+ self.settings.fps = float(actual_fps)
+ LOG.info(f"Camera configured with FPS: {actual_fps:.2f}")
+
+ # Apply extra properties
for prop, value in self.settings.properties.items():
if prop in ("api", "resolution"):
continue
@@ -142,14 +139,6 @@ def _configure_capture(self) -> None:
if not self._capture.set(prop_id, float(value)):
LOG.warning(f"Failed to set property {prop_id} to {value}")
- # Update actual FPS from camera and warn if different from requested
- actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
- if actual_fps:
- if requested_fps and abs(actual_fps - requested_fps) > 0.1:
- LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {actual_fps:.2f}")
- self.settings.fps = float(actual_fps)
- LOG.info(f"Camera configured with FPS: {actual_fps:.2f}")
-
def _resolve_backend(self, backend: str | None) -> int:
if backend is None:
return cv2.CAP_ANY
From 351e576f8a0084528f8e6052d7d1ace90d814bed Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 11:40:43 +0100
Subject: [PATCH 042/132] Switch to Ruff for linting and formatting
Replaces isort and black with Ruff in pre-commit configuration and adds Ruff settings to pyproject.toml. Also comments out deeplabcut-live dependency. This unifies linting and formatting under Ruff for improved workflow.
---
.pre-commit-config.yaml | 18 +++++++-----------
pyproject.toml | 12 +++++++++++-
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0178c8e..ceaed2d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,15 +9,11 @@ repos:
args: [--pytest-test-first]
- id: trailing-whitespace
- id: check-merge-conflict
-
- - repo: https://github.com/PyCQA/isort
- rev: 5.12.0
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.14.10
hooks:
- - id: isort
- args: ["--profile", "black", "--line-length", "100", "--atomic"]
-
- - repo: https://github.com/psf/black
- rev: 24.4.2
- hooks:
- - id: black
- args: ["--line-length=100"]
+ # Run the formatter.
+ - id: ruff-format
+ # Run the linter.
+ - id: ruff-check
+ args: [--fix,--unsafe-fixes]
diff --git a/pyproject.toml b/pyproject.toml
index b989b57..bb931d2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
- "deeplabcut-live", # might be missing timm and scipy
+ # "deeplabcut-live", # might be missing timm and scipy
"PySide6",
"numpy",
"opencv-python",
@@ -110,3 +110,13 @@ exclude_lines = [
"if TYPE_CHECKING:",
"@abstract",
]
+
+[tool.ruff]
+lint.select = ["E", "F", "B", "I", "UP"]
+lint.ignore = ["E741"]
+target-version = "py310"
+fix = true
+line-length = 120
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
From 1f139ab35b4879eef98ae8e0fb0b5f8938724e8a Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 11:41:01 +0100
Subject: [PATCH 043/132] Upgrade camera detection speed and UI
Refactor camera configuration dialog to use background threads for camera detection and preview loading, improving UI responsiveness. Update OpenCV backend for robust, fast startup and Windows-optimized camera handling. Enhance camera factory to support cancellation and progress reporting during device discovery.
---
dlclivegui/camera_config_dialog.py | 589 ++++++++++++++++++++-------
dlclivegui/cameras/factory.py | 116 +++---
dlclivegui/cameras/opencv_backend.py | 320 +++++++++++----
dlclivegui/gui.py | 143 +++----
4 files changed, 819 insertions(+), 349 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 978419e..0c85abf 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -1,14 +1,13 @@
-"""Camera configuration dialog for multi-camera setup."""
+"""Camera configuration dialog for multi-camera setup (with async preview loading)."""
from __future__ import annotations
+import copy # NEW
import logging
-from typing import List, Optional
import cv2
-import numpy as np
-from PySide6.QtCore import Qt, QTimer, Signal
-from PySide6.QtGui import QImage, QPixmap
+from PySide6.QtCore import QElapsedTimer, Qt, QThread, QTimer, Signal
+from PySide6.QtGui import QFont, QImage, QPixmap, QTextCursor
from PySide6.QtWidgets import (
QCheckBox,
QComboBox,
@@ -21,9 +20,11 @@
QListWidget,
QListWidgetItem,
QMessageBox,
+ QProgressBar,
QPushButton,
QSpinBox,
QStyle,
+ QTextEdit, # NEW: lightweight status console in the preview panel
QVBoxLayout,
QWidget,
)
@@ -36,34 +37,168 @@
LOGGER = logging.getLogger(__name__)
+# -------------------------------
+# Background worker to detect cameras
+# -------------------------------
+class DetectCamerasWorker(QThread):
+ """Background worker to detect cameras for the selected backend."""
+
+ progress = Signal(str) # human-readable text
+ result = Signal(list) # list[DetectedCamera]
+ error = Signal(str)
+ finished = Signal()
+
+ def __init__(self, backend: str, max_devices: int = 10, parent: QWidget | None = None):
+ super().__init__(parent)
+ self.backend = backend
+ self.max_devices = max_devices
+
+ def run(self):
+ try:
+ # Initial message
+ self.progress.emit(f"Scanning {self.backend} cameras…")
+
+ cams = CameraFactory.detect_cameras(
+ self.backend,
+ max_devices=self.max_devices,
+ should_cancel=self.isInterruptionRequested,
+ progress_cb=self.progress.emit,
+ )
+ self.result.emit(cams)
+ except Exception as exc:
+ self.error.emit(f"{type(exc).__name__}: {exc}")
+ finally:
+ self.finished.emit()
+
+
+# -------------------------------
+# Singleton camera preview loader worker
+# -------------------------------
+class CameraLoadWorker(QThread):
+ """Open/configure a camera backend off the UI thread with progress and cancel support."""
+
+ progress = Signal(str) # Human-readable status updates
+ success = Signal(object) # Emits the ready backend (CameraBackend)
+ error = Signal(str) # Emits error message
+ canceled = Signal() # Emits when canceled before success
+
+ def __init__(self, cam: CameraSettings, parent: QWidget | None = None):
+ super().__init__(parent)
+ # Work on a defensive copy so we never mutate the original settings
+ self._cam = copy.deepcopy(cam)
+ # Make first-time opening snappier by allowing backend fast-path if supported
+ if isinstance(self._cam.properties, dict):
+ self._cam.properties.setdefault("fast_start", True)
+ self._cancel = False
+ self._backend: CameraBackend | None = None
+
+ def request_cancel(self):
+ self._cancel = True
+
+ def _check_cancel(self) -> bool:
+ if self._cancel:
+ self.progress.emit("Canceled by user.")
+ return True
+ return False
+
+ def run(self):
+ try:
+ self.progress.emit("Creating backend…")
+ if self._check_cancel():
+ self.canceled.emit()
+ return
+
+ LOGGER.debug("Creating camera backend for %s:%d", self._cam.backend, self._cam.index)
+ self._backend = CameraFactory.create(self._cam)
+
+ self.progress.emit("Opening device…")
+ if self._check_cancel():
+ self.canceled.emit()
+ return
+
+ self._backend.open() # heavy: backend chooses/negotiates API/format/res/FPS
+
+ self.progress.emit("Warming up stream…")
+ if self._check_cancel():
+ self._backend.close()
+ self.canceled.emit()
+ return
+
+ # Warmup: allow driver pipeline to stabilize (skip None frames silently)
+ warm_ok = False
+ timer = QElapsedTimer()
+ timer.start()
+ budget = 50000 # ms
+ while timer.elapsed() < budget and not self._cancel:
+ frame, _ = self._backend.read()
+ if frame is not None and frame.size > 0:
+ warm_ok = True
+ break
+
+ if self._cancel:
+ self._backend.close()
+ self.canceled.emit()
+ return
+
+ if not warm_ok:
+ # Not fatal—some cameras deliver the first frame only after UI starts polling.
+ self.progress.emit("Warmup yielded no frame, proceeding…")
+
+ self.progress.emit("Camera ready.")
+ self.success.emit(self._backend)
+ # Ownership of _backend transfers to the receiver; do not close here.
+
+ except Exception as exc:
+ msg = f"{type(exc).__name__}: {exc}"
+ try:
+ if self._backend:
+ self._backend.close()
+ except Exception:
+ pass
+ self.error.emit(msg)
+
+
class CameraConfigDialog(QDialog):
- """Dialog for configuring multiple cameras."""
+ """Dialog for configuring multiple cameras with async preview loading."""
MAX_CAMERAS = 4
settings_changed = Signal(object) # MultiCameraSettings
+ # Camera discovery signals
+ scan_started = Signal(str)
+ scan_finished = Signal()
def __init__(
self,
- parent: Optional[QWidget] = None,
- multi_camera_settings: Optional[MultiCameraSettings] = None,
+ parent: QWidget | None = None,
+ multi_camera_settings: MultiCameraSettings | None = None,
):
super().__init__(parent)
self.setWindowTitle("Configure Cameras")
self.setMinimumSize(960, 720)
- self._multi_camera_settings = (
- multi_camera_settings if multi_camera_settings else MultiCameraSettings()
- )
- self._detected_cameras: List[DetectedCamera] = []
- self._current_edit_index: Optional[int] = None
- self._preview_backend: Optional[CameraBackend] = None
- self._preview_timer: Optional[QTimer] = None
+ self._multi_camera_settings = multi_camera_settings if multi_camera_settings else MultiCameraSettings()
+ self._detected_cameras: list[DetectedCamera] = []
+ self._current_edit_index: int | None = None
+
+ # Preview state
+ self._preview_backend: CameraBackend | None = None
+ self._preview_timer: QTimer | None = None
self._preview_active: bool = False
+ # Camera detection worker
+ self._scan_worker: DetectCamerasWorker | None = None
+
+ # Singleton loader per dialog
+ self._loader: CameraLoadWorker | None = None
+ self._loading_active: bool = False
+
self._setup_ui()
self._populate_from_settings()
self._connect_signals()
+ # -------------------------------
+ # UI setup
+ # -------------------------------
def _setup_ui(self) -> None:
# Main layout for the dialog
main_layout = QVBoxLayout(self)
@@ -86,9 +221,7 @@ def _setup_ui(self) -> None:
# Buttons for managing active cameras
list_buttons = QHBoxLayout()
self.remove_camera_btn = QPushButton("Remove")
- self.remove_camera_btn.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_TrashIcon)
- )
+ self.remove_camera_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_TrashIcon))
self.remove_camera_btn.setEnabled(False)
self.move_up_btn = QPushButton("↑")
self.move_up_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowUp))
@@ -126,6 +259,30 @@ def _setup_ui(self) -> None:
self.available_cameras_list = QListWidget()
available_layout.addWidget(self.available_cameras_list)
+ # Show status overlay during scan
+ self._scan_overlay = QLabel(available_group)
+ self._scan_overlay.setVisible(False)
+ self._scan_overlay.setAlignment(Qt.AlignCenter)
+ self._scan_overlay.setWordWrap(True)
+ self._scan_overlay.setStyleSheet(
+ "background-color: rgba(0, 0, 0, 140);color: white;padding: 12px;border: 1px solid #333;font-size: 12px;"
+ )
+ self._scan_overlay.setText("Discovering cameras…")
+ self.available_cameras_list.installEventFilter(self)
+
+ # Indeterminate progress bar + status text for async scan
+ self.scan_progress = QProgressBar()
+ self.scan_progress.setRange(0, 0)
+ self.scan_progress.setVisible(False)
+
+ available_layout.addWidget(self.scan_progress)
+
+ self.scan_cancel_btn = QPushButton("Cancel Scan")
+ self.scan_cancel_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserStop))
+ self.scan_cancel_btn.setVisible(False)
+ self.scan_cancel_btn.clicked.connect(self._on_scan_cancel)
+ available_layout.addWidget(self.scan_cancel_btn)
+
self.add_camera_btn = QPushButton("Add Selected Camera →")
self.add_camera_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowRight))
self.add_camera_btn.setEnabled(False)
@@ -214,9 +371,7 @@ def _setup_ui(self) -> None:
self.settings_form.addRow("Crop (x0,y0,x1,y1):", crop_widget)
self.apply_settings_btn = QPushButton("Apply Settings")
- self.apply_settings_btn.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DialogApplyButton)
- )
+ self.apply_settings_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogApplyButton))
self.apply_settings_btn.setEnabled(False)
self.settings_form.addRow(self.apply_settings_btn)
@@ -231,12 +386,35 @@ def _setup_ui(self) -> None:
# Preview widget
self.preview_group = QGroupBox("Camera Preview")
preview_layout = QVBoxLayout(self.preview_group)
+
self.preview_label = QLabel("No preview")
self.preview_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.preview_label.setMinimumSize(320, 240)
self.preview_label.setMaximumSize(400, 300)
self.preview_label.setStyleSheet("background-color: #1a1a1a; color: #888;")
preview_layout.addWidget(self.preview_label)
+ self.preview_label.installEventFilter(self) # For resize events
+
+ # NEW: small, read-only status console for loader messages
+ self.preview_status = QTextEdit()
+ self.preview_status.setReadOnly(True)
+ self.preview_status.setFixedHeight(45)
+ self.preview_status.setStyleSheet(
+ "QTextEdit { background: #141414; color: #bdbdbd; border: 1px solid #2a2a2a; }"
+ )
+ font = QFont("Consolas")
+ font.setPointSize(9)
+ self.preview_status.setFont(font)
+ preview_layout.addWidget(self.preview_status)
+
+ # NEW: overlay label for loading glass pane
+ self._loading_overlay = QLabel(self.preview_group)
+ self._loading_overlay.setVisible(False)
+ self._loading_overlay.setAlignment(Qt.AlignCenter)
+ self._loading_overlay.setStyleSheet("background-color: rgba(0,0,0,140); color: white; border: 1px solid #333;")
+ self._loading_overlay.setText("Loading camera…")
+ # We size/position it on show & on resize
+
self.preview_group.setVisible(False)
right_layout.addWidget(self.preview_group)
@@ -247,9 +425,7 @@ def _setup_ui(self) -> None:
self.ok_btn = QPushButton("OK")
self.ok_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogOkButton))
self.cancel_btn = QPushButton("Cancel")
- self.cancel_btn.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DialogCancelButton)
- )
+ self.cancel_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogCancelButton))
button_layout.addStretch(1)
button_layout.addWidget(self.ok_btn)
button_layout.addWidget(self.cancel_btn)
@@ -262,6 +438,48 @@ def _setup_ui(self) -> None:
main_layout.addLayout(panels_layout)
main_layout.addLayout(button_layout)
+ # Maintain overlay geometry when resizing
+ def resizeEvent(self, event): # NEW
+ super().resizeEvent(event)
+ if self._loading_overlay and self._loading_overlay.isVisible():
+ self._position_loading_overlay()
+ if hasattr(self, "_loading_overlay") and self._loading_overlay.isVisible():
+ self._position_loading_overlay()
+
+ def eventFilter(self, obj, event):
+ if obj is self.available_cameras_list and event.type() == event.Type.Resize:
+ if self._scan_overlay and self._scan_overlay.isVisible():
+ self._position_scan_overlay()
+ return super().eventFilter(obj, event)
+
+ def _position_scan_overlay(self) -> None:
+ """Position scan overlay to cover the available_cameras_list area."""
+ if not self._scan_overlay or not self.available_cameras_list:
+ return
+ parent = self._scan_overlay.parent() # available_group
+ top_left = self.available_cameras_list.mapTo(parent, self.available_cameras_list.rect().topLeft())
+ rect = self.available_cameras_list.rect()
+ self._scan_overlay.setGeometry(top_left.x(), top_left.y(), rect.width(), rect.height())
+
+ def _show_scan_overlay(self, message: str = "Discovering cameras…") -> None:
+ self._scan_overlay.setText(message)
+ self._scan_overlay.setVisible(True)
+ self._position_scan_overlay()
+
+ def _hide_scan_overlay(self) -> None:
+ self._scan_overlay.setVisible(False)
+
+ def _position_loading_overlay(self): # NEW
+ # Cover just the preview image area (label), not the whole group
+ if not self.preview_label:
+ return
+ gp = self.preview_label.mapTo(self.preview_group, self.preview_label.rect().topLeft())
+ rect = self.preview_label.rect()
+ self._loading_overlay.setGeometry(gp.x(), gp.y(), rect.width(), rect.height())
+
+ # -------------------------------
+ # Signals / population
+ # -------------------------------
def _connect_signals(self) -> None:
self.backend_combo.currentIndexChanged.connect(self._on_backend_changed)
self.refresh_btn.clicked.connect(self._refresh_available_cameras)
@@ -271,9 +489,7 @@ def _connect_signals(self) -> None:
self.move_down_btn.clicked.connect(self._move_camera_down)
self.active_cameras_list.currentRowChanged.connect(self._on_active_camera_selected)
self.available_cameras_list.currentRowChanged.connect(self._on_available_camera_selected)
- self.available_cameras_list.itemDoubleClicked.connect(
- self._on_available_camera_double_clicked
- )
+ self.available_cameras_list.itemDoubleClicked.connect(self._on_available_camera_double_clicked)
self.apply_settings_btn.clicked.connect(self._apply_camera_settings)
self.preview_btn.clicked.connect(self._toggle_preview)
self.ok_btn.clicked.connect(self._on_ok_clicked)
@@ -293,21 +509,11 @@ def _populate_from_settings(self) -> None:
self._update_button_states()
def _format_camera_label(self, cam: CameraSettings, index: int = -1) -> str:
- """Format camera label for display.
-
- Parameters
- ----------
- cam : CameraSettings
- The camera settings.
- index : int
- The index of the camera in the list. If 0 and enabled, shows DLC indicator.
- """
status = "✓" if cam.enabled else "○"
dlc_indicator = " [DLC]" if index == 0 and cam.enabled else ""
return f"{status} {cam.name} [{cam.backend}:{cam.index}]{dlc_indicator}"
def _refresh_camera_labels(self) -> None:
- """Refresh all camera labels in the active list (e.g., after reorder)."""
for i in range(self.active_cameras_list.count()):
item = self.active_cameras_list.item(i)
cam = item.data(Qt.ItemDataRole.UserRole)
@@ -318,48 +524,96 @@ def _on_backend_changed(self, _index: int) -> None:
self._refresh_available_cameras()
def _refresh_available_cameras(self) -> None:
- """Refresh the list of available cameras."""
+ """Refresh the list of available cameras asynchronously."""
backend = self.backend_combo.currentData()
if not backend:
backend = self.backend_combo.currentText().split()[0]
- self.available_cameras_list.clear()
- self._detected_cameras = CameraFactory.detect_cameras(backend, max_devices=10)
+ # If already scanning, ignore new requests to avoid races
+ if getattr(self, "_scan_worker", None) and self._scan_worker.isRunning():
+ self._show_scan_overlay("Already discovering cameras…")
+ return
+ # Reset list UI and show progress
+ self.available_cameras_list.clear()
+ self._detected_cameras = []
+ msg = f"Discovering {backend} cameras…"
+ self._show_scan_overlay(msg)
+ self.scan_progress.setRange(0, 0)
+ self.scan_progress.setVisible(True)
+ self.scan_cancel_btn.setVisible(True)
+ self.add_camera_btn.setEnabled(False)
+ self.refresh_btn.setEnabled(False)
+ self.backend_combo.setEnabled(False)
+
+ # Start worker
+ self._scan_worker = DetectCamerasWorker(backend, max_devices=10, parent=self)
+ self._scan_worker.progress.connect(self._on_scan_progress)
+ self._scan_worker.result.connect(self._on_scan_result)
+ self._scan_worker.error.connect(self._on_scan_error)
+ self._scan_worker.finished.connect(self._on_scan_finished)
+ self.scan_started.emit(f"Scanning {backend} cameras…")
+ self._scan_worker.start()
+
+ def _on_scan_progress(self, msg: str) -> None:
+ self._show_scan_overlay(msg or "Discovering cameras…")
+
+ def _on_scan_result(self, cams: list) -> None:
+ self._detected_cameras = cams or []
for cam in self._detected_cameras:
item = QListWidgetItem(f"{cam.label} (index {cam.index})")
item.setData(Qt.ItemDataRole.UserRole, cam)
self.available_cameras_list.addItem(item)
+ def _on_scan_error(self, msg: str) -> None:
+ QMessageBox.warning(self, "Camera Scan", f"Failed to detect cameras:\n{msg}")
+
+ def _on_scan_finished(self) -> None:
+ self._hide_scan_overlay()
+ self.scan_progress.setVisible(False)
+ self._scan_worker = None
+
+ self.scan_cancel_btn.setVisible(False)
+ self.scan_cancel_btn.setEnabled(True)
+ self.refresh_btn.setEnabled(True)
+ self.backend_combo.setEnabled(True)
+
self._update_button_states()
+ self.scan_finished.emit()
+
+ def _on_scan_cancel(self) -> None:
+ """User requested to cancel discovery."""
+ if self._scan_worker and self._scan_worker.isRunning():
+ try:
+ self._scan_worker.requestInterruption()
+ except Exception:
+ pass
+ # Keep the busy bar, update texts
+ self._show_scan_overlay("Canceling discovery…")
+ self.scan_progress.setVisible(True) # stay visible as indeterminate
+ self.scan_cancel_btn.setEnabled(False)
def _on_available_camera_selected(self, row: int) -> None:
self.add_camera_btn.setEnabled(row >= 0)
def _on_available_camera_double_clicked(self, item: QListWidgetItem) -> None:
- """Handle double-click on an available camera to add it."""
self._add_selected_camera()
def _on_active_camera_selected(self, row: int) -> None:
- """Handle selection of an active camera."""
# Stop any running preview when selection changes
if self._preview_active:
self._stop_preview()
-
self._current_edit_index = row
self._update_button_states()
-
if row < 0 or row >= self.active_cameras_list.count():
self._clear_settings_form()
return
-
item = self.active_cameras_list.item(row)
cam = item.data(Qt.ItemDataRole.UserRole)
if cam:
self._load_camera_to_form(cam)
def _load_camera_to_form(self, cam: CameraSettings) -> None:
- """Load camera settings into the form."""
self.cam_enabled_checkbox.setChecked(cam.enabled)
self.cam_name_label.setText(cam.name)
self.cam_index_label.setText(str(cam.index))
@@ -367,21 +621,16 @@ def _load_camera_to_form(self, cam: CameraSettings) -> None:
self.cam_fps.setValue(cam.fps)
self.cam_exposure.setValue(cam.exposure)
self.cam_gain.setValue(cam.gain)
-
- # Set rotation
rot_index = self.cam_rotation.findData(cam.rotation)
if rot_index >= 0:
self.cam_rotation.setCurrentIndex(rot_index)
-
self.cam_crop_x0.setValue(cam.crop_x0)
self.cam_crop_y0.setValue(cam.crop_y0)
self.cam_crop_x1.setValue(cam.crop_x1)
self.cam_crop_y1.setValue(cam.crop_y1)
-
self.apply_settings_btn.setEnabled(True)
def _clear_settings_form(self) -> None:
- """Clear the settings form."""
self.cam_enabled_checkbox.setChecked(True)
self.cam_name_label.setText("")
self.cam_index_label.setText("")
@@ -397,12 +646,10 @@ def _clear_settings_form(self) -> None:
self.apply_settings_btn.setEnabled(False)
def _add_selected_camera(self) -> None:
- """Add the selected available camera to active cameras."""
row = self.available_cameras_list.currentRow()
if row < 0:
return
-
- # Check limit
+ # limit check
active_count = len(
[
i
@@ -411,29 +658,20 @@ def _add_selected_camera(self) -> None:
]
)
if active_count >= self.MAX_CAMERAS:
- QMessageBox.warning(
- self,
- "Maximum Cameras",
- f"Maximum of {self.MAX_CAMERAS} active cameras allowed.",
- )
+ QMessageBox.warning(self, "Maximum Cameras", f"Maximum of {self.MAX_CAMERAS} active cameras allowed.")
return
-
item = self.available_cameras_list.item(row)
detected = item.data(Qt.ItemDataRole.UserRole)
backend = self.backend_combo.currentData() or "opencv"
- # Check if this camera (same backend + index) is already added
for i in range(self.active_cameras_list.count()):
existing_cam = self.active_cameras_list.item(i).data(Qt.ItemDataRole.UserRole)
if existing_cam.backend == backend and existing_cam.index == detected.index:
QMessageBox.warning(
- self,
- "Duplicate Camera",
- f"Camera '{backend}:{detected.index}' is already in the active list.",
+ self, "Duplicate Camera", f"Camera '{backend}:{detected.index}' is already in the active list."
)
return
- # Create new camera settings
new_cam = CameraSettings(
name=detected.label,
index=detected.index,
@@ -443,79 +681,55 @@ def _add_selected_camera(self) -> None:
gain=0.0,
enabled=True,
)
-
self._multi_camera_settings.cameras.append(new_cam)
-
- # Add to list
new_index = len(self._multi_camera_settings.cameras) - 1
new_item = QListWidgetItem(self._format_camera_label(new_cam, new_index))
new_item.setData(Qt.ItemDataRole.UserRole, new_cam)
self.active_cameras_list.addItem(new_item)
self.active_cameras_list.setCurrentItem(new_item)
-
- # Refresh labels in case this is the first camera (gets DLC indicator)
self._refresh_camera_labels()
self._update_button_states()
def _remove_selected_camera(self) -> None:
- """Remove the selected camera from active cameras."""
row = self.active_cameras_list.currentRow()
if row < 0:
return
-
self.active_cameras_list.takeItem(row)
if row < len(self._multi_camera_settings.cameras):
del self._multi_camera_settings.cameras[row]
-
self._current_edit_index = None
self._clear_settings_form()
- # Refresh labels since DLC camera may have changed
self._refresh_camera_labels()
self._update_button_states()
def _move_camera_up(self) -> None:
- """Move selected camera up in the list."""
row = self.active_cameras_list.currentRow()
if row <= 0:
return
-
item = self.active_cameras_list.takeItem(row)
self.active_cameras_list.insertItem(row - 1, item)
self.active_cameras_list.setCurrentRow(row - 1)
-
- # Update settings list
cams = self._multi_camera_settings.cameras
cams[row], cams[row - 1] = cams[row - 1], cams[row]
-
- # Refresh labels since DLC camera may have changed
self._refresh_camera_labels()
def _move_camera_down(self) -> None:
- """Move selected camera down in the list."""
row = self.active_cameras_list.currentRow()
if row < 0 or row >= self.active_cameras_list.count() - 1:
return
-
item = self.active_cameras_list.takeItem(row)
self.active_cameras_list.insertItem(row + 1, item)
self.active_cameras_list.setCurrentRow(row + 1)
-
- # Update settings list
cams = self._multi_camera_settings.cameras
cams[row], cams[row + 1] = cams[row + 1], cams[row]
-
- # Refresh labels since DLC camera may have changed
self._refresh_camera_labels()
def _apply_camera_settings(self) -> None:
- """Apply current form settings to the selected camera."""
if self._current_edit_index is None:
return
-
row = self._current_edit_index
if row < 0 or row >= len(self._multi_camera_settings.cameras):
return
-
cam = self._multi_camera_settings.cameras[row]
cam.enabled = self.cam_enabled_checkbox.isChecked()
cam.fps = self.cam_fps.value()
@@ -526,124 +740,215 @@ def _apply_camera_settings(self) -> None:
cam.crop_y0 = self.cam_crop_y0.value()
cam.crop_x1 = self.cam_crop_x1.value()
cam.crop_y1 = self.cam_crop_y1.value()
-
- # Update list item
item = self.active_cameras_list.item(row)
item.setText(self._format_camera_label(cam, row))
item.setData(Qt.ItemDataRole.UserRole, cam)
- if not cam.enabled:
- item.setForeground(Qt.GlobalColor.gray)
- else:
- item.setForeground(Qt.GlobalColor.black)
-
- # Refresh all labels in case enabled state changed (affects DLC indicator)
+ item.setForeground(Qt.GlobalColor.gray if not cam.enabled else Qt.GlobalColor.black)
self._refresh_camera_labels()
self._update_button_states()
-
- # Restart preview to apply new settings (exposure, gain, fps, etc.)
if self._preview_active:
self._stop_preview()
self._start_preview()
def _update_button_states(self) -> None:
- """Update button enabled states."""
active_row = self.active_cameras_list.currentRow()
has_active_selection = active_row >= 0
-
self.remove_camera_btn.setEnabled(has_active_selection)
self.move_up_btn.setEnabled(has_active_selection and active_row > 0)
- self.move_down_btn.setEnabled(
- has_active_selection and active_row < self.active_cameras_list.count() - 1
- )
- self.preview_btn.setEnabled(has_active_selection)
-
+ self.move_down_btn.setEnabled(has_active_selection and active_row < self.active_cameras_list.count() - 1)
+ # During loading, preview button becomes "Cancel Loading"
+ self.preview_btn.setEnabled(has_active_selection or self._loading_active)
available_row = self.available_cameras_list.currentRow()
self.add_camera_btn.setEnabled(available_row >= 0)
def _on_ok_clicked(self) -> None:
- """Handle OK button click."""
- # Stop preview if running
self._stop_preview()
-
- # Validate that we have at least one enabled camera if any cameras are configured
if self._multi_camera_settings.cameras:
active = self._multi_camera_settings.get_active_cameras()
if not active:
QMessageBox.warning(
- self,
- "No Active Cameras",
- "Please enable at least one camera or remove all cameras.",
+ self, "No Active Cameras", "Please enable at least one camera or remove all cameras."
)
return
-
self.settings_changed.emit(self._multi_camera_settings)
self.accept()
def reject(self) -> None:
"""Handle dialog rejection (Cancel or close)."""
self._stop_preview()
+
+ if getattr(self, "_scan_worker", None) and self._scan_worker.isRunning():
+ try:
+ self._scan_worker.requestInterruption()
+ except Exception:
+ pass
+ self._scan_worker.wait(1500)
+ self._scan_worker = None
+
+ self._hide_scan_overlay()
+ self.scan_progress.setVisible(False)
+ self.scan_cancel_btn.setVisible(False)
+ self.scan_cancel_btn.setEnabled(True)
+ self.refresh_btn.setEnabled(True)
+ self.backend_combo.setEnabled(True)
+
super().reject()
+ # -------------------------------
+ # Preview start/stop (ASYNC)
+ # -------------------------------
def _toggle_preview(self) -> None:
- """Toggle camera preview on/off."""
+ if self._loading_active:
+ self._cancel_loading()
+ return
if self._preview_active:
self._stop_preview()
else:
self._start_preview()
def _start_preview(self) -> None:
- """Start camera preview for the currently selected camera."""
+ """Start camera preview asynchronously (no UI freeze)."""
if self._current_edit_index is None or self._current_edit_index < 0:
return
-
item = self.active_cameras_list.item(self._current_edit_index)
if not item:
return
-
cam = item.data(Qt.ItemDataRole.UserRole)
if not cam:
return
- try:
- self._preview_backend = CameraFactory.create(cam)
- self._preview_backend.open()
- except Exception as exc:
- LOGGER.error(f"Failed to start preview: {exc}")
- QMessageBox.warning(self, "Preview Error", f"Failed to start camera preview:\n{exc}")
- self._preview_backend = None
- return
+ # Ensure any existing preview or loader is stopped/canceled
+ self._stop_preview()
+ if self._loader and self._loader.isRunning():
+ self._loader.request_cancel()
- self._preview_active = True
- self.preview_btn.setText("Stop Preview")
- self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
+ # Prepare UI
self.preview_group.setVisible(True)
- self.preview_label.setText("Starting...")
-
- # Start timer to update preview
- self._preview_timer = QTimer(self)
- self._preview_timer.timeout.connect(self._update_preview)
- self._preview_timer.start(33) # ~30 fps
+ self.preview_label.setText("No preview")
+ self.preview_status.clear()
+ self._show_loading_overlay("Loading camera…")
+ self._set_preview_button_loading(True)
+
+ # Create singleton worker
+ self._loader = CameraLoadWorker(cam, self)
+ self._loader.progress.connect(self._on_loader_progress)
+ self._loader.success.connect(self._on_loader_success)
+ self._loader.error.connect(self._on_loader_error)
+ self._loader.canceled.connect(self._on_loader_canceled)
+ self._loader.finished.connect(self._on_loader_finished)
+ self._loading_active = True
+ self._update_button_states()
+ self._loader.start()
def _stop_preview(self) -> None:
- """Stop camera preview."""
+ """Stop camera preview and cancel any ongoing loading."""
+ # Cancel loader if running
+ if self._loader and self._loader.isRunning():
+ self._loader.request_cancel()
+ self._loader.wait(1500)
+ self._loader = None
+ # Stop timer
if self._preview_timer:
self._preview_timer.stop()
self._preview_timer = None
-
+ # Close backend
if self._preview_backend:
try:
self._preview_backend.close()
except Exception:
pass
self._preview_backend = None
-
- self._preview_active = False
+ # Reset UI
+ self._loading_active = False
+ self._set_preview_button_loading(False)
self.preview_btn.setText("Start Preview")
self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
self.preview_group.setVisible(False)
self.preview_label.setText("No preview")
self.preview_label.setPixmap(QPixmap())
+ self._hide_loading_overlay()
+ self._update_button_states()
+ # -------------------------------
+ # Loader UI helpers / slots
+ # -------------------------------
+ def _set_preview_button_loading(self, loading: bool) -> None:
+ if loading:
+ self.preview_btn.setText("Cancel Loading")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserStop))
+ else:
+ self.preview_btn.setText("Start Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
+
+ def _show_loading_overlay(self, message: str) -> None:
+ self._loading_overlay.setText(message)
+ self._loading_overlay.setVisible(True)
+ self._position_loading_overlay()
+
+ def _hide_loading_overlay(self) -> None:
+ self._loading_overlay.setVisible(False)
+
+ def _append_status(self, text: str) -> None:
+ self.preview_status.append(text)
+ self.preview_status.moveCursor(QTextCursor.End)
+ self.preview_status.ensureCursorVisible()
+
+ def _cancel_loading(self) -> None:
+ if self._loader and self._loader.isRunning():
+ self._append_status("Cancel requested…")
+ self._loader.request_cancel()
+ # UI will flip back on finished -> _on_loader_finished
+ else:
+ self._loading_active = False
+ self._set_preview_button_loading(False)
+ self._hide_loading_overlay()
+ self._update_button_states()
+
+ # Loader signal handlers
+ def _on_loader_progress(self, message: str) -> None:
+ self._show_loading_overlay(message)
+ self._append_status(message)
+
+ def _on_loader_success(self, backend: CameraBackend) -> None:
+ # Transfer ownership to dialog
+ self._preview_backend = backend
+ self._append_status("Starting preview…")
+
+ # Mark preview as active
+ self._preview_active = True
+ self.preview_btn.setText("Stop Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
+ self.preview_group.setVisible(True)
+ self.preview_label.setText("Starting…")
+ self._hide_loading_overlay()
+
+ # Start timer to update preview (~25 fps more stable on Windows)
+ self._preview_timer = QTimer(self)
+ self._preview_timer.timeout.connect(self._update_preview)
+ self._preview_timer.start(40)
+
+ def _on_loader_error(self, error: str) -> None:
+ self._append_status(f"Error: {error}")
+ LOGGER.error(f"Failed to start preview: {error}")
+ QMessageBox.warning(self, "Preview Error", f"Failed to start camera preview:\n{error}")
+ self._hide_loading_overlay()
+ self.preview_group.setVisible(False)
+
+ def _on_loader_canceled(self) -> None:
+ self._append_status("Loading canceled.")
+ self._hide_loading_overlay()
+
+ def _on_loader_finished(self) -> None:
+ # Reset loading state and preview button iff not already running preview
+ self._loading_active = False
+ if not self._preview_active:
+ self._set_preview_button_loading(False)
+ self._loader = None
+ self._update_button_states()
+
+ # -------------------------------
+ # Preview frame update (unchanged logic, robust to None frames)
+ # -------------------------------
def _update_preview(self) -> None:
"""Update preview frame."""
if not self._preview_backend or not self._preview_active:
@@ -698,8 +1003,4 @@ def _update_preview(self) -> None:
self.preview_label.setPixmap(QPixmap.fromImage(q_img))
except Exception as exc:
- LOGGER.warning(f"Preview frame error: {exc}")
-
- def get_settings(self) -> MultiCameraSettings:
- """Get the current multi-camera settings."""
- return self._multi_camera_settings
+ LOGGER.debug(f"Preview frame skipped: {exc}")
diff --git a/dlclivegui/cameras/factory.py b/dlclivegui/cameras/factory.py
index 3a98d7c..54b8206 100644
--- a/dlclivegui/cameras/factory.py
+++ b/dlclivegui/cameras/factory.py
@@ -3,9 +3,9 @@
from __future__ import annotations
import importlib
+from collections.abc import Callable, Generator, Iterable # CHANGED
from contextlib import contextmanager
from dataclasses import dataclass
-from typing import Dict, Generator, Iterable, List, Tuple, Type
from ..config import CameraSettings
from .base import CameraBackend
@@ -35,7 +35,7 @@ class DetectedCamera:
label: str
-_BACKENDS: Dict[str, Tuple[str, str]] = {
+_BACKENDS: dict[str, tuple[str, str]] = {
"opencv": ("dlclivegui.cameras.opencv_backend", "OpenCVCameraBackend"),
"basler": ("dlclivegui.cameras.basler_backend", "BaslerCameraBackend"),
"gentl": ("dlclivegui.cameras.gentl_backend", "GenTLCameraBackend"),
@@ -49,14 +49,12 @@ class CameraFactory:
@staticmethod
def backend_names() -> Iterable[str]:
"""Return the identifiers of all known backends."""
-
return tuple(_BACKENDS.keys())
@staticmethod
- def available_backends() -> Dict[str, bool]:
+ def available_backends() -> dict[str, bool]:
"""Return a mapping of backend names to availability flags."""
-
- availability: Dict[str, bool] = {}
+ availability: dict[str, bool] = {}
for name in _BACKENDS:
try:
backend_cls = CameraFactory._resolve_backend(name)
@@ -67,7 +65,13 @@ def available_backends() -> Dict[str, bool]:
return availability
@staticmethod
- def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
+ def detect_cameras(
+ backend: str,
+ max_devices: int = 10,
+ *,
+ should_cancel: Callable[[], bool] | None = None, # NEW
+ progress_cb: Callable[[str], None] | None = None, # NEW
+ ) -> list[DetectedCamera]:
"""Probe ``backend`` for available cameras.
Parameters
@@ -77,13 +81,21 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
max_devices:
Upper bound for the indices that should be probed.
For backends with get_device_count (GenTL, Aravis), the actual device count is queried.
+ should_cancel:
+ Optional callable that returns True if discovery should be canceled.
+ When cancellation is requested, the function returns the cameras found so far.
+ progress_cb:
+ Optional callable to receive human-readable progress messages.
Returns
-------
list of :class:`DetectedCamera`
- Sorted list of detected cameras with human readable labels.
+ Sorted list of detected cameras with human readable labels (partial if canceled).
"""
+ def _canceled() -> bool:
+ return bool(should_cancel and should_cancel())
+
try:
backend_cls = CameraFactory._resolve_backend(backend)
except RuntimeError:
@@ -91,49 +103,72 @@ def detect_cameras(backend: str, max_devices: int = 10) -> List[DetectedCamera]:
if not backend_cls.is_available():
return []
- # For GenTL backend, try to get actual device count
+ # Resolve device count if possible
num_devices = max_devices
if hasattr(backend_cls, "get_device_count"):
try:
+ if _canceled():
+ return []
actual_count = backend_cls.get_device_count()
if actual_count >= 0:
num_devices = actual_count
except Exception:
pass
- detected: List[DetectedCamera] = []
+ detected: list[DetectedCamera] = []
# Suppress OpenCV warnings/errors during probing (e.g., "can't open camera by index")
with _suppress_opencv_logging():
- for index in range(num_devices):
- settings = CameraSettings(
- name=f"Probe {index}",
- index=index,
- fps=30.0,
- backend=backend,
- properties={},
- )
- backend_instance = backend_cls(settings)
- try:
- backend_instance.open()
- except Exception:
- continue
- else:
- label = backend_instance.device_name()
- if not label:
- label = f"{backend.title()} #{index}"
- detected.append(DetectedCamera(index=index, label=label))
- finally:
+ try:
+ for index in range(num_devices):
+ if _canceled():
+ # return partial results immediately
+ break
+
+ if progress_cb:
+ progress_cb(f"Probing {backend}:{index}…")
+
+ settings = CameraSettings(
+ name=f"Probe {index}",
+ index=index,
+ fps=30.0,
+ backend=backend,
+ properties={},
+ )
+ backend_instance = backend_cls(settings)
+
try:
- backend_instance.close()
+ # This open() may block for a short time depending on driver/backend.
+ backend_instance.open()
except Exception:
+ # Not available → continue probing next index
pass
+ else:
+ label = backend_instance.device_name() or f"{backend.title()} #{index}"
+ detected.append(DetectedCamera(index=index, label=label))
+ if progress_cb:
+ progress_cb(f"Found {label}")
+ finally:
+ try:
+ backend_instance.close()
+ except Exception:
+ pass
+
+ # Check cancel again between indices
+ if _canceled():
+ break
+
+ except KeyboardInterrupt:
+ # Graceful early exit with partial results
+ if progress_cb:
+ progress_cb("Discovery interrupted.")
+ # any other exception bubbles up to caller
+
detected.sort(key=lambda camera: camera.index)
return detected
@staticmethod
def create(settings: CameraSettings) -> CameraBackend:
"""Instantiate a backend for ``settings``."""
-
backend_name = (settings.backend or "opencv").lower()
try:
backend_cls = CameraFactory._resolve_backend(backend_name)
@@ -148,32 +183,17 @@ def create(settings: CameraSettings) -> CameraBackend:
@staticmethod
def check_camera_available(settings: CameraSettings) -> tuple[bool, str]:
- """Check if a camera is available without keeping it open.
-
- Parameters
- ----------
- settings : CameraSettings
- The camera settings to check.
-
- Returns
- -------
- tuple[bool, str]
- A tuple of (is_available, error_message).
- If available, error_message is empty.
- """
+ """Check if a camera is available without keeping it open."""
backend_name = (settings.backend or "opencv").lower()
- # Check if backend module is available
try:
backend_cls = CameraFactory._resolve_backend(backend_name)
except RuntimeError as exc:
return False, f"Backend '{backend_name}' not installed: {exc}"
- # Check if backend reports as available (drivers installed)
if not backend_cls.is_available():
return False, f"Backend '{backend_name}' is not available (missing drivers/packages)"
- # Try to actually open the camera briefly
try:
backend_instance = backend_cls(settings)
backend_instance.open()
@@ -183,7 +203,7 @@ def check_camera_available(settings: CameraSettings) -> tuple[bool, str]:
return False, f"Camera not accessible: {exc}"
@staticmethod
- def _resolve_backend(name: str) -> Type[CameraBackend]:
+ def _resolve_backend(name: str) -> type[CameraBackend]:
try:
module_name, class_name = _BACKENDS[name]
except KeyError as exc:
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 7110579..96784a6 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -1,66 +1,103 @@
-
-"""OpenCV based camera backend with MJPG enforcement for WSL2."""
+"""OpenCV-based camera backend (Windows-optimized, fast startup, robust read)."""
from __future__ import annotations
+
import logging
+import platform
import time
-from typing import Tuple
+
import cv2
import numpy as np
+
from .base import CameraBackend
LOG = logging.getLogger(__name__)
+
class OpenCVCameraBackend(CameraBackend):
- """Fallback backend using :mod:`cv2.VideoCapture` with MJPG optimization."""
+ """Backend using :mod:`cv2.VideoCapture` with Windows/MSMF preference and safe MJPG attempt.
+
+ Key features:
+ - Prefers MediaFoundation (MSMF) on Windows; falls back to DirectShow (DSHOW) or ANY.
+ - Attempts to enable MJPG **only** on Windows and **only** if the device accepts it.
+ - Minimizes expensive property negotiations (width/height/FPS) to what’s really needed.
+ - Robust `read()` that returns (None, ts) on transient failures instead of raising.
+ - Optional fast-start mode: set `properties["fast_start"]=True` to skip noncritical sets.
+ """
+
+ # Whitelisted camera properties we allow from settings.properties (numeric IDs only).
+ SAFE_PROP_IDS = {
+ # Exposure: note Windows backends differ in support (some expect relative values)
+ int(getattr(cv2, "CAP_PROP_EXPOSURE", 15)),
+ int(getattr(cv2, "CAP_PROP_AUTO_EXPOSURE", 21)),
+ # Gain (not always supported)
+ int(getattr(cv2, "CAP_PROP_GAIN", 14)),
+ # FPS (read-only on many webcams; we still attempt)
+ int(getattr(cv2, "CAP_PROP_FPS", 5)),
+ # Brightness / Contrast (optional, many cams support)
+ int(getattr(cv2, "CAP_PROP_BRIGHTNESS", 10)),
+ int(getattr(cv2, "CAP_PROP_CONTRAST", 11)),
+ int(getattr(cv2, "CAP_PROP_SATURATION", 12)),
+ int(getattr(cv2, "CAP_PROP_HUE", 13)),
+ # Disable RGB conversion (can reduce overhead if needed)
+ int(getattr(cv2, "CAP_PROP_CONVERT_RGB", 17)),
+ }
def __init__(self, settings):
super().__init__(settings)
self._capture: cv2.VideoCapture | None = None
- self._resolution: Tuple[int, int] = self._parse_resolution(
- settings.properties.get("resolution")
- )
+ self._resolution: tuple[int, int] = self._parse_resolution(settings.properties.get("resolution"))
+ # Optional fast-start: skip some property sets to reduce startup latency.
+ self._fast_start: bool = bool(self.settings.properties.get("fast_start", False))
+ # Cache last-known device state to avoid repeated queries
+ self._actual_width: int | None = None
+ self._actual_height: int | None = None
+ self._actual_fps: float | None = None
+ self._codec_str: str = ""
+
+ # ----------------------------
+ # Public API
+ # ----------------------------
def open(self) -> None:
- backend_flag = self._resolve_backend(self.settings.properties.get("api"))
- self._capture = cv2.VideoCapture(int(self.settings.index), backend_flag)
- if not self._capture.isOpened():
- raise RuntimeError(f"Unable to open camera index {self.settings.index} with OpenCV")
- self._configure_capture()
+ backend_flag = self._preferred_backend_flag(self.settings.properties.get("api"))
+ index = int(self.settings.index)
- def read(self) -> Tuple[np.ndarray, float]:
- if self._capture is None:
- raise RuntimeError("Camera has not been opened")
+ # Try preferred backend, then fallback chain
+ self._capture = self._try_open(index, backend_flag)
+ if not self._capture or not self._capture.isOpened():
+ raise RuntimeError(
+ f"Unable to open camera index {self.settings.index} with OpenCV (backend {backend_flag})"
+ )
- if not self._capture.grab():
- if not self._capture.isOpened():
- raise RuntimeError("OpenCV camera connection lost")
- raise TimeoutError("Failed to grab frame from OpenCV camera (temporary)")
+ self._configure_capture()
- success, frame = self._capture.retrieve()
- if not success or frame is None:
- raise TimeoutError("Failed to retrieve frame from OpenCV camera (temporary)")
+ def read(self) -> tuple[np.ndarray | None, float]:
+ """Robust frame read: return (None, ts) on transient failures; never raises."""
+ if self._capture is None:
+ # This should never happen in normal operation.
+ LOG.warning("OpenCVCameraBackend.read() called before open()")
+ return None, time.time()
- return frame, time.time()
+ # Some Windows webcams intermittently fail grab/retrieve.
+ # We *do not* raise, to avoid GUI restarts / loops.
+ try:
+ if not self._capture.grab():
+ return None, time.time()
+ success, frame = self._capture.retrieve()
+ if not success or frame is None or frame.size == 0:
+ return None, time.time()
+ return frame, time.time()
+ except Exception as exc:
+ # Log at debug to avoid warning spam
+ LOG.debug(f"OpenCV read transient error: {exc}")
+ return None, time.time()
def close(self) -> None:
- if self._capture:
- try:
- self._capture.release()
- except Exception:
- pass
- finally:
- self._capture = None
- time.sleep(0.1)
+ self._release_capture()
def stop(self) -> None:
- if self._capture:
- try:
- self._capture.release()
- except Exception:
- pass
- finally:
- self._capture = None
+ self._release_capture()
def device_name(self) -> str:
base_name = "OpenCV"
@@ -73,7 +110,22 @@ def device_name(self) -> str:
base_name = backend_name
return f"{base_name} camera #{self.settings.index}"
- def _parse_resolution(self, resolution) -> Tuple[int, int]:
+ # ----------------------------
+ # Internal helpers
+ # ----------------------------
+
+ def _release_capture(self) -> None:
+ if self._capture:
+ try:
+ self._capture.release()
+ except Exception:
+ pass
+ finally:
+ self._capture = None
+ # Small pause helps certain Windows drivers settle after release.
+ time.sleep(0.02 if platform.system() == "Windows" else 0.0)
+
+ def _parse_resolution(self, resolution) -> tuple[int, int]:
if resolution is None:
return (720, 540)
if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
@@ -84,63 +136,177 @@ def _parse_resolution(self, resolution) -> Tuple[int, int]:
return (720, 540)
return (720, 540)
+ def _preferred_backend_flag(self, backend: str | None) -> int:
+ """Resolve preferred backend, with Windows-aware defaults."""
+ if backend: # explicit request from settings
+ return self._resolve_backend(backend)
+
+ # Default preference by platform:
+ if platform.system() == "Windows":
+ # Prefer MSMF on modern Windows; fallback to DSHOW if needed.
+ return getattr(cv2, "CAP_MSMF", cv2.CAP_ANY)
+ else:
+ # Non-Windows: let OpenCV pick
+ return cv2.CAP_ANY
+
+ def _try_open(self, index: int, preferred_flag: int) -> cv2.VideoCapture | None:
+ """Try opening with preferred backend, then fall back."""
+ # 1) preferred
+ cap = cv2.VideoCapture(index, preferred_flag)
+ if cap.isOpened():
+ return cap
+
+ # 2) Windows fallback chain
+ if platform.system() == "Windows":
+ # If preferred was MSMF, try DSHOW, then ANY
+ dshow = getattr(cv2, "CAP_DSHOW", cv2.CAP_ANY)
+ if preferred_flag != dshow:
+ cap = cv2.VideoCapture(index, dshow)
+ if cap.isOpened():
+ return cap
+
+ # 3) Any
+ cap = cv2.VideoCapture(index, cv2.CAP_ANY)
+ if cap.isOpened():
+ return cap
+
+ return None
+
def _configure_capture(self) -> None:
if not self._capture:
return
- # Use MJPG if available
- if not self._capture.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*'MJPG')):
- LOG.warning("Failed to set MJPG format, falling back to default")
+ # --- Codec (FourCC) ---
+ self._codec_str = self._read_codec_string()
+ LOG.info(f"Camera using codec: {self._codec_str}")
- # Log actual codec
- fourcc = int(self._capture.get(cv2.CAP_PROP_FOURCC))
- codec = "".join([chr((fourcc >> 8 * i) & 0xFF) for i in range(4)])
- LOG.info(f"Camera using codec: {codec}")
+ # Attempt MJPG on Windows only, then re-read codec
+ if platform.system() == "Windows":
+ self._maybe_enable_mjpg()
+ self._codec_str = self._read_codec_string()
+ LOG.info(f"Camera codec after MJPG attempt: {self._codec_str}")
- # Set resolution
+ # --- Resolution ---
width, height = self._resolution
- if not self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width)):
- LOG.warning(f"Failed to set frame width to {width}")
- if not self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height)):
- LOG.warning(f"Failed to set frame height to {height}")
-
- actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH))
- actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT))
- if actual_width != width or actual_height != height:
- LOG.warning(f"Resolution mismatch: requested {width}x{height}, got {actual_width}x{actual_height}")
- try:
- self._resolution = (actual_width, actual_height)
- except Exception:
- LOG.warning("Failed to update internal resolution state")
+ if not self._fast_start:
+ self._set_resolution_if_needed(width, height)
+ else:
+ # Fast-start: Avoid early set; just read actual once for logging.
+ self._actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
+ self._actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
+
+ # If mismatch, update internal state for downstream consumers (avoid retries).
+ if self._actual_width and self._actual_height:
+ if (self._actual_width != width) or (self._actual_height != height):
+ LOG.warning(
+ f"Resolution mismatch: requested {width}x{height}, got {self._actual_width}x{self._actual_height}"
+ )
+ self._resolution = (self._actual_width, self._actual_height)
+
LOG.info(f"Camera configured with resolution: {self._resolution[0]}x{self._resolution[1]}")
- # Set FPS
- requested_fps = self.settings.fps
- if requested_fps:
- if not self._capture.set(cv2.CAP_PROP_FPS, float(requested_fps)):
- LOG.warning(f"Failed to set FPS to {requested_fps}")
+ # --- FPS ---
+ requested_fps = float(self.settings.fps or 0.0)
+ if not self._fast_start and requested_fps > 0.0:
+ # Only set if different and meaningful
+ current_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
+ if current_fps <= 0.0 or abs(current_fps - requested_fps) > 0.1:
+ if not self._capture.set(cv2.CAP_PROP_FPS, requested_fps):
+ LOG.debug(f"Device ignored FPS set to {requested_fps:.2f}")
+ # Re-read
+ self._actual_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
+ else:
+ # Fast-start: just read for logging
+ self._actual_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
- actual_fps = self._capture.get(cv2.CAP_PROP_FPS)
- if actual_fps:
- if requested_fps and abs(actual_fps - requested_fps) > 0.1:
- LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {actual_fps:.2f}")
- self.settings.fps = float(actual_fps)
- LOG.info(f"Camera configured with FPS: {actual_fps:.2f}")
+ if self._actual_fps and requested_fps:
+ if abs(self._actual_fps - requested_fps) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {self._actual_fps:.2f}")
+ if self._actual_fps:
+ self.settings.fps = float(self._actual_fps)
+ LOG.info(f"Camera configured with FPS: {self._actual_fps:.2f}")
- # Apply extra properties
+ # --- Extra properties (whitelisted only, numeric IDs only) ---
for prop, value in self.settings.properties.items():
- if prop in ("api", "resolution"):
+ if prop in ("api", "resolution", "fast_start"):
continue
try:
prop_id = int(prop)
- except (TypeError, ValueError) as e:
- LOG.warning(f"Could not parse property ID: {prop} ({e})")
+ except (TypeError, ValueError):
+ # Named properties are not supported here; keep numeric only
+ LOG.debug(f"Ignoring non-numeric property ID: {prop}")
continue
- if not self._capture.set(prop_id, float(value)):
- LOG.warning(f"Failed to set property {prop_id} to {value}")
+
+ if prop_id not in self.SAFE_PROP_IDS:
+ LOG.debug(f"Skipping unsupported/unsafe property {prop_id}")
+ continue
+
+ try:
+ if not self._capture.set(prop_id, float(value)):
+ LOG.debug(f"Device ignored property {prop_id} -> {value}")
+ except Exception as exc:
+ LOG.debug(f"Failed to set property {prop_id} -> {value}: {exc}")
+
+ # ----------------------------
+ # Lower-level helpers
+ # ----------------------------
+
+ def _read_codec_string(self) -> str:
+ """Get FourCC as text; returns empty if not available."""
+ try:
+ fourcc = int(self._capture.get(cv2.CAP_PROP_FOURCC) or 0)
+ except Exception:
+ fourcc = 0
+ if fourcc <= 0:
+ return ""
+ # FourCC in little-endian order
+ return "".join([chr((fourcc >> (8 * i)) & 0xFF) for i in range(4)])
+
+ def _maybe_enable_mjpg(self) -> None:
+ """Attempt to enable MJPG on Windows devices; verify and log."""
+ try:
+ fourcc_mjpg = cv2.VideoWriter_fourcc(*"MJPG")
+ if self._capture.set(cv2.CAP_PROP_FOURCC, fourcc_mjpg):
+ # Verify
+ verify = self._read_codec_string()
+ if verify and verify.upper().startswith("MJPG"):
+ LOG.info("MJPG enabled successfully.")
+ else:
+ LOG.debug(f"MJPG set reported success, but codec is '{verify}'")
+ else:
+ LOG.debug("Device rejected MJPG FourCC set.")
+ except Exception as exc:
+ LOG.debug(f"MJPG enable attempt raised: {exc}")
+
+ def _set_resolution_if_needed(self, width: int, height: int) -> None:
+ """Set width/height only if different to minimize renegotiation cost."""
+ # Read current
+ try:
+ cur_w = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
+ cur_h = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
+ except Exception:
+ cur_w, cur_h = 0, 0
+
+ # Only set if different
+ if (cur_w != width) or (cur_h != height):
+ # Set desired
+ set_w_ok = self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width))
+ set_h_ok = self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height))
+ if not set_w_ok:
+ LOG.debug(f"Failed to set frame width to {width}")
+ if not set_h_ok:
+ LOG.debug(f"Failed to set frame height to {height}")
+
+ # Re-read actual and cache
+ try:
+ self._actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
+ self._actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
+ except Exception:
+ self._actual_width, self._actual_height = 0, 0
def _resolve_backend(self, backend: str | None) -> int:
if backend is None:
return cv2.CAP_ANY
key = backend.upper()
+ # Common aliases: MSMF, DSHOW, ANY, V4L2 (non-Windows)
return getattr(cv2, f"CAP_{key}", cv2.CAP_ANY)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index c1684fe..b30ee20 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -5,11 +5,11 @@
import json
import logging
import os
+import signal
import sys
import time
from collections import deque
from pathlib import Path
-from typing import Optional
os.environ["PYLON_CAMEMU"] = "2"
@@ -22,7 +22,6 @@
QApplication,
QCheckBox,
QComboBox,
- QDoubleSpinBox,
QFileDialog,
QFormLayout,
QGroupBox,
@@ -58,13 +57,14 @@
from dlclivegui.processors.processor_utils import instantiate_from_scan, scan_processor_folder
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
-logging.basicConfig(level=logging.INFO)
+# logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
class MainWindow(QMainWindow):
"""Main application window."""
- def __init__(self, config: Optional[ApplicationSettings] = None):
+ def __init__(self, config: ApplicationSettings | None = None):
super().__init__()
self.setWindowTitle("DeepLabCut Live GUI")
@@ -87,11 +87,11 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._config_path = None
self._config = config
- self._current_frame: Optional[np.ndarray] = None
- self._raw_frame: Optional[np.ndarray] = None
- self._last_pose: Optional[PoseResult] = None
+ self._current_frame: np.ndarray | None = None
+ self._raw_frame: np.ndarray | None = None
+ self._last_pose: PoseResult | None = None
self._dlc_active: bool = False
- self._active_camera_settings: Optional[CameraSettings] = None
+ self._active_camera_settings: CameraSettings | None = None
self._camera_frame_times: deque[float] = deque(maxlen=240)
self._last_drop_warning = 0.0
self._last_recorder_summary = "Recorder idle"
@@ -101,12 +101,14 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
self._scanned_processors: dict = {}
self._processor_keys: list = []
self._last_processor_vid_recording = False
- self._auto_record_session_name: Optional[str] = None
+ self._auto_record_session_name: str | None = None
self._bbox_x0 = 0
self._bbox_y0 = 0
self._bbox_x1 = 0
self._bbox_y1 = 0
self._bbox_enabled = False
+ # UI elements
+ self._cam_dialog: CameraConfigDialog | None = None
# Visualization settings (will be updated from config)
self._p_cutoff = 0.6
@@ -146,9 +148,7 @@ def __init__(self, config: Optional[ApplicationSettings] = None):
# Show status message if myconfig.json was loaded
if self._config_path and self._config_path.name == "myconfig.json":
- self.statusBar().showMessage(
- f"Auto-loaded configuration from {self._config_path}", 5000
- )
+ self.statusBar().showMessage(f"Auto-loaded configuration from {self._config_path}", 5000)
# Validate cameras from loaded config (deferred to allow window to show first)
QTimer.singleShot(100, self._validate_configured_cameras)
@@ -229,9 +229,7 @@ def _setup_ui(self) -> None:
self.preview_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
self.preview_button.setMinimumWidth(150)
self.stop_preview_button = QPushButton("Stop Preview")
- self.stop_preview_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop)
- )
+ self.stop_preview_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
self.stop_preview_button.setEnabled(False)
self.stop_preview_button.setMinimumWidth(150)
button_bar.addWidget(self.preview_button)
@@ -274,9 +272,7 @@ def _build_camera_group(self) -> QGroupBox:
# Camera config button - opens dialog for all camera configuration
config_layout = QHBoxLayout()
self.config_cameras_button = QPushButton("Configure Cameras...")
- self.config_cameras_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_ComputerIcon)
- )
+ self.config_cameras_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ComputerIcon))
self.config_cameras_button.setToolTip("Configure camera settings (single or multi-camera)")
config_layout.addWidget(self.config_cameras_button)
form.addRow(config_layout)
@@ -297,9 +293,7 @@ def _build_dlc_group(self) -> QGroupBox:
self.model_path_edit.setPlaceholderText("/path/to/exported/model")
path_layout.addWidget(self.model_path_edit)
self.browse_model_button = QPushButton("Browse…")
- self.browse_model_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon)
- )
+ self.browse_model_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon))
self.browse_model_button.clicked.connect(self._action_browse_model)
path_layout.addWidget(self.browse_model_button)
form.addRow("Model file", path_layout)
@@ -311,16 +305,12 @@ def _build_dlc_group(self) -> QGroupBox:
processor_path_layout.addWidget(self.processor_folder_edit)
self.browse_processor_folder_button = QPushButton("Browse...")
- self.browse_processor_folder_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon)
- )
+ self.browse_processor_folder_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DirOpenIcon))
self.browse_processor_folder_button.clicked.connect(self._action_browse_processor_folder)
processor_path_layout.addWidget(self.browse_processor_folder_button)
self.refresh_processors_button = QPushButton("Refresh")
- self.refresh_processors_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserReload)
- )
+ self.refresh_processors_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserReload))
self.refresh_processors_button.clicked.connect(self._refresh_processors)
processor_path_layout.addWidget(self.refresh_processors_button)
form.addRow("Processor folder", processor_path_layout)
@@ -339,16 +329,12 @@ def _build_dlc_group(self) -> QGroupBox:
inference_buttons = QHBoxLayout(inference_button_widget)
inference_buttons.setContentsMargins(0, 0, 0, 0)
self.start_inference_button = QPushButton("Start pose inference")
- self.start_inference_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowRight)
- )
+ self.start_inference_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_ArrowRight))
self.start_inference_button.setEnabled(False)
self.start_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.start_inference_button)
self.stop_inference_button = QPushButton("Stop pose inference")
- self.stop_inference_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserStop)
- )
+ self.stop_inference_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_BrowserStop))
self.stop_inference_button.setEnabled(False)
self.stop_inference_button.setMinimumWidth(150)
inference_buttons.addWidget(self.stop_inference_button)
@@ -410,15 +396,11 @@ def _build_recording_group(self) -> QGroupBox:
buttons = QHBoxLayout(recording_button_widget)
buttons.setContentsMargins(0, 0, 0, 0)
self.start_record_button = QPushButton("Start recording")
- self.start_record_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DialogYesButton)
- )
+ self.start_record_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogYesButton))
self.start_record_button.setMinimumWidth(150)
buttons.addWidget(self.start_record_button)
self.stop_record_button = QPushButton("Stop recording")
- self.stop_record_button.setIcon(
- self.style().standardIcon(QStyle.StandardPixmap.SP_DialogNoButton)
- )
+ self.stop_record_button.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_DialogNoButton))
self.stop_record_button.setEnabled(False)
self.stop_record_button.setMinimumWidth(150)
buttons.addWidget(self.stop_record_button)
@@ -490,9 +472,7 @@ def _connect_signals(self) -> None:
self.multi_camera_controller.all_started.connect(self._on_multi_camera_started)
self.multi_camera_controller.all_stopped.connect(self._on_multi_camera_stopped)
self.multi_camera_controller.camera_error.connect(self._on_multi_camera_error)
- self.multi_camera_controller.initialization_failed.connect(
- self._on_multi_camera_initialization_failed
- )
+ self.multi_camera_controller.initialization_failed.connect(self._on_multi_camera_initialization_failed)
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
self.dlc_processor.error.connect(self._on_dlc_error)
@@ -594,9 +574,7 @@ def _visualization_settings_from_ui(self) -> VisualizationSettings:
# ------------------------------------------------------------------ actions
def _action_load_config(self) -> None:
- file_name, _ = QFileDialog.getOpenFileName(
- self, "Load configuration", str(Path.home()), "JSON files (*.json)"
- )
+ file_name, _ = QFileDialog.getOpenFileName(self, "Load configuration", str(Path.home()), "JSON files (*.json)")
if not file_name:
return
try:
@@ -618,9 +596,7 @@ def _action_save_config(self) -> None:
self._save_config_to_path(self._config_path)
def _action_save_config_as(self) -> None:
- file_name, _ = QFileDialog.getSaveFileName(
- self, "Save configuration", str(Path.home()), "JSON files (*.json)"
- )
+ file_name, _ = QFileDialog.getSaveFileName(self, "Save configuration", str(Path.home()), "JSON files (*.json)")
if not file_name:
return
path = Path(file_name)
@@ -651,9 +627,7 @@ def _action_browse_model(self) -> None:
self.model_path_edit.setText(file_path)
def _action_browse_directory(self) -> None:
- directory = QFileDialog.getExistingDirectory(
- self, "Select output directory", str(Path.home())
- )
+ directory = QFileDialog.getExistingDirectory(self, "Select output directory", str(Path.home()))
if directory:
self.output_directory_edit.setText(directory)
@@ -696,19 +670,28 @@ def _refresh_processors(self) -> None:
# ------------------------------------------------------------------ multi-camera
def _open_camera_config_dialog(self) -> None:
- """Open the camera configuration dialog."""
- dialog = CameraConfigDialog(self, self._config.multi_camera)
- dialog.settings_changed.connect(self._on_multi_camera_settings_changed)
- dialog.exec()
+ """Open the camera configuration dialog (non-modal, async inside)."""
+ if self.multi_camera_controller.is_running():
+ self._show_warning("Stop the main preview before configuring cameras.")
+ return
+
+ if self._cam_dialog is None:
+ self._cam_dialog = CameraConfigDialog(self, self._config.multi_camera)
+ self._cam_dialog.settings_changed.connect(self._on_multi_camera_settings_changed)
+ else:
+ # Refresh its UI from current settings when reopened
+ self._cam_dialog._populate_from_settings()
+
+ self._cam_dialog.show()
+ self._cam_dialog.raise_()
+ self._cam_dialog.activateWindow()
def _on_multi_camera_settings_changed(self, settings: MultiCameraSettings) -> None:
"""Handle changes to multi-camera settings."""
self._config.multi_camera = settings
self._update_active_cameras_label()
active_count = len(settings.get_active_cameras())
- self.statusBar().showMessage(
- f"Camera configuration updated: {active_count} active camera(s)", 3000
- )
+ self.statusBar().showMessage(f"Camera configuration updated: {active_count} active camera(s)", 3000)
def _update_active_cameras_label(self) -> None:
"""Update the label showing active cameras."""
@@ -717,9 +700,7 @@ def _update_active_cameras_label(self) -> None:
self.active_cameras_label.setText("No cameras configured")
elif len(active_cams) == 1:
cam = active_cams[0]
- self.active_cameras_label.setText(
- f"{cam.name} [{cam.backend}:{cam.index}] @ {cam.fps:.1f} fps"
- )
+ self.active_cameras_label.setText(f"{cam.name} [{cam.backend}:{cam.index}] @ {cam.fps:.1f} fps")
else:
cam_names = [f"{c.name}" for c in active_cams]
self.active_cameras_label.setText(f"{len(active_cams)} cameras: {', '.join(cam_names)}")
@@ -802,9 +783,7 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
# PRIORITY 3: Mark display dirty (tiling done in display timer)
self._display_dirty = True
- def _update_dlc_tile_info(
- self, dlc_cam_id: str, original_frame: np.ndarray, frames: dict[str, np.ndarray]
- ) -> None:
+ def _update_dlc_tile_info(self, dlc_cam_id: str, original_frame: np.ndarray, frames: dict[str, np.ndarray]) -> None:
"""Calculate tile offset and scale for drawing DLC poses on tiled frame."""
num_cameras = len(frames)
if num_cameras == 0:
@@ -867,9 +846,7 @@ def _on_multi_camera_started(self) -> None:
self.preview_button.setEnabled(False)
self.stop_preview_button.setEnabled(True)
active_count = self.multi_camera_controller.get_active_count()
- self.statusBar().showMessage(
- f"Multi-camera preview started: {active_count} camera(s)", 5000
- )
+ self.statusBar().showMessage(f"Multi-camera preview started: {active_count} camera(s)", 5000)
self._update_inference_buttons()
self._update_camera_controls_enabled()
@@ -1001,6 +978,8 @@ def _start_preview(self) -> None:
# Store active settings for single camera mode (for DLC, recording frame rate, etc.)
self._active_camera_settings = active_cams[0] if active_cams else None
+ for cam in active_cams:
+ cam.properties.setdefault("fast_start", True)
self.multi_camera_controller.start(active_cams)
self._update_inference_buttons()
@@ -1267,9 +1246,7 @@ def _update_metrics(self) -> None:
fps = self._compute_fps(self._camera_frame_times)
if fps > 0:
if active_count > 1:
- self.camera_stats_label.setText(
- f"{active_count} cameras | {fps:.1f} fps (last 5 s)"
- )
+ self.camera_stats_label.setText(f"{active_count} cameras | {fps:.1f} fps (last 5 s)")
else:
self.camera_stats_label.setText(f"{fps:.1f} fps (last 5 s)")
else:
@@ -1322,7 +1299,7 @@ def _update_metrics(self) -> None:
avg_latency = sum(avg_latencies) / len(avg_latencies) if avg_latencies else 0.0
summary = (
f"{num_recorders} cams | {total_written} frames | "
- f"latency {max_latency*1000:.1f}ms (avg {avg_latency*1000:.1f}ms) | "
+ f"latency {max_latency * 1000:.1f}ms (avg {avg_latency * 1000:.1f}ms) | "
f"queue {total_queue} | dropped {total_dropped}"
)
self._last_recorder_summary = summary
@@ -1371,13 +1348,11 @@ def _update_processor_status(self) -> None:
self._auto_record_session_name = session_name
# Update filename with session name
- original_filename = self.filename_edit.text()
+ self.filename_edit.text()
self.filename_edit.setText(f"{session_name}.mp4")
self._start_recording()
- self.statusBar().showMessage(
- f"Auto-started recording: {session_name}", 3000
- )
+ self.statusBar().showMessage(f"Auto-started recording: {session_name}", 3000)
logging.info(f"Auto-recording started for session: {session_name}")
else:
# Stop video recording
@@ -1468,11 +1443,7 @@ def _on_dlc_error(self, message: str) -> None:
def _update_video_display(self, frame: np.ndarray) -> None:
display_frame = frame
- if (
- self.show_predictions_checkbox.isChecked()
- and self._last_pose
- and self._last_pose.pose is not None
- ):
+ if self.show_predictions_checkbox.isChecked() and self._last_pose and self._last_pose.pose is not None:
display_frame = self._draw_pose(frame, self._last_pose.pose)
# Draw bounding box if enabled
@@ -1684,11 +1655,21 @@ def _show_info(self, message: str) -> None:
def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI behaviour
if self.multi_camera_controller.is_running():
self.multi_camera_controller.stop(wait=True)
+
# Stop all multi-camera recorders
for recorder in self._multi_camera_recorders.values():
if recorder.is_running:
recorder.stop()
self._multi_camera_recorders.clear()
+
+ # Close the camera dialog if open (ensures its worker thread is canceled)
+ if getattr(self, "_cam_dialog", None) is not None and self._cam_dialog.isVisible():
+ try:
+ self._cam_dialog.close()
+ except Exception:
+ pass
+ self._cam_dialog = None
+
self.dlc_processor.shutdown()
if hasattr(self, "_metrics_timer"):
self._metrics_timer.stop()
@@ -1696,6 +1677,8 @@ def closeEvent(self, event: QCloseEvent) -> None: # pragma: no cover - GUI beha
def main() -> None:
+ signal.signal(signal.SIGINT, signal.SIG_DFL) # Allow Ctrl+C to terminate the app
+
app = QApplication(sys.argv)
window = MainWindow()
window.show()
From 988eb6d3578e634a40bd5d2898dedc7e6e4f9860 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 11:57:52 +0100
Subject: [PATCH 044/132] Refactor camera loader initialization and cleanup
comments
Cleaned up comments and removed 'NEW' markers in camera_config_dialog.py. Adjusted the order of UI preparation and loader creation in the camera preview logic, and commented out redundant loader cancellation code.
---
dlclivegui/camera_config_dialog.py | 33 +++++++++++++++---------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 0c85abf..9771a43 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -24,7 +24,7 @@
QPushButton,
QSpinBox,
QStyle,
- QTextEdit, # NEW: lightweight status console in the preview panel
+ QTextEdit,
QVBoxLayout,
QWidget,
)
@@ -395,7 +395,7 @@ def _setup_ui(self) -> None:
preview_layout.addWidget(self.preview_label)
self.preview_label.installEventFilter(self) # For resize events
- # NEW: small, read-only status console for loader messages
+ # Small, read-only status console for loader messages
self.preview_status = QTextEdit()
self.preview_status.setReadOnly(True)
self.preview_status.setFixedHeight(45)
@@ -407,13 +407,12 @@ def _setup_ui(self) -> None:
self.preview_status.setFont(font)
preview_layout.addWidget(self.preview_status)
- # NEW: overlay label for loading glass pane
+ # Overlay label for loading glass pane
self._loading_overlay = QLabel(self.preview_group)
self._loading_overlay.setVisible(False)
self._loading_overlay.setAlignment(Qt.AlignCenter)
self._loading_overlay.setStyleSheet("background-color: rgba(0,0,0,140); color: white; border: 1px solid #333;")
self._loading_overlay.setText("Loading camera…")
- # We size/position it on show & on resize
self.preview_group.setVisible(False)
right_layout.addWidget(self.preview_group)
@@ -439,7 +438,7 @@ def _setup_ui(self) -> None:
main_layout.addLayout(button_layout)
# Maintain overlay geometry when resizing
- def resizeEvent(self, event): # NEW
+ def resizeEvent(self, event):
super().resizeEvent(event)
if self._loading_overlay and self._loading_overlay.isVisible():
self._position_loading_overlay()
@@ -469,7 +468,7 @@ def _show_scan_overlay(self, message: str = "Discovering cameras…") -> None:
def _hide_scan_overlay(self) -> None:
self._scan_overlay.setVisible(False)
- def _position_loading_overlay(self): # NEW
+ def _position_loading_overlay(self):
# Cover just the preview image area (label), not the whole group
if not self.preview_label:
return
@@ -819,17 +818,9 @@ def _start_preview(self) -> None:
# Ensure any existing preview or loader is stopped/canceled
self._stop_preview()
- if self._loader and self._loader.isRunning():
- self._loader.request_cancel()
-
- # Prepare UI
- self.preview_group.setVisible(True)
- self.preview_label.setText("No preview")
- self.preview_status.clear()
- self._show_loading_overlay("Loading camera…")
- self._set_preview_button_loading(True)
-
- # Create singleton worker
+ # if self._loader and self._loader.isRunning():
+ # self._loader.request_cancel()
+ # Create worker
self._loader = CameraLoadWorker(cam, self)
self._loader.progress.connect(self._on_loader_progress)
self._loader.success.connect(self._on_loader_success)
@@ -838,6 +829,14 @@ def _start_preview(self) -> None:
self._loader.finished.connect(self._on_loader_finished)
self._loading_active = True
self._update_button_states()
+
+ # Prepare UI
+ self.preview_group.setVisible(True)
+ self.preview_label.setText("No preview")
+ self.preview_status.clear()
+ self._show_loading_overlay("Loading camera…")
+ self._set_preview_button_loading(True)
+
self._loader.start()
def _stop_preview(self) -> None:
From 4fe8abc12a1d3cf85b7ad65954a171e6a2dcb95a Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 11:58:13 +0100
Subject: [PATCH 045/132] Enhance OpenCV camera backend for cross-platform
support
Refactored the OpenCVCameraBackend to improve platform-specific handling for Windows, macOS, and Linux. Added resolution normalization, alternate index probing, and robust fallback logic for device opening and configuration. Improved MJPG enabling, property whitelisting, and added a quick_ping discovery helper. Enhanced logging and made the backend more robust to device quirks and transient errors.
---
dlclivegui/cameras/opencv_backend.py | 213 +++++++++++++++++----------
1 file changed, 136 insertions(+), 77 deletions(-)
diff --git a/dlclivegui/cameras/opencv_backend.py b/dlclivegui/cameras/opencv_backend.py
index 96784a6..ffbc0d0 100644
--- a/dlclivegui/cameras/opencv_backend.py
+++ b/dlclivegui/cameras/opencv_backend.py
@@ -1,8 +1,9 @@
-"""OpenCV-based camera backend (Windows-optimized, fast startup, robust read)."""
+"""OpenCV-based camera backend (platform-optimized, fast startup, robust read)."""
from __future__ import annotations
import logging
+import os
import platform
import time
@@ -15,45 +16,48 @@
class OpenCVCameraBackend(CameraBackend):
- """Backend using :mod:`cv2.VideoCapture` with Windows/MSMF preference and safe MJPG attempt.
-
- Key features:
- - Prefers MediaFoundation (MSMF) on Windows; falls back to DirectShow (DSHOW) or ANY.
- - Attempts to enable MJPG **only** on Windows and **only** if the device accepts it.
- - Minimizes expensive property negotiations (width/height/FPS) to what’s really needed.
- - Robust `read()` that returns (None, ts) on transient failures instead of raising.
- - Optional fast-start mode: set `properties["fast_start"]=True` to skip noncritical sets.
+ """
+ Platform-aware OpenCV backend:
+
+ - Windows: prefer DSHOW, fall back to MSMF/ANY.
+ Order: FOURCC -> resolution -> FPS. Try standard UVC modes if request fails.
+ Optional alt-index probe (index+1) for Logitech-like endpoints: properties["alt_index_probe"]=True
+ Optional fast-start: properties["fast_start"]=True
+
+ - macOS: prefer AVFOUNDATION, fall back to ANY.
+
+ - Linux: prefer V4L2, fall back to GStreamer (if explicitly requested) or ANY.
+ Discovery can use /dev/video* to avoid blind opens (via quick_ping()).
+
+ Robust read(): returns (None, ts) on transient failures (never raises).
"""
- # Whitelisted camera properties we allow from settings.properties (numeric IDs only).
SAFE_PROP_IDS = {
- # Exposure: note Windows backends differ in support (some expect relative values)
int(getattr(cv2, "CAP_PROP_EXPOSURE", 15)),
int(getattr(cv2, "CAP_PROP_AUTO_EXPOSURE", 21)),
- # Gain (not always supported)
int(getattr(cv2, "CAP_PROP_GAIN", 14)),
- # FPS (read-only on many webcams; we still attempt)
int(getattr(cv2, "CAP_PROP_FPS", 5)),
- # Brightness / Contrast (optional, many cams support)
int(getattr(cv2, "CAP_PROP_BRIGHTNESS", 10)),
int(getattr(cv2, "CAP_PROP_CONTRAST", 11)),
int(getattr(cv2, "CAP_PROP_SATURATION", 12)),
int(getattr(cv2, "CAP_PROP_HUE", 13)),
- # Disable RGB conversion (can reduce overhead if needed)
int(getattr(cv2, "CAP_PROP_CONVERT_RGB", 17)),
}
+ # Standard UVC modes that commonly succeed fast on Windows/Logitech
+ UVC_FALLBACK_MODES = [(1280, 720), (1920, 1080), (640, 480)]
+
def __init__(self, settings):
super().__init__(settings)
self._capture: cv2.VideoCapture | None = None
self._resolution: tuple[int, int] = self._parse_resolution(settings.properties.get("resolution"))
- # Optional fast-start: skip some property sets to reduce startup latency.
self._fast_start: bool = bool(self.settings.properties.get("fast_start", False))
- # Cache last-known device state to avoid repeated queries
+ self._alt_index_probe: bool = bool(self.settings.properties.get("alt_index_probe", False))
self._actual_width: int | None = None
self._actual_height: int | None = None
self._actual_fps: float | None = None
self._codec_str: str = ""
+ self._mjpg_attempted: bool = False
# ----------------------------
# Public API
@@ -63,24 +67,38 @@ def open(self) -> None:
backend_flag = self._preferred_backend_flag(self.settings.properties.get("api"))
index = int(self.settings.index)
- # Try preferred backend, then fallback chain
+ # 1) Preferred backend
self._capture = self._try_open(index, backend_flag)
+
+ # 2) Optional Logitech endpoint trick (Windows only)
+ if (
+ (not self._capture or not self._capture.isOpened())
+ and platform.system() == "Windows"
+ and self._alt_index_probe
+ ):
+ LOG.debug("Primary index failed; trying alternate endpoint (index+1) with same backend.")
+ self._capture = self._try_open(index + 1, backend_flag)
+
if not self._capture or not self._capture.isOpened():
raise RuntimeError(
f"Unable to open camera index {self.settings.index} with OpenCV (backend {backend_flag})"
)
+ # MSMF hint for slow systems
+ if platform.system() == "Windows" and backend_flag == getattr(cv2, "CAP_MSMF", cv2.CAP_ANY):
+ if os.environ.get("OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS") is None:
+ LOG.debug(
+ "MSMF selected. If open is slow, consider setting "
+ "OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS=0 before importing cv2."
+ )
+
self._configure_capture()
def read(self) -> tuple[np.ndarray | None, float]:
"""Robust frame read: return (None, ts) on transient failures; never raises."""
if self._capture is None:
- # This should never happen in normal operation.
LOG.warning("OpenCVCameraBackend.read() called before open()")
return None, time.time()
-
- # Some Windows webcams intermittently fail grab/retrieve.
- # We *do not* raise, to avoid GUI restarts / loops.
try:
if not self._capture.grab():
return None, time.time()
@@ -89,7 +107,6 @@ def read(self) -> tuple[np.ndarray | None, float]:
return None, time.time()
return frame, time.time()
except Exception as exc:
- # Log at debug to avoid warning spam
LOG.debug(f"OpenCV read transient error: {exc}")
return None, time.time()
@@ -122,12 +139,11 @@ def _release_capture(self) -> None:
pass
finally:
self._capture = None
- # Small pause helps certain Windows drivers settle after release.
time.sleep(0.02 if platform.system() == "Windows" else 0.0)
def _parse_resolution(self, resolution) -> tuple[int, int]:
if resolution is None:
- return (720, 540)
+ return (720, 540) # normalized later where needed
if isinstance(resolution, (list, tuple)) and len(resolution) == 2:
try:
return (int(resolution[0]), int(resolution[1]))
@@ -136,111 +152,131 @@ def _parse_resolution(self, resolution) -> tuple[int, int]:
return (720, 540)
return (720, 540)
+ def _normalize_resolution(self, width: int, height: int) -> tuple[int, int]:
+ """On Windows, map non-standard requests to UVC-friendly modes for fast acceptance."""
+ if platform.system() == "Windows":
+ if (width, height) in self.UVC_FALLBACK_MODES:
+ return (width, height)
+ LOG.debug(f"Normalizing unsupported resolution {width}x{height} to 1280x720 on Windows.")
+ return self.UVC_FALLBACK_MODES[0]
+ return (width, height)
+
def _preferred_backend_flag(self, backend: str | None) -> int:
- """Resolve preferred backend, with Windows-aware defaults."""
- if backend: # explicit request from settings
+ """Resolve preferred backend by platform."""
+ if backend: # user override
return self._resolve_backend(backend)
- # Default preference by platform:
- if platform.system() == "Windows":
- # Prefer MSMF on modern Windows; fallback to DSHOW if needed.
- return getattr(cv2, "CAP_MSMF", cv2.CAP_ANY)
- else:
- # Non-Windows: let OpenCV pick
- return cv2.CAP_ANY
+ sys = platform.system()
+ if sys == "Windows":
+ # Prefer DSHOW (faster on many Logitech cams), then MSMF, then ANY.
+ return getattr(cv2, "CAP_DSHOW", cv2.CAP_ANY)
+ if sys == "Darwin":
+ return getattr(cv2, "CAP_AVFOUNDATION", cv2.CAP_ANY)
+ # Linux and others
+ return getattr(cv2, "CAP_V4L2", cv2.CAP_ANY)
def _try_open(self, index: int, preferred_flag: int) -> cv2.VideoCapture | None:
- """Try opening with preferred backend, then fall back."""
+ """Try opening with preferred backend, then platform-appropriate fallbacks."""
# 1) preferred
cap = cv2.VideoCapture(index, preferred_flag)
if cap.isOpened():
return cap
- # 2) Windows fallback chain
- if platform.system() == "Windows":
- # If preferred was MSMF, try DSHOW, then ANY
- dshow = getattr(cv2, "CAP_DSHOW", cv2.CAP_ANY)
- if preferred_flag != dshow:
- cap = cv2.VideoCapture(index, dshow)
+ sys = platform.system()
+
+ # Windows: try MSMF then ANY
+ if sys == "Windows":
+ ms = getattr(cv2, "CAP_MSMF", cv2.CAP_ANY)
+ if preferred_flag != ms:
+ cap = cv2.VideoCapture(index, ms)
if cap.isOpened():
return cap
- # 3) Any
+ # macOS: ANY fallback
+ if sys == "Darwin":
+ cap = cv2.VideoCapture(index, cv2.CAP_ANY)
+ if cap.isOpened():
+ return cap
+
+ # Linux: try ANY as final fallback
cap = cv2.VideoCapture(index, cv2.CAP_ANY)
if cap.isOpened():
return cap
-
return None
def _configure_capture(self) -> None:
if not self._capture:
return
- # --- Codec (FourCC) ---
+ # --- FOURCC (Windows benefits from setting this first) ---
self._codec_str = self._read_codec_string()
LOG.info(f"Camera using codec: {self._codec_str}")
- # Attempt MJPG on Windows only, then re-read codec
- if platform.system() == "Windows":
+ if platform.system() == "Windows" and not self._mjpg_attempted:
self._maybe_enable_mjpg()
+ self._mjpg_attempted = True
self._codec_str = self._read_codec_string()
LOG.info(f"Camera codec after MJPG attempt: {self._codec_str}")
- # --- Resolution ---
- width, height = self._resolution
+ # --- Resolution (normalize non-standard on Windows) ---
+ req_w, req_h = self._resolution
+ req_w, req_h = self._normalize_resolution(req_w, req_h)
+
if not self._fast_start:
- self._set_resolution_if_needed(width, height)
+ self._set_resolution_if_needed(req_w, req_h)
else:
- # Fast-start: Avoid early set; just read actual once for logging.
self._actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
self._actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
- # If mismatch, update internal state for downstream consumers (avoid retries).
- if self._actual_width and self._actual_height:
- if (self._actual_width != width) or (self._actual_height != height):
+ # Handle mismatch quickly with a few known-good UVC fallbacks (Windows only)
+ if platform.system() == "Windows" and self._actual_width and self._actual_height:
+ if (self._actual_width, self._actual_height) != (req_w, req_h) and not self._fast_start:
LOG.warning(
- f"Resolution mismatch: requested {width}x{height}, got {self._actual_width}x{self._actual_height}"
+ f"Resolution mismatch: requested {req_w}x{req_h}, got {self._actual_width}x{self._actual_height}"
)
- self._resolution = (self._actual_width, self._actual_height)
+ for fw, fh in self.UVC_FALLBACK_MODES:
+ if (fw, fh) == (self._actual_width, self._actual_height):
+ break # already at a fallback
+ if self._set_resolution_if_needed(fw, fh, reconfigure_only=True):
+ LOG.info(f"Switched to supported resolution {fw}x{fh}")
+ self._actual_width, self._actual_height = fw, fh
+ break
+ self._resolution = (self._actual_width or req_w, self._actual_height or req_h)
+ else:
+ # Non-Windows: accept actual as-is
+ self._resolution = (self._actual_width or req_w, self._actual_height or req_h)
LOG.info(f"Camera configured with resolution: {self._resolution[0]}x{self._resolution[1]}")
# --- FPS ---
requested_fps = float(self.settings.fps or 0.0)
if not self._fast_start and requested_fps > 0.0:
- # Only set if different and meaningful
current_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
if current_fps <= 0.0 or abs(current_fps - requested_fps) > 0.1:
if not self._capture.set(cv2.CAP_PROP_FPS, requested_fps):
LOG.debug(f"Device ignored FPS set to {requested_fps:.2f}")
- # Re-read
self._actual_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
else:
- # Fast-start: just read for logging
self._actual_fps = float(self._capture.get(cv2.CAP_PROP_FPS) or 0.0)
- if self._actual_fps and requested_fps:
- if abs(self._actual_fps - requested_fps) > 0.1:
- LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {self._actual_fps:.2f}")
+ if self._actual_fps and requested_fps and abs(self._actual_fps - requested_fps) > 0.1:
+ LOG.warning(f"FPS mismatch: requested {requested_fps:.2f}, got {self._actual_fps:.2f}")
if self._actual_fps:
self.settings.fps = float(self._actual_fps)
LOG.info(f"Camera configured with FPS: {self._actual_fps:.2f}")
- # --- Extra properties (whitelisted only, numeric IDs only) ---
+ # --- Extra properties (safe whitelist) ---
for prop, value in self.settings.properties.items():
- if prop in ("api", "resolution", "fast_start"):
+ if prop in ("api", "resolution", "fast_start", "alt_index_probe"):
continue
try:
prop_id = int(prop)
except (TypeError, ValueError):
- # Named properties are not supported here; keep numeric only
LOG.debug(f"Ignoring non-numeric property ID: {prop}")
continue
-
if prop_id not in self.SAFE_PROP_IDS:
LOG.debug(f"Skipping unsupported/unsafe property {prop_id}")
continue
-
try:
if not self._capture.set(prop_id, float(value)):
LOG.debug(f"Device ignored property {prop_id} -> {value}")
@@ -252,22 +288,21 @@ def _configure_capture(self) -> None:
# ----------------------------
def _read_codec_string(self) -> str:
- """Get FourCC as text; returns empty if not available."""
try:
fourcc = int(self._capture.get(cv2.CAP_PROP_FOURCC) or 0)
except Exception:
fourcc = 0
if fourcc <= 0:
return ""
- # FourCC in little-endian order
return "".join([chr((fourcc >> (8 * i)) & 0xFF) for i in range(4)])
def _maybe_enable_mjpg(self) -> None:
- """Attempt to enable MJPG on Windows devices; verify and log."""
+ """Attempt to enable MJPG on Windows devices; verify once."""
+ if platform.system() != "Windows":
+ return
try:
fourcc_mjpg = cv2.VideoWriter_fourcc(*"MJPG")
if self._capture.set(cv2.CAP_PROP_FOURCC, fourcc_mjpg):
- # Verify
verify = self._read_codec_string()
if verify and verify.upper().startswith("MJPG"):
LOG.info("MJPG enabled successfully.")
@@ -278,18 +313,17 @@ def _maybe_enable_mjpg(self) -> None:
except Exception as exc:
LOG.debug(f"MJPG enable attempt raised: {exc}")
- def _set_resolution_if_needed(self, width: int, height: int) -> None:
- """Set width/height only if different to minimize renegotiation cost."""
- # Read current
+ def _set_resolution_if_needed(self, width: int, height: int, reconfigure_only: bool = False) -> bool:
+ """Set width/height only if different.
+ Returns True if the device ends up at the requested size.
+ """
try:
cur_w = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
cur_h = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
except Exception:
cur_w, cur_h = 0, 0
- # Only set if different
if (cur_w != width) or (cur_h != height):
- # Set desired
set_w_ok = self._capture.set(cv2.CAP_PROP_FRAME_WIDTH, float(width))
set_h_ok = self._capture.set(cv2.CAP_PROP_FRAME_HEIGHT, float(height))
if not set_w_ok:
@@ -297,16 +331,41 @@ def _set_resolution_if_needed(self, width: int, height: int) -> None:
if not set_h_ok:
LOG.debug(f"Failed to set frame height to {height}")
- # Re-read actual and cache
try:
self._actual_width = int(self._capture.get(cv2.CAP_PROP_FRAME_WIDTH) or 0)
self._actual_height = int(self._capture.get(cv2.CAP_PROP_FRAME_HEIGHT) or 0)
except Exception:
self._actual_width, self._actual_height = 0, 0
+ return (self._actual_width, self._actual_height) == (width, height)
+
def _resolve_backend(self, backend: str | None) -> int:
if backend is None:
return cv2.CAP_ANY
key = backend.upper()
- # Common aliases: MSMF, DSHOW, ANY, V4L2 (non-Windows)
return getattr(cv2, f"CAP_{key}", cv2.CAP_ANY)
+
+ # ----------------------------
+ # Discovery helper (optional use by factory)
+ # ----------------------------
+ @staticmethod
+ def quick_ping(index: int, backend_flag: int | None = None) -> bool:
+ """Cheap 'is-present' check to avoid expensive blind opens during discovery."""
+ sys = platform.system()
+ if sys == "Linux":
+ # /dev/videoN present? That's a cheap, reliable hint.
+ return os.path.exists(f"/dev/video{index}")
+ if backend_flag is None:
+ if sys == "Windows":
+ backend_flag = getattr(cv2, "CAP_DSHOW", cv2.CAP_ANY)
+ elif sys == "Darwin":
+ backend_flag = getattr(cv2, "CAP_AVFOUNDATION", cv2.CAP_ANY)
+ else:
+ backend_flag = getattr(cv2, "CAP_V4L2", cv2.CAP_ANY)
+ cap = cv2.VideoCapture(index, backend_flag)
+ ok = cap.isOpened()
+ try:
+ cap.release()
+ except Exception:
+ pass
+ return ok
From 8d02ac68765fd66e5d5e27d25b8e226bc5f604a4 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 12:05:11 +0100
Subject: [PATCH 046/132] Refactor camera loading and fix preview
initialization logic
Updated CameraLoadWorker to emit the camera object directly and moved backend creation to the main thread for Windows compatibility. Improved _on_loader_success to handle both CameraBackend and CameraSettings payloads, ensuring proper preview initialization and error handling. Also fixed overlay geometry handling and reset preview state on stop.
---
dlclivegui/camera_config_dialog.py | 59 ++++++++++++++++++++----------
1 file changed, 40 insertions(+), 19 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 9771a43..43e4efc 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -109,9 +109,11 @@ def run(self):
return
LOGGER.debug("Creating camera backend for %s:%d", self._cam.backend, self._cam.index)
- self._backend = CameraFactory.create(self._cam)
-
+ # self._backend = CameraFactory.create(self._cam)
self.progress.emit("Opening device…")
+ self.success.emit(self._cam)
+ return
+
if self._check_cancel():
self.canceled.emit()
return
@@ -440,8 +442,6 @@ def _setup_ui(self) -> None:
# Maintain overlay geometry when resizing
def resizeEvent(self, event):
super().resizeEvent(event)
- if self._loading_overlay and self._loading_overlay.isVisible():
- self._position_loading_overlay()
if hasattr(self, "_loading_overlay") and self._loading_overlay.isVisible():
self._position_loading_overlay()
@@ -859,6 +859,7 @@ def _stop_preview(self) -> None:
self._preview_backend = None
# Reset UI
self._loading_active = False
+ self._preview_active = False
self._set_preview_button_loading(False)
self.preview_btn.setText("Start Preview")
self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaPlay))
@@ -908,23 +909,43 @@ def _on_loader_progress(self, message: str) -> None:
self._show_loading_overlay(message)
self._append_status(message)
- def _on_loader_success(self, backend: CameraBackend) -> None:
- # Transfer ownership to dialog
- self._preview_backend = backend
- self._append_status("Starting preview…")
+ def _on_loader_success(self, payload) -> None:
+ """
+ Payload is either:
+ - CameraBackend (non-Windows path if you kept worker-open), or
+ - CameraSettings (Windows probe-only, open on GUI thread)
+ """
+ try:
+ if isinstance(payload, CameraBackend):
+ # Legacy path: backend already opened in worker
+ self._preview_backend = payload
- # Mark preview as active
- self._preview_active = True
- self.preview_btn.setText("Stop Preview")
- self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
- self.preview_group.setVisible(True)
- self.preview_label.setText("Starting…")
- self._hide_loading_overlay()
+ elif isinstance(payload, CameraSettings):
+ # Windows probe path: open now on GUI thread
+ cam_settings = payload
+ self._append_status("Opening camera on main thread…")
+ self._preview_backend = CameraFactory.create(cam_settings)
+ self._preview_backend.open() # fast now; overlay keeps UI pleasant
+
+ else:
+ raise TypeError(f"Unexpected success payload type: {type(payload)}")
+
+ self._append_status("Starting preview…")
+ self._preview_active = True
+ self.preview_btn.setText("Stop Preview")
+ self.preview_btn.setIcon(self.style().standardIcon(QStyle.StandardPixmap.SP_MediaStop))
+ self.preview_group.setVisible(True)
+ self.preview_label.setText("Starting…")
+ self._hide_loading_overlay()
+
+ # Start timer to update preview (~25 fps more stable on Windows)
+ self._preview_timer = QTimer(self)
+ self._preview_timer.timeout.connect(self._update_preview)
+ self._preview_timer.start(40)
- # Start timer to update preview (~25 fps more stable on Windows)
- self._preview_timer = QTimer(self)
- self._preview_timer.timeout.connect(self._update_preview)
- self._preview_timer.start(40)
+ except Exception as exc:
+ # If open failed here, fall back to error handling
+ self._on_loader_error(str(exc))
def _on_loader_error(self, error: str) -> None:
self._append_status(f"Error: {error}")
From 6defc2e0a1096294c3609fbf0e76076df62e5216 Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Mon, 26 Jan 2026 18:10:48 +0100
Subject: [PATCH 047/132] fixed resizing of camera view, also prevent user from
changing config while acquiring.
---
dlclivegui/gui.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index b30ee20..19c3894 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -248,9 +248,9 @@ def _setup_ui(self) -> None:
def _build_menus(self) -> None:
file_menu = self.menuBar().addMenu("&File")
- load_action = QAction("Load configuration…", self)
- load_action.triggered.connect(self._action_load_config)
- file_menu.addAction(load_action)
+ self.load_config_action = QAction("Load configuration…", self)
+ self.load_config_action.triggered.connect(self._action_load_config)
+ file_menu.addAction(self.load_config_action)
save_action = QAction("Save configuration", self)
save_action.triggered.connect(self._action_save_config)
@@ -1072,6 +1072,10 @@ def _update_camera_controls_enabled(self) -> None:
# Config cameras button should be available when not in preview/recording
self.config_cameras_button.setEnabled(allow_changes)
+ # Disable loading configurations when preview/recording is active
+ if hasattr(self, "load_config_action"):
+ self.load_config_action.setEnabled(allow_changes)
+
def _track_camera_frame(self) -> None:
now = time.perf_counter()
self._camera_frame_times.append(now)
@@ -1454,7 +1458,15 @@ def _update_video_display(self, frame: np.ndarray) -> None:
h, w, ch = rgb.shape
bytes_per_line = ch * w
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
- self.video_label.setPixmap(QPixmap.fromImage(image))
+ pixmap = QPixmap.fromImage(image)
+
+ # Scale pixmap to fit label while preserving aspect ratio
+ scaled_pixmap = pixmap.scaled(
+ self.video_label.size(),
+ Qt.AspectRatioMode.KeepAspectRatio,
+ Qt.TransformationMode.SmoothTransformation
+ )
+ self.video_label.setPixmap(scaled_pixmap)
def _on_show_predictions_changed(self, _state: int) -> None:
if self._current_frame is not None:
From ba1e3d8c1c3715927dcab99efdc5b01d43f5d61c Mon Sep 17 00:00:00 2001
From: Artur Schneider
Date: Wed, 28 Jan 2026 12:05:29 +0100
Subject: [PATCH 048/132] fix timestamping with multiple cameras
---
dlclivegui/gui.py | 23 +++++++++++++----------
dlclivegui/video_recorder.py | 5 ++---
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 19c3894..2aec780 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -769,16 +769,19 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
self.dlc_processor.enqueue_frame(frame, timestamp)
# PRIORITY 2: Recording (queued, non-blocking)
- if self._multi_camera_recorders:
- for cam_id, frame in frame_data.frames.items():
- if cam_id in self._multi_camera_recorders:
- recorder = self._multi_camera_recorders[cam_id]
- if recorder.is_running:
- timestamp = frame_data.timestamps.get(cam_id, time.time())
- try:
- recorder.write(frame, timestamp=timestamp)
- except Exception as exc:
- logging.warning(f"Failed to write frame for camera {cam_id}: {exc}")
+ # Only record the frame from the camera that triggered this signal to avoid
+ # writing duplicate timestamps when multiple cameras are running
+ if self._multi_camera_recorders and frame_data.source_camera_id:
+ cam_id = frame_data.source_camera_id
+ if cam_id in self._multi_camera_recorders and cam_id in frame_data.frames:
+ recorder = self._multi_camera_recorders[cam_id]
+ if recorder.is_running:
+ frame = frame_data.frames[cam_id]
+ timestamp = frame_data.timestamps.get(cam_id, time.time())
+ try:
+ recorder.write(frame, timestamp=timestamp)
+ except Exception as exc:
+ logging.warning(f"Failed to write frame for camera {cam_id}: {exc}")
# PRIORITY 3: Mark display dirty (tiling done in display timer)
self._display_dirty = True
diff --git a/dlclivegui/video_recorder.py b/dlclivegui/video_recorder.py
index 47cfff4..3afa9e7 100644
--- a/dlclivegui/video_recorder.py
+++ b/dlclivegui/video_recorder.py
@@ -125,11 +125,9 @@ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
if error is not None:
raise RuntimeError(f"Video encoding failed: {error}") from error
- # Record timestamp for this frame
+ # Capture timestamp now, but only record it if frame is successfully enqueued
if timestamp is None:
timestamp = time.time()
- with self._stats_lock:
- self._frame_timestamps.append(timestamp)
# Convert frame to uint8 if needed
if frame.dtype != np.uint8:
@@ -179,6 +177,7 @@ def write(self, frame: np.ndarray, timestamp: Optional[float] = None) -> bool:
return False
with self._stats_lock:
self._frames_enqueued += 1
+ self._frame_timestamps.append(timestamp)
return True
def stop(self) -> None:
From 38fbf4b6c777920bee2011f47d7697dd4257086a Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 16:08:58 +0100
Subject: [PATCH 049/132] Add dark and system theme switching to GUI
Introduces a theme selection menu with dark and system (default) styles using qdarkstyle and QActionGroup. The current theme is tracked and can be switched via the new Appearance submenu under View.
---
dlclivegui/gui.py | 62 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 53 insertions(+), 9 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 2aec780..68a36d7 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import enum
import json
import logging
import os
@@ -16,8 +17,9 @@
import cv2
import matplotlib.pyplot as plt
import numpy as np
+import qdarkstyle
from PySide6.QtCore import Qt, QTimer
-from PySide6.QtGui import QAction, QCloseEvent, QImage, QPixmap
+from PySide6.QtGui import QAction, QActionGroup, QCloseEvent, QImage, QPixmap
from PySide6.QtWidgets import (
QApplication,
QCheckBox,
@@ -61,6 +63,12 @@
logging.basicConfig(level=logging.DEBUG)
+# auto enum for styles
+class AppStyle(enum.Enum):
+ SYS_DEFAULT = "system"
+ DARK = "dark"
+
+
class MainWindow(QMainWindow):
"""Main application window."""
@@ -108,6 +116,7 @@ def __init__(self, config: ApplicationSettings | None = None):
self._bbox_y1 = 0
self._bbox_enabled = False
# UI elements
+ self._current_style: AppStyle = AppStyle.DARK
self._cam_dialog: CameraConfigDialog | None = None
# Visualization settings (will be updated from config)
@@ -154,6 +163,25 @@ def __init__(self, config: ApplicationSettings | None = None):
QTimer.singleShot(100, self._validate_configured_cameras)
# ------------------------------------------------------------------ UI
+ def _init_theme_actions(self) -> None:
+ """Set initial checked state for theme actions based on current app stylesheet."""
+ self.action_dark_mode.setChecked(self._current_style == AppStyle.DARK)
+ self.action_light_mode.setChecked(self._current_style == AppStyle.SYS_DEFAULT)
+
+ def _apply_theme(self, mode: AppStyle) -> None:
+ """Apply the selected theme and update menu action states."""
+ app = QApplication.instance()
+ if mode == AppStyle.DARK:
+ css = qdarkstyle.load_stylesheet_pyside6()
+ app.setStyleSheet(css)
+ self.action_dark_mode.setChecked(True)
+ self.action_light_mode.setChecked(False)
+ else:
+ app.setStyleSheet("") # empty -> default Qt
+ self.action_dark_mode.setChecked(False)
+ self.action_light_mode.setChecked(True)
+ self._current_style = mode
+
def _setup_ui(self) -> None:
central = QWidget()
layout = QHBoxLayout(central)
@@ -246,25 +274,43 @@ def _setup_ui(self) -> None:
self._build_menus()
def _build_menus(self) -> None:
+ # File menu
file_menu = self.menuBar().addMenu("&File")
+ ## Save/Load config
self.load_config_action = QAction("Load configuration…", self)
self.load_config_action.triggered.connect(self._action_load_config)
file_menu.addAction(self.load_config_action)
-
save_action = QAction("Save configuration", self)
save_action.triggered.connect(self._action_save_config)
file_menu.addAction(save_action)
-
save_as_action = QAction("Save configuration as…", self)
save_as_action.triggered.connect(self._action_save_config_as)
file_menu.addAction(save_as_action)
-
+ ## Close
file_menu.addSeparator()
- exit_action = QAction("Exit", self)
+ exit_action = QAction("Close window", self)
exit_action.triggered.connect(self.close)
file_menu.addAction(exit_action)
+ # View menu
+ view_menu = self.menuBar().addMenu("&View")
+ appearance_menu = view_menu.addMenu("Appearance")
+ ## Style actions
+ self.action_dark_mode = QAction("Dark theme", self, checkable=True)
+ self.action_light_mode = QAction("System theme", self, checkable=True)
+ theme_group = QActionGroup(self)
+ theme_group.setExclusive(True)
+ theme_group.addAction(self.action_dark_mode)
+ theme_group.addAction(self.action_light_mode)
+ self.action_dark_mode.triggered.connect(lambda: self._apply_theme(AppStyle.DARK))
+ self.action_light_mode.triggered.connect(lambda: self._apply_theme(AppStyle.SYS_DEFAULT))
+
+ appearance_menu.addAction(self.action_light_mode)
+ appearance_menu.addAction(self.action_dark_mode)
+ self._apply_theme(self._current_style)
+ self._init_theme_actions()
+
def _build_camera_group(self) -> QGroupBox:
group = QGroupBox("Camera settings")
form = QFormLayout(group)
@@ -1462,12 +1508,10 @@ def _update_video_display(self, frame: np.ndarray) -> None:
bytes_per_line = ch * w
image = QImage(rgb.data, w, h, bytes_per_line, QImage.Format.Format_RGB888)
pixmap = QPixmap.fromImage(image)
-
+
# Scale pixmap to fit label while preserving aspect ratio
scaled_pixmap = pixmap.scaled(
- self.video_label.size(),
- Qt.AspectRatioMode.KeepAspectRatio,
- Qt.TransformationMode.SmoothTransformation
+ self.video_label.size(), Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation
)
self.video_label.setPixmap(scaled_pixmap)
From cc9a4400de7a0f3e116f7ec39f22f28d8b54ffee Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 16:09:13 +0100
Subject: [PATCH 050/132] Add qdarkstyle and new optional dependencies
Added 'qdarkstyle' to main dependencies for UI theming. Introduced 'pytorch' and 'tf' optional dependency groups for deeplabcut-live with respective extras.
---
pyproject.toml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pyproject.toml b/pyproject.toml
index bb931d2..ee960cd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,6 +28,7 @@ classifiers = [
dependencies = [
# "deeplabcut-live", # might be missing timm and scipy
"PySide6",
+ "qdarkstyle",
"numpy",
"opencv-python",
"vidgear[core]",
@@ -38,6 +39,12 @@ dependencies = [
basler = ["pypylon"]
gentl = ["harvesters"]
all = ["pypylon", "harvesters"]
+pytorch = [
+ "deeplabcut-live[pytorch]",
+]
+tf = [
+ "deeplabcut-live[tf]",
+]
dev = [
"pytest>=7.0",
"pytest-cov>=4.0",
From c3624c3ec3299b59166bf1e1e5cfbd2b8fb8a2e1 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 16:33:50 +0100
Subject: [PATCH 051/132] Add inference camera selection to GUI
Introduces a dropdown to select which camera is used for pose inference, replacing the previous hardcoded behavior. Updates camera label formatting and synchronizes selection between dialogs and main window. Removes unused additional options UI and ensures overlays update when the inference camera changes.
---
dlclivegui/camera_config_dialog.py | 67 ++++++++++--------------------
dlclivegui/gui.py | 66 ++++++++++++++++++++++++-----
2 files changed, 78 insertions(+), 55 deletions(-)
diff --git a/dlclivegui/camera_config_dialog.py b/dlclivegui/camera_config_dialog.py
index 43e4efc..09245ec 100644
--- a/dlclivegui/camera_config_dialog.py
+++ b/dlclivegui/camera_config_dialog.py
@@ -6,7 +6,7 @@
import logging
import cv2
-from PySide6.QtCore import QElapsedTimer, Qt, QThread, QTimer, Signal
+from PySide6.QtCore import Qt, QThread, QTimer, Signal
from PySide6.QtGui import QFont, QImage, QPixmap, QTextCursor
from PySide6.QtWidgets import (
QCheckBox,
@@ -109,46 +109,8 @@ def run(self):
return
LOGGER.debug("Creating camera backend for %s:%d", self._cam.backend, self._cam.index)
- # self._backend = CameraFactory.create(self._cam)
self.progress.emit("Opening device…")
self.success.emit(self._cam)
- return
-
- if self._check_cancel():
- self.canceled.emit()
- return
-
- self._backend.open() # heavy: backend chooses/negotiates API/format/res/FPS
-
- self.progress.emit("Warming up stream…")
- if self._check_cancel():
- self._backend.close()
- self.canceled.emit()
- return
-
- # Warmup: allow driver pipeline to stabilize (skip None frames silently)
- warm_ok = False
- timer = QElapsedTimer()
- timer.start()
- budget = 50000 # ms
- while timer.elapsed() < budget and not self._cancel:
- frame, _ = self._backend.read()
- if frame is not None and frame.size > 0:
- warm_ok = True
- break
-
- if self._cancel:
- self._backend.close()
- self.canceled.emit()
- return
-
- if not warm_ok:
- # Not fatal—some cameras deliver the first frame only after UI starts polling.
- self.progress.emit("Warmup yielded no frame, proceeding…")
-
- self.progress.emit("Camera ready.")
- self.success.emit(self._backend)
- # Ownership of _backend transfers to the receiver; do not close here.
except Exception as exc:
msg = f"{type(exc).__name__}: {exc}"
@@ -178,6 +140,7 @@ def __init__(
self.setWindowTitle("Configure Cameras")
self.setMinimumSize(960, 720)
+ self.dlc_camera_id: str | None = None
self._multi_camera_settings = multi_camera_settings if multi_camera_settings else MultiCameraSettings()
self._detected_cameras: list[DetectedCamera] = []
self._current_edit_index: int | None = None
@@ -198,6 +161,17 @@ def __init__(
self._populate_from_settings()
self._connect_signals()
+ @property
+ def dlc_camera_id(self) -> str | None:
+ """Get the currently selected DLC camera ID."""
+ return self._dlc_camera_id
+
+ @dlc_camera_id.setter
+ def dlc_camera_id(self, value: str | None) -> None:
+ """Set the currently selected DLC camera ID."""
+ self._dlc_camera_id = value
+ self._refresh_camera_labels()
+
# -------------------------------
# UI setup
# -------------------------------
@@ -509,15 +483,18 @@ def _populate_from_settings(self) -> None:
def _format_camera_label(self, cam: CameraSettings, index: int = -1) -> str:
status = "✓" if cam.enabled else "○"
- dlc_indicator = " [DLC]" if index == 0 and cam.enabled else ""
+ this_id = f"{cam.backend}:{cam.index}"
+ dlc_indicator = " [DLC]" if this_id == self._dlc_camera_id and cam.enabled else ""
return f"{status} {cam.name} [{cam.backend}:{cam.index}]{dlc_indicator}"
def _refresh_camera_labels(self) -> None:
- for i in range(self.active_cameras_list.count()):
- item = self.active_cameras_list.item(i)
- cam = item.data(Qt.ItemDataRole.UserRole)
- if cam:
- item.setText(self._format_camera_label(cam, i))
+ cam_list = getattr(self, "active_cameras_list", None)
+ if cam_list:
+ for i in range(cam_list.count()):
+ item = cam_list.item(i)
+ cam = item.data(Qt.ItemDataRole.UserRole)
+ if cam:
+ item.setText(self._format_camera_label(cam, i))
def _on_backend_changed(self, _index: int) -> None:
self._refresh_available_cameras()
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 68a36d7..6b16eb5 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -32,7 +32,6 @@
QLineEdit,
QMainWindow,
QMessageBox,
- QPlainTextEdit,
QPushButton,
QSizePolicy,
QSpinBox,
@@ -77,6 +76,7 @@ def __init__(self, config: ApplicationSettings | None = None):
self.setWindowTitle("DeepLabCut Live GUI")
# Try to load myconfig.json from the application directory if no config provided
+ # FIXME @C-Achard change this behavior for release
if config is None:
myconfig_path = Path(__file__).parent.parent / "myconfig.json"
if myconfig_path.exists():
@@ -95,6 +95,7 @@ def __init__(self, config: ApplicationSettings | None = None):
self._config_path = None
self._config = config
+ self._inference_camera_id: str | None = None # Camera ID used for inference
self._current_frame: np.ndarray | None = None
self._raw_frame: np.ndarray | None = None
self._last_pose: PoseResult | None = None
@@ -365,10 +366,13 @@ def _build_dlc_group(self) -> QGroupBox:
self.processor_combo.addItem("No Processor", None)
form.addRow("Processor", self.processor_combo)
- self.additional_options_edit = QPlainTextEdit()
- self.additional_options_edit.setPlaceholderText("")
- self.additional_options_edit.setFixedHeight(40)
- form.addRow("Additional options", self.additional_options_edit)
+ # self.additional_options_edit = QPlainTextEdit()
+ # self.additional_options_edit.setPlaceholderText("")
+ # self.additional_options_edit.setFixedHeight(40)
+ # form.addRow("Additional options", self.additional_options_edit)
+ self.dlc_camera_combo = QComboBox()
+ self.dlc_camera_combo.setToolTip("Select which camera to use for pose inference")
+ form.addRow("Inference Camera", self.dlc_camera_combo)
# Wrap inference buttons in a widget to prevent shifting
inference_button_widget = QWidget()
@@ -523,6 +527,7 @@ def _connect_signals(self) -> None:
self.dlc_processor.pose_ready.connect(self._on_pose_ready)
self.dlc_processor.error.connect(self._on_dlc_error)
self.dlc_processor.initialized.connect(self._on_dlc_initialised)
+ self.dlc_camera_combo.currentIndexChanged.connect(self._on_dlc_camera_changed)
# ------------------------------------------------------------------ config
def _apply_config(self, config: ApplicationSettings) -> None:
@@ -532,7 +537,7 @@ def _apply_config(self, config: ApplicationSettings) -> None:
dlc = config.dlc
self.model_path_edit.setText(dlc.model_path)
- self.additional_options_edit.setPlainText(json.dumps(dlc.additional_options, indent=2))
+ # self.additional_options_edit.setPlainText(json.dumps(dlc.additional_options, indent=2))
recording = config.recording
self.output_directory_edit.setText(recording.directory)
@@ -559,6 +564,8 @@ def _apply_config(self, config: ApplicationSettings) -> None:
self._p_cutoff = viz.p_cutoff
self._colormap = viz.colormap
self._bbox_color = viz.get_bbox_color_bgr()
+ # Update DLC camera list
+ self._refresh_dlc_camera_list()
def _current_config(self) -> ApplicationSettings:
# Get the first camera from multi-camera config for backward compatibility
@@ -588,8 +595,8 @@ def _dlc_settings_from_ui(self) -> DLCProcessorSettings:
dynamic=self._config.dlc.dynamic, # Preserve from config
resize=self._config.dlc.resize, # Preserve from config
precision=self._config.dlc.precision, # Preserve from config
- model_type="pytorch",
- additional_options=self._parse_json(self.additional_options_edit.toPlainText()),
+ model_type="pytorch", # FIXME @C-Achard hardcoded for now, we should allow tf models too
+ # additional_options=self._parse_json(self.additional_options_edit.toPlainText()),
)
def _recording_settings_from_ui(self) -> RecordingSettings:
@@ -727,6 +734,7 @@ def _open_camera_config_dialog(self) -> None:
else:
# Refresh its UI from current settings when reopened
self._cam_dialog._populate_from_settings()
+ self._cam_dialog.dlc_camera_id = self._inference_camera_id
self._cam_dialog.show()
self._cam_dialog.raise_()
@@ -736,6 +744,7 @@ def _on_multi_camera_settings_changed(self, settings: MultiCameraSettings) -> No
"""Handle changes to multi-camera settings."""
self._config.multi_camera = settings
self._update_active_cameras_label()
+ self._refresh_dlc_camera_list()
active_count = len(settings.get_active_cameras())
self.statusBar().showMessage(f"Camera configuration updated: {active_count} active camera(s)", 3000)
@@ -784,6 +793,39 @@ def _validate_configured_cameras(self) -> None:
self._show_warning("\n".join(error_lines))
logging.warning("\n".join(error_lines))
+ def _refresh_dlc_camera_list(self) -> None:
+ """Populate the inference camera dropdown from active cameras."""
+ self.dlc_camera_combo.blockSignals(True)
+ self.dlc_camera_combo.clear()
+
+ active_cams = self._config.multi_camera.get_active_cameras()
+ for cam in active_cams:
+ cam_id = get_camera_id(cam) # e.g., "opencv:0" or "pylon:1"
+ label = f"{cam.name} [{cam.backend}:{cam.index}]"
+ self.dlc_camera_combo.addItem(label, cam_id)
+
+ # Keep previous selection if still present, else default to first
+ if self._inference_camera_id is not None:
+ idx = self.dlc_camera_combo.findData(self._inference_camera_id)
+ if idx >= 0:
+ self.dlc_camera_combo.setCurrentIndex(idx)
+ elif self.dlc_camera_combo.count() > 0:
+ self.dlc_camera_combo.setCurrentIndex(0)
+ self._inference_camera_id = self.dlc_camera_combo.currentData()
+ else:
+ if self.dlc_camera_combo.count() > 0:
+ self.dlc_camera_combo.setCurrentIndex(0)
+ self._inference_camera_id = self.dlc_camera_combo.currentData()
+
+ self.dlc_camera_combo.blockSignals(False)
+
+ def _on_dlc_camera_changed(self, _index: int) -> None:
+ """Track user selection of the inference camera."""
+ self._inference_camera_id = self.dlc_camera_combo.currentData()
+ # Force redraw so bbox/pose overlays switch to the new tile immediately
+ if self._current_frame is not None:
+ self._display_frame(self._current_frame, force=True)
+
def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
"""Handle frames from multiple cameras.
@@ -797,7 +839,10 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
# Determine DLC camera (first active camera)
active_cams = self._config.multi_camera.get_active_cameras()
- dlc_cam_id = get_camera_id(active_cams[0]) if active_cams else None
+ selected_id = self._inference_camera_id
+ fallback_id = get_camera_id(active_cams[0]) if active_cams else None
+
+ dlc_cam_id = selected_id if selected_id in frame_data.frames else fallback_id
# Check if this frame is from the DLC camera
is_dlc_camera_frame = frame_data.source_camera_id == dlc_cam_id
@@ -1100,7 +1145,8 @@ def _update_dlc_controls_enabled(self) -> None:
self.browse_processor_folder_button,
self.refresh_processors_button,
self.processor_combo,
- self.additional_options_edit,
+ # self.additional_options_edit,
+ self.dlc_camera_combo,
]
for widget in widgets:
widget.setEnabled(allow_changes)
From 4eaec2b2322abae5b3c9eaf0fd11a3781a04d7a8 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 17:05:52 +0100
Subject: [PATCH 052/132] Improve camera stats display and FPS tracking
Refactored camera FPS tracking to support multiple cameras using per-camera deques and a configurable time window. Enhanced the camera stats panel to display per-camera FPS with clearer formatting, improved layout and sizing of stats widgets, and enabled text selection for stats labels. Minor UI adjustments were made for better usability and appearance.
---
dlclivegui/gui.py | 103 ++++++++++++++++++++++++++++++++--------------
1 file changed, 73 insertions(+), 30 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 6b16eb5..8fa98ca 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -59,7 +59,7 @@
from dlclivegui.video_recorder import RecorderStats, VideoRecorder
# logging.basicConfig(level=logging.INFO)
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.DEBUG) # FIXME @C-Achard set back to INFO for release
# auto enum for styles
@@ -101,7 +101,9 @@ def __init__(self, config: ApplicationSettings | None = None):
self._last_pose: PoseResult | None = None
self._dlc_active: bool = False
self._active_camera_settings: CameraSettings | None = None
- self._camera_frame_times: deque[float] = deque(maxlen=240)
+ # self._camera_frame_times: deque[float] = deque(maxlen=240)
+ self._camera_frame_times: dict[str, deque[float]] = {}
+ self._fps_window_seconds = 5.0 # seconds for fps calculation
self._last_drop_warning = 0.0
self._last_recorder_summary = "Recorder idle"
self._display_interval = 1.0 / 25.0
@@ -197,47 +199,62 @@ def _setup_ui(self) -> None:
self.video_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.video_label.setMinimumSize(640, 360)
self.video_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
- video_layout.addWidget(self.video_label)
+ video_layout.addWidget(self.video_label, stretch=1)
# Stats panel below video with clear labels
stats_widget = QWidget()
stats_widget.setStyleSheet("padding: 5px;")
- stats_widget.setMinimumWidth(800) # Prevent excessive line breaks
+ # stats_widget.setMinimumWidth(800) # Prevent excessive line breaks
+ stats_widget.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+ stats_widget.setMinimumHeight(80)
stats_layout = QVBoxLayout(stats_widget)
stats_layout.setContentsMargins(5, 5, 5, 5)
stats_layout.setSpacing(3)
# Camera throughput stats
camera_stats_container = QHBoxLayout()
+ camera_stats_container.setContentsMargins(0, 0, 0, 0)
+ camera_stats_container.setSpacing(8)
camera_stats_label_title = QLabel("Camera:")
- camera_stats_container.addWidget(camera_stats_label_title)
+ camera_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+ camera_stats_container.addWidget(camera_stats_label_title, stretch=0)
self.camera_stats_label = QLabel("Camera idle")
self.camera_stats_label.setWordWrap(True)
- camera_stats_container.addWidget(self.camera_stats_label)
- camera_stats_container.addStretch(1)
+ self.camera_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+ camera_stats_container.addWidget(self.camera_stats_label, stretch=1)
+ # camera_stats_container.addStretch(1)
stats_layout.addLayout(camera_stats_container)
# DLC processor stats
dlc_stats_container = QHBoxLayout()
dlc_stats_label_title = QLabel("DLC Processor:")
- dlc_stats_container.addWidget(dlc_stats_label_title)
+ dlc_stats_container.setContentsMargins(0, 0, 0, 0)
+ dlc_stats_container.setSpacing(8)
+ dlc_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+ dlc_stats_container.addWidget(dlc_stats_label_title, stretch=0)
self.dlc_stats_label = QLabel("DLC processor idle")
self.dlc_stats_label.setWordWrap(True)
- dlc_stats_container.addWidget(self.dlc_stats_label)
- dlc_stats_container.addStretch(1)
+ self.dlc_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+ dlc_stats_container.addWidget(self.dlc_stats_label, stretch=1)
stats_layout.addLayout(dlc_stats_container)
# Video recorder stats
recorder_stats_container = QHBoxLayout()
recorder_stats_label_title = QLabel("Recorder:")
- recorder_stats_container.addWidget(recorder_stats_label_title)
+ recorder_stats_container.setContentsMargins(0, 0, 0, 0)
+ recorder_stats_container.setSpacing(8)
+ recorder_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+ recorder_stats_container.addWidget(recorder_stats_label_title, stretch=0)
self.recording_stats_label = QLabel("Recorder idle")
self.recording_stats_label.setWordWrap(True)
- recorder_stats_container.addWidget(self.recording_stats_label)
- recorder_stats_container.addStretch(1)
+ self.recording_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+ recorder_stats_container.addWidget(self.recording_stats_label, stretch=1)
stats_layout.addLayout(recorder_stats_container)
+ video_layout.addWidget(stats_widget, stretch=0)
- video_layout.addWidget(stats_widget)
+ # Allow user to select stats text
+ for lbl in (self.camera_stats_label, self.dlc_stats_label, self.recording_stats_label):
+ lbl.setTextInteractionFlags(Qt.TextSelectableByMouse)
# Controls panel with fixed width to prevent shifting
controls_widget = QWidget()
@@ -269,6 +286,8 @@ def _setup_ui(self) -> None:
# Add controls and video panel to main layout
layout.addWidget(controls_widget, stretch=0)
layout.addWidget(video_panel, stretch=1)
+ layout.setStretch(0, 0)
+ layout.setStretch(1, 1)
self.setCentralWidget(central)
self.setStatusBar(QStatusBar())
@@ -835,7 +854,9 @@ def _on_multi_frame_ready(self, frame_data: MultiFrameData) -> None:
3. Display (lowest priority - tiled and updated on separate timer)
"""
self._multi_camera_frames = frame_data.frames
- self._track_camera_frame() # Track FPS
+ src_id = frame_data.source_camera_id
+ if src_id:
+ self._track_camera_frame(src_id) # Track FPS
# Determine DLC camera (first active camera)
active_cams = self._config.multi_camera.get_active_cameras()
@@ -1171,12 +1192,20 @@ def _update_camera_controls_enabled(self) -> None:
if hasattr(self, "load_config_action"):
self.load_config_action.setEnabled(allow_changes)
- def _track_camera_frame(self) -> None:
+ def _track_camera_frame(self, camera_id: str) -> None:
now = time.perf_counter()
- self._camera_frame_times.append(now)
- window_seconds = 5.0
- while self._camera_frame_times and now - self._camera_frame_times[0] > window_seconds:
- self._camera_frame_times.popleft()
+ dq = self._camera_frame_times.get(camera_id)
+ if dq is None:
+ # Maxlen sized to about the highest plausible FPS * window
+ # e.g., 240 entries ~ 48 FPS over 5s
+ dq = deque(maxlen=240)
+ self._camera_frame_times[camera_id] = dq
+ dq.append(now)
+
+ # Drop old timestamps outside window
+ window_seconds = self._fps_window_seconds
+ while dq and (now - dq[0]) > window_seconds:
+ dq.popleft()
def _display_frame(self, frame: np.ndarray, *, force: bool = False) -> None:
if frame is None:
@@ -1337,25 +1366,38 @@ def _format_dlc_stats(self, stats: ProcessorStats) -> str:
)
def _update_metrics(self) -> None:
+ # --- Camera stats ---
if hasattr(self, "camera_stats_label"):
running = self.multi_camera_controller.is_running()
-
if running:
active_count = self.multi_camera_controller.get_active_count()
- fps = self._compute_fps(self._camera_frame_times)
- if fps > 0:
- if active_count > 1:
- self.camera_stats_label.setText(f"{active_count} cameras | {fps:.1f} fps (last 5 s)")
+
+ # Build per-camera FPS list for active cameras only
+ active_cams = self._config.multi_camera.get_active_cameras()
+ lines = []
+ for cam in active_cams:
+ cam_id = get_camera_id(cam) # e.g., "opencv:0" or "pylon:1"
+ dq = self._camera_frame_times.get(cam_id, deque())
+ fps = self._compute_fps(dq)
+ # Make a compact label: name [backend:index] @ fps
+ label = f"{cam.name or cam_id} [{cam.backend}:{cam.index}]"
+ if fps > 0:
+ lines.append(f"{label} @ {fps:.1f} fps")
else:
- self.camera_stats_label.setText(f"{fps:.1f} fps (last 5 s)")
+ lines.append(f"{label} @ Measuring…")
+
+ if active_count == 1:
+ # Single camera: show just the line
+ summary = lines[0] if lines else "Measuring…"
else:
- if active_count > 1:
- self.camera_stats_label.setText(f"{active_count} cameras | Measuring…")
- else:
- self.camera_stats_label.setText("Measuring…")
+ # Multi camera: join lines with separator
+ summary = " | ".join(lines)
+
+ self.camera_stats_label.setText(summary)
else:
self.camera_stats_label.setText("Camera idle")
+ # --- DLC processor stats ---
if hasattr(self, "dlc_stats_label"):
if self._dlc_active and self._dlc_initialized:
stats = self.dlc_processor.get_stats()
@@ -1368,6 +1410,7 @@ def _update_metrics(self) -> None:
if hasattr(self, "processor_status_label"):
self._update_processor_status()
+ # --- Recorder stats ---
if hasattr(self, "recording_stats_label"):
# Handle multi-camera recording stats
if self._multi_camera_recorders:
From 7e1fe886418c58f5a53c62deb4dfe957a1e41469 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 17:11:42 +0100
Subject: [PATCH 053/132] Refactor stats layout to use QGridLayout
Replaces the nested QHBoxLayout-based stats section with a QGridLayout for improved alignment and spacing of the Camera, DLC Processor, and Recorder status labels. This change simplifies the layout code and ensures better control over column stretching and widget alignment.
---
dlclivegui/gui.py | 73 ++++++++++++++++++++++++-----------------------
1 file changed, 37 insertions(+), 36 deletions(-)
diff --git a/dlclivegui/gui.py b/dlclivegui/gui.py
index 8fa98ca..95b5a31 100644
--- a/dlclivegui/gui.py
+++ b/dlclivegui/gui.py
@@ -26,6 +26,7 @@
QComboBox,
QFileDialog,
QFormLayout,
+ QGridLayout,
QGroupBox,
QHBoxLayout,
QLabel,
@@ -207,49 +208,49 @@ def _setup_ui(self) -> None:
# stats_widget.setMinimumWidth(800) # Prevent excessive line breaks
stats_widget.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
stats_widget.setMinimumHeight(80)
- stats_layout = QVBoxLayout(stats_widget)
+
+ stats_layout = QGridLayout(stats_widget)
stats_layout.setContentsMargins(5, 5, 5, 5)
- stats_layout.setSpacing(3)
-
- # Camera throughput stats
- camera_stats_container = QHBoxLayout()
- camera_stats_container.setContentsMargins(0, 0, 0, 0)
- camera_stats_container.setSpacing(8)
- camera_stats_label_title = QLabel("Camera:")
- camera_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
- camera_stats_container.addWidget(camera_stats_label_title, stretch=0)
+ stats_layout.setHorizontalSpacing(8) # tighten horizontal gap between title and value
+ stats_layout.setVerticalSpacing(3)
+
+ row = 0
+
+ # Camera
+ title_camera = QLabel("Camera:")
+ title_camera.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+ stats_layout.addWidget(title_camera, row, 0, alignment=Qt.AlignTop)
+
self.camera_stats_label = QLabel("Camera idle")
self.camera_stats_label.setWordWrap(True)
- self.camera_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
- camera_stats_container.addWidget(self.camera_stats_label, stretch=1)
- # camera_stats_container.addStretch(1)
- stats_layout.addLayout(camera_stats_container)
-
- # DLC processor stats
- dlc_stats_container = QHBoxLayout()
- dlc_stats_label_title = QLabel("DLC Processor:")
- dlc_stats_container.setContentsMargins(0, 0, 0, 0)
- dlc_stats_container.setSpacing(8)
- dlc_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
- dlc_stats_container.addWidget(dlc_stats_label_title, stretch=0)
+ self.camera_stats_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+ stats_layout.addWidget(self.camera_stats_label, row, 1, alignment=Qt.AlignTop)
+ row += 1
+
+ # DLC
+ title_dlc = QLabel("DLC Processor:")
+ title_dlc.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+ stats_layout.addWidget(title_dlc, row, 0, alignment=Qt.AlignTop)
+
self.dlc_stats_label = QLabel("DLC processor idle")
self.dlc_stats_label.setWordWrap(True)
- self.dlc_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
- dlc_stats_container.addWidget(self.dlc_stats_label, stretch=1)
- stats_layout.addLayout(dlc_stats_container)
-
- # Video recorder stats
- recorder_stats_container = QHBoxLayout()
- recorder_stats_label_title = QLabel("Recorder:")
- recorder_stats_container.setContentsMargins(0, 0, 0, 0)
- recorder_stats_container.setSpacing(8)
- recorder_stats_label_title.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
- recorder_stats_container.addWidget(recorder_stats_label_title, stretch=0)
+ self.dlc_stats_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+ stats_layout.addWidget(self.dlc_stats_label, row, 1, alignment=Qt.AlignTop)
+ row += 1
+
+ # Recorder
+ title_rec = QLabel("Recorder:")
+ title_rec.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+ stats_layout.addWidget(title_rec, row, 0, alignment=Qt.AlignTop)
+
self.recording_stats_label = QLabel("Recorder idle")
self.recording_stats_label.setWordWrap(True)
- self.recording_stats_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
- recorder_stats_container.addWidget(self.recording_stats_label, stretch=1)
- stats_layout.addLayout(recorder_stats_container)
+ self.recording_stats_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+ stats_layout.addWidget(self.recording_stats_label, row, 1, alignment=Qt.AlignTop)
+
+ # Critical: make column 1 (values) eat the width, keep column 0 tight
+ stats_layout.setColumnStretch(0, 0)
+ stats_layout.setColumnStretch(1, 1)
video_layout.addWidget(stats_widget, stretch=0)
# Allow user to select stats text
From 5fb96f211e66013238bd4ce8e27717be8a2f6f88 Mon Sep 17 00:00:00 2001
From: C-Achard
Date: Wed, 28 Jan 2026 19:08:23 +0100
Subject: [PATCH 054/132] Add splash screen and logo assets to GUI
Introduces splash screen functionality and displays a logo with version text in the preview area when cameras are not running. Adds new logo and welcome image assets, updates the main window class name to DLCLiveMainWindow, and refactors icon loading and display logic for improved branding and user experience.
---
dlclivegui/__init__.py | 4 +-
dlclivegui/assets/logo.png | Bin 0 -> 162713 bytes
dlclivegui/assets/logo_transparent.png | Bin 0 -> 130352 bytes
dlclivegui/assets/welcome.png | Bin 0 -> 160086 bytes
dlclivegui/gui.py | 119 +++++++++++++++++++++++--
5 files changed, 115 insertions(+), 8 deletions(-)
create mode 100644 dlclivegui/assets/logo.png
create mode 100644 dlclivegui/assets/logo_transparent.png
create mode 100644 dlclivegui/assets/welcome.png
diff --git a/dlclivegui/__init__.py b/dlclivegui/__init__.py
index c803be5..e4fa54c 100644
--- a/dlclivegui/__init__.py
+++ b/dlclivegui/__init__.py
@@ -8,7 +8,7 @@
MultiCameraSettings,
RecordingSettings,
)
-from .gui import MainWindow, main
+from .gui import DLCLiveMainWindow, main
from .multi_camera_controller import MultiCameraController, MultiFrameData
__all__ = [
@@ -17,7 +17,7 @@
"DLCProcessorSettings",
"MultiCameraSettings",
"RecordingSettings",
- "MainWindow",
+ "DLCLiveMainWindow",
"MultiCameraController",
"MultiFrameData",
"CameraConfigDialog",
diff --git a/dlclivegui/assets/logo.png b/dlclivegui/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec77b4a720bdb40e82ebc9a33de18daf6c2e6240
GIT binary patch
literal 162713
zcmeGE+|~uemCDYeCXMG_QaYsE3S2oL5lLycsS%Z5Cq}L$~;qspqpaIKiD_H6S~{s
zdEl>Gb~0KH5Jd6_`3Fr_`Qcyi5Y0hZS^_HRqg(|)ZkUP7i9=9X1n&78ObFeBP4=0%
zsw>*Y1(xgUWw*yRqASp?{|wkOWeSei5^9*jLpFYtRjiuC@WCr6&R*I_&&W;vXe=MQ
zJbLkz`Ej^adps*|XZ&m9TG?_d;;DkzAG02hWzcV66Hp~?Bc%Uhjg0-_C*Uww6K=ZH
z1C#pElj7#H?3PxZVLa{ly*R9@Y9{PLskVl|zm?d3H=w2bTjef;&i=F{i8LK~7R!{k
zg*})u1cgfaOH{_kNv%8ZR_9!0PnlmC5Wy2jyYAq{;=$vjCg8ii66;voSKm#h49K!{^R&qS)I+INe5Ht+ZlEwa@CA
z6TDVFA64Fzl7yc4=6ua6cmEZzTdt|9PR(nqFkL9wiWD={yvk_YBI9P&{XXhr;D`H!
zpCDuO+7s6FI)Se4xx|aYoQ#D40%z1Hp_SJ8hS?ls_;~Te@mD(y+dd451UG0G#&OXj
zT=LfLuoj`3wTq-2AX^$tPsLl~
zn}lrQA2@1E7n_V8(?R!)PJZqt`_8>oqu#O7VMcXGUqTe%S@QUl`toOkPbDiE7kVTo
z?LO)i!>w$ozn=~Kq*3Pb+bp&o*WLdY|x+Nz6E0@B?x~Q1ye5i%N
zlkd9Q6ei|augbilBYjM|c0w5C!cz6jZl3=~{De3uBUF>-V>6MCTi9Z04nsO3PEJlz
zCvu->h*7Tyhu~lYtr6OOrW5F4ReeGJz4Jf`t>69VsMqv0y9{S`E-oic-bh7zev5e(
z`eVfFeHyTVMTf_)Pl;-!Cblx!nmxjDkq%<&gr1FDOX1PHL&LyPl(JQb+B>w5
z1=kXL(F1Q`KrBaWdtFH?NxYzklnzkK6=Qr^A%3|sd*uD_#WUF(w7fINL9HYH1@+}k
zn!XJ?f!)oW91K~i2E*kQ#L0<1rj65zpqDo#zdxhx>M~{w^ILz*c$U=yasA|
zf9Jb!OlUS&8Lv75sofPUi9ToE7Tb;2P&zOmbG(CU!k+V1$BG<-x+UBHHvUpa`=dqUCuXAG({aTjtW*JJ+bAu`mm)tY0M+pnc16o5E4uBG|>
z#|N5lkvC?r>HT;GUF&gvR5zg?5zy}?D^?NuFSqW&JkQ&7yh{rZ=i=Y{P!lou!4eK$
z7I(Ja;Qp;`Fmn#qx#T`m@!`IngOZXugXapyQG<^}aj(J`oXAhM=RKm>*E2M5B<||6
zIen&`l`h6)=-2T*;(xjYQ_}cY^E-99iMg?URR_QQ1_vEF!9QV#HUts*g`Pprj;|%L
z(EjX}c$*V+|NMH$9kcr%XcwMBcfC=+n~!;BB_qqp0&TpfSbdT&Iz`B@pVz4WZ)(%U
zs}c3kp9S98T@Njb{aVy}i2ehM)$s-X^jTwnJKvKM^vF-MyZMEMUEMS+%pq<6+5|{c
zw*C6m?~OW33qNXZiP_Zc5QY?Ht+i~d&Hrl@&vIjxb-jK`^5}8^PKMQGL`m>(ZZ|YY
z!pw_Bi%;75IF`^leIUW7Z`Mk{v`?P(|y}KTF(f(RB
zAt`e^4)4{7rmIHVHZrmp=pmk1K9eddD{~0vHX6!$L!prpm51>Mx_h5JuHNc|mMf*B
zMdJ%c6kz#Z>!{+Nau!+>bR$k8uVIWx&lR^H{}%kBWq!HbSBa;9_3J;OhtuGp=9Q5h
zON>Kv+U&JWQx$43j85QitqB<)!ghrsl`MTtwyswf`;{9%ThVFkZ7;^XIOxw3g{aa0
z-qe-XxK}RuhPr}7gEGTe8!gv@?zsK@x7pS4?2#zZgSXF^#RjJ%Sk7yBu3x6bl)sO%
z@#o1zlTlOk=BsSHHZ%d+LW9L$pBG_{w$B0qb$2h6T({@*jk5CRxsN8pq?2DlrAc1!
z?^Kai7gyKMC*uq6r;U=CJ{UwVtaJXWAo))j5tVl>{dqQsY0dw-IjLG-uNoG^$>G|I
za=DzL0S)L6aYda>!M6Yo<{Z%OtV~by>*e2m-@?oGydJaeJzG&2L4p0$Z{38zjD0ZhW7uz
zeNY;v@LKjOFOJt;U0t(I9zfU7FuNQNcv1b*#wJCq}K~s_|bV=(x;O|^V*9kRsGZdwy4>yU~~47
zo9mC5#R{_K1FoBsndz0_jlR4|JNZxZ76!VjTHFUnH2>d&iI>O+I0T!e*8<ptuH`Fv#_ypD#@>sui;r>skgz7%GQ})geve0DQ
z-mKUWT=yE3U9^$sAO^n2-1}#4Zf)kZQk$%bnls2aZ8m>KwSy9y-RqfiQ6cyeF>PGc
z#gfnU3qn07wYho66D!=Jmhyi-D)HA%CZ^rY2s4bxT|b=bkqo{uhqSb=KEW63!WE^$
z`KPK%anci+X6#)4w$Le!v4LLhOVVRM1_WpdZg(1|7P=ljRyWt
z1pg-jvHugn|A_$l|APpakRDmS#o!Ic=}q@6m#^&Zr}YbV3Obc0Q&ElKZ?}ahG2UZL
zY>tw3P`eb##>HfoSSYK;X|%>B=MN|j5rpv!rA=uhS&t~GDG@K4^o?Oazk0C6K%cHk
zURoUklU@wkb;(B3Q-|YIWrE4!8)4zI4+ci&?xkMnD)EW`v@ft=vM^L0`Q!O1#Tqv^
zjS4rHCA9WnZ#UA|0)9&hg7}Ehk)9^}#RwJS#`sJl^HX?HgtfKKydnuKn<=8@4Yq*Z
zt9~(sMyfTNPFvfzS_%52s>7zg+lLdCc)9vgoxNXkTx2Hln5&ZnbK^V%^O8k&2>UOg
zKqy%t+0bimO>+$K6kk*sw{R!JEJN^)W3IK&p_xuhbzd@%xpNASiTG>oy+KWGC#9Y=
zp~p-W7ZCJU;<}I6CC80zt6<`@gtp*Zld?P`m;F2YZLSI5lK0KzrlK1ZepF7bmVJ3+
z|C(oclCOFPk;reZ4nbn~ArN;m(B;RCUl9$o@=(t@#lP%
zw2gVWNq~emg(9Ya9utCc3OAN0Y#EWBRf@H$%H4e~TC>sCd}Di>H*-&@O*1DzI8g!ABvspyaZ|)pSl}
z;wr+#UXKKZSpRlKWTv1Ss}Tf2iqnH7_=#zeOEIu*PdoM|@no56s?25<(UbT2EJ~BuXmJ%>5u6PYo7enxCJi*3TPwdP&dO+VfrpZaS#b4Oo+#Rmr>
z*I#0Zvp+dAniL8;&wo|2XxF$BHx
zG=+hgz2d+M--swJK6_ClQltErvxh`pm#E2o)wY#CY}q0N6XIyOB?j8je^fo#iAfa=
zuIKd>t~;&wivm!~U0dz*c-OO&?a<`lWH1NAL1Y|ffX+8PM53>E(W>cYP+Jgj_o*V;
z$Fu5LiuL5NHjff_pPnQkUIb!o4TMUp~(gZC85&EJO!JfXV
z#zLT+y|Mm8r_6CqMO!b75U5vs>FeEf`pm@P3N*v?C2%*GKeRI#03t5z-!mpBmOwX0jkYfkn__rLl
z)d?=NP~ra>OVYgK#M^FNC_+=L8#sS}Ys*1N1sPCYH+_DJb-J*=zD3~u%1+lSb*DIN
z?&G!%LeL${9k~{9)LL#T|JoUG(hm>(KqEzmNh3P#?L+<6>5vNKx@~EwHN@sLFVuf(
zB#ziPwHLX1KhME2P7`5zm8-9FMofpCJuUK_lbPUK)r&SZ9q7f;NWJAaX))S0!f6y2FhGMABgdwj;QCIjnlwYOi{)ze|J@0<8?qf4{R}5+*4Elob@M2IHJv(
zS@iKa1DgMa<$-UU{n%-#MIg|{=hrO^jJgAA9C|kg^a;FUqaS&sa}(Zx0PHLV&mbGCiK
zcT=8wqv7dxK)N7fE8SeCU60>tmf*v56Bh#wYVJVUg4-3_RtQ07>e;)04V5X1Y>Un;
zfVkeFX7K$j5YWy_2~E;jOSik-8NQ+0&>*sNlr#cllh-2yULPf&waA{%cj*`@oPo^P
z;P`svmgZk#=dR0=Wmg@Iu$U3xv8q|lo;e;k0YL8iwX)xaSK0)pZw#LXtBl3^o6b$T
zYTPEd2^8q}1LVH*NlKpz%==o4cIX(itO9i>ENgVL29xtdP0lO>$Pno@mVOn$hDIjF
z?zz|=yH`5X;6P9S%5MF-&Fw-HO0((7af)?@-uI*AFx7r;X?tlVQA?&wf#-5m`ZFhB+O9rq+d|ub%d@b~nE_$m?&M}QMF*b=&
zxKK7D3J!vNI#OePaRW(x9~ck@RC$aNAf~l&;QXqW!p+bCBERXX
zOH1uHXi&<{>u)v7eB8KQc(6j_C1+UOurrBCpyqs(N~B~z0PX>t6wFX~-jPT?@(tsE
zFmM1;vZ<`6cJZEnQrCo_JbBdW{{zBZDAN@UYWZf+tSM9cwGqA*etjPFP{;h&!|c{&
zH7xZTp*bdJY2nf?7XbfobwjN#<}0_3>(;%MTVyZuiARM$HBzz8^a9;{Nr)T{5lZA)
zG+BE3e&=&m>4V1Ft@Q!kaexgW_)tse<{KXQZ)ysDGn7z{`l*~UpU#%%V2w}&a}t#J3vklB#BZMy>Gek
zVQ32z!02yjAB~I;z*!;am=QJG5C$R~qyjg)j)B9VuX_}CEu^$Z$h~sCE0-!aFzv))
zaDV*WTNTeYt!9~XLIe;j1*ITTRu&Tk98oOR?gCp=yA2FP;Fx3#Uyu1?bhH2M`L}lG7u=z+vptBuB>j~fndsXC?)mH
zl}E#FHEF#xIe8TcqAC#iV4~z~e661RB5YR+##MP)Gr#k)e{htZ1!PtBrZ{MhX`%xpB`x{6>!&tnK$K9A;R({p22RY@`>;mEIF2Dgp%PfXs>PO0#n
zrcg8No6#xI;k&1m?!SoO-}Ngfoo$(2+1jSwwLIK+F}aFxH{w%`*J#V`lD%tUB7HQX
zI{as9Z}93Wc*EXg!iZi&E_k;*n4!CI@F=(Yym8-BO?5G%l&KU4`sI2pv1};=1|I*7
z^~>U;A0RTG=Vd!f)#O;*AhTrrB7-J1C#HYfn66FCyI$1&%pK6UsgOV8U)o6hf{4=$+OK1MNd
z*Hsu~Rg^kN1d^HEzYrBTf6X^FI^@nYm+XJPN{cKS^TCM9-p}lkayEL6F|%rl%(7g%
z+!48u{0T3-sxU1v<+wmrHDWcl8s$U37sOEF+iNviq4|j(GB}!sc~@Wi;ADKboNm_X
zH~VtPVqPXYF0b;)a~%G`gYUwO<9tNDx>$P!VTT*eI6{La1${D2`kxiCpFh_ljh}St#N)LRXMH`Lz5U*+|lXFV>QDN_u$J`|=-Yj>fT@O+)q81BZU_;8h+F!lh6DWPY_f2~on
z3&sRLg0?0i38z1Ce4AzLhiQK~^OKD&dMifmGt!zDeWI>-+#947W4cHu>*Va?B;_QM
zkZpLQAQ1YcigMjB(l~8Hul*pO;Og|NKGzvP-aihH^ce66^+9Om`mW!|?U%Uy%eaSF
z0`+@e*ERFWAF73Lk8&?1fSkySjWUU9sKPFr9`|_xv&D@EP-t@bCtHM67$Z0jxaa+W
zSJK`jf*iw$(~9{S(u=$re@xdsU#fX`IKr84F&KH~f#q(5jDmh1
z(zL-xSwUF%!Omi>JUt%~r{24-$>Ai9%y3C+dcy;f0}u`Izt^FZ+t<4*a{5QKy)FI#
z4N>WMcqui+9!^2h^oT9d`*$QcmlyXnU#I@Oo#?%b2YyA>EUEyYjY(eo`@vta$b@j9htI;LvawO1^GGu3y
zGV_&TX{4W5`bI_v>ZpW+%oM*pLBod=_B(2c3$a#|9;DIZrPfoD?l7H_D)E_s%4-uO
zf0*v}yPr`NMn-_R$y+UaS+
z;_w{2zc;)VP-D@@vr}+V8sv``B41N8&GnOTO1t_8VLeS450-`$u!_xZ-9-qJ)OZDP
zCD}r8bM-0B6odtVi4$c*U>JC!LMF-wsa}^?!lzNt^R_<)o%TDSFBcAQeV+EEJA2PY
zuW0&zGpIa(w{`(QA}UohTz6A&_r+Z@>$pWVpzg{&`RNp-a!n8WEQQ!{|Mmqo}{vN$_$W>#7NQt}f6m!pfvCyj*vjRG~+qVo5H4TyxpdI6hP+I7;>U6V`o@cmFUT
ziEP&V(&-m*%JM^p!{iN%h0tTR&Tj~?JPgNjmuGdcE(L^bfLAUYo|3V+`8EX@3zyYq;qY47hL%WXIM^qGpI4r=RiG6!N4
zVy%xZ-T+l8sBv6cKQ8
zW$f`=J_7M(z8&E#WWHtb=nW?-eZk$Px_6Q1k%WgOcz0u&95(PT$RYC1Cb&UHldGx_
z#Jv2Pur&FK%U*t=mc9PtG>G;`DPI#SYT%h3!$WcLXZv^DSg1
zDhu;4bqBJ!u-Lq2f!<87u5AbB9g0NR5>ND7;q0;XqerbT>CuE$4Q0X0pF(_Gs1Stk
zOUajTOf77~a46JvQ#jDbd}!!IU4x&|HX=^jL|15G{!3}{f5I5TJAcw1qqkM~wp=2k
z^BG`F--sM76>ONfsm~OBDNH5;i4N;m2$uPTkB3maITdXE-y>^dmKWP$AWO<4Lx+rVK@@X(Q@ME{9gAwyYZHkmi@xO2
zg_|U7PB>?ma&1RVPq_T4RWzcd&n&szKl=DaNnbZTkS3-A_U8mL0nl>dYhnJmu}I8E
zjCM)NLy`KWec$4VBC~N~x`bHr_kHile*-Gk^Sx7|#mxu`Eq0tnto{t}tOu5NAtk_J
zq0X%|xVu~|`*ZF<5C`-aiRnC7Rq%1CJc66iwMA|0+HI_lQ?Tmx+GjZUIPN7hK~{XAv!n1iQ^DTX?5DVrg9obqPa15Vzv`8URyB`iqp-{~X_2+o
zOI1$wXF74h;A4CP;yruy3%~J^MlQ$zA@imqApYPaK718e_I|%e=Jev*`RNJilo&9O
z4w2EDL#q|OZBa<;m0X@-G#BON#v`p=q;RIvie>bm6y6En-~OvSnDjn>MBQ3Smn44J
zc&ws(17p8OwxS%C%}HKitv$1kn9Sa)<#^;18u{UVe85i}F^H^G*<)-IB+Q$>)<^Bg
zW5{f(Pqi#B$iDO{xp0k?!5k>luh?v7wfyJ>I}+E8UWxDqt??-MQptNaj{?n5tq@0%k>pXgIN2c`NU%7#ye#bXMMGqiimFb
z6YG148GXGZ(T3|FVOr2lcBx)#4)%Q6ZW2P?7gV^cN4m_DmQGWM7E2DC(cetv@hB#~
z!N{HAIt!gCI1t+d+xpl^?VQhlVsjmH-%Jknw}<3=utBnDoxrKMF+5?#mo+s_=vR-*
z)}nWc>koK%s?Md?oBl-f>YiN43y4DrAPdV#Al~rsPpy3?a6)VRV{LxvW#
z(tM!}`*>q*B4w%DZ^32P}Aq?VfK@eL}S6
zB3qY4&O%dq%>EBz4Bt8P3*$aFRY;2oe2B+`=Y}bJnP~M=a`sJjHd79++3SZ8n!z^@
zXT6S5Pmi}}`18}|%k5PT`gcRfNtW9+q1N1gMF++I22;WTd}6fsIjpSA#7l1`s_!Rn
z#rq)oUc&s6FTq{q1z)<@RA`?#3~nIYAL3aljDYdN1{9|f10R}9kfwl)U2dm|=0v8^
z?grFKPsN@(;Dp0
zVlWo{E_@*z)tJe?+m!>)D5?F5+TkBClidF(=0!Aagi)E+3x#<`-;A)rb%pGsR6iS}95Y0l;TcND*hyelRmYYG>`FG_2cHKZ%9{?G-mb?hX6^
z`5Ab`)?CR?yG#-BTT3e&f|*?ydOyV8(B3@7%6we6Hx*c?Q@;FjDeEZD?Y{X-I$19@
zFY3_jv~fmCS+$4x7RDA%1++;di;I09Sso?y)(Ii~^Wp3vNdCt}$4Ng`^plwv&S}z&
z^?8}R<^m+H%2+Uz8Djw;f2fdbAt1>Di?v#BxdT0xhT3T8n9)C{OqSkhk
z-+u9WiY@zD#)1OKa%mtq+FZ-^+m8xhiH}!eu2KT&AjN_~dxe7F*L+U)uepv+YuIp~
z4RR7Ry8@U4X3v7>tXH?asyVr@s^@-(C_%KeHT}
zJ^=aW7Zk26t*j;ppymotf1D@Y)2AvGS+8;nVS(*PfYZJ33INYS4M&~GWKsg3!QQ;D
zqmt#ed69W&8w-K#CR}-{xKhqzD|+DQPg?uJ9M`4eeTQnXYR|N^+`P4-bmJ2=o*mA8>0k>{OCH#7^4`Tq
z7JQ-RPFc15gdPM-Nurn2>n97*Z#%+yR0E&~ovKn08K!wjdjSUXuI~~>@|YF}Mq6>^
z*E#Y)`O_Wq0mFAAe}wjBe#W=+=;PfgR6l#W`A+n
zg4|m7zN($^t@Im^-MiD9XNE{LPhCfgg0#1WThHZ?!pQ#n{CN$U0U#Aa1|PCptCqIj
z@AS+*+WE894jgU+nxfU9r7lQuyc>$^dE_;4B$cH)_tYNb+q%k0Z4R6jR@goCr*C%`
zdCRYsf4YT?tn3hqJ|xbRtAg+LopEFZ((6+Le){~a6BQ(%J)h>c4Kh1q4NCJ(0~otp
zLAd_x{;S5`Bq8>aWFR}P?bAdJ(Yf;{2IELoNX)57hEq?bq!T0FUEz#SLyzh3AGV#a
zWD|u7HEid*&P>>L*!HIiiI$|E;i%Clj6u$zk(R+HWpg+uz&k!Ws5Fi90^^d+8t%-MTZt
z^yA}N(p3*+f~V>mv2c
zXz_A!=SN!myqKBFu=|Ky`<|k`5GTig=&}^T3KZob2y?VZ7Z-^^
zMTdzP266Zeo>>(jrYGz8)u}b304-tknb!f4IJO;t8VLrLB<$CVhRf{{IY?jmicGY158I^3dsDU#The>z9xmwGw
z3k3l?qbEUb@k#r&m&3)_!kNx?Cn-E-23PDzOk-Gm6q!VIkZLKj@3tkkAuA`d6_gMe
z709M3x6DI;T{fDy%ozY6_p3gMNX8MB%uK|6*dV~1VT3X*?YmZY*Fm-PV<7y3BU#`G
z6GA8otnbg?OK1Za*ZE;(-97s+^^cq>XQ`p)mG#x_z9}Nnp?y{0H3>(E~?^<21LouT8`uyELN0!1Q4+mb3axEo2_;{)+*FI
zPDV!g(M$T!c)RnZkwbSILRVdvA+nEm*ak{+JNu1!
zhLU@eUy7570G8Lo%;!4~0KW`l>$iHOE=9G%$RqT2OJL=dE+qdFxRrfl-%}H=(vCt=
zrfy~II?`6g@IOh!f9)gEIc*lHr
z8Y@<}5I3~J+>$0|8j&Oyn?_jltNb)_HR2IaqX|2@2ayF1p6vl(0*SH}jW=#E?5g$=5Dhe^5CUnFXU3oq+PYu23P6{45Fsc6!ZOFWeo`ITHt=p~I_QX;m)L^p
zp+ODRs^EWt9(UT~DoXk=B7@6=HK$$Wf#Z!#e}e-O?3oMQvYnr&LfGc37C}h0D}!^w
zfW$hNZ+nt=&iEoN#@G!?B0+c0N|hT+Kf^ianou=bLTUFa`AwGe={-#=Kq;zjO%`?wr@cW>0NkWhPDK+}W8Go*
zP8E-S(0g4h4CuLz#-ZNu;0&ckUoE}u`?!=TR~swy8Oq+-PmqCx#i~tE-Vtk1Z{X9#
z;xg0G-v2%{1H=a{gW)#OO+#dvhpSs8DgBLLq8D1Tra2&I&;)qPFSwn|%K(r1`ssR?
zE4>ci>R|L;h`z}2$#*2LXze|7IjylpPg?f<8*LRx{5ppK;t+Q_azSEv^MI8Qm+%my
z*;PqRkE+RIk>*F0L#b$;t;<=-@ll@56Cx@DqG2`pV67Ol_F65nRJhxL*zVRg?y4u)E3u
zxKd9wRwHHjDCd{a`e(VFUjU*8z#b-DN;I(2?Gz-9jC%Z6YJLP{(tuH9@NJc1C9M5O
z=s$g}y&Nz#$=f8A_2>qkYrV4-@Jg#tWLn4*$8*wn&xyu!^fOdrdCW;94?ZXZ%ghN1;}({tA9bxzY=l`C>tM)_?umCK
zV-)T>TLQ@SmW07=5NIS4goDvQ$R_XUw3&bkGa$lFU~-f`vGxgz5(#S!e`TPFZ@iLG
zf$UD{)#QS!!NrTPI8MpU7y~_FD?q%%he|+o?$K9?r4O5{mGH~
zqk0fkAgWx|CUYsmcmoOG=?1za&;2lW6T#LRt>jMEh?y)>(@@3YCFKK5EV(=)20(3xQH$(sB49$6@xEbZI5k@MgmmqYmA=
zECJcp5btNpOaHvmw-1pUg9D=CSXLu|Mhjb=}9YFjW_
z?*4SQJ|s`m>;CPSQ}7cG47HbmiIqSlrv-tqlJwQwH5)UBB1eg>J$uXD0Cjl6(^D7f>i;W2&spVt9@zWQ2{dY>oIc-%^hyD
zlb#A6cQIA~BoT3$0tRh+1FenC@lRBQ!^`a$#1F;?@m_?1o#L$C?wCc=jurx^wnEY_
z(?FR!Qrm#rh592hq;pb>+4V9XFj88WANPD4LvZ7lRQ6bpe(muXnDRcEb-sy`lavX_
zb?yUF1xA3R#o2VM7n@$v#p}&(zerGEN{pr=B#Xae2B;U!0Li2gojA!lJ`e5(+!j!V
z&sj1UYZ>>+X2ccm6D0TJ9+fBbgAgC~$ooThQ};$aBlk6BN{1A-b)qpR^s?^h^#D(wiQb1|@Z1@Zs^o(*#*z+~EGN_pV{G7?TYCCjEo(@|q`deUi
z>e*qUy5Q+%sos}{YGL&)eG-mnWhogPiL{9$)k`h+mf?!5f=mHe44`iq3}<7e*cR14
zpq@BbKy33ve^vSeX~%jR*a|BCK9CKe)ab8$ddHFKqZif9Ep!mswSFRLa_Z?1pkcWE
zBWq%roD5GGW2P+M$%y*Hut~o!|G{2c5hmp;Zs7BuzXk<#p~kbQ?f`{X7CYG;dQOkKsG*M4b8028+uJ!<+fAFPY*>1XFhoX#|ePZ)Y#{R2f^N$lT
zrqV`-bk^F|M#JjEOM7@}W1>H4tQ)LP)}>y$I8d(H1OZB6rc1LY?F%GlX+Ea^TnBNq
zc17+$-`{(b;}6%b|5KgyIhPaZz>#)JjPV8QSBtd5Xo{CNRk+k|;=V`nQ>gu3^RE{i
zpWx0q?YpA!0SXW7Zd5>BiC_)=*6iN{01h(aOo)>!l9QK5K1glwMp`zJR+U1Ea{u5p
zM4W<~*2zn6+f%UwzldS_ZKOg1e1DYsHSs5W>n+J4eRwzu9N4489i>6kc*762e|7UDcKLkO;?m5nA)afvqA$`)Db5dt(uiu%K=
zyFD%TUEr!=yad$D@q)Fqv1+FTq%9XGSVS4eITb^tDPB&9rHwJOkg9}dQYU{8AIkf7
zEP!fSpoDY8^`Bb4-D^WE_KnW{e`lk)m121Urx#z@#Z(4
zTVWcJcTY0+nMt9Lyfits*H-1;LV%QQa7Atk)ma4hV#R+M<2hYMdF##an5Mg%G~cR=ZNpv-uHb9BY37Q9uK5XwgA>B|5D%zuaY9ac^-UH
z8XU|*Gyy^tk@vV6i8*7nATnsp3~1$y_b%U)F8jWNwV*i!gz{rcItzigPx6$dOJ`I9
z$yKwP9K4rrKCmMi?=2M1D@-V6|4Etak)GG6<$|zAqv(>!@9(aPx=K_4^t*417u)Bz
zy<&;aU}RBz0H=ugtQ
z8Aq2&%l1yb1a0$Nx>e@n_*MXrb2lmw4F=F41@%VM2g8b2fQj4q!F|
z|Jw%k;BN6u;BJM8+Iy&#DfMrpJnZck^U$)dPjwW%jh7>KTTK$Nk)g`OrP=Pp8|2wf
z7hHO;$b{UPa>u{>VNNb>UOJ5lRQr~0n5{PMGd-^TYTFSZrmqD`L>Y2?H;@n$$gB({
zyX#8INy1pf1E6ZNZw>eb!M_mF|1|!&Y@#ar=tV46db88IR{I#$(W409>#FYh$
zD)QJu0dFm{K{|va;~43kx=r=&f?~8GcaF0JNTu30Bfmw=FuwDXZetOXcFPYMsO;O5r*{8h
z($^u$0|hMc4GsCe`Q?&I^M+&uK)PNaYDcM>p7)5#{hA8X>swVJMC437S-hI-r
z#A>0*y-{&nd9hts>)3ufe)|Sd1rbATK>-p)ugc?D8tw0%GHiJUf`(swtF%|04H2yx
zqto#kFeqnXvbOZ2e$6jksgbK{P~A>9DmT2^1<3{;Focgr0jFmIz3ub)a+3(IX!J0-
zWlL*hT^H4)EE?Qd?ln?X4b4lXV(nCB>v+`2OJqEwO#
z3@;F!NQ&jlJm%i8n7gY}jtOo^Ow!?!#T3%F1DZnjw@A#gqmJ1XV9;PeENXt)zmCL~
zFB7$g2=FGH>sUPp*Ue6=8p}^#0_25zFN;9&g))zf#e@1r6KkYBK0n1gN#RWV2y~Qk
zWZI2(>$QuA5d7@!o=C=x8Q0nVb{>b)2*X$sujP^c2ot&fw`Y=_{L@3u-!MZfIr#Ft
z^P)NC_IdaG3BkomkMX0|Au|4uCPqfB+$}Q{e{$uWkREZsf
zV#~wd%m7~JmN76e6}7!hv*EE-E_zzN-tfNR#B#PVyrIl^djXkig<`?y()-0WTqMXS
zk*sWhLsHL7IK1S+CX}1#<()N*!vzIJ%t}G!
z=Xiziil~0l_jvvo+Tv|0d++qI>W33m`2QJ10*|U@@zW6dAc^
z+8eq(=%=ZFSeKx8cB9GeowDVGe%*@3!X*Egv|FtOL7ON*Yag+sj_d>IcfQ2Q<+;c9
zZ|H@JHgr+-(!20s*8~!bXq~H?K(`ftiTgs6-1~BP_Hkx;CexAv|N7el0P#!BlB^f-
zj~O4Sfhw$SpWn@33HLdLQnLmOVK;x7$-#rleonL$#4wZ13GgKrkrjDqR6N85;$(AR
zPaYN2H!+LW?_IJUEn!`Wt-2%QH)L)5g_P0EKByxBVAttpZ29ozqk~R`Vm(v&&BM63AOR;7px#s)FR5MmPYr1BmsCes_*2!%K^5S<}WZ
z-U6ftok2JM{=7@6yREkt)1a0`Zz@&=zO@eeN4}r6qUxLa)Kp$noYmgm!)l|8XG0Qg
zv1^P-n$Wx-%WeLjRibyCz|8=dsz#jY3h)L`^fhEgXyYF3C;0_Qg24<2wNmu8-7EpQ
zt>>!)ZAp@YF5=x~|FeAAi>3r#;jAirp~nYJfNJUoDo`C$Z+i37Jt|q%Eh2bB>C25o#X#hTZA+vVmwWo4L{z-=yQ*5^n*P9U-
zpb+IDMJ^r`9=H$3`l|viJb+5}8q%nfTTmc#UFq$YW=?EfBu`5K+L5Tm%XLUIkuI!9
zfDYxb^$twTO%O5TvqYRGGa_j~Xbb+(jf`j6Tu*G==hHK*q}OqNY2|N@*y`_iAg@&A
ziR9ve8)ReB`D?4&ouU~z
zT%&+hxhD>Cu`Gb#5`bGt6rkb-)>K@kOt8yk2C_2d0waZX8*ywXviiF_xDsc7S&3_8
zAt%|4?4GEWX4{pcv2xAfWFiG(ckG>BUx-dhkjgJ$DDCLC+oq~Cz-52r|G}INc>|#n
zD~mm`+@RxLD&u*L-KmrxU{`$MX5R>!iFht4X9VgIZ<;m14F{q!tm-S;#w
zm6w8gvF#2<3S!H5OEZSmR0v@GB4l3bhXTrKN>2NiL?8aJ9`<=l4y(y^^+TI0)?+qz
zpcjgCxZ=o*hah20OJ!CU<`KOUH~`!^!xP5yr3(h?iKozC8OBo6~NCosbuhi^87PJ=}`Mtq
zV!x0D_fNfhA}1a5;7Ls4WO(QVu=@j}LnPJ3m*DCP
zY?BST85_Pt^4O2)hKOZcN{7e&6uaaqfY4bzQ!j!m!Io?NCR+&?kBK%x(VKR(*acy?UOnsf?EOtlC-|1LlvNsLS-8x
zK>793&>S-fBgMRA&fFL`xyD!2BP>n2+p2vBLeC$LiaZV7%?)z5-XOeqC*v*%1a?}E
zI(PYj!gM=+fexTNv5V&%tSB(qMHCn7JY3YsnZE|6ec%^zzh*Fs1@u1NPcez^-sC$1
zgb-qY@zC|+awuB}4o;K^9gBN5m)Nika8uJf^q6gh=#kMs1ONTr)kg?b22o#U#b!D|
ztQTRRYsdmVnqe*UUKC3x_CH30!ueP|)fL^_+Km~st9)Kr+s-|0{U`VA`EFCt@#Bf7
zf!SvSPGHEo*-V~nNQ4dc85ojalTUV=f@IuA;K#G)eH}P3kcH444Z+*2ZTyibux`G8
z2V={7`k4zf&`E})D0jom*VzY%{Knv$6nKi4#R=DM_uSWKV<-b#4I~24uY;C~slVS?
z4L`8ao^Y!IMu~Y@6m7MxM-Ix8kllmtsLvkz18=7LBMYdvf}%tZhvL8ncqq5jlbh&8
z#k+xmgkZj2{#LVd_R3AQzqw^C4Yd2{hSoXGTGvrKVeu#l8#bHM?%I%G12k7+PHy2r
zOu1c-(Vet5>lh@27px3Oa`c|gXD;2KA->#^;C~YTpf%vY^8(8JAYcUD%6!d?d)}w7
zsZ+1>kWh5A^#n{GgKk@JIYv)35Ey5v47k^PTZP*duVN&;4ekuVttVX!-&Ug;
zt6~lK@ATYgU!<}=Ky5|(4akp3%TYx;wxN~{a5QqPL2uA_i^UGlCL#xkNkEvMTqd+f
zeaO{|Mxn6yBmkzEM?JjfORBwGZsz0n!vOX@N{u`M*-3?^p54M0LK2+-^45cC&-d#3
z@AL~mcM$;s#0cFjk@JySBbD4>&y*rRM0nv1-jb``R_FGzkqJ2!3;Zqo&NSCQ)7zs!
zCVJiO2BBk9)<6afwBqMjdL4s7VTA6QF-&MiGZMr^KB)uKfiQRU?bO1|4a*V=d**2C
zlG?|gRz5rYjbJqE)1lpN+xTG)Ed7a}eLr9|D`Pdh-dtq!htUU!gsRH>dTL*6eom0<
z66kq>%m+fakA=-@vX{d08O-3tCT}w|hu6w~QjEC}j8g5rkRrgo4CUROK!*V?nM8)d
z=6ylTAhiEP^09c@^tqJC6QtMRJQ}9D+0WcMfT7PO7za1O-e6*KHhLOxFuOG~_Psd*}<4d}#*RcqeS@Yw;88$H@;6
z3^SntLC6ySln7K@Li!25(g?Pa8*7B{&-)4BdMc|F%^one1x6N=YDd{mxSx6@_S@s*9hIC(3*l+uWGnj>0V^3=R?G0f
zwWrI5$U&6=@BV*%`ZzICVyBeavi+ZC*p}MG?rir
zgAD1}hD*V>ILrQETJvcIh}o~m%#dTaQr`bdh^{Ran<*o}a0RzsA
zH&CNv4SCGHbeLi@;50HQ93_pt)EtPgDE)?aKWB&Vv<3_uEG#%Glk$%~J!lL~7ri48
zB}E7i{m9!6d9&ILI*5isT8*v_o_E&^QIF8^F{TzqNAdPA|15;Xr@ZNO11Z$4&=44A
z`N1>vGzW@qzy_anB
zHw$*beShfJSei;&;8#i97GH3{O3RA@-5O$L(9pgZI`b#hXzgAwtGQja`MVo|5L=D?
zpanj87dqLr=OlTSTYlJbnbHzs=Y5=VxeIdR&;<$(*9B~yZOo`d`@E!YNzmbcQj^BC
zTs|6r3p#K5(r@H$F4OPayq|-8p>Kh?9;DMk4lMHrAU!CpMf?#C&GdkQKEr=6*;(V_
zeLY{OrkelP}shm~f#qSKRe
zC{MuB+$BZ5=iO;a=pM`Owb10n6i_e$9#tUlNU-tnqTtE>g#?>9p1|7*_aZt+;f0diwQ+myNIuIMt#5$aliP
zi~%v<2XRn?LUh0&cf!5_F}Pl&?8C;;-%1Ph#?xZEK^+6((t-j;{kyBlo-|>P019xU
zL?;;S|3|a~lE1nn&rHpH<2b=SM4bkK=k)8531jg7BD$W3T@L4SE!n5vrRf1I@#aO5auAInV?y^XE80iYAA?4hiqE3{G$%p8^%dVu8NI%d~Ui?l3r
zmHqnt!7#P8#hCA-kM
z2A2&On*=zOFGOyqHUdJALTf!I;>9-s8w~$+Lg#Te;Q{Gl(%OtjgjQVUL*at^ja((Q
z%b}Fl9v&XY)tcBM7lx^kAhz%hn85&Mz9wq~<$
z2uP%HWodG=L^SYuQ)5d2$kN`qTcsBzvh%r~iE7v{y}K%1sYt)IP7UF9$ttelfiK^A
zzL>uZ+7C|N7z}PVq`a!X9(sY1pH~q4c4IgkecshpXaxTLX677jU@cO~;EwXz=7$=v
zYtJHG8mZF}j~X?eeUXUf#x}XVI)z|65!kZeyR3mMshP@GM#N7>Ri$3a&>Z#1pM@s~
z#>I_|LLvvg*qwGa-FBod3+5un$rt}*L((N*vRFhc$Z;+t#5nn2Shx1NE
zP4ihXN2!_jK#JoVFsdcERk&pgf{8Dfm`ILpp$kc5eatIeYF?e56kN0}+^D8{UA|SF
zR3V73iZ9EtHOBCSp9Cc=IP^SMRaM1Jho9sIVMwR*+Gu-jsi*fNeu=et0In8L!~oN|
zQ2#uX?yaf<&G>=*!fmZp$K(nS!2qauUncszgfFwfmup*>HgnS>TW)7sBAT0*EHqEs
zu)XbNf2!!eC99b~o6>5qQ!0u8d5D6e0?)#{yzp}4W*>HRBeikeJ3|A-g7l|89-9VT
zaWB;)=Y0SQN=r&ga`W-^Y}VhN%^1UPE)Qd(JWYDjoz8Zq4tMQ*1k;~UAw59&wEU%@
zR~?5_n+u)D;HD4}BNkZfvo&iC&_xE|4;=lz?*rfP86vnfc;69-c{v;Pc--s3UAJFKa5XiJ(u{V8i!BQai`ozWaVSV7@WgQt)8CVA;4z7G`IC+LRJQ5*A}co?YKc#P4j6n;cIY*kq>@EM1az1iCBl7^#da4$k@=L8ttyM6RPHXndWY6cjZ
zA{yS&!9y@+!4y#TAN1Ls^xmz#7J(l|_0Wr6_7RejHuHL+<1_c71huFXe_Q()
zpUTdD@HH`%9^{pjkd@yZ_K-(mdms3ZjEvxRY~CCXM~PneixQTXR#b46=E+t_2TDE`
zi~Lr6@)d|GfjVD#j^O7lqIS=ntv?Tt%pU~S?pDtX+`ri;@MgK2%`6LHyEcH%6y>ll
zbERJnI8^ZSTK~lXCE16-YN9A)DNftwww>*!-65kDdN2g{7>UoA-gL%LgZB~~v5sAe
zE)azuvE6YtAH|oF64YleaKVC6#lhyI!v_`6;;)0N$Bp4HuLtZCW`kejHD566H@f!1
zZ?DgLMByu<-H6yiI2|mv`Yp$TEnFrBmZeU|gM8!!TB#vbR+G{S3csSgN_}p(jkB|H
zR=xH;3}yj3(PN0))~x|eq!1keTw9c1T7oSPuIyQSnlqtkpnv*#$MM2_6EQWilJG7>
z*^^5DvLE74(|WfpcjtG@XESzDF$WMTm(*_+P+qH@_GCqg5O*+qW?<4RAuVTv84V+X*{NqRKS0_t}PqwHx6yU{5MX&hV+({7g%fh!(xB
z5EU$Or>lZrof_OZQKEu_M8Wf{3Piwg<3Q}al>rP+(RD0#Rb1Ay%P`+6f~w8NPWo#KlXtSOM(Pcd|!{qSy|&_6PhCZCIP^z0(U&-w)F|J
zjD97sxFvne#90LZ?QyekckN?5U1U$4|o)?$0Zs!dP&l3&2FQdJnIzJ1LjzbM_zh{EZJA~!?(^jPs;K78L
zAda$dv(5)N7Nv^iqqC7HZw+YaR{lcs?#!i+?>7q#>6XaTg{h0d7gCf6-SP#kvP(UF
zkI(~m_BS^}&YRDh$~-TR2pJ%7KX19aRRuZ6j|RkeaOJxb<;&Tan2$T8(a^}LNo6(;
z4Q%2DlxE^`QP|?mncbZ;nIAVVFQ}F5@YFx9`YQF{xUm`kWG7shx7Q@ydr695Ov`fR
zv-~7Ic)PU4yBGdc;^zDgzOW*=aQQkso3G_^(BX7k6ML%0X?p_PP~A*G%`*5vj&c~i
zX$w{wI#OvnSMRweU+kQ1=OW(VGJa+6y2j_a=HjA9G!2E4`tsW6z@I#PYb*V1P^o2sp!wkQzb)d+
zI$4YAzNHRH$$!QuWl@39srQ&aPJ0qa0pSBZRA(K`fVZ6_y0-KEBUnOx36J5Wi~g@{
zYcOyqXko5UYXH^?5fSk)dDxQqL$g-RCKF8+7oMd`xTGuv<-tX@TReuKp+5
zOZ5DMD1q@31asgQ(}!o?HK}-cc|otjTT`;GzVi9FW01z}uTUn&StG
zA6P+4;ZseYQ%$#L-RLZUlET3{@ZRs!@$vC46hNgY$I1IN0Zgq(e2V$m+|VrUf)av7rn12fE-pYz*Okjr{o!#ZVaw+afE349I-f_4;GzBgZumv%2M{)6=h
zgVNn|>uo%OyzQ3%d;%=?5crzpSHFXf+$ehjrNK%3S7(3qxeVNq_q`H26yJS*iUO%b
z<>VyF)6V15ljN5l%se+03_?Gn697mvv%T-Ki?pj4rJ)+@59&dZklRu8t;OP1ASMa0
z>3Oy8F(ASe;foNt-_Cp!p#2&=vD!vCKJ)-QPrwZ*omTjb9HkF4?w@EVd3>c+y}yY-
zh;EVAnJap`S-V%i9oewYc6Y?K(tN!aHe$b-lh|Df-zvqLszMZA$Lo~WtSvW3p7_059v4eNE5iG3%9WLs7*pvI(N9fs+$fRhv%LN;er$?N~_kzL69ivJ}56)MMc)V@G&eV%tdK{;_-pgiN$mYehd8eGp|eg*B=%svy&f&a52P!gSB7evvikwcsuuwj7v!sKmRbm
zAs@yx_1Dg#?+dN`XWuN@(;fia-z%3bH&>!W-ynY%{B^YU%VwfGoCs0#aK^5MVIlYH
zSK{&d*>rO63ra~GD(FX0kj9Nzx~G1~3dvCfnLo8ebh18Kqyb2zL2vZ9c2
zp`X*{?8T?4zwc-+F6@7$z`JA+aYycc6%VwHrnZPlt-dcSD{}?KKPD+DPa7m1V2qDV
z5Nfk7uC5p>MB6($VA}xsbJWdzDl0#1yng!ZS^h*eOmjPw$ozWIAA1^8Jo~ejv@~)s
z^pkfUKtg3daxj&8EzV2$2?zHrPZG&bieqz)u|)si-k9a(<%3ZLwy8?Tf}*0%2)_B?
zbnh#)$hd@rKypDk_;TjOaw}-u(=@
zc@w68ZrV`DHMC#9bf=5KII`8dEpt75SESc~Ut&0t`KsWUl9G~8#FJll~!AWW7@HMs$&G9UeLXYe1n^jqNv1k{ntzT-~~F
z8Xr(c1%7WWw6x$kb0ASdyKjp)Ya%#IMmO*TbJmoR%)k*Cx4V16i)9e202W!{br
z8QYF9w&uTPs7IF@>C~K@c=yj46CvN8sf?p$=P@M?7VwAOizOd^VbrYtqj
z#LSFg;C1>;I*P1VyEHFPW!lK=YBSd!*}v@*IIVhBbQQ8>9y=UB!)zO`wC$sj%uWGE`G#u!iP49_KZR`13h@DgX7~4
zu(7PU_QiSIbDk#zkSi%E*(2w}-!~nyR){v=p6S$5)!7u!IMzubPyt`|u=9zs;ofYW
zeDBy7PfWGvoj3u|uIPOuFH4>(V2JGL#Z9rr4A5dVKKp7Vac+TWKO~rR34Xobvzc2M
zrST;cVd@}Z(B6D->bGT8?NT6#h813CZ)4~L>~TqEc6R3vSW*D;($bPW3b@myUojfm
zx^p-*EG(G!AMXU)rx>>)P#?j6f?P_k4O%0-LQ!yvSsM=|WIyi-io?e0Hf!@I7
z`;Q;ULyk9xJ;t5ExCK>%DSRt{V+Atl)PKz1YOEw6;eL-Z`$}Iwjq^CC31{^)fxei8
z#KZe-j>=!Xe<+J8kEE)}0c~+=7&$tZkJ%{-?#oWfAW}cjDPswIdtJqf*qw8fSzAju
zMCCj1&1F7cJ9aB7H{F{UFb#XtVw4ON6qE)S0+n_k#XT~+0_g&WgajSh<5YGDgmD4+
z41dJOo&zB7-8O;kbWLQkP*9cgO*MLh(i%5-nLwjkyZ+Vcr^mT1|DTK?vI2|+TLvz!
zC+R-$m%4KXKDRjnr6cdz9hRkPNzlZ}To)gtgyNHvlaqSvl-2GxUlaP_fISd1c~sV{
zq#%sv-Rw=Vg#|4TjCcU^!eY{eo#$olqzJAXcCyUjxTb+oZ!~4WX=vzUUH8o#UXuAp
zx^eQm+kGFK2~&6g#+I`aAlPEIwk4J}N2`7Picef(zkMsNq|&Li&#=^!h@Pr2Hy%oT
zDIdo6-y1$5j|;}-$PydVgWj-kRdd5gfdg8x=4@i4`9?QFKHF5wrjin@D4`=%k=qmX
zobfoWzFBOG;c+z>ES@uZ?s@NRjrA1gxVEAq#?|RIiVKbZocTb~h#9KmR(>v{q^+l?4Q8!@;(3_4TsRc?j94NFjPV}ylo4m$eHoE6L}h)P@F_2n@viq&_z=xxRSzM*EwL6nsA04mNY
z5_F1)PuB%*l1~MLgLmY#@#kDuBKl*l2eY-8g2=sF^<3t1G<^AWKoxo|xXV5MRl`T<
zay8bT-Uoh}yVZ#FsM!2#Z3<`>Q@yV?wOYKJESp{;#XLC0JAsx9*R9^+@Ci;fIRe+>K)Vq1
z_perM!#a-1@%mta6VZ`3AVVu)yFP>-6q8H*M3BrV5PZ3((3g9>eKeW*^9O>I)EN#L
zStQVS5&V%c)rwOT>2$p>*Z$TzQ0sQ_OzQgg_R5ZfR<0>5jPJ+CGX3!VjB8X6t{Xtz-oUH@3Go6~QT}
zt`E-7H3Ng9Nce`<%kO|9asf2SMMki#at9LM%Sn8Nj`d!FQ>_U*A^W?44Gj4>UM)4W
zQ2``ezFB)j@C$do_jnf@9{$`PRgxyy9T9pV*QsZ3|H8J2i_L?3k7s@EZu^m)tkhtX
z$6~s2I^*Q~P3LL9DmS*Uk`YIz1JIr<$_YFcCv#iHrA56jc1K9WJNDYKrq+
z4q~LF$m~=n_5lzC{bFrUB$8$6$k(~LJzs$QpZ0hf8k)tOis97JuzS$ctv>F!(k@>UF*lr@?KqM2D)ux&s%ViX4HHzNTsSpWSg
zUWHFe8s6C{<@(k1R{{gez;pqU+j0oK{k+@8RDi=hRPVJbXLV%s{mD2T_sgq+c5&31
z%h@|_ZDMh$u@t~P{egOjCN3^sa0+Y!CXz7#`1Z7T$i3^eNR)##-;=q_v1Wl3`3+B?
zie@440U~nilUvXa@&h)as-~8y%|{&3&z$(S!t8&Pp(YOhYhc`O5sED(2y2YrGUMNv
zVgiEft_~?42OZedyu5F!^!4>4nM!Ii2eXd9?E*q7t*e`AX#=S8-$pksp|;T+1=vQ8
z!NK1$=<4f3?EkS7m#ou~ckkMtUR+-J=J7#?C#tIHBhzE6
z$6``rI+>Z7P%p3&OdY9GJUKZDxh!q%pV5~rmseICMqUx*2cq(7`qXOY$h*jqlulG|
z(7jGYRR&^IixE(-p9fN~FnQlEn(kXQdro92jEAar#?Yc!t-(zxsJ2)}-~GGVF70`_
zk(#B=mon&j*hO&I&s17FHXCIY^xT;c2-3OQu?eargcBbV2Oe1H4UV?>_@pG$r>*;A
zi@fJUin-+OA@gAV?;+nbd=zC<{S3WOgWXA>?JQgMgLsE|?g3TiJca)d8z`-`2qTu`
z;4Y}kbrPYAMgP3w;?IR4;o%wuqT2Ij7T6bCg{9L2(e~yr7>u`L)^tzK(vnd~574@+
zL;7)fyna&?lTY^tCtmJUM*74aXX^gk$m)dhX660Bk&+UowFwv!xweKRZBz^l4ZUi>
zgH3B|3j@*UQ|
z`2%m?H*M}P`uY3Y6o{^#F9Z7jDKHS(l^D%=YimoxYNaPCsODlhj4kdZx6Nk?fOH*k
z4C-RgZeO)j>lkIHaYPN?xo4`WqxJ80Ud$m=Wu|?>SL0L>prezn(%04wtr!wO2mPae
zp}=~Qu{9%w$?I;wMv;|iVEn}!pD@UT2s1J=4v;xfr2HbQC8D#lX#g$bdn9rHkSp*m
zmPa26E8!I71W*lkm>?*U{FaXez8@t^oXH>8f4?&dobowc0W`;jB5Kki&ak!IIGQ@k
zDX875>gi!Bk4;c~oVrMit$B|nZbGND&6w_sh_YNo
z(|`f}+sAlhUMH%lj{OV;P8Cz(;NZ%=tm90+9;v^g23!PcM}*?7FKV!IKywz)h+{`Z
z*$Xu+08z^4a7=)PdXLPG)p3g=2d7JC+*1VPMpCP)XPRpixt!?W5fHE~gI)9nGcw_l
z2=r4CYPTcq69G(z=jT08m!jcYc{2N9IHRZtBh7lM+_Ycp#O&yngwK|=F~T!F-E|p_
z7AfX;2`!p9O{;=}0^)t$;kvEc=W8t6gYB@+<+zh6kEMVHFh=HWlMgL1O9VJcSOx|L
zsV?(w{p)4v>FHaXXrjO}cQ=IxF$o^^Qgb+MX+V`5wDW=oA7^UpWM03Hw6t074B;(q
zZS)PGaG7%=SReXkb^K0^QEcAl&Wje~9?%`}r&^{|e&Q>$`Czb>x{1I1Ue$Lc{om7j
z*xxE@8PtL`n{$E$3TXf3r)ibFdjwUnL^5|)lPn(q1E`N5s}=uR{6K`aw+WbcnNbJw
zxOTdT7Y;c&wjE7d4@=FgpR&lMRKB65oOX5-Xt^-N?~mB#*RQ~httC@t^+FQexk7$+
z`ix?W#2o>^@#AuNJt8`7b?u7%0n70{?OIdd*5D7Y516!o3C_W
ziw5w4*gYS(Okv1G6K3TQ;PZC%+}*Gd9uC(Ei&>yr36+89(Lfv!dhb
zHTUbUdbPq^>Md62RN(%FhX#Y2!-L4$0eF1Z=1NxV?>+#KVap{u{Y>t(r*0#yQ2W=f
zU+UAOJlx!^IzAX>fFQyKp`^as+Ow1`&@X`>^BBwM
z(@U$vqb-8CYAwJ3ahy;f$V7FNLYOhYRdtc|CTULdr{uzP`SG_K#N^4wObypeVt%@%%_#W*zz)2?K%1BPBI9
z6Ru4yfob#)>!p~|^t-02J(y6_jw)d8zIheU@tKJg4FCl0Q*a)W3BpNXX|rWTv)8q=
zu45l#H|D!fudxTH{x(C^F;4$`
zVv47ir-Q^5L+wU13WwFd&%wOi-y59c_d5N<_TNmulN0=y=?{?>+tS)+I+;75_Gm%YhId*D124MHKLz=P7PPJUl$|Yd!t(OiQew?FDMmD+vidOFd*g
zHof|%^94VD;?&jE6;!qPqfmpp6;IgEu3ifrb~;N&zx=R%Ul;S}Z@9hrOZG#4Tipp?
zC~g;4AyWn|R?D3)HX0GUMf^hZQRYpTh)}}~nrHc%nO;zhG3Nc}3uu@tlmg+Y(cP7J^i{A@*1#&obVySt_&%JFkj8gbetyVA3gJFx^x
zn~H7!sbVy#=n4=$V{PqF*y}o)&FL4xRaJn_d@*b+(b(V>U2rg#bnc&}2^~AwL&W^l
z_i~I9GzboS73Raz^75gUN`OBMw;u4~!7H1wO{DvO8g+=h=n8feU8LSa}P%-I*7mM8exi;5PGoyjanxyl|;lGK6!finjvRFcUVBfozmxKOb)>U&?B
zB0YNaTq`!>?hY8@{S+>C1bBFUTtoblRSDm|ML^P^iNbm}2)ZBv&8*RJf#=VAZbB|I
z3{Nkw_+L5Np%4V;aYZT$;u|k_J6&BJ)wA>yMwA_{jL=uI^>6=D)z?Hu7tkE1oD-+H
z0S7vn(~gFNAGdkJ{&OP<6ZGk9*ro!JD?Dtp@nTkbTOG6u1*={!vDpZgYwA;f+v4YQJ@~
z%LsBtWH{+dykU`RW&m3n+qAT_NiRRp9UUDl+E!|_fUJS#_}8v?
zZGV(Si%I*G?<$=vn_|*aQ;Q0cD0Mh-fI#5q_i((vvbFvWe*ItLJ|Zrs#bLZS_1g;L
zUx<%?GzrItUbkRu#eW}hsKzM-6d01^x30%
zt#eL@s)Co>6cM
z1GEzu)%eT?&7|P`3ub@KNUm(rZg4Jk%#7Tfsz4FFyQvtpWZ~vMX{}FBCkGutaB3Kp*GKk8kD!3PuS!8(OW^d1JSrwP!%e65iCGkIUc;N7&nCaCkFSlIy!p)XY(U4Av
z^asSu2oCo59&f%$>_Gx!U9sr-ZD7+{G6j{TlJ*JYo7dhP{feg?8Z@am14@W`U`E4s
zH@K%WL41RyZzqbxw)O!CV|@4NTM)-lsN}tEP_Al*NjI@pDxOFA)WO%`Tgk*fW;6*rKRgb0NA~tx>Num#c+6)g
zw|85Er+-!J^^(!?EKwzsPRHV>s8-XU@}g6~HNLzdEUIG7n08^TP@f3_lN(}EvI32B^}-Er|f*mF{EGKVY1x(o(cDs&JO%xB-TlR
zwB@Iws}rET?LE@=bR7Sk!XX{)4anF9cFQ0h=|V8a@=SwZv8JhoF((Z8BhS4~M*3%?
z5@d?d^S|%|wMSK3`>_ixi1pTQvyS6x0JMedz}k!jWHiA@;WMq1{e`>Muhz>gfM32~
z+tzu`fA&eobp0ac^K~;%F1CR0vIjJy-a7
z=u!(m;e7C`yu4a50X{zCQcsCq!{U&>=i#eyvu4+WHk2~^C5dR3sm8=>1>Vh+M@UGEK>JoT
z(^c7!r5#LQ(E%2ViIPP0H$fM_d%y#<+p*B`XX!gOsvBxtqwoOXUh#KrS2!49WRajH
z&$BI(u&_a6o~Vgjh3)p#`|+TTe5MefNMI=w!hy=FLRh)CW+WBZpL7{P1LuS<9kVT)
zfO-q+y5lvzs&RLC8z7`bm2H-E#UT*NXux2;({v;!pn0m^@{T#S{6-W)#>Z)iS+b#b|cLmp>X^IaT1_rjPvP$o*s+K@EVDhykI
zT&h5t_i2fYgA(Nz$*Wd_ZR{gbXq9)zk}MCl)6(NIw56mZcnufaw^>NNFO~|Z2r>WqxG_O$OYU94R4?cwpTsQ)zmc`OnIkT_5#vUw7O==iytt!R+m*4RET
zFE6(T7hVk-nc3pKkQZVqa$FFbj-<}236KuULpwz3X7_VHuo=mAUz&4SFkMsRD+V+f6BD!F@FamU7{VyUq)+ionv7A(5LY;|Zo5*^6}}P(
zS568L`0$NWSyEg7d3a^#v|ja-%_YR8ee(d}KC8UiR@WS!gx6V;-s9ffTGQ$DOp;?c
zv~Nr$b2tt4;N*^W_n+J(VYl7jr2@sPIH}b+ljBoxj=P)A=L;?Ss3DaYbb`WpMMVJ(
zu@jobIv!r29g&BjIw|`7T
z(d%#F$&T$9_;zpFW9{!yqp#mV^mJoCwdH5wN0i{;$d~JcIsMc$G*VTp
zDHUqZm(Yq`)zsAw{~AXzbTp*MF=c`mAn5Aq`tBdw(-Tg_g_W9^)jCn4SE#|La()Z;
zQok3|lG?AWLLhKt^v13yFXAQ>sY?aUzuyH`c4{~I
zJd!xckZ)l0s7bvtS8-<#lrn$O7N$|8F;-)s%9bdnz)VhVaDpahtia6I1>}&~(7L|x
zN6Dg0w^Sj$4H3jVkD=b9pehE)UnnJY>%<_zL!7n+0+K>;srf?Xbdd`n_i?x$
z7>>KEs>Y1sSphS(f4!&ybVDG$4Z}RJCEL^I`B<6lzl
z#w5HgE%rhqw}Xo%Q%mgmLX{-`7WR_8N^>;eDkUm5qlA&=lpVI
zWo27|m-fB_{#z2;x84@0H3i24--gV73OS_*L;|NLm{Yge36;}+QH)u)R>dOz71Vg{
z$(4?*%w`Z!@>D7(!bQ;tIWvP+KnrB3I9uzlFWMrYj3y44g+&c_i?brLcnh0o
zUP+H0ad;b2_D0J?+@mUqV+(T5Byf`J@CXS}AxLv%8ztMS^ffnn{}H*KNs8PLos+fe
za|ig}ZdkbsEsDCgtu~C>($bBpla^#TCrvDmxMw*oMHFR|W^D@#clw#3e$AR$YyaST
zV13{{W0dWO|JmDD(bjxSbtD2QwGfz%e>bJ{ZA~^$3pqM+bPYW?upda_Q+8Vzjn~u<
z0nUfYd8+fYMZvYkdVa65Jnvq;UoJu-W8D+ZUV{i+V-
zg^|oFug`-{*^+$)jcf9P%og9)f*@-$?>2`?G0p`1K&VpKL$riTmN)_fgED%
zdUTW!Aqxfk_yLfO?+f3g<{vG8maY^W@+3n{Np}&M;f3M6$_~z}OJjpBeQxL9Tb}7W
zFZv3HU=NX-`~$Q2j?0?+CYj=0pY6_|
zY?0Mr{}~-+2k~G;D>xk9Z>-?Qy`@)GRV7ag*i$GcY7<~S$k=2>y7TocL;xCa>watn
zG8VCE1^sPxHGLzkEcZ%ATT9ebq!(VG8#jhu;{hly)dNZG_XbGYl8f)vrba}Co@c%5
z`QBg8M=LICW$I+A6?&~CHz=52K8~R5CC=kLb&&dp;g`qox5IJ#%Tnq
zBVd+e0Ue6!HUARQc>R=hxA6I_zovoLvoz_4>2)7AsOad{0b!3#NYI+8wn01%pH0L|
z?K3V+uI&Dj{8WunqDfgI8ialx0YR>4%Yo%VI@162&e^b!YkzesaTzG{gE^(M_+&r7
zYB_-av%|!!PPBeioL@b-J)XSvlhp^a{k9{{S$zmqeD#AgkfW?`TytJcG#`0Q{Fa`}
zmzs9oWt;DSm&H70-kN|QV1|t
z{eb9HFi~wi>zjl4&Kw#&=J2^sXPg|_rWkV-n3o^}J00E2s20NQQ)ABT?GJ1T1T0LNw)AT%~s
zEGgY2T!yJREHO*lAiS0r#Y~K-e;m@*$D62t0E%c&S(%|;1B_*rum~7ZH55K$@Y!?0
zP)p!RrR`s=MD+m5VP3(}1nP(BKQ~iTS|KHHog$g%fw(EJ1XsQm6i`0^9+a>9>w+LG
z(Hr~h++1?4Sn+@4o(B((j*rF9)b;gC25zFSTZ-jz(8Lm$-}-fTOW)U+6{0HX0aAAn
zI-1wwwx-pbK~>c94Y`?0sK-%a5^Pl+YPLZ{>YGy*iQkQv(sOzqtkuXm;*UC%UieXp+ERrX~S6+3Zd
zNFBcG>dyo5VIPceJ?U+xLAnG^YFxSlkbV^z#UWdAY)r${4E4Wuw&zR2Yt8UxEI_>}
zMhQO~jZnuS!W@}C2o#k^J8S6_QwG1ul6Q(>llTk8-X?MA#*r#9oDD>ES
z%kGO8=$P7-8=5OF{bi)masbfx|2|HT2@d;TVn7~sIb`*piv{ACyGo@-zzu-2@AK5K
zSCHXiiPa0*xu1q@52J7U2I4_HbQx;Vt*v)_ozTQr5AE0qe*$wYNpZ-^9O^7rl>((O
zJ6;i0;1Uq}7%CO8T?L-W1aROrD7d^}DV@$j!p#xPn7lf-M5O|=3YSv9mGeDYa1rvaAX7p)@I{<-Oy2hJ11FhKYDV`uI1Gb{*6d7eIVT9X(1Lplq>
zgvREZ&aFK)lO0r+-?{Evcq9>dP|~kocI?wpQ@9xcCDwj`69?xTin@$KnBf
zTd+nb$ohsZJb~U$F!&&1!jwV8cIoVrRxvJz+M=L40y1Z)@vz2*m%Ghws_uo=Whm*FK~&~7@#oDS{(v}
z_NN1@os#xO-PWdWUTMnZ$le`1n82YTOkVSt{)RqE>W2|ZIBI59oOT2>NPb6l2@IpZ
zItdnk@Cxh8h-boTUc?h{JSb!3u%cEW2zY?&4_YWG{c-P{$5MXLnO`MpHHiJCy*dS`{8HZ2`Ojayd(STGrAfL=kF2fe^=zf7;s_k-wDM7#u`Y)gK7
z`s}POl;NdRWJcqywp)l?@VR^5L;4|H3Dt3@tS7Uv
zQ8)R2LQ9^x$sb{AGo+g;_&+QIas!&6Y{qel8TslLMv^)}`S@0Y2kFfI!S*M-79q5f
z!zeOX;?8R#DG6Fm6JFUomxbRa38V2wW$Na@_41md64yp115k_0Bp&Q3n(Z_RjK%o2
zV>OoL$2H@B?$=J!s-VkHxaGxuNbiT1eku31>@dE*F;;oX7p4l8OckyqeeuzttFl%mZ<_9Kl
znfWl8^=xenC6uL9#n#}}U>wdJrAF4`n{E*OBq&QB{$L5Qti@ea-b!J*@pV=XE;#o_
zhMk6MS7#J=d%;N~{k|1%Z7MszM0cAsJqLANk5230oC~V#JcOa0A~}9JuPqp=yW9=>
zzF(dkJotTODc%$Wby|&pO5QYHduRcBXO&1zO%06fvb{*TV^R2Gy56-jRZ#{&-c{go
z+72ko_r3)a1B0rWkA{ZEryUtaF;LC2h=s_3Ed(M~VwYsmA7r~GLF_-i02@R+0sl4%
zdj3PV8aTgD5m)UIu*|7!VMIZsLZ&PViYLMok*%fd7&*3@wtdT5oL0_wZsd9*oAa=p
zESqQYdoLyGc#x6#CKm0%dpT`IxdUp0itd{03}w47>~swLL>%Lpo%fGR}IygRyy&*9-=zqH3Mgx6-DAm?^fh%@Zfx?d%h_|5Gths7w3^?c)7
zqSV(=Pg$KAKEj_lJdzaWidy~DE@0}NV3BSCCQT(FfoMk0F$czk(v|PTK}Oqb9tN%5
zb}P(6IbJh9Ed1Y+bD{M`E|2EptDszC^(Ew#I*PXwhHYae5`eiU7L>4GJuwe5N;ybTr)m@_hoca&`P4
zMW_u@JW#L#(p8>iks2e<&QvJl08Zo*N7m0$p+9Dk)^9HL*R~VH_q?48q&Kl5c%tR7
z$%DNoW@tOs3W*t2L0`5@tAlG1uJ*cwy?5^0fA5$79s8dSmXex*Z1m)WAoeITl;aC=2D#cYgOSGFs*ABUu_871&Zs~w&_G&#}LMVFB$*X
znojU~FKLh%SXtjZj7s1VU%iIn5!6gf3i-%TsN%>B7mmySV*!ny#|t^|6?RP^nJ