|
|
|
@ -230,6 +230,7 @@ void SurveyMissionItem::save(QJsonArray& missionItems)
@@ -230,6 +230,7 @@ void SurveyMissionItem::save(QJsonArray& missionItems)
|
|
|
|
|
saveObject[_jsonHoverAndCaptureKey] = _hoverAndCaptureFact.rawValue().toBool(); |
|
|
|
|
saveObject[_jsonRefly90DegreesKey] = _refly90Degrees; |
|
|
|
|
saveObject[_jsonCameraTriggerDistanceKey] = _cameraTriggerDistanceFact.rawValue().toDouble(); |
|
|
|
|
saveObject[_jsonCameraTriggerInTurnaroundKey] = _cameraTriggerInTurnaroundFact.rawValue().toBool(); |
|
|
|
|
|
|
|
|
|
QJsonObject gridObject; |
|
|
|
|
gridObject[_jsonGridAltitudeKey] = _gridAltitudeFact.rawValue().toDouble(); |
|
|
|
@ -310,6 +311,7 @@ bool SurveyMissionItem::load(const QJsonObject& complexObject, int sequenceNumbe
@@ -310,6 +311,7 @@ bool SurveyMissionItem::load(const QJsonObject& complexObject, int sequenceNumbe
|
|
|
|
|
{ _jsonFixedValueIsAltitudeKey, QJsonValue::Bool, true }, |
|
|
|
|
{ _jsonHoverAndCaptureKey, QJsonValue::Bool, false }, |
|
|
|
|
{ _jsonRefly90DegreesKey, QJsonValue::Bool, false }, |
|
|
|
|
{ _jsonCameraTriggerInTurnaroundKey, QJsonValue::Bool, false }, // Should really be required, but it was missing from initial code due to bug
|
|
|
|
|
}; |
|
|
|
|
if (!JsonHelper::validateKeys(v2Object, mainKeyInfoList, errorString)) { |
|
|
|
|
return false; |
|
|
|
@ -328,10 +330,11 @@ bool SurveyMissionItem::load(const QJsonObject& complexObject, int sequenceNumbe
@@ -328,10 +330,11 @@ bool SurveyMissionItem::load(const QJsonObject& complexObject, int sequenceNumbe
|
|
|
|
|
|
|
|
|
|
setSequenceNumber(sequenceNumber); |
|
|
|
|
|
|
|
|
|
_manualGridFact.setRawValue (v2Object[_jsonManualGridKey].toBool(true)); |
|
|
|
|
_fixedValueIsAltitudeFact.setRawValue (v2Object[_jsonFixedValueIsAltitudeKey].toBool(true)); |
|
|
|
|
_gridAltitudeRelativeFact.setRawValue (v2Object[_jsonGridAltitudeRelativeKey].toBool(true)); |
|
|
|
|
_hoverAndCaptureFact.setRawValue (v2Object[_jsonHoverAndCaptureKey].toBool(false)); |
|
|
|
|
_manualGridFact.setRawValue (v2Object[_jsonManualGridKey].toBool(true)); |
|
|
|
|
_fixedValueIsAltitudeFact.setRawValue (v2Object[_jsonFixedValueIsAltitudeKey].toBool(true)); |
|
|
|
|
_gridAltitudeRelativeFact.setRawValue (v2Object[_jsonGridAltitudeRelativeKey].toBool(true)); |
|
|
|
|
_hoverAndCaptureFact.setRawValue (v2Object[_jsonHoverAndCaptureKey].toBool(false)); |
|
|
|
|
_cameraTriggerInTurnaroundFact.setRawValue (v2Object[_jsonCameraTriggerInTurnaroundKey].toBool(true)); |
|
|
|
|
|
|
|
|
|
_refly90Degrees = v2Object[_jsonRefly90DegreesKey].toBool(false); |
|
|
|
|
|
|
|
|
|