From 4eb9fb49f142562d3d3582277336754d1f5a591e Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 16 Nov 2019 08:55:21 -0800 Subject: [PATCH] Group parameters with no metadata with the other existing params in the group, not in "Other" --- src/FirmwarePlugin/APM/APMParameterMetaData.cc | 12 ++++++++++-- src/FirmwarePlugin/APM/APMParameterMetaData.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc index 1fd7f18c2..7d73528be 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc @@ -129,6 +129,13 @@ QString APMParameterMetaData::mavTypeToString(MAV_TYPE vehicleTypeEnum) return vehicleName; } +QString APMParameterMetaData::_groupFromParameterName(const QString& name) +{ + QString group = name.split('_').first(); + return group.remove(QRegExp("[0-9]*$")); // remove any numbers from the end +} + + void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaDataFile) { if (_parameterMetaDataLoaded) { @@ -232,8 +239,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData if (name.contains(':')) { name = name.split(':').last(); } - QString group = name.split('_').first(); - group = group.remove(QRegExp("[0-9]*$")); // remove any numbers from the end + QString group = _groupFromParameterName(name); QString category = xml.attributes().value("user").toString(); if (category.isEmpty()) { @@ -435,6 +441,8 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) // we don't have data for this fact if (!rawMetaData) { + metaData->setCategory(QStringLiteral("Advanced")); + metaData->setGroup(_groupFromParameterName(fact->name())); fact->setMetaData(metaData); qCDebug(APMParameterMetaDataLog) << "No metaData for " << fact->name() << "using generic metadata"; return; diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.h b/src/FirmwarePlugin/APM/APMParameterMetaData.h index 675476ed2..5b69588e5 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.h +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.h @@ -80,6 +80,7 @@ private: bool parseParameterAttributes(QXmlStreamReader& xml, APMFactMetaDataRaw *rawMetaData); void correctGroupMemberships(ParameterNametoFactMetaDataMap& parameterToFactMetaDataMap, QMap& groupMembers); QString mavTypeToString(MAV_TYPE vehicleTypeEnum); + QString _groupFromParameterName(const QString& name); bool _parameterMetaDataLoaded; ///< true: parameter meta data already loaded QMap _vehicleTypeToParametersMap; ///< Maps from a vehicle type to paramametertoFactMeta map> -- 2.22.0