From f1ae005267c76df912d441a10f0392828e649eda Mon Sep 17 00:00:00 2001 From: matteo porta Date: Tue, 11 Oct 2022 16:08:24 +0200 Subject: [PATCH] wip --- src/components/dummies/cv2/__init__.py | 2 +- .../cv2/{dummy_video_camera.py => dummy_video_capture.py} | 2 +- src/components/uvc_camera.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/components/dummies/cv2/{dummy_video_camera.py => dummy_video_capture.py} (97%) diff --git a/src/components/dummies/cv2/__init__.py b/src/components/dummies/cv2/__init__.py index acd1838..de79551 100644 --- a/src/components/dummies/cv2/__init__.py +++ b/src/components/dummies/cv2/__init__.py @@ -1 +1 @@ -from .dummy_video_camera import DummyVideoCamera +from .dummy_video_capture import DummyVideoCapture diff --git a/src/components/dummies/cv2/dummy_video_camera.py b/src/components/dummies/cv2/dummy_video_capture.py similarity index 97% rename from src/components/dummies/cv2/dummy_video_camera.py rename to src/components/dummies/cv2/dummy_video_capture.py index 777df3c..2fd92fe 100644 --- a/src/components/dummies/cv2/dummy_video_camera.py +++ b/src/components/dummies/cv2/dummy_video_capture.py @@ -4,7 +4,7 @@ import cv2 from PyQt5.QtCore import QThread -class DummyVideoCamera: +class DummyVideoCapture: def __init__(self, device): self.values = {} self.sim_imgs = None diff --git a/src/components/uvc_camera.py b/src/components/uvc_camera.py index 89f0e44..402c496 100644 --- a/src/components/uvc_camera.py +++ b/src/components/uvc_camera.py @@ -11,9 +11,9 @@ from PyQt5.QtWidgets import (QDialog, QFormLayout, QLabel, QMessageBox, QPushButton, QSizePolicy, QSlider) if "--sim-camera" in sys.argv: - from components.dummies.cv2 import DummyVideoCamera as VideoCamera + from components.dummies.cv2 import DummyVideoCapture as VideoCapture else: - from cv2 import VideoCamera + from cv2 import VideoCapture from datetime import datetime @@ -30,7 +30,7 @@ class UVCCamera(Component): self._last_frame = None def config_changed(self): - self.camera = VideoCamera(0) + self.camera = VideoCapture(0) if self.camera is None: raise AssertionError(f"camera not detected: 0") if self.simulate: