Merge pull request #6662 from DonLakeFlyer/FWLandingSettings

FW LandingPattern: Fix ability to adjust settings

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 */);
 }
 

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);
 

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)

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;