zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Use new FactMetaData json load support

QGC4.4
Don Gagne 9 years ago
parent
74ac750236
commit
5466f49651
12 changed files with 271 additions and 390 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      qgroundcontrol.qrc
  2. 127
      src/FactSystem/FactGroup.cc
  3. 11
      src/FactSystem/FactGroup.h
  4. 77
      src/QmlControls/QGroundControlQmlGlobal.cc
  5. 6
      src/QmlControls/QGroundControlQmlGlobal.h
  6. 48
      src/QmlControls/QGroundControlQmlGlobal.json
  7. 28
      src/Vehicle/BatteryFact.json
  8. 24
      src/Vehicle/GPSFact.json
  9. 36
      src/Vehicle/VehicleFact.json
  10. 28
      src/Vehicle/VibrationFact.json
  11. 17
      src/Vehicle/WindFact.json
  12. 2
      src/ui/preferences/GeneralSettings.qml

1
qgroundcontrol.qrc
Unescape View File

@ -189,5 +189,6 @@
<file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file> <file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
<file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file> <file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file> <file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="QGroundControlQmlGlobal.json">src/QmlControls/QGroundControlQmlGlobal.json</file>
</qresource> </qresource>
</RCC> </RCC>

127
src/FactSystem/FactGroup.cc
Unescape View File

@ -20,17 +20,6 @@
QGC_LOGGING_CATEGORY(FactGroupLog, "FactGroupLog") QGC_LOGGING_CATEGORY(FactGroupLog, "FactGroupLog")
const char* FactGroup::_decimalPlacesJsonKey = "decimalPlaces";
const char* FactGroup::_nameJsonKey = "name";
const char* FactGroup::_propertiesJsonKey = "properties";
const char* FactGroup::_versionJsonKey = "version";
const char* FactGroup::_typeJsonKey = "type";
const char* FactGroup::_shortDescriptionJsonKey = "shortDescription";
const char* FactGroup::_unitsJsonKey = "units";
const char* FactGroup::_defaultValueJsonKey = "defaultValue";
const char* FactGroup::_minJsonKey = "min";
const char* FactGroup::_maxJsonKey = "max";
FactGroup::FactGroup(int updateRateMsecs, const QString& metaDataFile, QObject* parent) FactGroup::FactGroup(int updateRateMsecs, const QString& metaDataFile, QObject* parent)
: QObject(parent) : QObject(parent)
, _updateRateMSecs(updateRateMsecs) , _updateRateMSecs(updateRateMsecs)
@ -121,119 +110,5 @@ void FactGroup::_updateAllValues(void)
void FactGroup::_loadMetaData(const QString& jsonFilename) void FactGroup::_loadMetaData(const QString& jsonFilename)
{ {
if (jsonFilename.isEmpty()) { _nameToFactMetaDataMap = FactMetaData::createMapFromJsonFile(jsonFilename, this);
return;
}
qCDebug(FactGroupLog) << "Loading" << jsonFilename;
QFile jsonFile(jsonFilename);
if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qWarning() << "Unable to open file" << jsonFilename << jsonFile.errorString();
return;
}
QByteArray bytes = jsonFile.readAll();
jsonFile.close();
QJsonParseError jsonParseError;
QJsonDocument doc = QJsonDocument::fromJson(bytes, &jsonParseError);
if (jsonParseError.error != QJsonParseError::NoError) {
qWarning() << "Unable to open json document" << jsonFilename << jsonParseError.errorString();
return;
}
QJsonObject json = doc.object();
int version = json.value(_versionJsonKey).toInt();
if (version != 1) {
qWarning() << "Invalid version" << version;
return;
}
QJsonValue jsonValue = json.value(_propertiesJsonKey);
if (!jsonValue.isArray()) {
qWarning() << "properties object not array";
return;
}
QJsonArray jsonArray = jsonValue.toArray();
foreach(QJsonValue property, jsonArray) {
if (!property.isObject()) {
qWarning() << "properties object should contain only objects";
return;
}
QJsonObject jsonObject = property.toObject();
// Make sure we have the required keys
QString errorString;
QStringList requiredKeys;
requiredKeys << _nameJsonKey << _typeJsonKey << _shortDescriptionJsonKey;
if (!JsonHelper::validateRequiredKeys(jsonObject, requiredKeys, errorString)) {
qWarning() << errorString;
return;
}
// Validate key types
QStringList keys;
QList<QJsonValue::Type> types;
keys << _nameJsonKey << _decimalPlacesJsonKey << _typeJsonKey << _shortDescriptionJsonKey << _unitsJsonKey << _defaultValueJsonKey << _minJsonKey << _maxJsonKey;
types << QJsonValue::String << QJsonValue::Double << QJsonValue::String << QJsonValue::String << QJsonValue::String << QJsonValue::Double << QJsonValue::Double << QJsonValue::Double;
if (!JsonHelper::validateKeyTypes(jsonObject, keys, types, errorString)) {
qWarning() << errorString;
return;
}
QString name = jsonObject.value(_nameJsonKey).toString();
if (_nameToFactMetaDataMap.contains(name)) {
qWarning() << "Duplicate property name" << name;
continue;
}
bool unknownType;
FactMetaData::ValueType_t type = FactMetaData::stringToType(jsonObject.value(_typeJsonKey).toString(), unknownType);
if (unknownType) {
qWarning() << "Unknown type" << jsonObject.value(_typeJsonKey).toString();
return;
}
QStringList enumValues, enumStrings;
if (!JsonHelper::parseEnum(jsonObject, enumStrings, enumValues, errorString)) {
qWarning() << errorString;
return;
}
FactMetaData* metaData = new FactMetaData(type, this);
metaData->setDecimalPlaces(jsonObject.value(_decimalPlacesJsonKey).toInt(0));
metaData->setShortDescription(jsonObject.value(_shortDescriptionJsonKey).toString());
metaData->setRawUnits(jsonObject.value(_unitsJsonKey).toString());
if (jsonObject.contains(_defaultValueJsonKey)) {
metaData->setRawDefaultValue(jsonObject.value(_defaultValueJsonKey).toDouble());
}
if (jsonObject.contains(_minJsonKey)) {
metaData->setRawMin(jsonObject.value(_minJsonKey).toDouble());
}
if (jsonObject.contains(_maxJsonKey)) {
metaData->setRawMax(jsonObject.value(_maxJsonKey).toDouble());
}
for (int i=0; i<enumValues.count(); i++) {
QVariant enumVariant;
QString errorString;
if (metaData->convertAndValidateRaw(enumValues[i], false /* validate */, enumVariant, errorString)) {
metaData->addEnumInfo(enumStrings[i], enumVariant);
} else {
qWarning() << "Invalid enum value, name:" << metaData->name()
<< " type:" << metaData->type() << " value:" << enumValues[i]
<< " error:" << errorString;
delete metaData;
return;
}
}
_nameToFactMetaDataMap[name] = metaData;
}
} }

11
src/FactSystem/FactGroup.h
Unescape View File

@ -57,17 +57,6 @@ private:
QMap<QString, FactMetaData*> _nameToFactMetaDataMap; QMap<QString, FactMetaData*> _nameToFactMetaDataMap;
QTimer _updateTimer; QTimer _updateTimer;
static const char* _propertiesJsonKey;
static const char* _nameJsonKey;
static const char* _decimalPlacesJsonKey;
static const char* _typeJsonKey;
static const char* _versionJsonKey;
static const char* _shortDescriptionJsonKey;
static const char* _unitsJsonKey;
static const char* _defaultValueJsonKey;
static const char* _minJsonKey;
static const char* _maxJsonKey;
}; };
#endif #endif

77
src/QmlControls/QGroundControlQmlGlobal.cc
Unescape View File

@ -19,20 +19,17 @@
static const char* kQmlGlobalKeyName = "QGCQml"; static const char* kQmlGlobalKeyName = "QGCQml";
SettingsFact* QGroundControlQmlGlobal::_offlineEditingFirmwareTypeFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_offlineEditingFirmwareTypeMetaData = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingVehicleTypeFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_offlineEditingVehicleTypeMetaData = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingCruiseSpeedFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingHoverSpeedFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_distanceUnitsFact = NULL; SettingsFact* QGroundControlQmlGlobal::_distanceUnitsFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_distanceUnitsMetaData = NULL; FactMetaData* QGroundControlQmlGlobal::_distanceUnitsMetaData = NULL;
SettingsFact* QGroundControlQmlGlobal::_areaUnitsFact = NULL; SettingsFact* QGroundControlQmlGlobal::_areaUnitsFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_areaUnitsMetaData = NULL; FactMetaData* QGroundControlQmlGlobal::_areaUnitsMetaData = NULL;
SettingsFact* QGroundControlQmlGlobal::_speedUnitsFact = NULL; SettingsFact* QGroundControlQmlGlobal::_speedUnitsFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_speedUnitsMetaData = NULL; FactMetaData* QGroundControlQmlGlobal::_speedUnitsMetaData = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingFirmwareTypeFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingVehicleTypeFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingCruiseSpeedFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_offlineEditingHoverSpeedFact = NULL;
SettingsFact* QGroundControlQmlGlobal::_batteryPercentRemainingAnnounceFact = NULL; SettingsFact* QGroundControlQmlGlobal::_batteryPercentRemainingAnnounceFact = NULL;
FactMetaData* QGroundControlQmlGlobal::_batteryPercentRemainingAnnounceMetaData = NULL;
const char* QGroundControlQmlGlobal::_virtualTabletJoystickKey = "VirtualTabletJoystick"; const char* QGroundControlQmlGlobal::_virtualTabletJoystickKey = "VirtualTabletJoystick";
const char* QGroundControlQmlGlobal::_baseFontPointSizeKey = "BaseDeviceFontPointSize"; const char* QGroundControlQmlGlobal::_baseFontPointSizeKey = "BaseDeviceFontPointSize";
@ -229,20 +226,21 @@ void QGroundControlQmlGlobal::setBaseFontPointSize(qreal size)
} }
} }
Fact* QGroundControlQmlGlobal::offlineEditingFirmwareType(void) SettingsFact* QGroundControlQmlGlobal::_createSettingsFact(const QString& name)
{ {
if (!_offlineEditingFirmwareTypeFact) { SettingsFact* fact;
QStringList enumStrings; FactMetaData* metaData = nameToMetaDataMap()[name];
QVariantList enumValues;
_offlineEditingFirmwareTypeFact = new SettingsFact(QString(), "OfflineEditingFirmwareType", FactMetaData::valueTypeUint32, (uint32_t)MAV_AUTOPILOT_ARDUPILOTMEGA); fact = new SettingsFact(QString(), name, metaData->type(), metaData->rawDefaultValue());
_offlineEditingFirmwareTypeMetaData = new FactMetaData(FactMetaData::valueTypeUint32); fact->setMetaData(metaData);
enumStrings << tr("ArduPilot Firmware") << tr("PX4 Pro Firmware") << tr("Mavlink Generic Firmware"); return fact;
enumValues << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_ARDUPILOTMEGA) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_PX4) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_GENERIC); }
_offlineEditingFirmwareTypeMetaData->setEnumInfo(enumStrings, enumValues); Fact* QGroundControlQmlGlobal::offlineEditingFirmwareType(void)
_offlineEditingFirmwareTypeFact->setMetaData(_offlineEditingFirmwareTypeMetaData); {
if (!_offlineEditingFirmwareTypeFact) {
_offlineEditingFirmwareTypeFact = _createSettingsFact(QStringLiteral("OfflineEditingFirmwareType"));
} }
return _offlineEditingFirmwareTypeFact; return _offlineEditingFirmwareTypeFact;
@ -251,19 +249,7 @@ Fact* QGroundControlQmlGlobal::offlineEditingFirmwareType(void)
Fact* QGroundControlQmlGlobal::offlineEditingVehicleType(void) Fact* QGroundControlQmlGlobal::offlineEditingVehicleType(void)
{ {
if (!_offlineEditingVehicleTypeFact) { if (!_offlineEditingVehicleTypeFact) {
QStringList enumStrings; _offlineEditingVehicleTypeFact = _createSettingsFact(QStringLiteral("OfflineEditingVehicleType"));
QVariantList enumValues;
_offlineEditingVehicleTypeFact = new SettingsFact(QString(), "OfflineEditingVehicleType", FactMetaData::valueTypeUint32, (uint32_t)MAV_TYPE_FIXED_WING);
_offlineEditingVehicleTypeMetaData = new FactMetaData(FactMetaData::valueTypeUint32);
enumStrings << tr("Fixedwing") << tr("Multicopter") << tr("VTOL") << tr("Rover") << tr("Sub");
enumValues << QVariant::fromValue((uint32_t)MAV_TYPE_FIXED_WING) << QVariant::fromValue((uint32_t)MAV_TYPE_QUADROTOR)
<< QVariant::fromValue((uint32_t)MAV_TYPE_VTOL_DUOROTOR) << QVariant::fromValue((uint32_t)MAV_TYPE_GROUND_ROVER)
<< QVariant::fromValue((uint32_t)MAV_TYPE_SUBMARINE);
_offlineEditingVehicleTypeMetaData->setEnumInfo(enumStrings, enumValues);
_offlineEditingVehicleTypeFact->setMetaData(_offlineEditingVehicleTypeMetaData);
} }
return _offlineEditingVehicleTypeFact; return _offlineEditingVehicleTypeFact;
@ -272,7 +258,7 @@ Fact* QGroundControlQmlGlobal::offlineEditingVehicleType(void)
Fact* QGroundControlQmlGlobal::offlineEditingCruiseSpeed(void) Fact* QGroundControlQmlGlobal::offlineEditingCruiseSpeed(void)
{ {
if (!_offlineEditingCruiseSpeedFact) { if (!_offlineEditingCruiseSpeedFact) {
_offlineEditingCruiseSpeedFact = new SettingsFact(QString(), "OfflineEditingCruiseSpeed", FactMetaData::valueTypeDouble, 16.0); _offlineEditingCruiseSpeedFact = _createSettingsFact(QStringLiteral("OfflineEditingCruiseSpeed"));
} }
return _offlineEditingCruiseSpeedFact; return _offlineEditingCruiseSpeedFact;
} }
@ -280,7 +266,7 @@ Fact* QGroundControlQmlGlobal::offlineEditingCruiseSpeed(void)
Fact* QGroundControlQmlGlobal::offlineEditingHoverSpeed(void) Fact* QGroundControlQmlGlobal::offlineEditingHoverSpeed(void)
{ {
if (!_offlineEditingHoverSpeedFact) { if (!_offlineEditingHoverSpeedFact) {
_offlineEditingHoverSpeedFact = new SettingsFact(QString(), "OfflineEditingHoverSpeed", FactMetaData::valueTypeDouble, 4.0); _offlineEditingHoverSpeedFact = _createSettingsFact(QStringLiteral("OfflineEditingHoverSpeed"));
} }
return _offlineEditingHoverSpeedFact; return _offlineEditingHoverSpeedFact;
} }
@ -288,6 +274,7 @@ Fact* QGroundControlQmlGlobal::offlineEditingHoverSpeed(void)
Fact* QGroundControlQmlGlobal::distanceUnits(void) Fact* QGroundControlQmlGlobal::distanceUnits(void)
{ {
if (!_distanceUnitsFact) { if (!_distanceUnitsFact) {
// Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading.
QStringList enumStrings; QStringList enumStrings;
QVariantList enumValues; QVariantList enumValues;
@ -308,6 +295,7 @@ Fact* QGroundControlQmlGlobal::distanceUnits(void)
Fact* QGroundControlQmlGlobal::areaUnits(void) Fact* QGroundControlQmlGlobal::areaUnits(void)
{ {
if (!_areaUnitsFact) { if (!_areaUnitsFact) {
// Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading.
QStringList enumStrings; QStringList enumStrings;
QVariantList enumValues; QVariantList enumValues;
@ -328,6 +316,7 @@ Fact* QGroundControlQmlGlobal::areaUnits(void)
Fact* QGroundControlQmlGlobal::speedUnits(void) Fact* QGroundControlQmlGlobal::speedUnits(void)
{ {
if (!_speedUnitsFact) { if (!_speedUnitsFact) {
// Distance/Area/Speed units settings can't be loaded from json since it creates an infinite loop of meta data loading.
QStringList enumStrings; QStringList enumStrings;
QVariantList enumValues; QVariantList enumValues;
@ -347,19 +336,7 @@ Fact* QGroundControlQmlGlobal::speedUnits(void)
Fact* QGroundControlQmlGlobal::batteryPercentRemainingAnnounce(void) Fact* QGroundControlQmlGlobal::batteryPercentRemainingAnnounce(void)
{ {
if (!_batteryPercentRemainingAnnounceFact) { if (!_batteryPercentRemainingAnnounceFact) {
QStringList enumStrings; _batteryPercentRemainingAnnounceFact = _createSettingsFact(QStringLiteral("batteryPercentRemainingAnnounce"));
QVariantList enumValues;
_batteryPercentRemainingAnnounceFact = new SettingsFact(QString(), "batteryPercentRemainingAnnounce", FactMetaData::valueTypeUint32, 30);
_batteryPercentRemainingAnnounceMetaData = new FactMetaData(FactMetaData::valueTypeUint32);
_batteryPercentRemainingAnnounceMetaData->setDecimalPlaces(0);
_batteryPercentRemainingAnnounceMetaData->setShortDescription(tr("Percent announce"));
_batteryPercentRemainingAnnounceMetaData->setRawUnits("%");
_batteryPercentRemainingAnnounceMetaData->setRawMin(0);
_batteryPercentRemainingAnnounceMetaData->setRawMax(100);
_batteryPercentRemainingAnnounceFact->setMetaData(_batteryPercentRemainingAnnounceMetaData);
} }
return _batteryPercentRemainingAnnounceFact; return _batteryPercentRemainingAnnounceFact;
@ -372,3 +349,13 @@ bool QGroundControlQmlGlobal::linesIntersect(QPointF line1A, QPointF line1B, QPo
return QLineF(line1A, line1B).intersect(QLineF(line2A, line2B), &intersectPoint) == QLineF::BoundedIntersection && return QLineF(line1A, line1B).intersect(QLineF(line2A, line2B), &intersectPoint) == QLineF::BoundedIntersection &&
intersectPoint != line1A && intersectPoint != line1B; intersectPoint != line1A && intersectPoint != line1B;
} }
QMap<QString, FactMetaData*>& QGroundControlQmlGlobal::nameToMetaDataMap(void) {
static QMap<QString, FactMetaData*> map;
if (map.isEmpty()) {
map = FactMetaData::createMapFromJsonFile(":/json/QGroundControlQmlGlobal.json", NULL);
}
return map;
}

6
src/QmlControls/QGroundControlQmlGlobal.h
Unescape View File

@ -229,6 +229,9 @@ signals:
void flightMapZoomChanged (double flightMapZoom); void flightMapZoomChanged (double flightMapZoom);
private: private:
static SettingsFact* _createSettingsFact(const QString& name);
static QMap<QString, FactMetaData*>& nameToMetaDataMap(void);
FlightMapSettings* _flightMapSettings; FlightMapSettings* _flightMapSettings;
HomePositionManager* _homePositionManager; HomePositionManager* _homePositionManager;
LinkManager* _linkManager; LinkManager* _linkManager;
@ -245,9 +248,7 @@ private:
// These are static so they are available to C++ code as well as Qml // These are static so they are available to C++ code as well as Qml
static SettingsFact* _offlineEditingFirmwareTypeFact; static SettingsFact* _offlineEditingFirmwareTypeFact;
static FactMetaData* _offlineEditingFirmwareTypeMetaData;
static SettingsFact* _offlineEditingVehicleTypeFact; static SettingsFact* _offlineEditingVehicleTypeFact;
static FactMetaData* _offlineEditingVehicleTypeMetaData;
static SettingsFact* _offlineEditingCruiseSpeedFact; static SettingsFact* _offlineEditingCruiseSpeedFact;
static SettingsFact* _offlineEditingHoverSpeedFact; static SettingsFact* _offlineEditingHoverSpeedFact;
static SettingsFact* _distanceUnitsFact; static SettingsFact* _distanceUnitsFact;
@ -257,7 +258,6 @@ private:
static SettingsFact* _speedUnitsFact; static SettingsFact* _speedUnitsFact;
static FactMetaData* _speedUnitsMetaData; static FactMetaData* _speedUnitsMetaData;
static SettingsFact* _batteryPercentRemainingAnnounceFact; static SettingsFact* _batteryPercentRemainingAnnounceFact;
static FactMetaData* _batteryPercentRemainingAnnounceMetaData;
static const char* _virtualTabletJoystickKey; static const char* _virtualTabletJoystickKey;
static const char* _baseFontPointSizeKey; static const char* _baseFontPointSizeKey;

48
src/QmlControls/QGroundControlQmlGlobal.json
Unescape View File

@ -0,0 +1,48 @@
[
{
"name": "OfflineEditingFirmwareType",
"shortDescription": "Offline editing firmware type",
"type": "uint32",
"enumStrings": "ArduPilot Firmware,PX4 Pro Firmware,Mavlink Generic Firmware",
"enumValues": "3,12,0",
"defaultValue": 3
},
{
"name": "OfflineEditingVehicleType",
"shortDescription": "Offline editing vehicle type",
"type": "uint32",
"enumStrings": "Fixedwing,Multicopter,VTOL,Rover,Sub",
"enumValues": "1,2,19,10,12",
"defaultValue": 1
},
{
"name": "OfflineEditingCruiseSpeed",
"shortDescription": "Offline editing cruise speed",
"longDescription": "This value defines the cruising speed for forward flight vehicles for use in calculating mission duration when not connected to a vehicle.",
"type": "double",
"defaultValue": 16.0,
"min": 1.0,
"units": "m/s",
"decimalPlaces": 2
},
{
"name": "OfflineEditingHoverSpeed",
"shortDescription": "Offline editing hover speed",
"longDescription": "This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration when not connected to a vehicle.",
"type": "double",
"defaultValue": 4.0,
"min": 1.0,
"units": "m/s",
"decimalPlaces": 2
},
{
"name": "batteryPercentRemainingAnnounce",
"shortDescription": "Announce battery remaining percent",
"longDescription": "QGroundControl will announce the remaining battery percent when it falls below the specified percentage.",
"type": "uint32",
"defaultValue": 30,
"units": "%",
"min": 0,
"max": 100
}
]

28
src/Vehicle/BatteryFact.json
Unescape View File

@ -1,47 +1,43 @@
[
{ {
"version": 1,
"properties": [
{
"name": "voltage", "name": "voltage",
"shortDescription": "Voltage", "shortDescription": "Voltage",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"units": "v" "units": "v"
}, },
{ {
"name": "percentRemaining", "name": "percentRemaining",
"shortDescription": "Percent", "shortDescription": "Percent",
"type": "int32", "type": "int32",
"decimalPlaces": 0, "decimalPlaces": 0,
"units": "%" "units": "%"
}, },
{ {
"name": "mahConsumed", "name": "mahConsumed",
"shortDescription": "Consumed", "shortDescription": "Consumed",
"type": "int32", "type": "int32",
"decimalPlaces": 0, "decimalPlaces": 0,
"units": "mAh" "units": "mAh"
}, },
{ {
"name": "current", "name": "current",
"shortDescription": "Current", "shortDescription": "Current",
"type": "int32", "type": "int32",
"decimalPlaces": 0, "decimalPlaces": 0,
"units": "mA" "units": "mA"
}, },
{ {
"name": "temperature", "name": "temperature",
"shortDescription": "Temperature", "shortDescription": "Temperature",
"type": "int32", "type": "int32",
"decimalPlaces": 2, "decimalPlaces": 2,
"units": "C" "units": "C"
}, },
{ {
"name": "cellCount", "name": "cellCount",
"shortDescription": "Cell Count", "shortDescription": "Cell Count",
"type": "int32", "type": "int32",
"decimalPlaces": 0 "decimalPlaces": 0
}
]
} }
]

24
src/Vehicle/GPSFact.json
Unescape View File

@ -1,39 +1,35 @@
[
{ {
"version": 1,
"properties": [
{
"name": "hdop", "name": "hdop",
"shortDescription": "HDOP", "shortDescription": "HDOP",
"type": "double", "type": "double",
"decimalPlaces": 1 "decimalPlaces": 1
}, },
{ {
"name": "vdop", "name": "vdop",
"shortDescription": "VDOP", "shortDescription": "VDOP",
"type": "double", "type": "double",
"decimalPlaces": 1 "decimalPlaces": 1
}, },
{ {
"name": "courseOverGround", "name": "courseOverGround",
"shortDescription": "Course Over Ground", "shortDescription": "Course Over Ground",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "deg" "units": "deg"
}, },
{ {
"name": "lock", "name": "lock",
"shortDescription": "GPS Lock", "shortDescription": "GPS Lock",
"type": "uint32", "type": "uint32",
"enumStrings": "None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed)", "enumStrings": "None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed)",
"enumValues": "0,1,2,3,4,5,6", "enumValues": "0,1,2,3,4,5,6",
"decimalPlaces": 0 "decimalPlaces": 0
}, },
{ {
"name": "count", "name": "count",
"shortDescription": "Sat Count", "shortDescription": "Sat Count",
"type": "double", "type": "double",
"decimalPlaces": 0 "decimalPlaces": 0
}
]
} }
]

36
src/Vehicle/VehicleFact.json
Unescape View File

@ -1,62 +1,58 @@
[
{ {
"version": 1,
"properties": [
{
"name": "roll", "name": "roll",
"shortDescription": "Roll", "shortDescription": "Roll",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "deg" "units": "deg"
}, },
{ {
"name": "pitch", "name": "pitch",
"shortDescription": "Pitch", "shortDescription": "Pitch",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "deg" "units": "deg"
}, },
{ {
"name": "heading", "name": "heading",
"shortDescription": "Heading", "shortDescription": "Heading",
"type": "double", "type": "double",
"decimalPlaces": 0, "decimalPlaces": 0,
"units": "deg" "units": "deg"
}, },
{ {
"name": "groundSpeed", "name": "groundSpeed",
"shortDescription": "Ground Speed", "shortDescription": "Ground Speed",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m/s" "units": "m/s"
}, },
{ {
"name": "airSpeed", "name": "airSpeed",
"shortDescription": "Air Speed", "shortDescription": "Air Speed",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m/s" "units": "m/s"
}, },
{ {
"name": "climbRate", "name": "climbRate",
"shortDescription": "Climb Rate", "shortDescription": "Climb Rate",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m/s" "units": "m/s"
}, },
{ {
"name": "altitudeRelative", "name": "altitudeRelative",
"shortDescription": "Altitude-rel", "shortDescription": "Altitude-rel",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m" "units": "m"
}, },
{ {
"name": "altitudeAMSL", "name": "altitudeAMSL",
"shortDescription": "Altitude", "shortDescription": "Altitude",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m" "units": "m"
}
]
} }
]

28
src/Vehicle/VibrationFact.json
Unescape View File

@ -1,39 +1,35 @@
[
{ {
"version": 1,
"properties": [
{
"name": "xAxis", "name": "xAxis",
"shortDescription": "Vibe xAxis", "shortDescription": "Vibe xAxis",
"type": "double", "type": "double",
"decimalPlaces": 1 "decimalPlaces": 1
}, },
{ {
"name": "yAxis", "name": "yAxis",
"shortDescription": "Vibe yAxis", "shortDescription": "Vibe yAxis",
"type": "double", "type": "double",
"decimalPlaces": 1 "decimalPlaces": 1
}, },
{ {
"name": "zAxis", "name": "zAxis",
"shortDescription": "Vibe zAxis", "shortDescription": "Vibe zAxis",
"type": "double", "type": "double",
"decimalPlaces": 1 "decimalPlaces": 1
}, },
{ {
"name": "clipCount1", "name": "clipCount1",
"shortDescription": "Clip Count (1)", "shortDescription": "Clip Count (1)",
"type": "uint32" "type": "uint32"
}, },
{ {
"name": "clipCount2", "name": "clipCount2",
"shortDescription": "Clip Count (2)", "shortDescription": "Clip Count (2)",
"type": "uint32" "type": "uint32"
}, },
{ {
"name": "clipCount3", "name": "clipCount3",
"shortDescription": "Clip Count (3)", "shortDescription": "Clip Count (3)",
"type": "uint32" "type": "uint32"
}
]
} }
]

17
src/Vehicle/WindFact.json
Unescape View File

@ -1,27 +1,24 @@
[
{ {
"version": 1,
"properties": [
{
"name": "direction", "name": "direction",
"shortDescription": "Wind Direction", "shortDescription": "Wind Direction",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "deg" "units": "deg"
}, },
{ {
"name": "speed", "name": "speed",
"shortDescription": "Wind Spd", "shortDescription": "Wind Spd",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m/s" "units": "m/s"
}, },
{ {
"name": "verticalSpeed", "name": "verticalSpeed",
"shortDescription": "Wind Spd (vert)", "shortDescription": "Wind Spd (vert)",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"units": "m/s" "units": "m/s"
}
]
} }
]

2
src/ui/preferences/GeneralSettings.qml
Unescape View File

@ -408,7 +408,7 @@ QGCView {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
QGCLabel { QGCLabel {
anchors.baseline: paletteCombo.baseline anchors.baseline: paletteCombo.baseline
text: qsTr("Style:") text: qsTr("UI Style:")
width: _labelWidth width: _labelWidth
} }
QGCComboBox { QGCComboBox {

Write Preview
Loading…
Cancel
Save