{"id":20356,"url":"https://patchwork.libcamera.org/api/patches/20356/?format=json","web_url":"https://patchwork.libcamera.org/patch/20356/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240620154919.1923755-1-kieran.bingham@ideasonboard.com>","date":"2024-06-20T15:49:19","name":"[v3] qcam: viewfinder_qt: Maintain aspect ratio","commit_ref":"644986c2b77eef28150f6ea2083f9b828c509d26","pull_url":null,"state":"accepted","archived":false,"hash":"8dbba3f9d74c31f532930488cd71637b9efa2742","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20356/mbox/","series":[{"id":4408,"url":"https://patchwork.libcamera.org/api/series/4408/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4408","date":"2024-06-20T15:49:19","name":"[v3] qcam: viewfinder_qt: Maintain aspect ratio","version":3,"mbox":"https://patchwork.libcamera.org/series/4408/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20356/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20356/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 56A5FBE175\n\tfor ;\n\tThu, 20 Jun 2024 15:49:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 96CAA654A3;\n\tThu, 20 Jun 2024 17:49:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 953F7619ED\n\tfor ;\n\tThu, 20 Jun 2024 17:49:23 +0200 (CEST)","from Monstersaurus.local\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4E61C2B3;\n\tThu, 20 Jun 2024 17:49:04 +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=\"Mfmhv36U\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718898544;\n\tbh=FRt3L0pA3I8E+IOKOZKHbGTww5ZLIcl5zKHEgLTszpI=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=Mfmhv36UHoCdyavFgxG3NWDopaGaMrCvN2FA/IW7hBAjY210yrXAUg1NfXKdN9QQW\n\tVpLw6jlgpYOwxNVZyu6cAL/kpRMIpaY4fsCrPFH6HS0iUwEQJSjV88pwPIsm+7qW7E\n\tihZ6t2YX4G7Jdb9x3bpzMrU5XeTy+uXPBnbGOl6g=","From":"Kieran Bingham ","To":"libcamera devel ","Cc":"Kieran Bingham ,\n\tLaurent Pinchart ","Subject":"[PATCH v3] qcam: viewfinder_qt: Maintain aspect ratio","Date":"Thu, 20 Jun 2024 16:49:19 +0100","Message-Id":"<20240620154919.1923755-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","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":"Keep the image aspect ratio when displaying in the viewfinder.\n\nWhen the window is adjusted to a size that differs in aspect ratio to\nthe image, keep the image centered in the main window.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n\nv2: (fixed up from Laurent's review comments)\n - No longer accept event on an invalid size.\n - centering simplifed\n\nv3:\n - use QWidget::resizeEvent(event);\n - simplify commit message. \n\n src/apps/qcam/viewfinder_qt.cpp | 16 ++++++++++++++--\n src/apps/qcam/viewfinder_qt.h | 2 ++\n 2 files changed, 16 insertions(+), 2 deletions(-)","diff":"diff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp\nindex 4821c27d826e..492648cfa2ff 100644\n--- a/src/apps/qcam/viewfinder_qt.cpp\n+++ b/src/apps/qcam/viewfinder_qt.cpp\n@@ -18,6 +18,7 @@\n #include \n #include \n #include \n+#include \n #include \n \n #include \"../common/image.h\"\n@@ -40,7 +41,7 @@ static const QMap nativeFormats\n };\n \n ViewFinderQt::ViewFinderQt(QWidget *parent)\n-\t: QWidget(parent), buffer_(nullptr)\n+\t: QWidget(parent), place_(rect()), buffer_(nullptr)\n {\n \ticon_ = QIcon(\":camera-off.svg\");\n }\n@@ -148,7 +149,7 @@ void ViewFinderQt::paintEvent(QPaintEvent *)\n \n \t/* If we have an image, draw it. */\n \tif (!image_.isNull()) {\n-\t\tpainter.drawImage(rect(), image_, image_.rect());\n+\t\tpainter.drawImage(place_, image_, image_.rect());\n \t\treturn;\n \t}\n \n@@ -181,3 +182,14 @@ QSize ViewFinderQt::sizeHint() const\n {\n \treturn size_.isValid() ? size_ : QSize(640, 480);\n }\n+\n+void ViewFinderQt::resizeEvent(QResizeEvent *event)\n+{\n+\tif (!size_.isValid())\n+\t\treturn;\n+\n+\tplace_.setSize(size_.scaled(event->size(), Qt::KeepAspectRatio));\n+\tplace_.moveCenter(rect().center());\n+\n+\tQWidget::resizeEvent(event);\n+}\ndiff --git a/src/apps/qcam/viewfinder_qt.h b/src/apps/qcam/viewfinder_qt.h\nindex 4f4b9f117e37..50fde88e163e 100644\n--- a/src/apps/qcam/viewfinder_qt.h\n+++ b/src/apps/qcam/viewfinder_qt.h\n@@ -44,6 +44,7 @@ Q_SIGNALS:\n \n protected:\n \tvoid paintEvent(QPaintEvent *) override;\n+\tvoid resizeEvent(QResizeEvent *) override;\n \tQSize sizeHint() const override;\n \n private:\n@@ -51,6 +52,7 @@ private:\n \n \tlibcamera::PixelFormat format_;\n \tQSize size_;\n+\tQRect place_;\n \n \t/* Camera stopped icon */\n \tQSize vfSize_;\n","prefixes":["v3"]}