[libcamera-devel] [PATCH 3/3] qcam: Add --script to load capture script

[Laurent Pinchart]

On Sat, Jun 18, 2022 at 04:19:13PM +0100, Kieran Bingham via libcamera-devel wrote:
> Quoting Utkarsh Tiwari via libcamera-devel (2022-06-13 07:03:45)
> > Add --script as an individual option to load capture scripts. Load the capture script before starting the capture.
> > 
> 
> The commit message should be wrapped to 72 chars.
> 
> But otherwise I think this is good too.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> 
> > Signed-off-by: Utkarsh Tiwari <utkarsh02t at gmail.com>
> > ---
> >  src/qcam/main.cpp        | 3 +++
> >  src/qcam/main_window.cpp | 9 +++++++++
> >  src/qcam/main_window.h   | 1 +
> >  3 files changed, 13 insertions(+)
> > 
> > diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp
> > index d3f01a85..91166be5 100644
> > --- a/src/qcam/main.cpp
> > +++ b/src/qcam/main.cpp
> > @@ -43,6 +43,9 @@ OptionsParser::Options parseOptions(int argc, char *argv[])
> >                          "Set configuration of a camera stream", "stream", true);
> >         parser.addOption(OptVerbose, OptionNone,
> >                          "Print verbose log messages", "verbose");
> > +       parser.addOption(OptCaptureScript, OptionString,
> > +                        "Load a capture session configuration script from a file",
> > +                        "script", ArgumentRequired, "script");
> >  
> >         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 7cdb1238..b9bf5b04 100644
> > --- a/src/qcam/main_window.cpp
> > +++ b/src/qcam/main_window.cpp
> > @@ -151,6 +151,15 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)
> >                 return;
> >         }
> >  
> > +       if (options_.isSet(OptCaptureScript)) {
> > +               std::string scriptName = options_[OptCaptureScript].toString();
> > +               script_ = std::make_unique<CaptureScript>(camera_, scriptName);
> > +               if (!script_->valid()) {
> > +                       QMessageBox::critical(this, tr("Invalid Script"), tr("Couldn't execute the capture script"));

This should also be wrapped to

			QMessageBox::critical(this, tr("Invalid Script"),
					      tr("Couldn't execute the capture script"));

But you can actually skip the tr() as qcam doesn't support
internationalization yet.

			QMessageBox::critical(this, "Invalid Script",
					      "Couldn't execute the capture script");

Finally, I'd write "Couldn't load the capture script" as this is only
loading it, not executing it.

> > +                       script_.reset();
> > +               }
> > +       }
> > +
> >         startStopAction_->setChecked(true);
> >  }
> >  
> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
> > index cde5842f..45069b0e 100644
> > --- a/src/qcam/main_window.h
> > +++ b/src/qcam/main_window.h
> > @@ -42,6 +42,7 @@ enum {
> >         OptRenderer = 'r',
> >         OptStream = 's',
> >         OptVerbose = 'v',
> > +       OptCaptureScript = 256,
> >  };
> >  
> >  class MainWindow : public QMainWindow

-- 
Regards,

Laurent Pinchart