Browse Source

Change VideoManager::grabImage to automatically generate file name

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
477602f567
  1. 5
      src/Camera/QGCCameraControl.cc
  2. 7
      src/VideoManager/VideoManager.cc
  3. 2
      src/VideoManager/VideoManager.h

5
src/Camera/QGCCameraControl.cc

@ -387,10 +387,7 @@ QGCCameraControl::takePhoto() @@ -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;
}

7
src/VideoManager/VideoManager.cc

@ -350,7 +350,12 @@ VideoManager::grabImage(const QString& imageFile) @@ -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();

2
src/VideoManager/VideoManager.h

@ -109,7 +109,7 @@ public: @@ -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 ();

Loading…
Cancel
Save