diff --git a/src/FactSystem/Fact.cc b/src/FactSystem/Fact.cc index b4ecbb2f3fa1a0d161cf4a4af83a49993b697d35..9becee8db6465011915301551e6d2fadff67d57f 100644 --- a/src/FactSystem/Fact.cc +++ b/src/FactSystem/Fact.cc @@ -51,7 +51,7 @@ Fact::Fact(int componentId, QString name, FactMetaData::ValueType_t type, QObjec QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); } -Fact::Fact(FactMetaData* metaData, QObject* parent) +Fact::Fact(const QString& settingsGroup, FactMetaData* metaData, QObject* parent) : QObject(parent) , _name (metaData->name()) , _componentId (0) @@ -62,6 +62,7 @@ Fact::Fact(FactMetaData* metaData, QObject* parent) , _deferredValueChangeSignal(false) , _valueSliderModel (NULL) { + qgcApp()->toolbox()->corePlugin()->adjustSettingMetaData(settingsGroup, *metaData); setMetaData(metaData, true /* setDefaultFromMetaData */); } diff --git a/src/FactSystem/Fact.h b/src/FactSystem/Fact.h index 74fe6b518a7c2b1fdba0d1146e19231c11828c29..e409236ccb12635174d7125aeafd81e5af7e33ed 100644 --- a/src/FactSystem/Fact.h +++ b/src/FactSystem/Fact.h @@ -36,7 +36,7 @@ public: /// Creates a Fact using the name and type from metaData. Also calls QGCCorePlugin::adjustSettingsMetaData allowing /// custom builds to override the metadata. - Fact(FactMetaData* metaData, QObject* parent = NULL); + Fact(const QString& settingsGroup, FactMetaData* metaData, QObject* parent = NULL); const Fact& operator=(const Fact& other); diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index 18873b703796ac5f04645573e1e3f40e7787deea..f15e9f175ee9c48414e0142c80f5b5e22fc77558 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -18,6 +18,7 @@ QGC_LOGGING_CATEGORY(FixedWingLandingComplexItemLog, "FixedWingLandingComplexItemLog") +const char* FixedWingLandingComplexItem::settingsGroup = "FixedWingLanding"; const char* FixedWingLandingComplexItem::jsonComplexItemTypeValue = "fwLandingPattern"; const char* FixedWingLandingComplexItem::loiterToLandDistanceName = "LandingDistance"; @@ -46,12 +47,12 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(Vehicle* vehicle, bool , _landingCoordSet (false) , _ignoreRecalcSignals (false) , _metaDataMap (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/FWLandingPattern.FactMetaData.json"), this)) - , _landingDistanceFact (_metaDataMap[loiterToLandDistanceName]) - , _loiterAltitudeFact (_metaDataMap[loiterAltitudeName]) - , _loiterRadiusFact (_metaDataMap[loiterRadiusName]) - , _landingHeadingFact (_metaDataMap[landingHeadingName]) - , _landingAltitudeFact (_metaDataMap[landingAltitudeName]) - , _glideSlopeFact (_metaDataMap[glideSlopeName]) + , _landingDistanceFact (settingsGroup, _metaDataMap[loiterToLandDistanceName]) + , _loiterAltitudeFact (settingsGroup, _metaDataMap[loiterAltitudeName]) + , _loiterRadiusFact (settingsGroup, _metaDataMap[loiterRadiusName]) + , _landingHeadingFact (settingsGroup, _metaDataMap[landingHeadingName]) + , _landingAltitudeFact (settingsGroup, _metaDataMap[landingAltitudeName]) + , _glideSlopeFact (settingsGroup, _metaDataMap[glideSlopeName]) , _loiterClockwise (true) , _altitudesAreRelative (true) , _valueSetIsDistance (true) diff --git a/src/MissionManager/FixedWingLandingComplexItem.h b/src/MissionManager/FixedWingLandingComplexItem.h index cc08a0996787b192ba06cfc8c79de0f88f4b3679..c456c15bcb010882f3714eadcae5cf411ac6b226 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.h +++ b/src/MissionManager/FixedWingLandingComplexItem.h @@ -144,6 +144,7 @@ private: bool _altitudesAreRelative; bool _valueSetIsDistance; + static const char* settingsGroup; static const char* _jsonLoiterCoordinateKey; static const char* _jsonLoiterRadiusKey; static const char* _jsonLoiterClockwiseKey;