Patch Detail
Show a patch.
GET /api/patches/20891/?format=api
{ "id": 20891, "url": "https://patchwork.libcamera.org/api/patches/20891/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20891/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240812145034.190342-1-tomi.valkeinen@ideasonboard.com>", "date": "2024-08-12T14:50:34", "name": "py: cam: Convert to PyQt6", "commit_ref": "15a51caae8811817f55af0a925915d8fa45ca7a4", "pull_url": null, "state": "accepted", "archived": false, "hash": "096c263c33fff6b124713b2024ee0e8cf631dbe3", "submitter": { "id": 109, "url": "https://patchwork.libcamera.org/api/people/109/?format=api", "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20891/mbox/", "series": [ { "id": 4512, "url": "https://patchwork.libcamera.org/api/series/4512/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4512", "date": "2024-08-12T14:50:34", "name": "py: cam: Convert to PyQt6", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4512/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20891/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20891/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5CEBEC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 12 Aug 2024 14:51:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4F68A633B5;\n\tMon, 12 Aug 2024 16:50:59 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B71563369\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Aug 2024 16:50:57 +0200 (CEST)", "from deskari.lan (91-156-87-48.elisa-laajakaista.fi [91.156.87.48])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8729A6B5;\n\tMon, 12 Aug 2024 16:50:00 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"cC43kGdB\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723474200;\n\tbh=NrjFx/HOmDALXdZfh2p9kQPv/v/3xIvdd6WQO6up0ZQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=cC43kGdByQ5Bp+amfaa1rrfkY/xyWObTiGWuOTcmOixeCgfWjFtl5zEnmAU1zixLy\n\tf0T6NAx76ICTSkGQEFEGAWS4v0XYyXeYUPqEsWI7T+R3lkxd9ns/VONsjxUXosxhI6\n\tWBjhxu+Gv/fYLSi0S3Nn+zxeuXjYcANlgzM6PjsY=", "From": "Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tStefan Klug <stefan.klug@ideasonboard.com>", "Cc": "Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>", "Subject": "[PATCH] py: cam: Convert to PyQt6", "Date": "Mon, 12 Aug 2024 17:50:34 +0300", "Message-ID": "<20240812145034.190342-1-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Perhaps it's time... Convert the py cam tool to PyQt6.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/cam/cam_qt.py | 6 +++---\n src/py/cam/cam_qtgl.py | 12 ++++++------\n 2 files changed, 9 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex c1723b44..22d8c4da 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -2,7 +2,7 @@\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n \n from helpers import mfb_to_rgb\n-from PyQt5 import QtCore, QtGui, QtWidgets\n+from PyQt6 import QtCore, QtGui, QtWidgets\n import libcamera as libcam\n import libcamera.utils\n import sys\n@@ -63,10 +63,10 @@ class QtRenderer:\n self.buf_mmap_map = buf_mmap_map\n \n def run(self):\n- camnotif = QtCore.QSocketNotifier(self.cm.event_fd, QtCore.QSocketNotifier.Read)\n+ camnotif = QtCore.QSocketNotifier(self.cm.event_fd, QtCore.QSocketNotifier.Type.Read)\n camnotif.activated.connect(lambda _: self.readcam())\n \n- keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n+ keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Type.Read)\n keynotif.activated.connect(lambda _: self.readkey())\n \n print('Capturing...')\ndiff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py\nindex 6cfbd347..35b4b06b 100644\n--- a/src/py/cam/cam_qtgl.py\n+++ b/src/py/cam/cam_qtgl.py\n@@ -1,8 +1,8 @@\n # SPDX-License-Identifier: GPL-2.0-or-later\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n \n-from PyQt5 import QtCore, QtWidgets\n-from PyQt5.QtCore import Qt\n+from PyQt6 import QtCore, QtWidgets\n+from PyQt6.QtCore import Qt\n \n import math\n import os\n@@ -142,10 +142,10 @@ class QtRenderer:\n self.window = window\n \n def run(self):\n- camnotif = QtCore.QSocketNotifier(self.state.cm.event_fd, QtCore.QSocketNotifier.Read)\n+ camnotif = QtCore.QSocketNotifier(self.state.cm.event_fd, QtCore.QSocketNotifier.Type.Read)\n camnotif.activated.connect(lambda _: self.readcam())\n \n- keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n+ keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Type.Read)\n keynotif.activated.connect(lambda _: self.readkey())\n \n print('Capturing...')\n@@ -175,8 +175,8 @@ class MainWindow(QtWidgets.QWidget):\n def __init__(self, state):\n super().__init__()\n \n- self.setAttribute(Qt.WA_PaintOnScreen)\n- self.setAttribute(Qt.WA_NativeWindow)\n+ self.setAttribute(Qt.WidgetAttribute.WA_PaintOnScreen)\n+ self.setAttribute(Qt.WidgetAttribute.WA_NativeWindow)\n \n self.state = state\n \n", "prefixes": [] }