Merge pull request #9007 from DonLakeFlyer/VideoStreaming

Video Streaming: Camera ui allows switch to photo mode to capture individual images from stream

ChangeLog.md

@@ -4,6 +4,7 @@ Note: This file only contains high level features or important fixes.
 
 ## 4.1 - Daily build
 
+* Video Streaming: New camera control supports capturing individual images from the stream
 * Fly: Press and hold on arm button will change it to Force Arm. Click again to force arm.
 * VTOL: General setting for transition distance which affects Plan takeoff, landing pattern creation
 * VTOL: Much better VTOL support throughout QGC

src/Camera/QGCCameraControl.cc

@@ -387,10 +387,7 @@ QGCCameraControl::takePhoto()
             _captureInfoRetries = 0;
             //-- Capture local image as well
             if(qgcApp()->toolbox()->videoManager()) {
-                QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo");
-                QDir().mkpath(photoPath);
-                photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
-                qgcApp()->toolbox()->videoManager()->grabImage(photoPath);
+                qgcApp()->toolbox()->videoManager()->grabImage();
             }
             return true;
         }

src/Settings/AppSettings.cc

@@ -27,12 +27,13 @@ const char* AppSettings::kmlFileExtension =         "kml";
 const char* AppSettings::shpFileExtension =         "shp";
 const char* AppSettings::logFileExtension =         "ulg";
 
-const char* AppSettings::parameterDirectory =       "Parameters";
-const char* AppSettings::telemetryDirectory =       "Telemetry";
-const char* AppSettings::missionDirectory =         "Missions";
-const char* AppSettings::logDirectory =             "Logs";
-const char* AppSettings::videoDirectory =           "Video";
-const char* AppSettings::crashDirectory =           "CrashLogs";
+const char* AppSettings::parameterDirectory =       QT_TRANSLATE_NOOP("AppSettings", "Parameters");
+const char* AppSettings::telemetryDirectory =       QT_TRANSLATE_NOOP("AppSettings", "Telemetry");
+const char* AppSettings::missionDirectory =         QT_TRANSLATE_NOOP("AppSettings", "Missions");
+const char* AppSettings::logDirectory =             QT_TRANSLATE_NOOP("AppSettings", "Logs");
+const char* AppSettings::videoDirectory =           QT_TRANSLATE_NOOP("AppSettings", "Video");
+const char* AppSettings::photoDirectory =           QT_TRANSLATE_NOOP("AppSettings", "Photo");
+const char* AppSettings::crashDirectory =           QT_TRANSLATE_NOOP("AppSettings", "CrashLogs");
 
 DECLARE_SETTINGGROUP(App, "")
 {
@@ -160,6 +161,7 @@ void AppSettings::_checkSavePathDirectories(void)
         savePathDir.mkdir(missionDirectory);
         savePathDir.mkdir(logDirectory);
         savePathDir.mkdir(videoDirectory);
+        savePathDir.mkdir(photoDirectory);
         savePathDir.mkdir(crashDirectory);
     }
 }
@@ -219,6 +221,16 @@ QString AppSettings::videoSavePath(void)
     return QString();
 }
 
+QString AppSettings::photoSavePath(void)
+{
+    QString path = savePath()->rawValue().toString();
+    if (!path.isEmpty() && QDir(path).exists()) {
+        QDir dir(path);
+        return dir.filePath(photoDirectory);
+    }
+    return QString();
+}
+
 QString AppSettings::crashSavePath(void)
 {
     QString path = savePath()->rawValue().toString();

src/Settings/AppSettings.h

@@ -71,6 +71,7 @@ public:
     Q_PROPERTY(QString telemetrySavePath    READ telemetrySavePath  NOTIFY savePathsChanged)
     Q_PROPERTY(QString logSavePath          READ logSavePath        NOTIFY savePathsChanged)
     Q_PROPERTY(QString videoSavePath        READ videoSavePath      NOTIFY savePathsChanged)
+    Q_PROPERTY(QString photoSavePath        READ photoSavePath      NOTIFY savePathsChanged)
     Q_PROPERTY(QString crashSavePath        READ crashSavePath      NOTIFY savePathsChanged)
 
     Q_PROPERTY(QString planFileExtension        MEMBER planFileExtension        CONSTANT)
@@ -87,6 +88,7 @@ public:
     QString telemetrySavePath   ();
     QString logSavePath         ();
     QString videoSavePath       ();
+    QString photoSavePath       ();
     QString crashSavePath       ();
 
     // Helper methods for working with firstRunPromptIds QVariant settings string list
@@ -112,6 +114,7 @@ public:
     static const char* missionDirectory;
     static const char* logDirectory;
     static const char* videoDirectory;
+    static const char* photoDirectory;
     static const char* crashDirectory;
 
     // Returns the current language setting bypassing the standard SettingsGroup path. This should only be used

src/VideoManager/VideoManager.cc

@@ -350,7 +350,12 @@ VideoManager::grabImage(const QString& imageFile)
         return;
     }
 
-    _imageFile = imageFile;
+    if (imageFile.isEmpty()) {
+        _imageFile = qgcApp()->toolbox()->settingsManager()->appSettings()->photoSavePath();
+        _imageFile += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
+    } else {
+        _imageFile = imageFile;
+    }
 
     emit imageFileChanged();
 

src/VideoManager/VideoManager.h

@@ -109,7 +109,7 @@ public:
     Q_INVOKABLE void startRecording (const QString& videoFile = QString());
     Q_INVOKABLE void stopRecording  ();
 
-    Q_INVOKABLE void grabImage(const QString& imageFile);
+    Q_INVOKABLE void grabImage(const QString& imageFile = QString());
 
 signals:
     void hasVideoChanged            ();