{"id":20892,"url":"https://patchwork.libcamera.org/api/1.1/patches/20892/?format=json","web_url":"https://patchwork.libcamera.org/patch/20892/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240812172730.204242-1-tomi.valkeinen@ideasonboard.com>","date":"2024-08-12T17:27:30","name":"[v2] 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/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20892/mbox/","series":[{"id":4513,"url":"https://patchwork.libcamera.org/api/1.1/series/4513/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4513","date":"2024-08-12T17:27:30","name":"[v2] py: cam: Convert to PyQt6","version":2,"mbox":"https://patchwork.libcamera.org/series/4513/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20892/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20892/checks/","tags":{},"headers":{"Return-Path":"","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 77423BE173\n\tfor ;\n\tMon, 12 Aug 2024 17:27:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 73216633B5;\n\tMon, 12 Aug 2024 19:27:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C297863369\n\tfor ;\n\tMon, 12 Aug 2024 19:27:46 +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 DA2D26B5;\n\tMon, 12 Aug 2024 19:26:49 +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=\"IzMkPboo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723483610;\n\tbh=FPqNyP2iHkT9DRM6uS6BoAynPntSoleYeBf58Yltjdo=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=IzMkPbooz0b+zaCVUQcY7Q6VJv9/RtoEM3BkiKwzuTeGeXzGLsZrwLRRwjBubzQG4\n\tpjMdKWdxqdFu5awB4VGTouVKc6WBjWBywzkM525oDjCSLHiBkR9vjlCnD8mP55uXpq\n\tcAGLRQWOsO+6Ay52mGixiqIDFzAPHsiL15ZPcbYo=","From":"Tomi Valkeinen ","To":"libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart ,\n\tKieran Bingham ,\n\tStefan Klug ","Cc":"Tomi Valkeinen ","Subject":"[PATCH v2] py: cam: Convert to PyQt6","Date":"Mon, 12 Aug 2024 20:27:30 +0300","Message-ID":"<20240812172730.204242-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Qt5 is now end of life. The libcamera 'qcam' application has removed\nsupport for Qt5, and updated to Qt6.\n\nUpdate the python 'cam' application accordingly to Qt6.\n\nSigned-off-by: Tomi Valkeinen \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\nv2:\n- Added RB tags\n- Updated the commit description\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 \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 \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":["v2"]}