Browse Source

QGCCameraControl.cc: _dataReady: search for possible definition files in resources:

This allows definition files to be embedded in resources. It asks
QGCCorePlugin, so it can be overriden from custom builds too
QGC4.4
davidsastresas 1 year ago committed by Julian Oes
parent
commit
8f28f4cbf0
No known key found for this signature in database
GPG Key ID: F0ED380FEA56DE41
  1. 15
      src/Camera/QGCCameraControl.cc

15
src/Camera/QGCCameraControl.cc

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include "QGCCameraManager.h"
#include "FTPManager.h"
#include "QGCLZMA.h"
#include "QGCCorePlugin.h"
#include <QDir>
#include <QStandardPaths>
@ -2092,7 +2093,19 @@ QGCCameraControl::_dataReady(QByteArray data) @@ -2092,7 +2093,19 @@ QGCCameraControl::_dataReady(QByteArray data)
qCDebug(CameraControlLog) << "Parsing camera definition";
_loadCameraDefinitionFile(data);
} else {
qCDebug(CameraControlLog) << "No camera definition";
qCDebug(CameraControlLog) << "No camera definition received, trying to search on our own...";
QFile definitionFile;
if(qgcApp()->toolbox()->corePlugin()->getOfflineCameraDefinitionFile(_modelName, definitionFile)) {
qCDebug(CameraControlLog) << "Found offline definition file for: " << _modelName << ", loading: " << definitionFile.fileName();
if (definitionFile.open(QIODevice::ReadOnly)) {
QByteArray newData = definitionFile.readAll();
_loadCameraDefinitionFile(newData);
} else {
qCDebug(CameraControlLog) << "error opening offline definition file for: " << _modelName;
}
} else {
qCDebug(CameraControlLog) << "No offline camera definition file found";
}
}
_initWhenReady();
}

Loading…
Cancel
Save