Patch Detail
Show a patch.
GET /api/1.1/patches/17070/?format=api
{ "id": 17070, "url": "https://patchwork.libcamera.org/api/1.1/patches/17070/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17070/", "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": "<20220810150349.414043-5-utkarsh02t@gmail.com>", "date": "2022-08-10T15:03:45", "name": "[libcamera-devel,v8,4/8] qcam: CamSelectDialog: Display Location and Model propety of camera", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cc9536d5fa7b893390f2cf2c68a5610c0db0ef57", "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/17070/mbox/", "series": [ { "id": 3402, "url": "https://patchwork.libcamera.org/api/1.1/series/3402/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3402", "date": "2022-08-10T15:03:41", "name": "Introduce capture scripts to qcam", "version": 8, "mbox": "https://patchwork.libcamera.org/series/3402/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17070/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17070/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 8D4B3C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 10 Aug 2022 15:04:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5221063337;\n\tWed, 10 Aug 2022 17:04:07 +0200 (CEST)", "from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com\n\t[IPv6:2607:f8b0:4864:20::102c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AB56600EA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Aug 2022 17:04:05 +0200 (CEST)", "by mail-pj1-x102c.google.com with SMTP id\n\te8-20020a17090a280800b001f2fef7886eso2385362pjd.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Aug 2022 08:04:05 -0700 (PDT)", "from localhost.localdomain ([2404:bd00:3:d2bc:2a55:4cae:bf8f:f4ed])\n\tby smtp.gmail.com with ESMTPSA id\n\tb3-20020a1709027e0300b0016f1319d2a7sm12882624plm.297.2022.08.10.08.04.02\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 10 Aug 2022 08:04:03 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660143847;\n\tbh=tSkV38layzPywD5+leW5gky6c211YBGtMOIU/YmxMJw=;\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=J5RLB16WcvEzy5LMj8mMXKFz3sy8EMrGxl1H5xo097id7+5xWA7IEDTnzv9cvaUgH\n\tA16BPJ/DxqI8bwG5mi5Zb3CTuMMIlMendPMjMEjuKrjf5svTEbILFhj7/Crw19RByc\n\t7eMPuxEzsJLowGiZIRtu/K8MozgtrtmZXzLrik+ENfsYc+FGTYLqXnKz6lFKwbmKTs\n\t4eE5BoNRtn4cQfzNhN7FY8FfnSBCsltsYcHlTuTMCyRnRS3T1+4NdQR1SpfFg+McXH\n\t0rXp/JbNCRcMSFCM0I9CuUhfpaAqIhzwQqneP7GwJWY3AOn5Jcpc8luRtoq8RdhH2X\n\tsi1McCRYTz4yg==", "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=yPqc+syOGhMuqA0QCVsz3uFjAHkQ3W7uVeQQ/RZBUUA=;\n\tb=Ubfd9QgyD17IQsFF7t5fGWP23wFPZINsEtZEQXLE+PBKtx5PEG0Tf34vtVzMF4LpxF\n\tsf9iy3BuNFxFqcwnAyNYKnM05eQaeOHQmOTZHLobjntElv0+ZAJLhREEshIgpL2b8JKu\n\tOz4B96EFmrB56ud8WrhFAIed9lJlmEohjUADkH2bYdwxT0zZSbwdiUV4+6QyPFpB+Xh+\n\ttsR3qgFPtr/3jq9FrNvcerc+dNjsKXQmBIxJ1hz0BzlKOjHIK0cOeUJt9FNEM4OWsOLs\n\tGJiCrqBvUeDsEB5BFi2VLbsk/4K/6iso28l455dqxzzwnoYdokUKgeNrcPiEALDUVlBG\n\tP5Kw==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Ubfd9Qgy\"; 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=yPqc+syOGhMuqA0QCVsz3uFjAHkQ3W7uVeQQ/RZBUUA=;\n\tb=AJCtnVu4RZDTNOwUlF4ImXGPIdOK8W/YrP3y+AFWD6hIW0Hp4eqh3mzmCaL/1zlVDX\n\tR3G8H2yTc23aLSRWimmHDOfIuAD+bIoqPgwPlNoBcPcx4Xpy7zmQw03OkIfjLsv4DCzg\n\tLoi9qdeTGsh2bQ+x71S2N+JTsI53v7JrmfWYBSORGNo+/zfDUBQi9h8UlWEzwAtokqN+\n\trSqxLV6SeU2ChBsHy8fOgQLbdaIO5IySEs6FXgl4O/F3RtjY5Kit0yp9A/OwtwebrD+P\n\t/dchboIzL922TI5HUWM7wMYr4Xy+FWZlKc84ZSR3iW+xeEbiIMEhPNOodhHTHO6syMoT\n\tiBbg==", "X-Gm-Message-State": "ACgBeo26qL2kJUdtfWuHw+CpsQPELasnc+7Soqie7d7gPrtkiQ7mjUd4\n\t7aMHvFZ9RTJIXi/8Ofd5EjTp4zASNuY=", "X-Google-Smtp-Source": "AA6agR40B/UOntW5AeWAFN0kIbHN8zph+pR6mwgPMmTtJDn4DiyLBmWrjMMN6VL07rWOMQPPPAf1lQ==", "X-Received": "by 2002:a17:90a:fa91:b0:1f5:1f52:a2ba with SMTP id\n\tcu17-20020a17090afa9100b001f51f52a2bamr4135279pjb.16.1660143843741; \n\tWed, 10 Aug 2022 08:04:03 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 10 Aug 2022 20:33:45 +0530", "Message-Id": "<20220810150349.414043-5-utkarsh02t@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220810150349.414043-1-utkarsh02t@gmail.com>", "References": "<20220810150349.414043-1-utkarsh02t@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8 4/8] qcam: CamSelectDialog: Display\n\tLocation and Model propety of camera", "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": "The camera selection dialog currently only displays the camera Id.\nDisplay the camera location and camera model if available.\n\nSigned-off-by: Utkarsh Tiwari <utkarsh02t@gmail.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\nDifference from v7:\n\t1. Nothing\n src/qcam/cam_select_dialog.cpp | 52 ++++++++++++++++++++++++++++++++++\n src/qcam/cam_select_dialog.h | 10 +++++++\n 2 files changed, 62 insertions(+)", "diff": "diff --git a/src/qcam/cam_select_dialog.cpp b/src/qcam/cam_select_dialog.cpp\nindex d8982800..f97ad6eb 100644\n--- a/src/qcam/cam_select_dialog.cpp\n+++ b/src/qcam/cam_select_dialog.cpp\n@@ -7,6 +7,7 @@\n \n #include \"cam_select_dialog.h\"\n \n+#include <memory>\n #include <string>\n \n #include <libcamera/camera.h>\n@@ -30,6 +31,14 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag\n \tfor (const auto &cam : cm_->cameras())\n \t\tcameraIdComboBox_->addItem(QString::fromStdString(cam->id()));\n \n+\t/* Set camera information labels. */\n+\tcameraLocation_ = new QLabel;\n+\tcameraModel_ = new QLabel;\n+\n+\thandleCameraChange();\n+\tconnect(cameraIdComboBox_, &QComboBox::currentTextChanged,\n+\t\tthis, &CameraSelectorDialog::handleCameraChange);\n+\n \t/* Setup the QDialogButton Box */\n \tQDialogButtonBox *buttonBox =\n \t\tnew QDialogButtonBox(QDialogButtonBox::Ok |\n@@ -41,7 +50,10 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag\n \t\tthis, &QDialog::reject);\n \n \t/* Set the layout. */\n+\n \tlayout->addRow(\"Camera:\", cameraIdComboBox_);\n+\tlayout->addRow(\"Location:\", cameraLocation_);\n+\tlayout->addRow(\"Model:\", cameraModel_);\n \tlayout->addWidget(buttonBox);\n }\n \n@@ -63,3 +75,43 @@ void CameraSelectorDialog::cameraRemoved(libcamera::Camera *camera)\n \n \tcameraIdComboBox_->removeItem(cameraIndex);\n }\n+\n+/* Camera Information */\n+void CameraSelectorDialog::handleCameraChange()\n+{\n+\tupdateCamInfo(cm_->get(getCameraId()));\n+}\n+\n+void CameraSelectorDialog::updateCamInfo(const std::shared_ptr<libcamera::Camera> &camera)\n+{\n+\tif (!camera)\n+\t\treturn;\n+\n+\tconst libcamera::ControlList &cameraProperties = camera->properties();\n+\n+\tconst auto &location =\n+\t\tcameraProperties.get(libcamera::properties::Location);\n+\tif (location) {\n+\t\tswitch (*location) {\n+\t\tcase libcamera::properties::CameraLocationFront:\n+\t\t\tcameraLocation_->setText(\"Internal front camera\");\n+\t\t\tbreak;\n+\t\tcase libcamera::properties::CameraLocationBack:\n+\t\t\tcameraLocation_->setText(\"Internal back camera\");\n+\t\t\tbreak;\n+\t\tcase libcamera::properties::CameraLocationExternal:\n+\t\t\tcameraLocation_->setText(\"External camera\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tcameraLocation_->setText(\"Unknown\");\n+\t\t}\n+\t} else {\n+\t\tcameraLocation_->setText(\"Unknown\");\n+\t}\n+\n+\tconst auto &model = cameraProperties\n+\t\t\t\t .get(libcamera::properties::Model)\n+\t\t\t\t .value_or(\"Unknown\");\n+\n+\tcameraModel_->setText(QString::fromStdString(model));\n+}\ndiff --git a/src/qcam/cam_select_dialog.h b/src/qcam/cam_select_dialog.h\nindex 04c71fd8..16475af6 100644\n--- a/src/qcam/cam_select_dialog.h\n+++ b/src/qcam/cam_select_dialog.h\n@@ -11,9 +11,12 @@\n \n #include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n+#include <libcamera/controls.h>\n+#include <libcamera/property_ids.h>\n \n #include <QComboBox>\n #include <QDialog>\n+#include <QLabel>\n \n class CameraSelectorDialog : public QDialog\n {\n@@ -30,9 +33,16 @@ public:\n \tvoid cameraAdded(libcamera::Camera *camera);\n \n \tvoid cameraRemoved(libcamera::Camera *camera);\n+\n+\t/* Camera Information */\n+\tvoid updateCamInfo(const std::shared_ptr<libcamera::Camera> &camera);\n+\tvoid handleCameraChange();\n+\n private:\n \tlibcamera::CameraManager *cm_;\n \n \t/* UI elements. */\n \tQComboBox *cameraIdComboBox_;\n+\tQLabel *cameraLocation_;\n+\tQLabel *cameraModel_;\n };\n", "prefixes": [ "libcamera-devel", "v8", "4/8" ] }