QVideo 3.6.2__tar.gz → 3.6.4__tar.gz

{qvideo-3.6.2 → qvideo-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.6.2
+Version: 3.6.4
 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

{qvideo-3.6.2 → qvideo-3.6.4}/QCamcorder.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 '''Composite camcorder widget combining a video screen, camera controls, and DVR.
 
 Run directly to launch a full camcorder application with camera selection::

qvideo-3.6.4/QCamcorder.ui

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>628</width>
+    <height>519</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>DVR</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QVideoScreen" name="screen" native="true">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="controls" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QDVRWidget" name="dvr" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVideoScreen</class>
+   <extends>QWidget</extends>
+   <header>QVideo.lib</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QDVRWidget</class>
+   <extends>QWidget</extends>
+   <header>QVideo.dvr</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

{qvideo-3.6.2 → qvideo-3.6.4}/QVideo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QVideo
-Version: 3.6.2
+Version: 3.6.4
 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

{qvideo-3.6.2 → qvideo-3.6.4}/QVideo.egg-info/SOURCES.txt

@@ -1,9 +1,11 @@
 LICENSE.md
 QCamcorder.py
+QCamcorder.ui
 README.md
 __init__.py
 pyproject.toml
 ./QCamcorder.py
+./QCamcorder.ui
 ./__init__.py
 QVideo.egg-info/PKG-INFO
 QVideo.egg-info/SOURCES.txt
@@ -49,6 +51,7 @@ demos/filterdemo.py
 demos/trackpydemo.py
 demos/yolodemo.py
 dvr/QDVRWidget.py
+dvr/QDVRWidget.ui
 dvr/QHDF5Reader.py
 dvr/QHDF5Writer.py
 dvr/QOpenCVReader.py
@@ -86,6 +89,7 @@ overlays/trackpy.py
 overlays/yolo.py
 tests/test_chooser.py
 tests/test_clickable.py
+tests/test_compositedemo.py
 tests/test_demo.py
 tests/test_filterdemo.py
 tests/test_icons_rc.py
@@ -110,6 +114,7 @@ tests/test_qhdf5writer.py
 tests/test_qidscamera.py
 tests/test_qlistcameras.py
 tests/test_qlistcvcameras.py
+tests/test_qlistflircameras.py
 tests/test_qmvcamera.py
 tests/test_qnoisecamera.py
 tests/test_qnoisetree.py
@@ -119,6 +124,7 @@ tests/test_qopencvreader.py
 tests/test_qopencvtree.py
 tests/test_qopencvwriter.py
 tests/test_qpicamera.py
+tests/test_qpicameratree.py
 tests/test_qrgbfilter.py
 tests/test_qsamplehold.py
 tests/test_qthresholdfilter.py
@@ -131,5 +137,8 @@ tests/test_qyolofilter.py
 tests/test_resolutions.py
 tests/test_roidemo.py
 tests/test_trackpy_overlay.py
+tests/test_trackpydemo.py
+tests/test_vendor_trees.py
 tests/test_videofilter.py
-tests/test_yolo_overlay.py
+tests/test_yolo_overlay.py
+tests/test_yolodemo.py

qvideo-3.6.4/dvr/QDVRWidget.ui

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QDVRWidget</class>
+ <widget class="QFrame" name="QDVRWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>279</width>
+    <height>200</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::Box</enum>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="widgetRecord" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="recordButton">
+        <property name="statusTip">
+         <string>Record video</string>
+        </property>
+        <property name="text">
+         <string>&amp;Record</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/media-record.svg</normaloff>:/icons/icons/media-record.svg</iconset>
+        </property>
+        <property name="shortcut">
+         <string>R</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="stopButton">
+        <property name="statusTip">
+         <string>Stop recording</string>
+        </property>
+        <property name="text">
+         <string>&amp;Stop</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/media-playback-stop.svg</normaloff>:/icons/icons/media-playback-stop.svg</iconset>
+        </property>
+        <property name="shortcut">
+         <string>S</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLCDNumber" name="frameNumber">
+        <property name="segmentStyle">
+         <enum>QLCDNumber::Flat</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widgetSaveFile" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="saveLabel">
+        <property name="text">
+         <string>Save As</string>
+        </property>
+        <property name="buddy">
+         <cstring>saveEdit</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="saveEdit">
+        <property name="statusTip">
+         <string>Video file name</string>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widgetPlay" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>1</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>1</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="rewindButton">
+        <property name="statusTip">
+         <string>Rewind video file</string>
+        </property>
+        <property name="text">
+         <string>&amp;Rewind</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/media-skip-backward.svg</normaloff>:/icons/icons/media-skip-backward.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pauseButton">
+        <property name="statusTip">
+         <string>Pause video playback</string>
+        </property>
+        <property name="text">
+         <string>&amp;Pause</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/media-playback-pause.svg</normaloff>:/icons/icons/media-playback-pause.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="playButton">
+        <property name="statusTip">
+         <string>Play video file</string>
+        </property>
+        <property name="text">
+         <string>P&amp;lay</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/media-playback-start.svg</normaloff>:/icons/icons/media-playback-start.svg</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widgetPlayFile" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="labelPlayFile">
+        <property name="text">
+         <string>Play</string>
+        </property>
+        <property name="buddy">
+         <cstring>playEdit</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="playEdit">
+        <property name="statusTip">
+         <string>Video file</string>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widgetFrames" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>4</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="labelNFrames">
+        <property name="text">
+         <string>Duration</string>
+        </property>
+        <property name="buddy">
+         <cstring>nframes</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="nframes">
+        <property name="toolTip">
+         <string>number of frames to record</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>10</number>
+        </property>
+        <property name="maximum">
+         <number>99000</number>
+        </property>
+        <property name="singleStep">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>10000</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelInterval">
+        <property name="text">
+         <string>Interval</string>
+        </property>
+        <property name="buddy">
+         <cstring>nskip</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="nskip">
+        <property name="toolTip">
+         <string>Record every Nth frame</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>999</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

{qvideo-3.6.2 → qvideo-3.6.4}/filters/Median.py

@@ -1,3 +1,4 @@
+'''Batch median-of-medians background estimator (remedian algorithm).'''
 from QVideo.filters._MedianBase import _MedianBase
 from QVideo.lib.videotypes import Image
 import numpy as np

{qvideo-3.6.2 → qvideo-3.6.4}/filters/MoMedian.py

@@ -1,3 +1,4 @@
+'''Streaming median-of-medians background estimator (rolling remedian).'''
 from QVideo.filters._MedianBase import _MedianBase
 from QVideo.lib.videotypes import Image
 import numpy as np

{qvideo-3.6.2 → qvideo-3.6.4}/filters/Normalize.py

@@ -1,3 +1,4 @@
+'''Background-normalisation filters built on median background estimation.'''
 from QVideo.filters.Median import Median
 from QVideo.filters.MoMedian import MoMedian
 from QVideo.lib.videotypes import Image

{qvideo-3.6.2 → qvideo-3.6.4}/filters/QBlurFilter.py

@@ -1,3 +1,4 @@
+'''Gaussian blur filter and companion Qt widget.'''
 from qtpy import QtCore, QtWidgets
 from pyqtgraph import SpinBox
 from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter

{qvideo-3.6.2 → qvideo-3.6.4}/filters/QEdgeFilter.py

@@ -1,3 +1,4 @@
+'''Canny edge-detection filter and companion Qt widget.'''
 from qtpy import QtCore, QtWidgets
 from pyqtgraph import SpinBox
 from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter

{qvideo-3.6.2 → qvideo-3.6.4}/filters/QRGBFilter.py

@@ -1,3 +1,4 @@
+'''RGB color-channel selection filter and companion Qt widget.'''
 from qtpy import QtCore, QtWidgets
 from QVideo.lib.QVideoFilter import VideoFilter, QVideoFilter
 from QVideo.lib.videotypes import Image

{qvideo-3.6.2 → qvideo-3.6.4}/filters/QSampleHold.py

@@ -1,3 +1,4 @@
+'''Sample-and-hold background normalisation filter and companion Qt widget.'''
 from qtpy import QtCore, QtWidgets
 from QVideo.filters.Normalize import Normalize
 from QVideo.lib.QVideoFilter import QVideoFilter

{qvideo-3.6.2 → qvideo-3.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "QVideo"
-version = "3.6.2"
+version = "3.6.4"
 description = "PyQt-based framework for integrating video cameras into research applications"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }
@@ -72,6 +72,10 @@ packages = [
     "QVideo.overlays",
 ]
 
+[tool.setuptools.package-data]
+'QVideo'     = ['*.ui']
+'QVideo.dvr' = ['*.ui']
+
 [tool.setuptools.package-dir]
 "QVideo"                    = "."
 "QVideo.cameras"            = "cameras"

qvideo-3.6.4/tests/test_compositedemo.py

@@ -0,0 +1,97 @@
+'''Unit tests for demos.compositedemo.'''
+import unittest
+from unittest.mock import MagicMock, patch
+from qtpy import QtCore, QtWidgets
+import QVideo.overlays.trackpy as _trackpy_mod
+from QVideo.QCamcorder import QCamcorder
+from QVideo.cameras.Noise._tree import QNoiseTree
+from QVideo.demos.compositedemo import CompositeDemo
+from QVideo.overlays.trackpy import QTrackpyWidget, _TrackpyWorker
+
+
+app = QtWidgets.QApplication.instance() or QtWidgets.QApplication([])
+
+
+def make_demo():
+    with patch.object(_trackpy_mod, 'tp', MagicMock()), \
+         patch.object(_TrackpyWorker, 'moveToThread'), \
+         patch.object(QtCore.QThread, 'start'):
+        return CompositeDemo(QNoiseTree())
+
+
+class TestCompositeDemoInit(unittest.TestCase):
+
+    def test_creates_successfully(self):
+        widget = make_demo()
+        self.assertIsInstance(widget, CompositeDemo)
+
+    def test_is_subclass_of_qcamcorder(self):
+        widget = make_demo()
+        self.assertIsInstance(widget, QCamcorder)
+
+    def test_trackpy_attribute_is_qtrackpywidget(self):
+        widget = make_demo()
+        self.assertIsInstance(widget.trackpy, QTrackpyWidget)
+
+    def test_trackpy_source_connected_to_camera_source(self):
+        tree = QNoiseTree()
+        with patch.object(_trackpy_mod, 'tp', MagicMock()), \
+             patch.object(_TrackpyWorker, 'moveToThread'), \
+             patch.object(QtCore.QThread, 'start'):
+            widget = CompositeDemo(tree)
+        self.assertIs(widget.trackpy.source, tree.source)
+
+    def test_composite_check_is_qcheckbox(self):
+        widget = make_demo()
+        self.assertIsInstance(widget._compositeCheck, QtWidgets.QCheckBox)
+
+    def test_composite_check_label(self):
+        widget = make_demo()
+        self.assertEqual(widget._compositeCheck.text(), 'Composite')
+
+    def test_controls_contains_trackpy_widget(self):
+        widget = make_demo()
+        layout = widget.controls.layout()
+        items = [layout.itemAt(i).widget() for i in range(layout.count())]
+        self.assertIn(widget.trackpy, items)
+
+    def test_controls_contains_composite_check(self):
+        widget = make_demo()
+        layout = widget.controls.layout()
+        items = [layout.itemAt(i).widget() for i in range(layout.count())]
+        self.assertIn(widget._compositeCheck, items)
+
+    def test_overlay_added_to_screen(self):
+        widget = make_demo()
+        self.assertIn(widget.trackpy.overlay, widget.screen._overlays)
+
+
+class TestCompositeDemoToggle(unittest.TestCase):
+
+    def setUp(self):
+        self.widget = make_demo()
+
+    def test_composite_off_by_default(self):
+        self.assertFalse(self.widget._compositeCheck.isChecked())
+
+    def test_toggle_on_sets_screen_composite(self):
+        self.widget._onCompositeToggled(True)
+        self.assertTrue(self.widget.screen.composite)
+
+    def test_toggle_on_sets_dvr_source_to_screen(self):
+        self.widget._onCompositeToggled(True)
+        self.assertIs(self.widget.dvr.source, self.widget.screen)
+
+    def test_toggle_off_clears_screen_composite(self):
+        self.widget._onCompositeToggled(True)
+        self.widget._onCompositeToggled(False)
+        self.assertFalse(self.widget.screen.composite)
+
+    def test_toggle_off_restores_dvr_source_to_camera(self):
+        self.widget._onCompositeToggled(True)
+        self.widget._onCompositeToggled(False)
+        self.assertIs(self.widget.dvr.source, self.widget.source)
+
+
+if __name__ == '__main__':  # pragma: no cover
+    unittest.main()