Patch Detail
Show a patch.
GET /api/1.1/patches/17098/?format=api
{ "id": 17098, "url": "https://patchwork.libcamera.org/api/1.1/patches/17098/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17098/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220812124651.27496-3-utkarsh02t@gmail.com>", "date": "2022-08-12T12:46:42", "name": "[libcamera-devel,v2,02/11] qcam: ControlFrame: Display defualt value of controls", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ac600e29e8ca4da343898ba03c379e7951cbfe96", "submitter": { "id": 114, "url": "https://patchwork.libcamera.org/api/1.1/people/114/?format=api", "name": "Utkarsh Tiwari", "email": "utkarsh02t@gmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17098/mbox/", "series": [ { "id": 3410, "url": "https://patchwork.libcamera.org/api/1.1/series/3410/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3410", "date": "2022-08-12T12:46:40", "name": "Introduce control interaction to qcam", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3410/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17098/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17098/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 71B1CBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 12 Aug 2022 12:47:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2C75061FAB;\n\tFri, 12 Aug 2022 14:47:10 +0200 (CEST)", "from mail-pf1-x429.google.com (mail-pf1-x429.google.com\n\t[IPv6:2607:f8b0:4864:20::429])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 39F9B603EA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Aug 2022 14:47:08 +0200 (CEST)", "by mail-pf1-x429.google.com with SMTP id h28so850203pfq.11\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Aug 2022 05:47:08 -0700 (PDT)", "from localhost.localdomain ([2404:bd00:3:dc0d:d8e:96a2:2dbe:5a83])\n\tby smtp.gmail.com with ESMTPSA id\n\te6-20020a17090a728600b001f069352d73sm1431785pjg.25.2022.08.12.05.47.04\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 12 Aug 2022 05:47:06 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660308430;\n\tbh=PBNtZh/GBCMXZFNxvU/c9S6wR55Oyh3d5ac/jw5ZbN4=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=4ZgAV29+5abmpsFjA1NvbLsOOrOUTizaQFNmuyExHsRuC2Kuj5dV1JjypFeZha2T7\n\tgzgnqMzxGfn+iWrqCMTmdZyzOAUr+LdactAT9gHxbQhLFFCNi5kNTn8hv42W7LtXui\n\tg+TaHYNmWHo/kRLv45+GTvs8iU50bwBWHmX1yFC+2YUjXB296o+9UdwpkhPTpTJyZc\n\t4ry3DlGMrquHLr25IQV7ZjubQ4FVblh1LTVBPKhez3QGiMG6tfoDd4IlZ6q43ihd3N\n\tAUBaGrcjAU7AwTfNf9Z/b245RSRi0+eeMINEhWKiKJIUb3qPLJo/enM+zBjqq1qNQC\n\t1vNKZGX2pDTdA==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc;\n\tbh=ghblknVhGijt/nmW4rVKt6Xyc1ourgY6xruFoCTihac=;\n\tb=C//4Of9BNxWEhvbgQaRSpOISVthlOUDG+Wm3J8AZk8AsfSZZlT1+YHVmvLfLsAkL/p\n\tK6la3IMHI8YwwWI6mW9jvwZ41pILa4OhyeZFZf3zT5xsahSGG+Y7kugSEhhhMeH5xpAN\n\tpsJEjsJpHuXboaCzn5P4vM/Rnls2t0zxRpM7ZEBDXqRWaQhG4QauxRe/+x0OKF8XUecT\n\tILikiRMKxzg72Zlrj2hPHwod4Jdye3eFLFLiLRyFRgiY7ZZ5NtCZtzO+1v7OO/WyQlyU\n\tIRpF7EU/VKm5BcWAHrr2GFnjuFl07na30fIrhOIvZEm6Xftm4/R0nKz3O6lm+jGCbRPS\n\tel0Q==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"C//4Of9B\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc;\n\tbh=ghblknVhGijt/nmW4rVKt6Xyc1ourgY6xruFoCTihac=;\n\tb=Wrt6kAXt4gfwA+cxNW0GZeUsOSCklkXZxf9m958/O1Y1oUdjakbCleDr32UUwuAgge\n\tVyfQs7gf5V55nfpzeAnVbYXIgjm/uxoIfUL2F9wwpzj1+VNzmDZ16Edgl18RAcw1yqae\n\tObROnGeY4l98Pj4rQ5dLu74bwyMyavYxRqXjx1I7OelCVn0URRHQNPg226cYrBVVvyHW\n\tuwtdpsrHZ2Hy4sIkpituH4tORZ5+GLPWQmyw4bNnYumgwbD4GvCFtvJ9FiCY3E5uwOQI\n\tGydsf2PpU8AAU8sG0gHHS/TXV+lwX8nmYq9rcnMWtX8CwCnE3oGft1W5l1A0VhLx9Hce\n\t90ng==", "X-Gm-Message-State": "ACgBeo2U2EyQvQAFjUF6gexJv3niwyLbU8grVgXT61D9Acrr92XB0ipQ\n\tO8m/zf7CCUTg8KUQ4yEl4nlWo8eObh8=", "X-Google-Smtp-Source": "AA6agR40EPJkbX2Phwc1hCLO/0kuzY0HOKXnSUA5XOrNwU1FFg3qAjMX0yG/1fnwXhmoZDOjLBdCnw==", "X-Received": "by 2002:a63:14c:0:b0:41d:c975:1ed6 with SMTP id\n\t73-20020a63014c000000b0041dc9751ed6mr3032099pgb.39.1660308426473; \n\tFri, 12 Aug 2022 05:47:06 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 12 Aug 2022 18:16:42 +0530", "Message-Id": "<20220812124651.27496-3-utkarsh02t@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220812124651.27496-1-utkarsh02t@gmail.com>", "References": "<20220812124651.27496-1-utkarsh02t@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 02/11] qcam: ControlFrame: Display\n\tdefualt value of controls", "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>", "From": "Utkarsh Tiwari via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Utkarsh Tiwari <utkarsh02t@gmail.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Display a QLabel below the Control Name showing the default value for\nthe controls.\n\nThis adds support to Display defualt value for the\ncontrol types :\n ControlTypeBool\n ControlTypeInteger32\n ControlTypeInteger64\n ControlTypeFloat\n\nSigned-off-by: Utkarsh Tiwari <utkarsh02t@gmail.com>\n---\nDifference from v1: \n\t1. Fix comment styling\n\t2. Now parameters can drop libcamera:: as effect from 1/11\n src/qcam/settings/control_frame.cpp | 48 +++++++++++++++++++++++++++--\n src/qcam/settings/control_frame.h | 9 ++++++\n src/qcam/settings/controls_tab.cpp | 2 +-\n 3 files changed, 56 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/qcam/settings/control_frame.cpp b/src/qcam/settings/control_frame.cpp\nindex 8b1162db..79cf67eb 100644\n--- a/src/qcam/settings/control_frame.cpp\n+++ b/src/qcam/settings/control_frame.cpp\n@@ -16,13 +16,57 @@\n \n using namespace libcamera;\n \n-ControlFrame::ControlFrame(const ControlId *control, QWidget *parent)\n-\t: QFrame(parent), control_(control)\n+ControlFrame::ControlFrame(const ControlId *control,\n+\t\t\t const ControlInfo &controlInfo, QWidget *parent)\n+\t: QFrame(parent), control_(control), controlInfo_(controlInfo)\n {\n \t/* Main layout for the frame */\n \tQVBoxLayout *frameVLayout = new QVBoxLayout(this);\n \n \tframeVLayout->addWidget(new QLabel(QString::fromStdString(control_->name())));\n \n+\t/*\n+\t * No need to pass parents to widgets, as QVBoxLayout transfers\n+\t * ownership to its parent widget.\n+\t */\n+\tframeVLayout->addWidget(defaultValueLabel());\n+\n \tsetFrameStyle(QFrame::StyledPanel);\n }\n+\n+/* -----------------------------------------------------------------------------\n+ * Widgets\n+ */\n+\n+QLabel *ControlFrame::defaultValueLabel(QWidget *parent)\n+{\n+\tQLabel *defaultValLabel = new QLabel(parent);\n+\n+\tdefaultValLabel->setText(\"Default Value: \" + getDefaultValueQStr());\n+\n+\treturn defaultValLabel;\n+}\n+\n+/* -----------------------------------------------------------------------------\n+ * Helpers\n+ */\n+\n+QString ControlFrame::getDefaultValueQStr()\n+{\n+\tswitch (control_->type()) {\n+\tcase ControlTypeBool:\n+\t\tif (controlInfo_.def().get<bool>()) {\n+\t\t\treturn QString(\"True\");\n+\t\t} else {\n+\t\t\treturn QString(\"False\");\n+\t\t}\n+\tcase ControlTypeInteger32:\n+\t\treturn QString::number(controlInfo_.def().get<int32_t>());\n+\tcase ControlTypeInteger64:\n+\t\treturn QString::number(controlInfo_.def().get<int64_t>());\n+\tcase ControlTypeFloat:\n+\t\treturn QString::number(controlInfo_.def().get<float>());\n+\tdefault:\n+\t\treturn QString(\"Unavailable\");\n+\t}\n+}\ndiff --git a/src/qcam/settings/control_frame.h b/src/qcam/settings/control_frame.h\nindex 10690674..280f07e0 100644\n--- a/src/qcam/settings/control_frame.h\n+++ b/src/qcam/settings/control_frame.h\n@@ -10,6 +10,7 @@\n #include <libcamera/controls.h>\n \n #include <QFrame>\n+#include <QLabel>\n #include <QWidget>\n \n class ControlFrame : public QFrame\n@@ -18,9 +19,17 @@ class ControlFrame : public QFrame\n \n public:\n \tControlFrame(const libcamera::ControlId *control,\n+\t\t const libcamera::ControlInfo &controlInfo,\n \t\t QWidget *parent);\n \t~ControlFrame() = default;\n \n private:\n \tconst libcamera::ControlId *control_;\n+\tconst libcamera::ControlInfo &controlInfo_;\n+\n+\t/* Widgets */\n+\tQLabel *defaultValueLabel(QWidget *parent = nullptr);\n+\n+\t/* Helper Hunctions */\n+\tQString getDefaultValueQStr();\n };\ndiff --git a/src/qcam/settings/controls_tab.cpp b/src/qcam/settings/controls_tab.cpp\nindex 33ed9332..adc24326 100644\n--- a/src/qcam/settings/controls_tab.cpp\n+++ b/src/qcam/settings/controls_tab.cpp\n@@ -26,7 +26,7 @@ ControlsTab::ControlsTab(std::shared_ptr<libcamera::Camera> camera_,\n \n \tint controlCount = 0;\n \tfor (auto &[control, info] : camera_->controls()) {\n-\t\tControlFrame *controlFrame = new ControlFrame(control, this);\n+\t\tControlFrame *controlFrame = new ControlFrame(control, info, this);\n \n \t\tcontrolGLayout->addWidget(controlFrame, controlCount / 2,\n \t\t\t\t\t controlCount % 2);\n", "prefixes": [ "libcamera-devel", "v2", "02/11" ] }