Browse Source

Merge pull request #6908 from DonLakeFlyer/StructureScanFix

Structure Scan: Structure Height was not being loaded back from plan files
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
dfabac0b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/MissionManager/StructureScan.SettingsGroup.json
  2. 12
      src/MissionManager/StructureScanComplexItem.cc

1
src/MissionManager/StructureScan.SettingsGroup.json

@ -38,6 +38,7 @@
"name": "StructureHeight", "name": "StructureHeight",
"shortDescription": "Height of structure being scanned.", "shortDescription": "Height of structure being scanned.",
"type": "double", "type": "double",
"decimalPlaces": 2,
"units": "m", "units": "m",
"min": 1, "min": 1,
"defaultValue": 100 "defaultValue": 100

12
src/MissionManager/StructureScanComplexItem.cc

@ -147,8 +147,8 @@ void StructureScanComplexItem::save(QJsonArray& missionItems)
saveObject[ComplexMissionItem::jsonComplexItemTypeKey] = jsonComplexItemTypeValue; saveObject[ComplexMissionItem::jsonComplexItemTypeKey] = jsonComplexItemTypeValue;
saveObject[altitudeName] = _altitudeFact.rawValue().toDouble(); saveObject[altitudeName] = _altitudeFact.rawValue().toDouble();
saveObject[structureHeightName] = _structureHeightFact.rawValue().toDouble(); saveObject[structureHeightName] = _structureHeightFact.rawValue().toDouble();
saveObject[_jsonAltitudeRelativeKey] = _altitudeRelative; saveObject[_jsonAltitudeRelativeKey] = _altitudeRelative;
saveObject[layersName] = _layersFact.rawValue().toDouble(); saveObject[layersName] = _layersFact.rawValue().toDouble();
QJsonObject cameraCalcObject; QJsonObject cameraCalcObject;
@ -208,9 +208,11 @@ bool StructureScanComplexItem::load(const QJsonObject& complexObject, int sequen
return false; return false;
} }
_altitudeFact.setRawValue (complexObject[altitudeName].toDouble()); _altitudeFact.setRawValue (complexObject[altitudeName].toDouble());
_layersFact.setRawValue (complexObject[layersName].toDouble()); _layersFact.setRawValue (complexObject[layersName].toDouble());
_altitudeRelative = complexObject[_jsonAltitudeRelativeKey].toBool(true); _structureHeightFact.setRawValue(complexObject[structureHeightName].toDouble());
_altitudeRelative = complexObject[_jsonAltitudeRelativeKey].toBool(true);
if (!_structurePolygon.loadFromJson(complexObject, true /* required */, errorString)) { if (!_structurePolygon.loadFromJson(complexObject, true /* required */, errorString)) {
_structurePolygon.clear(); _structurePolygon.clear();

Loading…
Cancel
Save