QVideo 3.4.2__tar.gz → 3.6.0__tar.gz

{qvideo-3.4.2 → qvideo-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.4.2
+Version: 3.6.0
 Summary: PyQt-based framework for integrating video cameras into research applications
 Author-email: "David G. Grier" <david.grier@nyu.edu>
 License: GPL-3.0-or-later
@@ -21,16 +21,21 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: h5py
 Requires-Dist: numpy
 Requires-Dist: opencv-python
-Requires-Dist: pandas
 Requires-Dist: pyqtgraph
 Provides-Extra: pyqt5
 Requires-Dist: PyQt5; extra == "pyqt5"
 Requires-Dist: PyQt5-sip; extra == "pyqt5"
 Provides-Extra: pyqt6
 Requires-Dist: PyQt6; extra == "pyqt6"
+Provides-Extra: dvr
+Requires-Dist: h5py; extra == "dvr"
+Provides-Extra: overlays
+Requires-Dist: pandas; extra == "overlays"
+Requires-Dist: trackpy; extra == "overlays"
+Requires-Dist: numba; extra == "overlays"
+Requires-Dist: ultralytics; extra == "overlays"
 Provides-Extra: genicam
 Requires-Dist: harvesters; extra == "genicam"
 Requires-Dist: genicam; extra == "genicam"
@@ -41,15 +46,30 @@ Requires-Dist: PyQt5; extra == "dev-pyqt5"
 Requires-Dist: PyQt5-sip; extra == "dev-pyqt5"
 Requires-Dist: pytest; extra == "dev-pyqt5"
 Requires-Dist: pytest-cov; extra == "dev-pyqt5"
+Requires-Dist: h5py; extra == "dev-pyqt5"
+Requires-Dist: pandas; extra == "dev-pyqt5"
+Requires-Dist: trackpy; extra == "dev-pyqt5"
+Requires-Dist: numba; extra == "dev-pyqt5"
+Requires-Dist: ultralytics; extra == "dev-pyqt5"
 Provides-Extra: dev-pyqt6
 Requires-Dist: PyQt6; extra == "dev-pyqt6"
 Requires-Dist: pytest; extra == "dev-pyqt6"
 Requires-Dist: pytest-cov; extra == "dev-pyqt6"
+Requires-Dist: h5py; extra == "dev-pyqt6"
+Requires-Dist: pandas; extra == "dev-pyqt6"
+Requires-Dist: trackpy; extra == "dev-pyqt6"
+Requires-Dist: numba; extra == "dev-pyqt6"
+Requires-Dist: ultralytics; extra == "dev-pyqt6"
 Provides-Extra: dev
 Requires-Dist: PyQt5; extra == "dev"
 Requires-Dist: PyQt5-sip; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: h5py; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: trackpy; extra == "dev"
+Requires-Dist: numba; extra == "dev"
+Requires-Dist: ultralytics; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"

{qvideo-3.4.2 → qvideo-3.6.0}/QVideo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.4.2
+Version: 3.6.0
 Summary: PyQt-based framework for integrating video cameras into research applications
 Author-email: "David G. Grier" <david.grier@nyu.edu>
 License: GPL-3.0-or-later
@@ -21,16 +21,21 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: h5py
 Requires-Dist: numpy
 Requires-Dist: opencv-python
-Requires-Dist: pandas
 Requires-Dist: pyqtgraph
 Provides-Extra: pyqt5
 Requires-Dist: PyQt5; extra == "pyqt5"
 Requires-Dist: PyQt5-sip; extra == "pyqt5"
 Provides-Extra: pyqt6
 Requires-Dist: PyQt6; extra == "pyqt6"
+Provides-Extra: dvr
+Requires-Dist: h5py; extra == "dvr"
+Provides-Extra: overlays
+Requires-Dist: pandas; extra == "overlays"
+Requires-Dist: trackpy; extra == "overlays"
+Requires-Dist: numba; extra == "overlays"
+Requires-Dist: ultralytics; extra == "overlays"
 Provides-Extra: genicam
 Requires-Dist: harvesters; extra == "genicam"
 Requires-Dist: genicam; extra == "genicam"
@@ -41,15 +46,30 @@ Requires-Dist: PyQt5; extra == "dev-pyqt5"
 Requires-Dist: PyQt5-sip; extra == "dev-pyqt5"
 Requires-Dist: pytest; extra == "dev-pyqt5"
 Requires-Dist: pytest-cov; extra == "dev-pyqt5"
+Requires-Dist: h5py; extra == "dev-pyqt5"
+Requires-Dist: pandas; extra == "dev-pyqt5"
+Requires-Dist: trackpy; extra == "dev-pyqt5"
+Requires-Dist: numba; extra == "dev-pyqt5"
+Requires-Dist: ultralytics; extra == "dev-pyqt5"
 Provides-Extra: dev-pyqt6
 Requires-Dist: PyQt6; extra == "dev-pyqt6"
 Requires-Dist: pytest; extra == "dev-pyqt6"
 Requires-Dist: pytest-cov; extra == "dev-pyqt6"
+Requires-Dist: h5py; extra == "dev-pyqt6"
+Requires-Dist: pandas; extra == "dev-pyqt6"
+Requires-Dist: trackpy; extra == "dev-pyqt6"
+Requires-Dist: numba; extra == "dev-pyqt6"
+Requires-Dist: ultralytics; extra == "dev-pyqt6"
 Provides-Extra: dev
 Requires-Dist: PyQt5; extra == "dev"
 Requires-Dist: PyQt5-sip; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: h5py; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: trackpy; extra == "dev"
+Requires-Dist: numba; extra == "dev"
+Requires-Dist: ultralytics; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"

{qvideo-3.4.2 → qvideo-3.6.0}/QVideo.egg-info/SOURCES.txt

@@ -33,7 +33,7 @@ cameras/Noise/_tree.py
 cameras/OpenCV/QListCVCameras.py
 cameras/OpenCV/__init__.py
 cameras/OpenCV/_camera.py
-cameras/OpenCV/_resolution_tree.py
+cameras/OpenCV/_devices.py
 cameras/OpenCV/_tree.py
 cameras/Picamera/__init__.py
 cameras/Picamera/_camera.py
@@ -43,6 +43,7 @@ cameras/Vimbax/_camera.py
 cameras/Vimbax/_tree.py
 demos/ROIdemo.py
 demos/__init__.py
+demos/compositedemo.py
 demos/demo.py
 demos/filterdemo.py
 demos/trackpydemo.py
@@ -77,8 +78,7 @@ lib/QVideoWriter.py
 lib/__init__.py
 lib/chooser.py
 lib/clickable.py
-lib/resolutions.py
-lib/types.py
+lib/videotypes.py
 overlays/__init__.py
 overlays/trackpy.py
 overlays/yolo.py
@@ -111,8 +111,8 @@ tests/test_qmvcamera.py
 tests/test_qnoisecamera.py
 tests/test_qnoisetree.py
 tests/test_qopencvcamera.py
+tests/test_qopencvdevices.py
 tests/test_qopencvreader.py
-tests/test_qopencvresolutiontree.py
 tests/test_qopencvtree.py
 tests/test_qopencvwriter.py
 tests/test_qpicamera.py
@@ -123,6 +123,7 @@ tests/test_qvideoscreen.py
 tests/test_qvideosource.py
 tests/test_qvideowriter.py
 tests/test_qvimbaxcamera.py
+tests/test_qyolofilter.py
 tests/test_resolutions.py
 tests/test_roidemo.py
 tests/test_trackpy_overlay.py

{qvideo-3.4.2 → qvideo-3.6.0}/QVideo.egg-info/requires.txt

@@ -1,7 +1,5 @@
-h5py
 numpy
 opencv-python
-pandas
 pyqtgraph
 
 [dev]
@@ -9,27 +7,51 @@ PyQt5
 PyQt5-sip
 pytest
 pytest-cov
+h5py
+pandas
+trackpy
+numba
+ultralytics
 
 [dev-pyqt5]
 PyQt5
 PyQt5-sip
 pytest
 pytest-cov
+h5py
+pandas
+trackpy
+numba
+ultralytics
 
 [dev-pyqt6]
 PyQt6
 pytest
 pytest-cov
+h5py
+pandas
+trackpy
+numba
+ultralytics
 
 [docs]
 pydata-sphinx-theme
 sphinx
 sphinx-autodoc-typehints
 
+[dvr]
+h5py
+
 [genicam]
 harvesters
 genicam
 
+[overlays]
+pandas
+trackpy
+numba
+ultralytics
+
 [picamera]
 picamera2
 

{qvideo-3.4.2 → qvideo-3.6.0}/cameras/Genicam/_camera.py

@@ -13,8 +13,10 @@ try:
     IProperty = (IEnumeration, IBoolean, IInteger, IFloat, IString)
 except (ImportError, ModuleNotFoundError) as exc:
     raise ImportError(
-        "QGenicamCamera requires the 'genicam' and 'harvesters' packages. "
-        "Install them with: pip install genicam harvesters"
+        f"QGenicamCamera could not import 'genicam' or 'harvesters': {exc}\n"
+        '\tInstall them with: pip install genicam harvesters\n'
+        '\tIf the packages are installed, a NumPy version mismatch may be the cause:\n'
+        '\t  pip install "numpy<2"'
     ) from exc
 
 

qvideo-3.6.0/cameras/OpenCV/__init__.py

@@ -0,0 +1,6 @@
+from ._camera import QOpenCVCamera, QOpenCVSource
+from ._tree import QOpenCVTree
+from ._devices import QOpenCVDevices
+
+
+__all__ = 'QOpenCVCamera QOpenCVSource QOpenCVTree QOpenCVDevices'.split()

{qvideo-3.4.2 → qvideo-3.6.0}/cameras/OpenCV/_camera.py

@@ -1,5 +1,5 @@
 from QVideo.lib import QCamera, QVideoSource
-from pyqtgraph.Qt import QtCore
+from QVideo.cameras.OpenCV._devices import configure, probe_formats
 import cv2
 import platform
 import logging
@@ -43,11 +43,31 @@ class QOpenCVCamera(QCamera):
     On Linux the V4L2 backend is selected automatically; all other
     platforms use ``CAP_ANY``.
 
+    Resolution and frame rate are configured once at device open time
+    via :func:`~QVideo.cameras.OpenCV._devices.configure`.  Three modes are
+    supported:
+
+    - **Quality** (default): probes the device, selects the largest
+      supported resolution, and sets *fps* (default 30 fps).
+    - **Performance** (*fps* ``= None``): probes the device, selects the
+      smallest supported resolution, and lets the driver maximize frame
+      rate (slo-mo mode).
+    - **Explicit** (*width* and *height* both given): applies the
+      requested dimensions and *fps* directly.
+
+    ``width`` and ``height`` are registered as writable properties.
+    Changes are applied to the open device via OpenCV's V4L2 backend, which
+    handles the required ``VIDIOC_STREAMOFF`` / ``VIDIOC_S_FMT`` /
+    ``VIDIOC_STREAMON`` cycle internally.  The camera mutex serialises these
+    writes against concurrent reads, so no source stop/restart is needed.
+    :class:`~QVideo.cameras.OpenCV.QOpenCVTree.QOpenCVTree` exposes them as
+    read-only display fields; the ``resolution`` enum in that tree changes
+    width, height, and fps together.
     Transform properties (``mirrored``, ``flipped``) are registered
-    immediately on construction.  Device properties (``width``,
-    ``height``, ``color``, and any properties in :data:`_PROBED_PROPS`
-    that the device supports) are registered inside :meth:`_initialize`
-    once the capture device is open.
+    immediately on construction.  Device properties (``color``, and any
+    properties in :data:`_PROBED_PROPS` that the device supports) are
+    registered inside :meth:`_initialize` once the capture device is
+    open.
 
     Parameters
     ----------
@@ -60,6 +80,15 @@ class QOpenCVCamera(QCamera):
     gray : bool
         Initial grayscale state.  Equivalent to opening with ``color=False``.
         Default: ``False`` (color output).
+    width : int or None
+        Desired frame width [pixels].  Must be paired with *height* for
+        explicit mode.  ``None`` triggers auto-selection.  Default: ``None``.
+    height : int or None
+        Desired frame height [pixels].  Must be paired with *width* for
+        explicit mode.  ``None`` triggers auto-selection.  Default: ``None``.
+    fps : float or None
+        Desired frame rate [fps].  ``None`` selects performance mode.
+        Default: ``30.``.
     *args :
         Forwarded to :class:`~QVideo.lib.QCamera`.
     **kwargs :
@@ -77,12 +106,18 @@ class QOpenCVCamera(QCamera):
                  mirrored: bool = False,
                  flipped: bool = False,
                  gray: bool = False,
+                 width: int | None = None,
+                 height: int | None = None,
+                 fps: float | None = 30.,
                  **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.cameraID = cameraID
         self._mirrored = bool(mirrored)
         self._flipped = bool(flipped)
         self._gray = bool(gray)
+        self._configWidth = width
+        self._configHeight = height
+        self._configFps = fps
         self.registerProperty('mirrored', ptype=bool)
         self.registerProperty('flipped', ptype=bool)
         self.open()
@@ -90,9 +125,12 @@ class QOpenCVCamera(QCamera):
     def _initialize(self) -> bool:
         '''Open the OpenCV VideoCapture device and register device properties.
 
-        Registers ``width``, ``height``, and ``color`` unconditionally,
-        then probes the device for each property in :data:`_PROBED_PROPS`
-        and registers those it supports.
+        Configures resolution and frame rate via
+        :func:`~QVideo.cameras.OpenCV._devices.configure` using the values supplied
+        at construction time.  Registers ``width`` and ``height`` as
+        writable properties, ``color`` as read-write, then probes the
+        device for each property in :data:`_PROBED_PROPS` and registers
+        those it supports.
 
         Returns
         -------
@@ -101,6 +139,13 @@ class QOpenCVCamera(QCamera):
         '''
         api = cv2.CAP_V4L2 if platform.system() == 'Linux' else cv2.CAP_ANY
         self.device = cv2.VideoCapture(self.cameraID, api)
+        # Probe supported resolutions and their actual maximum frame rates on
+        # the live device before configuring.  QtMultimedia nominal fps values
+        # are unreliable; reading back what the V4L2 driver accepts is accurate.
+        self._formats = probe_formats(self.device)
+        resolutions = [(w, h) for w, h, *_ in self._formats] or None
+        configure(self.device, self._configWidth, self._configHeight,
+                  self._configFps, resolutions=resolutions)
         for _ in range(5):
             if (ready := self.device.read()[0]):
                 break
@@ -112,6 +157,7 @@ class QOpenCVCamera(QCamera):
             self.registerProperty('color', getter=self._getColor,
                                   setter=self._setColor, ptype=bool)
             self._probeProperties()
+            self.shapeChanged.emit(self.shape)
         else:
             self.device.release()
         return ready
@@ -127,10 +173,12 @@ class QOpenCVCamera(QCamera):
         for name, (prop_id, ptype) in _PROBED_PROPS.items():
             value = self.device.get(prop_id)
             if self.device.set(prop_id, value):
+                setter = (self._setFps if name == 'fps'
+                          else lambda v, p=prop_id: self.device.set(p, v))
                 self.registerProperty(
                     name,
                     getter=lambda p=prop_id, t=ptype: t(self.device.get(p)),
-                    setter=lambda v, p=prop_id: self.device.set(p, v),
+                    setter=setter,
                     ptype=ptype)
                 registered.append(name)
             else:
@@ -146,16 +194,41 @@ class QOpenCVCamera(QCamera):
         return int(self.device.get(self.WIDTH))
 
     def _setWidth(self, value: int) -> None:
-        self.device.set(self.WIDTH, value)
+        '''Set the frame width on the open device.
+
+        Stores the value for the next :meth:`_initialize` and writes it to
+        the device immediately.  OpenCV's V4L2 backend handles the required
+        ``VIDIOC_STREAMOFF`` / ``VIDIOC_S_FMT`` / ``VIDIOC_STREAMON`` cycle
+        internally, so no device close/reopen is needed.  The caller must not
+        be holding :attr:`~QVideo.lib.QCamera.QCamera.mutex` — use
+        :meth:`~QVideo.lib.QCamera.QCamera.set` which acquires it.
+        '''
+        self._configWidth = int(value)
+        self.device.set(self.WIDTH, self._configWidth)
         self.shapeChanged.emit(self.shape)
 
     def _getHeight(self) -> int:
         return int(self.device.get(self.HEIGHT))
 
     def _setHeight(self, value: int) -> None:
-        self.device.set(self.HEIGHT, value)
+        '''Set the frame height on the open device.
+
+        See :meth:`_setWidth` for rationale.
+        '''
+        self._configHeight = int(value)
+        self.device.set(self.HEIGHT, self._configHeight)
         self.shapeChanged.emit(self.shape)
 
+    def _setFps(self, value: float) -> None:
+        '''Store the requested frame rate and apply it to the open device.
+
+        Unlike width/height, frame-rate changes in V4L2 do not require
+        stopping the stream, so the value is written to the device
+        immediately as well as stored for the next :meth:`_initialize`.
+        '''
+        self._configFps = float(value)
+        self.device.set(self.FPS, self._configFps)
+
     def _getColor(self) -> bool:
         '''Return color mode
             ``True`` if frames are delivered in color