Skip to content

Q
qgroundcontrol
Commit ac14fcb2 authored by DoinLakeFlyer's avatar DoinLakeFlyer
Browse files
Options

parent 479d6f06
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
src/MissionManager/CameraCalc.cc
View file @ ac14fcb2
...@@ -241,6 +241,11 @@ bool CameraCalc::load(const QJsonObject& json, QString& errorString) ...@@ -241,6 +241,11 @@ bool CameraCalc::load(const QJsonObject& json, QString& errorString)
_distanceToSurfaceRelative = v1Json[distanceToSurfaceRelativeName].toBool(); _distanceToSurfaceRelative = v1Json[distanceToSurfaceRelativeName].toBool();
_cameraNameFact.setRawValue (v1Json[cameraNameName].toString());
_adjustedFootprintSideFact.setRawValue (v1Json[adjustedFootprintSideName].toDouble());
_adjustedFootprintFrontalFact.setRawValue (v1Json[adjustedFootprintFrontalName].toDouble());
_distanceToSurfaceFact.setRawValue (v1Json[distanceToSurfaceName].toDouble());
if (!isManualCamera()) { if (!isManualCamera()) {
QList<JsonHelper::KeyValidateInfo> keyInfoList2 = { QList<JsonHelper::KeyValidateInfo> keyInfoList2 = {
{ valueSetIsDistanceName, QJsonValue::Bool, true }, { valueSetIsDistanceName, QJsonValue::Bool, true },
...@@ -256,14 +261,7 @@ bool CameraCalc::load(const QJsonObject& json, QString& errorString) ...@@ -256,14 +261,7 @@ bool CameraCalc::load(const QJsonObject& json, QString& errorString)
_valueSetIsDistanceFact.setRawValue (v1Json[valueSetIsDistanceName].toBool()); _valueSetIsDistanceFact.setRawValue (v1Json[valueSetIsDistanceName].toBool());
_frontalOverlapFact.setRawValue (v1Json[frontalOverlapName].toDouble()); _frontalOverlapFact.setRawValue (v1Json[frontalOverlapName].toDouble());
_sideOverlapFact.setRawValue (v1Json[sideOverlapName].toDouble()); _sideOverlapFact.setRawValue (v1Json[sideOverlapName].toDouble());
} _imageDensityFact.setRawValue (v1Json[imageDensityName].toDouble());
_cameraNameFact.setRawValue (v1Json[cameraNameName].toString());
_adjustedFootprintSideFact.setRawValue (v1Json[adjustedFootprintSideName].toDouble());
_adjustedFootprintFrontalFact.setRawValue (v1Json[adjustedFootprintFrontalName].toDouble());
_distanceToSurfaceFact.setRawValue (v1Json[distanceToSurfaceName].toDouble());
if (!isManualCamera()) {
_imageDensityFact.setRawValue(v1Json[imageDensityName].toDouble());
if (!CameraSpec::load(v1Json, errorString)) { if (!CameraSpec::load(v1Json, errorString)) {
_disableRecalc = false; _disableRecalc = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment