QVideo 3.2.3__tar.gz → 3.4.1__tar.gz

{qvideo-3.2.3 → qvideo-3.4.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.2.3
+Version: 3.4.1
 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
 Project-URL: Homepage, https://github.com/davidgrier/QVideo
 Project-URL: Repository, https://github.com/davidgrier/QVideo
 Project-URL: Bug Tracker, https://github.com/davidgrier/QVideo/issues
-Keywords: camera,video,imaging,PyQt5,scientific,GenICam,GigE Vision,raspberry pi
+Keywords: camera,video,imaging,PyQt5,PyQt6,scientific,GenICam,GigE Vision,raspberry pi
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -24,15 +24,30 @@ License-File: LICENSE.md
 Requires-Dist: h5py
 Requires-Dist: numpy
 Requires-Dist: opencv-python
-Requires-Dist: PyQt5
-Requires-Dist: PyQt5-sip
+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: genicam
 Requires-Dist: harvesters; extra == "genicam"
 Requires-Dist: genicam; extra == "genicam"
 Provides-Extra: picamera
 Requires-Dist: picamera2; extra == "picamera"
+Provides-Extra: dev-pyqt5
+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"
+Provides-Extra: dev-pyqt6
+Requires-Dist: PyQt6; extra == "dev-pyqt6"
+Requires-Dist: pytest; extra == "dev-pyqt6"
+Requires-Dist: pytest-cov; 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"
 Provides-Extra: docs
@@ -48,8 +63,9 @@ Dynamic: license-file
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.md)
 [![Tests](https://github.com/davidgrier/QVideo/actions/workflows/test.yml/badge.svg)](https://github.com/davidgrier/QVideo/actions/workflows/test.yml)
 [![Documentation](https://readthedocs.org/projects/qvideo/badge/?version=latest)](https://qvideo.readthedocs.io/en/latest/)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.19239402.svg)](https://doi.org/10.5281/zenodo.19239402)
 
-**QVideo** is a framework for integrating video cameras into PyQt5 projects
+**QVideo** is a framework for integrating video cameras into PyQt projects
 for scientific research.  It provides a unified, registration-based property
 system so that every camera backend — USB webcams, GenICam devices, FLIR
 cameras, Raspberry Pi cameras — is controlled through the same API.  Property
@@ -87,16 +103,15 @@ pip install QVideo
 |---------|-------|-------|
 | GenICam cameras (Vimba, etc.) | `pip install QVideo[genicam]` | Requires a vendor-supplied `.cti` producer file |
 | Raspberry Pi camera | `pip install QVideo[picamera]` | Requires `picamera2` |
-| FLIR / Spinnaker cameras | — | Requires the proprietary PySpin SDK; install that separately |
 
 ## Quick start
 
 ```python
-from pyqtgraph.Qt import QtWidgets
+import pyqtgraph as pg
 from QVideo.cameras.Noise import QNoiseSource
 from QVideo.lib import QVideoScreen
 
-app = QtWidgets.QApplication([])
+pg.mkApp()
 
 source = QNoiseSource()          # synthetic noise — no hardware needed
 screen = QVideoScreen()
@@ -104,7 +119,7 @@ source.newFrame.connect(screen.setImage)
 
 screen.show()
 source.start()
-app.exec()
+pg.exec()
 ```
 
 Replace `QNoiseSource` with `QOpenCVSource`, `QGenicamSource`, etc. to switch
@@ -157,5 +172,5 @@ additional code needed.
 ## Acknowledgements
 
 Work on this project at New York University is supported by the National
-Science Foundation of the United States under award number DMR-2104837 and
+Science Foundation of the United States under award number DMR-2428983 and
 by an award from the TAC Program of New York University.

{qvideo-3.2.3 → qvideo-3.4.1}/QVideo.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.2.3
+Version: 3.4.1
 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
 Project-URL: Homepage, https://github.com/davidgrier/QVideo
 Project-URL: Repository, https://github.com/davidgrier/QVideo
 Project-URL: Bug Tracker, https://github.com/davidgrier/QVideo/issues
-Keywords: camera,video,imaging,PyQt5,scientific,GenICam,GigE Vision,raspberry pi
+Keywords: camera,video,imaging,PyQt5,PyQt6,scientific,GenICam,GigE Vision,raspberry pi
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -24,15 +24,30 @@ License-File: LICENSE.md
 Requires-Dist: h5py
 Requires-Dist: numpy
 Requires-Dist: opencv-python
-Requires-Dist: PyQt5
-Requires-Dist: PyQt5-sip
+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: genicam
 Requires-Dist: harvesters; extra == "genicam"
 Requires-Dist: genicam; extra == "genicam"
 Provides-Extra: picamera
 Requires-Dist: picamera2; extra == "picamera"
+Provides-Extra: dev-pyqt5
+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"
+Provides-Extra: dev-pyqt6
+Requires-Dist: PyQt6; extra == "dev-pyqt6"
+Requires-Dist: pytest; extra == "dev-pyqt6"
+Requires-Dist: pytest-cov; 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"
 Provides-Extra: docs
@@ -48,8 +63,9 @@ Dynamic: license-file
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.md)
 [![Tests](https://github.com/davidgrier/QVideo/actions/workflows/test.yml/badge.svg)](https://github.com/davidgrier/QVideo/actions/workflows/test.yml)
 [![Documentation](https://readthedocs.org/projects/qvideo/badge/?version=latest)](https://qvideo.readthedocs.io/en/latest/)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.19239402.svg)](https://doi.org/10.5281/zenodo.19239402)
 
-**QVideo** is a framework for integrating video cameras into PyQt5 projects
+**QVideo** is a framework for integrating video cameras into PyQt projects
 for scientific research.  It provides a unified, registration-based property
 system so that every camera backend — USB webcams, GenICam devices, FLIR
 cameras, Raspberry Pi cameras — is controlled through the same API.  Property
@@ -87,16 +103,15 @@ pip install QVideo
 |---------|-------|-------|
 | GenICam cameras (Vimba, etc.) | `pip install QVideo[genicam]` | Requires a vendor-supplied `.cti` producer file |
 | Raspberry Pi camera | `pip install QVideo[picamera]` | Requires `picamera2` |
-| FLIR / Spinnaker cameras | — | Requires the proprietary PySpin SDK; install that separately |
 
 ## Quick start
 
 ```python
-from pyqtgraph.Qt import QtWidgets
+import pyqtgraph as pg
 from QVideo.cameras.Noise import QNoiseSource
 from QVideo.lib import QVideoScreen
 
-app = QtWidgets.QApplication([])
+pg.mkApp()
 
 source = QNoiseSource()          # synthetic noise — no hardware needed
 screen = QVideoScreen()
@@ -104,7 +119,7 @@ source.newFrame.connect(screen.setImage)
 
 screen.show()
 source.start()
-app.exec()
+pg.exec()
 ```
 
 Replace `QNoiseSource` with `QOpenCVSource`, `QGenicamSource`, etc. to switch
@@ -157,5 +172,5 @@ additional code needed.
 ## Acknowledgements
 
 Work on this project at New York University is supported by the National
-Science Foundation of the United States under award number DMR-2104837 and
+Science Foundation of the United States under award number DMR-2428983 and
 by an award from the TAC Program of New York University.

{qvideo-3.2.3 → qvideo-3.4.1}/QVideo.egg-info/SOURCES.txt

@@ -45,6 +45,8 @@ demos/ROIdemo.py
 demos/__init__.py
 demos/demo.py
 demos/filterdemo.py
+demos/trackpydemo.py
+demos/yolodemo.py
 dvr/QDVRWidget.py
 dvr/QHDF5Reader.py
 dvr/QHDF5Writer.py
@@ -52,7 +54,6 @@ dvr/QOpenCVReader.py
 dvr/QOpenCVWriter.py
 dvr/__init__.py
 dvr/icons_rc.py
-dvr/icons_rc_qt6.py
 filters/Median.py
 filters/MoMedian.py
 filters/Normalize.py
@@ -60,6 +61,7 @@ filters/QBlurFilter.py
 filters/QEdgeFilter.py
 filters/QRGBFilter.py
 filters/QSampleHold.py
+filters/QYOLOFilter.py
 filters/_MedianBase.py
 filters/__init__.py
 lib/QCamera.py
@@ -67,16 +69,19 @@ lib/QCameraTree.py
 lib/QFPSMeter.py
 lib/QFilterBank.py
 lib/QListCameras.py
+lib/QVideoFilter.py
 lib/QVideoReader.py
 lib/QVideoScreen.py
 lib/QVideoSource.py
 lib/QVideoWriter.py
-lib/VideoFilter.py
 lib/__init__.py
 lib/chooser.py
 lib/clickable.py
 lib/resolutions.py
 lib/types.py
+overlays/__init__.py
+overlays/trackpy.py
+overlays/yolo.py
 tests/test_chooser.py
 tests/test_clickable.py
 tests/test_demo.py
@@ -120,4 +125,6 @@ tests/test_qvideowriter.py
 tests/test_qvimbaxcamera.py
 tests/test_resolutions.py
 tests/test_roidemo.py
-tests/test_videofilter.py
+tests/test_trackpy_overlay.py
+tests/test_videofilter.py
+tests/test_yolo_overlay.py

{qvideo-3.2.3 → qvideo-3.4.1}/QVideo.egg-info/requires.txt

@@ -1,11 +1,23 @@
 h5py
 numpy
 opencv-python
-PyQt5
-PyQt5-sip
+pandas
 pyqtgraph
 
 [dev]
+PyQt5
+PyQt5-sip
+pytest
+pytest-cov
+
+[dev-pyqt5]
+PyQt5
+PyQt5-sip
+pytest
+pytest-cov
+
+[dev-pyqt6]
+PyQt6
 pytest
 pytest-cov
 
@@ -20,3 +32,10 @@ genicam
 
 [picamera]
 picamera2
+
+[pyqt5]
+PyQt5
+PyQt5-sip
+
+[pyqt6]
+PyQt6

{qvideo-3.2.3 → qvideo-3.4.1}/README.md

@@ -5,8 +5,9 @@
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.md)
 [![Tests](https://github.com/davidgrier/QVideo/actions/workflows/test.yml/badge.svg)](https://github.com/davidgrier/QVideo/actions/workflows/test.yml)
 [![Documentation](https://readthedocs.org/projects/qvideo/badge/?version=latest)](https://qvideo.readthedocs.io/en/latest/)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.19239402.svg)](https://doi.org/10.5281/zenodo.19239402)
 
-**QVideo** is a framework for integrating video cameras into PyQt5 projects
+**QVideo** is a framework for integrating video cameras into PyQt projects
 for scientific research.  It provides a unified, registration-based property
 system so that every camera backend — USB webcams, GenICam devices, FLIR
 cameras, Raspberry Pi cameras — is controlled through the same API.  Property
@@ -44,16 +45,15 @@ pip install QVideo
 |---------|-------|-------|
 | GenICam cameras (Vimba, etc.) | `pip install QVideo[genicam]` | Requires a vendor-supplied `.cti` producer file |
 | Raspberry Pi camera | `pip install QVideo[picamera]` | Requires `picamera2` |
-| FLIR / Spinnaker cameras | — | Requires the proprietary PySpin SDK; install that separately |
 
 ## Quick start
 
 ```python
-from pyqtgraph.Qt import QtWidgets
+import pyqtgraph as pg
 from QVideo.cameras.Noise import QNoiseSource
 from QVideo.lib import QVideoScreen
 
-app = QtWidgets.QApplication([])
+pg.mkApp()
 
 source = QNoiseSource()          # synthetic noise — no hardware needed
 screen = QVideoScreen()
@@ -61,7 +61,7 @@ source.newFrame.connect(screen.setImage)
 
 screen.show()
 source.start()
-app.exec()
+pg.exec()
 ```
 
 Replace `QNoiseSource` with `QOpenCVSource`, `QGenicamSource`, etc. to switch
@@ -114,5 +114,5 @@ additional code needed.
 ## Acknowledgements
 
 Work on this project at New York University is supported by the National
-Science Foundation of the United States under award number DMR-2104837 and
+Science Foundation of the United States under award number DMR-2428983 and
 by an award from the TAC Program of New York University.

{qvideo-3.2.3 → qvideo-3.4.1}/cameras/OpenCV/_resolution_tree.py

@@ -117,8 +117,12 @@ class QOpenCVResolutionTree(QCameraTree):
             if change == 'value' and param.name() == 'resolution':
                 if value in self._resolutionMap:
                     w, h = self._resolutionMap[value]
+                    fps = (self.camera.fps
+                           if 'fps' in self.camera._properties else None)
                     self.camera.set('width', w)
                     self.camera.set('height', h)
+                    if fps is not None:
+                        self.camera.set('fps', fps)
                 return
         super()._sync(root, changes)
 

{qvideo-3.2.3 → qvideo-3.4.1}/demos/__init__.py

@@ -21,6 +21,16 @@ ROIdemo
     rectangular ROI overlay.  Only the cropped region is saved when
     the DVR records, making it easy to capture a sub-region of interest.
 
+trackpydemo
+    Extends :mod:`demo` with a :class:`~QVideo.overlays.trackpy.QTrackpyWidget`
+    panel so that trackpy particle positions are overlaid on the live feed
+    in real time and locate results are available via a signal.
+
+yolodemo
+    Extends :mod:`demo` with a :class:`~QVideo.overlays.yolo.QYoloWidget`
+    panel so that YOLO object-detection bounding boxes are overlaid on the
+    live feed in real time and detection results are available via a signal.
+
 Running
 -------
 Each demo can be launched directly::
@@ -28,6 +38,8 @@ Each demo can be launched directly::
     python -m QVideo.demos.demo
     python -m QVideo.demos.filterdemo
     python -m QVideo.demos.ROIdemo
+    python -m QVideo.demos.trackpydemo
+    python -m QVideo.demos.yolodemo
 
 Camera selection
 ----------------
@@ -59,4 +71,6 @@ Example::
 from .demo import Demo
 from .filterdemo import FilterDemo
 from .ROIdemo import ROIFilter, ROIDemo
+from .trackpydemo import TrackpyDemo
+from .yolodemo import YoloDemo
 

{qvideo-3.2.3 → qvideo-3.4.1}/demos/demo.py

@@ -7,7 +7,7 @@ Run directly::
 '''
 
 from QVideo.lib import QVideoScreen, QCameraTree
-from pyqtgraph.Qt.QtWidgets import QWidget, QHBoxLayout
+from pyqtgraph.Qt.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout
 
 
 __all__ = ['Demo']
@@ -40,9 +40,11 @@ class Demo(QWidget):
     def _setupUi(self) -> None:
         layout = QHBoxLayout(self)
         layout.addWidget(self.screen)
-        layout.addWidget(self.cameraTree)
+        self._controls = QVBoxLayout()
+        layout.addLayout(self._controls)
         layout.setStretch(0, 1)  # screen takes all surplus horizontal space
         layout.setStretch(1, 0)  # controls stay at their natural width
+        self._controls.addWidget(self.cameraTree)
 
 
 def main() -> None:  # pragma: no cover

{qvideo-3.2.3 → qvideo-3.4.1}/demos/filterdemo.py

@@ -8,7 +8,6 @@ Run directly::
 
 from QVideo.demos.demo import Demo
 from QVideo.lib import QCameraTree
-from pyqtgraph.Qt.QtWidgets import QHBoxLayout, QVBoxLayout
 
 
 __all__ = ['FilterDemo']
@@ -38,15 +37,6 @@ class FilterDemo(Demo):
         super().__init__(cameraTree, **kwargs)
         self.addFilters(filters)
 
-    def _setupUi(self) -> None:
-        layout = QHBoxLayout(self)
-        layout.addWidget(self.screen)
-        self._controls = QVBoxLayout()
-        layout.addLayout(self._controls)
-        layout.setStretch(0, 1)  # screen takes all surplus horizontal space
-        layout.setStretch(1, 0)  # controls stay at their natural width
-        self._controls.addWidget(self.cameraTree)
-
     def addFilters(self, filters: list[str]) -> None:
         '''Register filters by name and show the filter bank.
 
@@ -68,7 +58,7 @@ def main() -> None:  # pragma: no cover
 
     pg.mkQApp()
     camera = choose_camera().start()
-    filters = 'QRGBFilter QBlurFilter QSampleHold QEdgeFilter'.split()
+    filters = 'QYOLOFilter QRGBFilter QSampleHold QBlurFilter QEdgeFilter'.split()
     widget = FilterDemo(camera, filters)
     widget.show()
     pg.exec()

qvideo-3.4.1/demos/trackpydemo.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+'''Demo combining a live video feed, camera controls, and a trackpy overlay.
+
+Run directly::
+
+    python -m QVideo.demos.trackpydemo
+
+See :mod:`QVideo.overlays.trackpy` for literature references.
+'''
+
+from QVideo.demos.demo import Demo
+from QVideo.lib import QCameraTree
+from QVideo.overlays import QTrackpyWidget
+
+
+__all__ = ['TrackpyDemo']
+
+
+class TrackpyDemo(Demo):
+    '''Extends :class:`~QVideo.demos.demo.Demo` with a trackpy overlay.
+
+    Adds a :class:`~QVideo.overlays.trackpy.QTrackpyWidget` control panel
+    below the camera control tree.  Detected particle positions are
+    rendered in real time as a scatter-plot overlay on the video screen.
+
+    Parameters
+    ----------
+    cameraTree : QCameraTree
+        The camera control tree widget to display alongside the video feed.
+    **kwargs :
+        Additional keyword arguments forwarded to :class:`~QVideo.demos.demo.Demo`.
+    '''
+
+    def __init__(self, cameraTree: QCameraTree, **kwargs) -> None:
+        super().__init__(cameraTree, **kwargs)
+        self.trackpy = QTrackpyWidget(self)
+        self.trackpy.source = self.screen.source
+        self.trackpy.attachTo(self.screen)
+        self._controls.addWidget(self.trackpy)
+
+
+def main() -> None:  # pragma: no cover
+    '''Launch the trackpy demo with an interactively chosen camera.'''
+    import pyqtgraph as pg
+    from QVideo.lib import choose_camera
+
+    pg.mkQApp()
+    camera = choose_camera().start()
+    widget = TrackpyDemo(camera)
+    widget.show()
+    pg.exec()
+
+
+if __name__ == '__main__':  # pragma: no cover
+    main()

qvideo-3.4.1/demos/yolodemo.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+'''Demo combining a live video feed, camera controls, and a YOLO overlay.
+
+Run directly::
+
+    python -m QVideo.demos.yolodemo
+
+See :mod:`QVideo.overlays.yolo` for literature references.
+'''
+
+from QVideo.demos.demo import Demo
+from QVideo.lib import QCameraTree
+from QVideo.overlays import QYoloWidget
+
+
+__all__ = ['YoloDemo']
+
+
+class YoloDemo(Demo):
+    '''Extends :class:`~QVideo.demos.demo.Demo` with a YOLO overlay.
+
+    Adds a :class:`~QVideo.overlays.yolo.QYoloWidget` control panel
+    below the camera control tree.  Detected object bounding boxes are
+    rendered in real time as a rectangle overlay on the video screen.
+
+    Parameters
+    ----------
+    cameraTree : QCameraTree
+        The camera control tree widget to display alongside the video feed.
+    model_name : str
+        YOLO model weights file passed to :class:`~QVideo.overlays.yolo.QYoloWidget`.
+        Default: ``'yolo11n.pt'``.
+    **kwargs :
+        Additional keyword arguments forwarded to :class:`~QVideo.demos.demo.Demo`.
+    '''
+
+    def __init__(self,
+                 cameraTree: QCameraTree,
+                 model_name: str = 'yolo11n.pt',
+                 **kwargs) -> None:
+        super().__init__(cameraTree, **kwargs)
+        self.yolo = QYoloWidget(self, model_name=model_name)
+        self.yolo.source = self.screen.source
+        self.yolo.attachTo(self.screen)
+        self._controls.addWidget(self.yolo)
+
+
+def main() -> None:  # pragma: no cover
+    '''Launch the YOLO demo with an interactively chosen camera.'''
+    import pyqtgraph as pg
+    from QVideo.lib import choose_camera
+
+    pg.mkQApp()
+    camera = choose_camera().start()
+    widget = YoloDemo(camera)
+    widget.show()
+    pg.exec()
+
+
+if __name__ == '__main__':  # pragma: no cover
+    main()

{qvideo-3.2.3 → qvideo-3.4.1}/dvr/QDVRWidget.py

@@ -120,7 +120,7 @@ class QDVRWidget(QtWidgets.QFrame):
     def __init__(self,
                  *args,
                  source: QVideoSource | None = None,
-                 filename: str | None = None,
+                 filename: str = '',
                  **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self._source = None
@@ -130,7 +130,7 @@ class QDVRWidget(QtWidgets.QFrame):
         self._setupUi()
         self._connectSignals()
         self.source = source
-        self.filename = filename if filename is not None else str(
+        self.filename = filename if filename else str(
             Path.home() / self.FILENAME)
 
     def _setupUi(self) -> None:
@@ -335,6 +335,7 @@ class QDVRWidget(QtWidgets.QFrame):
             return
         if not (self.isRecording() or self.isPlaying()):
             self.saveEdit.setText(filename)
+            self.playname = filename
 
     @QtCore.pyqtProperty(str)
     def playname(self) -> str:

{qvideo-3.2.3 → qvideo-3.4.1}/filters/QBlurFilter.py

@@ -1,6 +1,6 @@
 from pyqtgraph.Qt import QtCore, QtWidgets
 from pyqtgraph import SpinBox
-from QVideo.lib.VideoFilter import QVideoFilter, VideoFilter
+from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter
 from QVideo.lib.types import Image
 import cv2
 
@@ -67,7 +67,7 @@ class QBlurFilter(QVideoFilter):
     '''
 
     def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
-        super().__init__('Gaussian Blur', parent, BlurFilter())
+        super().__init__(parent, 'Gaussian Blur', BlurFilter())
 
     def _setupUi(self) -> None:
         super()._setupUi()

{qvideo-3.2.3 → qvideo-3.4.1}/filters/QEdgeFilter.py

@@ -1,6 +1,6 @@
 from pyqtgraph.Qt import QtCore, QtWidgets
 from pyqtgraph import SpinBox
-from QVideo.lib.VideoFilter import QVideoFilter, VideoFilter
+from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter
 from QVideo.lib.types import Image
 import cv2
 import logging
@@ -49,8 +49,8 @@ class EdgeFilter(VideoFilter):
     def low(self, low: int) -> None:
         low = max(1, int(low))
         if low >= self._high:
-            logger.warning('low (%d) must be less than high (%d); '
-                           'ignoring', low, self._high)
+            logger.warning(f'low ({low}) must be less than '
+                           f'high ({self._high}); ignoring')
             return
         self._low = low
 
@@ -63,8 +63,8 @@ class EdgeFilter(VideoFilter):
     def high(self, high: int) -> None:
         high = max(2, int(high))
         if high <= self._low:
-            logger.warning('high (%d) must be greater than low (%d); '
-                           'ignoring', high, self._low)
+            logger.warning(f'high ({high}) must be greater than '
+                           f'low ({self._low}); ignoring')
             return
         self._high = high
 
@@ -106,7 +106,7 @@ class QEdgeFilter(QVideoFilter):
     '''
 
     def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
-        super().__init__('Canny Edge Detection', parent, EdgeFilter())
+        super().__init__(parent, 'Canny Edge Detection', EdgeFilter())
 
     def _setupUi(self) -> None:
         super()._setupUi()

{qvideo-3.2.3 → qvideo-3.4.1}/filters/QRGBFilter.py

@@ -1,5 +1,5 @@
 from pyqtgraph.Qt import QtCore, QtWidgets
-from QVideo.lib.VideoFilter import QVideoFilter, VideoFilter
+from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter
 from QVideo.lib.types import Image
 
 
@@ -61,7 +61,7 @@ class QRGBFilter(QVideoFilter):
     '''
 
     def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
-        super().__init__('Color Channel', parent, RGBFilter())
+        super().__init__(parent, 'Color Channel', RGBFilter())
 
     def _setupUi(self) -> None:
         super()._setupUi()

{qvideo-3.2.3 → qvideo-3.4.1}/filters/QSampleHold.py

@@ -1,7 +1,7 @@
 from pyqtgraph.Qt import QtCore, QtWidgets
-from QVideo.lib.VideoFilter import QVideoFilter
-from QVideo.lib.types import Image
 from QVideo.filters.Normalize import Normalize
+from QVideo.lib.QVideoFilter import QVideoFilter
+from QVideo.lib.types import Image
 
 
 __all__ = ['SampleHold', 'QSampleHold']
@@ -87,14 +87,16 @@ class QSampleHold(QVideoFilter):
     '''
 
     def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
-        super().__init__('Sample and Hold', parent, SampleHold())
+        super().__init__(parent, 'Sample and Hold', SampleHold())
 
     def _setupUi(self) -> None:
         super()._setupUi()
         self._layout.addWidget(QtWidgets.QLabel('order'))
-        self._orderButtons = [QtWidgets.QRadioButton(str(n)) for n in (1, 2, 3)]
+        self._orderButtons = [
+            QtWidgets.QRadioButton(str(n)) for n in (1, 2, 3)]
         for n, button in enumerate(self._orderButtons, start=1):
-            button.toggled.connect(lambda checked, n=n: self.setOrder(checked, n))
+            button.toggled.connect(
+                lambda checked, n=n: self.setOrder(checked, n))
             self._layout.addWidget(button)
         self._orderButtons[self.filter.order - 1].setChecked(True)
         self._resetButton = QtWidgets.QPushButton('Reset', self)