QVideo 3.2.3__tar.gz → 3.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.2.3
+Version: 3.4.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
@@ -157,5 +157,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.0}/QVideo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.2.3
+Version: 3.4.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
@@ -157,5 +157,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.0}/QVideo.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ demos/ROIdemo.py
 demos/__init__.py
 demos/demo.py
 demos/filterdemo.py
+demos/trackpydemo.py
 dvr/QDVRWidget.py
 dvr/QHDF5Reader.py
 dvr/QHDF5Writer.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,5 @@ tests/test_qvideowriter.py
 tests/test_qvimbaxcamera.py
 tests/test_resolutions.py
 tests/test_roidemo.py
+tests/test_trackpy_overlay.py
 tests/test_videofilter.py

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

@@ -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.0}/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.0}/demos/__init__.py

@@ -21,6 +21,11 @@ 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.
+
 Running
 -------
 Each demo can be launched directly::
@@ -28,6 +33,7 @@ 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
 
 Camera selection
 ----------------
@@ -59,4 +65,5 @@ Example::
 from .demo import Demo
 from .filterdemo import FilterDemo
 from .ROIdemo import ROIFilter, ROIDemo
+from .trackpydemo import TrackpyDemo
 

{qvideo-3.2.3 → qvideo-3.4.0}/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.0}/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.0/demos/trackpydemo.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+'''Demo combining a live video feed, camera controls, and a trackpy overlay.
+
+Run directly::
+
+    python -m QVideo.demos.trackpydemo
+'''
+
+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.2.3 → qvideo-3.4.0}/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.0}/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.0}/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.0}/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.0}/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)

qvideo-3.4.0/filters/QYOLOFilter.py

@@ -0,0 +1,89 @@
+'''Real-time object detection with YOLO.'''
+
+from pyqtgraph.Qt import QtCore, QtWidgets
+from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter
+from QVideo.lib.types import Image
+import numpy as np
+
+try:
+    from ultralytics import YOLO
+except ImportError:
+    YOLO = None
+
+
+__all__ = ['YOLOFilter', 'QYOLOFilter']
+
+
+class YOLOFilter(VideoFilter):
+
+    '''YOLO object detection filter.
+
+    Parameters
+    ----------
+    model_name: str
+        Name of the YOLO model weights file.
+        Default: ``'yolo11n.pt'``.
+    passthrough: bool
+        If True, return the input image.
+        If False, mark up the image with bounding box data
+    '''
+
+    #: Emitted with bounding boxes of detected features.
+    featuresReady = QtCore.pyqtSignal(np.ndarray)
+
+    def __init__(self,
+                 model_name: str = 'yolo11n.pt',
+                 passthrough: bool = False) -> None:
+        super().__init__()
+        if YOLO is None:
+            raise ImportError(
+                'YOLO is required for QYOLOFilter.'
+                '\n\tInstall it with: pip install ultralytics'
+                '\n\tSee https://docs.ultralytics.com/ '
+                'for more information.')
+        try:
+            self.model = YOLO(model_name)
+        except FileNotFoundError:
+            raise FileNotFoundError(
+                f'YOLO model "{model_name}" not found.'
+                '\n\tProvide the name of a pretrained ultralytics model'
+                '\n\tor the full path to a custom YOLO weights file.'
+                '\n\tSee https://docs.ultralytics.com/models/ '
+                'for available pretrained models.')
+        self._passthrough = passthrough
+
+    def add(self, image: Image) -> None:
+        '''Performs YOLO feature detection on image
+
+        Emits featuresReady with bounding-box data
+        '''
+        results = self.model(image, verbose=False)
+        boxes = results[0].boxes.xyxy.numpy()
+        self.featuresReady.emit(boxes)
+        self.data = image if self._passthrough else results[0].plot()
+
+    @property
+    def passthrough(self) -> bool:
+        return self._passthrough
+
+    @passthrough.setter
+    def passthrough(self, value: bool) -> None:
+        self._passthrough = bool(value)
+
+
+class QYOLOFilter(QVideoFilter):
+
+    '''QVideoFilter wrapper for YOLOFilter.'''
+
+    def __init__(self, parent: QtWidgets.QWidget | None = None) -> None:
+        super().__init__(parent, 'YOLO Filter', YOLOFilter())
+
+    def _setupUi(self) -> None:
+        super()._setupUi()
+        self._checkbox = QtWidgets.QCheckBox('Passthrough')
+        self._layout.addWidget(self._checkbox)
+        self._checkbox.stateChanged.connect(self._setPassthrough)
+
+    @QtCore.pyqtSlot(int)
+    def _setPassthrough(self, state: int) -> None:
+        self.filter.passthrough = state

{qvideo-3.2.3 → qvideo-3.4.0}/filters/_MedianBase.py

@@ -1,4 +1,4 @@
-from QVideo.lib.VideoFilter import VideoFilter
+from QVideo.lib.QVideoFilter import VideoFilter
 from QVideo.lib.types import Image
 import numpy as np
 

{qvideo-3.2.3 → qvideo-3.4.0}/filters/__init__.py

@@ -5,6 +5,7 @@ from .QBlurFilter import BlurFilter, QBlurFilter
 from .QEdgeFilter import EdgeFilter, QEdgeFilter
 from .QRGBFilter import RGBFilter, QRGBFilter
 from .QSampleHold import SampleHold, QSampleHold
+from .QYOLOFilter import YOLOFilter, QYOLOFilter
 
 
 __all__ = '''
@@ -14,4 +15,5 @@ BlurFilter QBlurFilter
 EdgeFilter QEdgeFilter
 RGBFilter QRGBFilter
 SampleHold QSampleHold
+YOLOFilter QYOLOFilter
 '''.split()

{qvideo-3.2.3 → qvideo-3.4.0}/lib/QFilterBank.py

@@ -1,14 +1,17 @@
 '''Composable pipeline of VideoFilter stages between a source and a display.'''
+import logging
 from typing import Iterator
 
 from pyqtgraph.Qt import QtWidgets
-from QVideo.lib.VideoFilter import QVideoFilter
+from QVideo.lib.QVideoFilter import QVideoFilter
 from QVideo.lib.types import Image
 import QVideo.filters as videofilters
 
 
 __all__ = ['QFilterBank']
 
+logger = logging.getLogger(__name__)
+
 
 class QFilterBank(QtWidgets.QGroupBox):
 
@@ -72,7 +75,8 @@ class QFilterBank(QtWidgets.QGroupBox):
             If *video_filter* is not a :class:`~QVideo.lib.VideoFilter.QVideoFilter`.
         '''
         if not isinstance(video_filter, QVideoFilter):
-            raise TypeError(f'expected QVideoFilter, got {type(video_filter).__name__}')
+            raise TypeError('expected QVideoFilter, '
+                            f'got {type(video_filter).__name__}')
         self._filters.append(video_filter)
         self._layout.addWidget(video_filter)
 
@@ -116,4 +120,7 @@ class QFilterBank(QtWidgets.QGroupBox):
         if cls is None or not (isinstance(cls, type) and
                                issubclass(cls, QVideoFilter)):
             raise ValueError(f'{name!r} is not a known filter')
-        self.register(cls())
+        try:
+            self.register(cls())
+        except Exception as e:
+            logger.warning(f'Failed to instantiate filter {name!r}: {e}')

qvideo-3.2.3/lib/VideoFilter.py → qvideo-3.4.0/lib/QVideoFilter.py

@@ -1,12 +1,12 @@
 '''Base classes for image-processing filters in the QVideo filter pipeline.'''
-from pyqtgraph.Qt import QtWidgets
+from pyqtgraph.Qt import QtCore, QtWidgets
 from QVideo.lib.types import Image
 
 
 __all__ = ['VideoFilter', 'QVideoFilter']
 
 
-class VideoFilter:
+class VideoFilter(QtCore.QObject):
 
     '''Base class for video filters.
 
@@ -20,6 +20,7 @@ class VideoFilter:
     '''
 
     def __init__(self) -> None:
+        super().__init__()
         self.data: Image | None = None
 
     def __call__(self, data: Image) -> Image:
@@ -80,21 +81,20 @@ class QVideoFilter(QtWidgets.QGroupBox):
 
     Parameters
     ----------
+    parent : QtWidgets.QWidget
+        Parent widget.
     title : str
         Label displayed in the group box border.
-    parent : QtWidgets.QWidget or None
-        Parent widget.
-    video_filter : VideoFilter or None
-        The filter to apply when enabled.  Defaults to a passthrough
-        :class:`VideoFilter` if not provided.
+    videoFilter : VideoFilter
+        The filter to apply when enabled.
     '''
 
     def __init__(self,
+                 parent: QtWidgets.QWidget,
                  title: str,
-                 parent: QtWidgets.QWidget | None = None,
-                 video_filter: VideoFilter | None = None) -> None:
+                 videoFilter: VideoFilter) -> None:
         super().__init__(title, parent)
-        self._filter = VideoFilter() if video_filter is None else video_filter
+        self._filter = videoFilter
         self._setupUi()
 
     @property
@@ -103,10 +103,10 @@ class QVideoFilter(QtWidgets.QGroupBox):
         return self._filter
 
     @filter.setter
-    def filter(self, video_filter: VideoFilter) -> None:
-        if not isinstance(video_filter, VideoFilter):
-            raise TypeError(f'expected VideoFilter, got {type(video_filter).__name__}')
-        self._filter = video_filter
+    def filter(self, videoFilter: VideoFilter) -> None:
+        if not isinstance(videoFilter, VideoFilter):
+            raise TypeError(f'expected VideoFilter, got {type(videoFilter).__name__}')
+        self._filter = videoFilter
 
     def __call__(self, image: Image) -> Image:
         '''Apply the filter if enabled, otherwise return *image* unchanged.

{qvideo-3.2.3 → qvideo-3.4.0}/lib/QVideoScreen.py

@@ -1,5 +1,6 @@
 '''Live video display widget with mouse-aware graphical overlay support.'''
-from QVideo.lib import QVideoSource, QFilterBank
+from QVideo.lib.QVideoSource import QVideoSource
+from QVideo.lib.QFilterBank import QFilterBank
 from QVideo.lib.types import Image
 from pyqtgraph.Qt import QtCore
 import numpy as np
@@ -71,13 +72,17 @@ class QVideoScreen(GraphicsLayoutWidget):
 
     @property
     def framerate(self) -> int | None:
-        '''Maximum display frame rate [fps], or ``None`` for no throttling.'''
+        '''Maximum display frame rate [fps].
+
+        Accommodate high-speed cameras by throttling the rate at
+        which frames are displayed. ``None`` for no throttling.'''
         return self._framerate
 
     @framerate.setter
     def framerate(self, framerate: int | None) -> None:
         if framerate is not None and framerate <= 0:
-            raise ValueError(f'framerate must be positive, got {framerate}')
+            raise ValueError('framerate must be positive, '
+                             f'got {framerate}')
         self._framerate = framerate
         self._interval = 0 if framerate is None else int(1000 / framerate)
 
@@ -124,7 +129,7 @@ class QVideoScreen(GraphicsLayoutWidget):
             self._pending = image
 
     def sizeHint(self) -> QtCore.QSize:
-        '''Return the source's natural frame size as the preferred widget size.'''
+        '''Return the source frame size as the preferred widget size.'''
         if self.source is not None:
             return self.source.shape
         return super().sizeHint()
@@ -164,11 +169,12 @@ class QVideoScreen(GraphicsLayoutWidget):
 
     @QtCore.pyqtSlot()
     def _fitToVideo(self) -> None:
-        '''Resize the containing window so this widget matches the video aspect ratio.
+        '''Resize the containing window to match the video aspect ratio.
 
-        Computes the height the widget should have given its current width and
-        the source aspect ratio, then adjusts the top-level window height by
-        the difference.  Has no effect when no source is connected.
+        Computes the height the widget should have given its current
+        width and the source aspect ratio, then adjusts the top-level
+        window height by the difference. Only has effect when a source
+        is connected.
         '''
         if not self.hasHeightForWidth():
             return

{qvideo-3.2.3 → qvideo-3.4.0}/lib/__init__.py

@@ -3,18 +3,18 @@ from .clickable import clickable
 from .QCamera import QCamera
 from .QVideoSource import QVideoSource
 from .QCameraTree import QCameraTree
+from .QVideoScreen import QVideoScreen
 from .QFilterBank import QFilterBank
+from .QVideoFilter import VideoFilter, QVideoFilter
 from .QVideoReader import QVideoReader
 from .QVideoWriter import QVideoWriter
-from .QVideoScreen import QVideoScreen
 from .chooser import choose_camera
 from .QListCameras import QListCameras
 from .QFPSMeter import QFPSMeter
-from .VideoFilter import VideoFilter
 
 
 __all__ = '''Image
 clickable choose_camera QListCameras
 QCamera QVideoSource QCameraTree QFilterBank
 QVideoReader QVideoWriter QVideoScreen
-QFPSMeter VideoFilter'''.split()
+QFPSMeter VideoFilter QVideoFilter'''.split()