summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/py/cam/cam.py2
-rw-r--r--src/py/cam/cam_qt.py12
-rw-r--r--src/py/cam/cam_qtgl.py9
3 files changed, 5 insertions, 18 deletions
diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py
index 2f0690b5..e2bc78da 100755
--- a/src/py/cam/cam.py
+++ b/src/py/cam/cam.py
@@ -304,7 +304,7 @@ def event_handler(state):
running = any(ctx['reqs-completed'] < ctx['opt-capture'] for ctx in contexts)
return running
- except Exception as e:
+ except Exception:
traceback.print_exc()
return False
diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py
index 0a25a823..bff1175b 100644
--- a/src/py/cam/cam_qt.py
+++ b/src/py/cam/cam_qt.py
@@ -184,12 +184,7 @@ class QtRenderer:
windows = []
for ctx in self.contexts:
- camera = ctx['camera']
-
for stream in ctx['streams']:
- fmt = stream.configuration.pixel_format
- size = stream.configuration.size
-
window = MainWindow(ctx, stream)
window.setAttribute(QtCore.Qt.WA_ShowWithoutActivating)
window.show()
@@ -199,10 +194,10 @@ class QtRenderer:
def run(self):
camnotif = QtCore.QSocketNotifier(self.cm.efd, QtCore.QSocketNotifier.Read)
- camnotif.activated.connect(lambda x: self.readcam())
+ camnotif.activated.connect(lambda _: self.readcam())
keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)
- keynotif.activated.connect(lambda x: self.readkey())
+ keynotif.activated.connect(lambda _: self.readkey())
print('Capturing...')
@@ -292,9 +287,6 @@ class MainWindow(QtWidgets.QWidget):
def buf_to_qpixmap(self, stream, fb):
with fb.mmap() as mfb:
cfg = stream.configuration
- w = cfg.size.width
- h = cfg.size.height
- pitch = cfg.stride
if cfg.pixel_format == libcam.formats.MJPEG:
img = Image.open(BytesIO(mfb.planes[0]))
diff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py
index 4bbcda6c..3fb7dde3 100644
--- a/src/py/cam/cam_qtgl.py
+++ b/src/py/cam/cam_qtgl.py
@@ -5,16 +5,11 @@ from PyQt5 import QtCore, QtWidgets
from PyQt5.QtCore import Qt
import math
-import numpy as np
import os
import sys
os.environ['PYOPENGL_PLATFORM'] = 'egl'
-import OpenGL
-# OpenGL.FULL_LOGGING = True
-
-from OpenGL import GL as gl
from OpenGL.EGL.EXT.image_dma_buf_import import *
from OpenGL.EGL.KHR.image import *
from OpenGL.EGL.VERSION.EGL_1_0 import *
@@ -149,10 +144,10 @@ class QtRenderer:
def run(self):
camnotif = QtCore.QSocketNotifier(self.state['cm'].efd, QtCore.QSocketNotifier.Read)
- camnotif.activated.connect(lambda x: self.readcam())
+ camnotif.activated.connect(lambda _: self.readcam())
keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)
- keynotif.activated.connect(lambda x: self.readkey())
+ keynotif.activated.connect(lambda _: self.readkey())
print('Capturing...')