Browse Source

Fix for travis falure. Validate min max values before trying to set on metadata

QGC4.4
Pritam Ghanghas 9 years ago
parent
commit
159bce0539
  1. 4
      src/FirmwarePlugin/APM/APMParameterMetaData.cc

4
src/FirmwarePlugin/APM/APMParameterMetaData.cc

@ -440,7 +440,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) @@ -440,7 +440,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType)
if (!rawMetaData->min.isEmpty()) {
QVariant varMin;
QString errorString;
if (metaData->convertAndValidate(rawMetaData->min, true /* convertOnly */, varMin, errorString)) {
if (metaData->convertAndValidate(rawMetaData->min, false /* validate as well */, varMin, errorString)) {
metaData->setMin(varMin);
} else {
qCDebug(APMParameterMetaDataLog) << "Invalid min value, name:" << metaData->name()
@ -452,7 +452,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) @@ -452,7 +452,7 @@ void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType)
if (!rawMetaData->max.isEmpty()) {
QVariant varMax;
QString errorString;
if (metaData->convertAndValidate(rawMetaData->max, true /* convertOnly */, varMax, errorString)) {
if (metaData->convertAndValidate(rawMetaData->max, false /* validate as well */, varMax, errorString)) {
metaData->setMax(varMax);
} else {
qCDebug(APMParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:"

Loading…
Cancel
Save