|
|
|
@ -79,7 +79,11 @@ void ComplexMissionItem::_savePresetJson(const QString& name, QJsonObject& prese
@@ -79,7 +79,11 @@ void ComplexMissionItem::_savePresetJson(const QString& name, QJsonObject& prese
|
|
|
|
|
QSettings settings; |
|
|
|
|
settings.beginGroup(presetsSettingsGroup()); |
|
|
|
|
settings.beginGroup(_presetSettingsKey); |
|
|
|
|
settings.setValue(name, QCborMap::fromJsonObject(presetObject).toCborValue().toByteArray()); |
|
|
|
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) |
|
|
|
|
settings.setValue(name, QJsonDocument(presetObject).toBinaryData()); |
|
|
|
|
#else |
|
|
|
|
settings.setValue(name, QCborMap::fromJsonObject(presetObject).toCborValue().toVariant()); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
// Use this to save a survey preset as a JSON file to be included in the build
|
|
|
|
|
// as a built-in survey preset that cannot be deleted.
|
|
|
|
@ -108,7 +112,11 @@ QJsonObject ComplexMissionItem::_loadPresetJson(const QString& name)
@@ -108,7 +112,11 @@ QJsonObject ComplexMissionItem::_loadPresetJson(const QString& name)
|
|
|
|
|
QSettings settings; |
|
|
|
|
settings.beginGroup(presetsSettingsGroup()); |
|
|
|
|
settings.beginGroup(_presetSettingsKey); |
|
|
|
|
return QCborValue(settings.value(name).toByteArray()).toMap().toJsonObject(); |
|
|
|
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) |
|
|
|
|
return QJsonDocument::fromBinaryData(settings.value(name).toByteArray()).object(); |
|
|
|
|
#else |
|
|
|
|
return QCborValue::fromVariant(settings.value(name)).toMap().toJsonObject(); |
|
|
|
|
#endif |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ComplexMissionItem::addKMLVisuals(KMLPlanDomDocument& /* domDocument */) |
|
|
|
|