From patchwork Thu Apr 30 00:36:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 3617 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8194260AF5 for ; Thu, 30 Apr 2020 02:36:37 +0200 (CEST) X-Halon-ID: 872db93e-8a7a-11ea-89d0-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de [79.202.35.146]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 872db93e-8a7a-11ea-89d0-0050569116f7; Thu, 30 Apr 2020 02:35:44 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Thu, 30 Apr 2020 02:36:02 +0200 Message-Id: <20200430003604.2423018-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200430003604.2423018-1-niklas.soderlund@ragnatech.se> References: <20200430003604.2423018-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC/PATCH 3/5] qcam: Add an option to allow specifying output path X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 00:36:37 -0000 Add a command line option to specify an output path for files captured. This will become more useful when JPEG capture is turned into an quick operation instead of using a QFileDialog and when RAW capture support is added. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/qcam/main.cpp | 3 +++ src/qcam/main_window.cpp | 8 ++++++-- src/qcam/main_window.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index cd73fa764614e7e7..2999e4959d8ecff8 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -34,6 +34,9 @@ OptionsParser::Options parseOptions(int argc, char *argv[]) "help"); parser.addOption(OptStream, &streamKeyValue, "Set configuration of a camera stream", "stream", true); + parser.addOption(OptSavePath, OptionString, + "Path to qcam picture storage", + "output-dir", ArgumentRequired, "path"); OptionsParser::Options options = parser.parse(argc, argv); if (options.isSet(OptHelp)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index e77bc01df8f3edfe..470f78162cabffe5 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -75,6 +75,11 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) return; } + if (options_.isSet(OptSavePath)) + defaultPath_ = QString::fromUtf8(options_[OptSavePath].toString().c_str()); + else + defaultPath_ = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); + startStopAction_->setChecked(true); } @@ -507,9 +512,8 @@ void MainWindow::stopCapture() void MainWindow::saveImageAs() { QImage image = viewfinder_->getCurrentImage(); - QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); - QString filename = QFileDialog::getSaveFileName(this, "Save Image", defaultPath, + QString filename = QFileDialog::getSaveFileName(this, "Save Image", defaultPath_, "Image Files (*.png *.jpg *.jpeg)"); if (filename.isEmpty()) return; diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index c2040c0ebcd61bfa..7b8a185511e17a8f 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -33,6 +33,7 @@ class QAction; enum { OptCamera = 'c', OptHelp = 'h', + OptSavePath = 'o', OptStream = 's', }; @@ -83,6 +84,7 @@ private: /* Options */ const OptionsParser::Options &options_; + QString defaultPath_; /* Camera manager, camera, configuration and buffers */ CameraManager *cm_;