Browse Source

Merge pull request #2165 from DonLakeFlyer/ParamMeta

Fix loading of meta data
QGC4.4
Roman Bapst 10 years ago
parent
commit
e6eb564421
  1. 2
      src/FirmwarePlugin/APM/APMParameterMetaData.cc
  2. 1
      src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc

2
src/FirmwarePlugin/APM/APMParameterMetaData.cc

@ -97,6 +97,8 @@ void APMParameterMetaData::_loadParameterFactMetaData(void) @@ -97,6 +97,8 @@ void APMParameterMetaData::_loadParameterFactMetaData(void)
/// Override from FactLoad which connects the meta data to the fact
void APMParameterMetaData::addMetaDataToFact(Fact* fact)
{
_loadParameterFactMetaData();
// FIXME: Will need to switch here based on _vehicle->firmwareType() to pull right set of meta data
FactMetaData* metaData = new FactMetaData(fact->type(), fact);

1
src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc

@ -347,6 +347,7 @@ void PX4ParameterMetaData::_loadParameterFactMetaData(void) @@ -347,6 +347,7 @@ void PX4ParameterMetaData::_loadParameterFactMetaData(void)
/// Override from FactLoad which connects the meta data to the fact
void PX4ParameterMetaData::addMetaDataToFact(Fact* fact)
{
_loadParameterFactMetaData();
if (_mapParameterName2FactMetaData.contains(fact->name())) {
fact->setMetaData(_mapParameterName2FactMetaData[fact->name()]);
} else {

Loading…
Cancel
Save