Patch Detail
Show a patch.
GET /api/patches/2829/?format=api
{ "id": 2829, "url": "https://patchwork.libcamera.org/api/patches/2829/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2829/", "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": "<20200214001810.19302-5-kieran.bingham@ideasonboard.com>", "date": "2020-02-14T00:18:07", "name": "[libcamera-devel,v2,4/7] qcam: Introduce a toolbar and camera switching", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1aab01f34d0479acdf8c44cdb1c37e714d81c029", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2829/mbox/", "series": [ { "id": 673, "url": "https://patchwork.libcamera.org/api/series/673/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=673", "date": "2020-02-14T00:18:03", "name": "qcam: Provide an initial toolbar", "version": 2, "mbox": "https://patchwork.libcamera.org/series/673/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2829/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2829/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0AD1A61A2B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 Feb 2020 01:18:15 +0100 (CET)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A31179D3;\n\tFri, 14 Feb 2020 01:18:14 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1581639494;\n\tbh=n8Ke77ofzJzoVF6fV89MLufSYAARGKeBWO4ic7rqD7U=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OLP0PQne3AE7KSYTDyZyAdgUw1ILYgVZc4Xa8dtlNR/y+etPdAl+cPvOAeZih3Frp\n\tZZnd4T7hSDm8NDnLVwacdtsEhhKKhDOddVbxCLmasCUW7DOmvG6xQjnB+1dLtgaBG9\n\tdvfsIWr+vOqbK8LhsT4illUg2k7072PTZHKodl2o=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Fri, 14 Feb 2020 00:18:07 +0000", "Message-Id": "<20200214001810.19302-5-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200214001810.19302-1-kieran.bingham@ideasonboard.com>", "References": "<20200214001810.19302-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 4/7] qcam: Introduce a toolbar and\n\tcamera switching", "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>", "X-List-Received-Date": "Fri, 14 Feb 2020 00:18:15 -0000" }, "content": "Implement a quit button, and a list of cameras.\n\nSelecting a different camera from the Toolbar will stop the current\nstream, and start streaming the chosen camera device if it can be\nacquired.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n---\nv2:\n\n - Add name to toolbar\n - Rename setCamera to switchCamera\n - Disable right click context menu on toolbar.\n - Utilise a combo box for camera selections\n - Squash in \"qcam: Expose quit method for MainWindow\"\n\n src/qcam/main_window.cpp | 64 ++++++++++++++++++++++++++++++++++++++--\n src/qcam/main_window.h | 5 ++++\n 2 files changed, 67 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 2ed84cacf655..0e9e717b7e1a 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -10,9 +10,12 @@\n #include <string>\n #include <sys/mman.h>\n \n+#include <QComboBox>\n #include <QCoreApplication>\n #include <QInputDialog>\n #include <QTimer>\n+#include <QToolBar>\n+#include <QToolButton>\n \n #include <libcamera/camera_manager.h>\n #include <libcamera/version.h>\n@@ -27,6 +30,8 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n {\n \tint ret;\n \n+\tcreateToolbars();\n+\n \ttitle_ = \"QCam \" + QString::fromStdString(CameraManager::version());\n \tsetWindowTitle(title_);\n \tconnect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle()));\n@@ -40,8 +45,7 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n \t\tret = startCapture();\n \n \tif (ret < 0)\n-\t\tQTimer::singleShot(0, QCoreApplication::instance(),\n-\t\t\t\t &QCoreApplication::quit);\n+\t\tquit();\n }\n \n MainWindow::~MainWindow()\n@@ -53,6 +57,39 @@ MainWindow::~MainWindow()\n \t}\n }\n \n+int MainWindow::createToolbars()\n+{\n+\tQAction *action;\n+\n+\ttoolbar_ = addToolBar(\"Main\");\n+\n+\t/* Disable right click context menu */\n+\ttoolbar_->setContextMenuPolicy(Qt::PreventContextMenu);\n+\n+\taction = toolbar_->addAction(\"Quit\");\n+\tconnect(action, &QAction::triggered, this, &MainWindow::quit);\n+\n+\t/* Camera selection */\n+\tQComboBox *cameraCombo = new QComboBox();\n+\tconnect(cameraCombo, QOverload<int>::of(&QComboBox::activated),\n+\t\tthis, &MainWindow::switchCamera);\n+\n+\tfor (const std::shared_ptr<Camera> &cam : cm_->cameras())\n+\t\tcameraCombo->addItem(QString::fromStdString(cam->name()));\n+\n+\ttoolbar_->addWidget(cameraCombo);\n+\n+\ttoolbar_->addSeparator();\n+\n+\treturn 0;\n+}\n+\n+void MainWindow::quit()\n+{\n+\tQTimer::singleShot(0, QCoreApplication::instance(),\n+\t\t\t &QCoreApplication::quit);\n+}\n+\n void MainWindow::updateTitle()\n {\n \tunsigned int duration = frameRateInterval_.elapsed();\n@@ -66,6 +103,29 @@ void MainWindow::updateTitle()\n \tsetWindowTitle(title_ + \" : \" + QString::number(fps, 'f', 2) + \" fps\");\n }\n \n+void MainWindow::switchCamera(int index)\n+{\n+\tconst auto &cameras = cm_->cameras();\n+\tif (static_cast<unsigned int>(index) >= cameras.size())\n+\t\treturn;\n+\n+\tconst std::shared_ptr<Camera> &cam = cameras[index];\n+\n+\tif (cam->acquire()) {\n+\t\tstd::cout << \"Failed to acquire camera \" << cam->name() << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tstd::cout << \"Switching to camera \" << cam->name() << std::endl;\n+\n+\tstopCapture();\n+\n+\tcamera_->release();\n+\tcamera_ = cam;\n+\n+\tstartCapture();\n+}\n+\n std::string MainWindow::chooseCamera()\n {\n \tQStringList cameras;\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex d19cda16e36b..12af103f87d0 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -41,9 +41,13 @@ public:\n \t~MainWindow();\n \n private Q_SLOTS:\n+\tvoid quit();\n \tvoid updateTitle();\n \n+\tvoid switchCamera(int index);\n+\n private:\n+\tint createToolbars();\n \tstd::string chooseCamera();\n \tint openCamera();\n \n@@ -71,6 +75,7 @@ private:\n \tuint32_t previousFrames_;\n \tuint32_t framesCaptured_;\n \n+\tQToolBar *toolbar_;\n \tViewFinder *viewfinder_;\n \tstd::map<int, std::pair<void *, unsigned int>> mappedBuffers_;\n };\n", "prefixes": [ "libcamera-devel", "v2", "4/7" ] }