Browse Source

Add mobileDefaultValue JSON key functionality

QGC4.4
dheideman 8 years ago
parent
commit
1f220051f2
  1. 9
      src/FactSystem/FactMetaData.cc
  2. 1
      src/FactSystem/FactMetaData.h

9
src/FactSystem/FactMetaData.cc

@ -68,6 +68,7 @@ const char* FactMetaData::_shortDescriptionJsonKey = "shortDescription"; @@ -68,6 +68,7 @@ const char* FactMetaData::_shortDescriptionJsonKey = "shortDescription";
const char* FactMetaData::_longDescriptionJsonKey = "longDescription";
const char* FactMetaData::_unitsJsonKey = "units";
const char* FactMetaData::_defaultValueJsonKey = "defaultValue";
const char* FactMetaData::_mobileDefaultValueJsonKey = "mobileDefaultValue";
const char* FactMetaData::_minJsonKey = "min";
const char* FactMetaData::_maxJsonKey = "max";
@ -861,9 +862,17 @@ FactMetaData* FactMetaData::createFromJsonObject(const QJsonObject& json, QObjec @@ -861,9 +862,17 @@ FactMetaData* FactMetaData::createFromJsonObject(const QJsonObject& json, QObjec
if (json.contains(_unitsJsonKey)) {
metaData->setRawUnits(json[_unitsJsonKey].toString());
}
#ifdef __mobile__
if (json.contains(_mobileDefaultValueJsonKey)) {
metaData->setRawDefaultValue(json[_mobileDefaultValueJsonKey].toVariant());
} else if (json.contains(_defaultValueJsonKey)) {
metaData->setRawDefaultValue(json[_defaultValueJsonKey].toVariant());
}
#else
if (json.contains(_defaultValueJsonKey)) {
metaData->setRawDefaultValue(json[_defaultValueJsonKey].toVariant());
}
#endif
if (json.contains(_minJsonKey)) {
QVariant typedValue;
QString errorString;

1
src/FactSystem/FactMetaData.h

@ -245,6 +245,7 @@ private: @@ -245,6 +245,7 @@ private:
static const char* _longDescriptionJsonKey;
static const char* _unitsJsonKey;
static const char* _defaultValueJsonKey;
static const char* _mobileDefaultValueJsonKey;
static const char* _minJsonKey;
static const char* _maxJsonKey;
};

Loading…
Cancel
Save