|
|
|
@ -20,17 +20,19 @@
@@ -20,17 +20,19 @@
|
|
|
|
|
|
|
|
|
|
QGC_LOGGING_CATEGORY(FactGroupLog, "FactGroupLog") |
|
|
|
|
|
|
|
|
|
FactGroup::FactGroup(int updateRateMsecs, const QString& metaDataFile, QObject* parent) |
|
|
|
|
FactGroup::FactGroup(int updateRateMsecs, const QString& metaDataFile, QObject* parent, bool ignoreCamelCase) |
|
|
|
|
: QObject(parent) |
|
|
|
|
, _updateRateMSecs(updateRateMsecs) |
|
|
|
|
, _ignoreCamelCase(ignoreCamelCase) |
|
|
|
|
{ |
|
|
|
|
_setupTimer(); |
|
|
|
|
_nameToFactMetaDataMap = FactMetaData::createMapFromJsonFile(metaDataFile, this); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
FactGroup::FactGroup(int updateRateMsecs, QObject* parent) |
|
|
|
|
FactGroup::FactGroup(int updateRateMsecs, QObject* parent, bool ignoreCamelCase) |
|
|
|
|
: QObject(parent) |
|
|
|
|
, _updateRateMSecs(updateRateMsecs) |
|
|
|
|
, _ignoreCamelCase(ignoreCamelCase) |
|
|
|
|
{ |
|
|
|
|
_setupTimer(); |
|
|
|
|
} |
|
|
|
@ -70,7 +72,7 @@ Fact* FactGroup::getFact(const QString& name)
@@ -70,7 +72,7 @@ Fact* FactGroup::getFact(const QString& name)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Fact* fact = nullptr; |
|
|
|
|
QString camelCaseName = _camelCase(name); |
|
|
|
|
QString camelCaseName = _ignoreCamelCase ? name : _camelCase(name); |
|
|
|
|
|
|
|
|
|
if (_nameToFactMap.contains(camelCaseName)) { |
|
|
|
|
fact = _nameToFactMap[camelCaseName]; |
|
|
|
@ -85,7 +87,7 @@ Fact* FactGroup::getFact(const QString& name)
@@ -85,7 +87,7 @@ Fact* FactGroup::getFact(const QString& name)
|
|
|
|
|
FactGroup* FactGroup::getFactGroup(const QString& name) |
|
|
|
|
{ |
|
|
|
|
FactGroup* factGroup = nullptr; |
|
|
|
|
QString camelCaseName = _camelCase(name); |
|
|
|
|
QString camelCaseName = _ignoreCamelCase ? name : _camelCase(name); |
|
|
|
|
|
|
|
|
|
if (_nameToFactGroupMap.contains(camelCaseName)) { |
|
|
|
|
factGroup = _nameToFactGroupMap[camelCaseName]; |
|
|
|
|