Merge pull request #9044 from DonLakeFlyer/RegexParamMetadata

COMPONENT_INFORMATION:COMP_METADATA_TYPE_PARAMETER Changed parameter name regex support

src/Vehicle/CompInfoParam.cc

@@ -76,30 +76,58 @@ void CompInfoParam::setJson(const QString& metadataJsonFileName, const QString&
         }
 
         FactMetaData* newMetaData = FactMetaData::createFromJsonObject(parameterValue.toObject(), emptyDefineMap, this);
+
+        QRegularExpression      regexNameIncludesRegex("/\\(.+\\)/");
+        QRegularExpressionMatch match = regexNameIncludesRegex.match(newMetaData->name());
+        if (match.hasMatch()) {
+            QString regexParamName = newMetaData->name();
+            regexParamName.replace(QRegularExpression("/(\\(.+\\))/"), "\\1");
+            newMetaData->setName(regexParamName);
+            _regexNameMetaDataList.append(RegexFactMetaDataPair_t(newMetaData->name(), newMetaData));
+        } else {
             _nameToMetaDataMap[newMetaData->name()] = newMetaData;
         }
+    }
 }
 
 FactMetaData* CompInfoParam::factMetaDataForName(const QString& name, FactMetaData::ValueType_t type)
 {
+    FactMetaData* factMetaData = nullptr;
+
     if (_opaqueParameterMetaData) {
-        return vehicle->firmwarePlugin()->_getMetaDataForFact(_opaqueParameterMetaData, name, type, vehicle->vehicleType());
+        factMetaData = vehicle->firmwarePlugin()->_getMetaDataForFact(_opaqueParameterMetaData, name, type, vehicle->vehicleType());
+    } else {
+        if (_nameToMetaDataMap.contains(name)) {
+            factMetaData = _nameToMetaDataMap[name];
         } else {
-        QString indexTagName = name;
-        if (!_nameToMetaDataMap.contains(name)) {
-            // Checked for indexed parameter names: "FOO<#>_BAR" will match "FOO1_BAR"
-            QRegularExpression regex("\\d+");
-            indexTagName = indexTagName.replace(regex, _parameterIndexTag);
-            if (!_nameToMetaDataMap.contains(indexTagName)) {
-                indexTagName.clear();
+            for (int i=0; i<_regexNameMetaDataList.count(); i++) {
+                const RegexFactMetaDataPair_t& pair = _regexNameMetaDataList[i];
+                QString regexParamName = pair.first;
+                QRegularExpression regex(regexParamName);
+                QRegularExpressionMatch match = regex.match(name);
+                QStringList captured = match.capturedTexts();
+                if (captured.count() == 2) {
+                    factMetaData = new FactMetaData(*pair.second, this);
+                    factMetaData->setName(name);
+
+                    QString shortDescription = factMetaData->shortDescription();
+                    shortDescription.replace("/1", captured[1]);
+                    factMetaData->setShortDescription(shortDescription);
+                    QString longDescription = factMetaData->shortDescription();
+                    longDescription.replace("/1", captured[1]);
+                    factMetaData->setLongDescription(longDescription);
                 }
             }
-        if (indexTagName.isEmpty()) {
-            indexTagName = name;
-            _nameToMetaDataMap[name] = new FactMetaData(type, this);
+
+            if (!factMetaData) {
+                factMetaData = new FactMetaData(type, this);
+            }
+            _nameToMetaDataMap[name] = factMetaData;
         }
-        return _nameToMetaDataMap[indexTagName];
     }
+
+
+    return factMetaData;
 }
 
 bool CompInfoParam::_isParameterVolatile(const QString& name)

src/Vehicle/CompInfoParam.h

@@ -44,8 +44,11 @@ private:
     static FirmwarePlugin*  _anyVehicleTypeFirmwarePlugin   (MAV_AUTOPILOT firmwareType);
     static QString          _parameterMetaDataFile          (Vehicle* vehicle, MAV_AUTOPILOT firmwareType, int wantedMajorVersion, int& majorVersion, int& minorVersion);
 
+    typedef QPair<QString /* regexName */, FactMetaData*> RegexFactMetaDataPair_t;
+
     bool                                _noJsonMetadata             = true;
     FactMetaData::NameToMetaDataMap_t   _nameToMetaDataMap;
+    QList<RegexFactMetaDataPair_t>      _regexNameMetaDataList;
     QObject*                            _opaqueParameterMetaData    = nullptr;
 
     static const char* _cachedMetaDataFilePrefix;