Commit 470a46f8 authored by Don Gagne's avatar Don Gagne

Land items default to 0 altitude

parent 4f0562b9
...@@ -33,7 +33,13 @@ ...@@ -33,7 +33,13 @@
"description": "Land using VTOL mode.", "description": "Land using VTOL mode.",
"specifiesCoordinate": true, "specifiesCoordinate": true,
"friendlyEdit": true, "friendlyEdit": true,
"category": "VTOL" "category": "VTOL",
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 0.0,
"decimalPlaces": 2
}
} }
] ]
} }
...@@ -120,6 +120,12 @@ ...@@ -120,6 +120,12 @@
"units": "radians", "units": "radians",
"default": 0.0, "default": 0.0,
"decimalPlaces": 2 "decimalPlaces": 2
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 0.0,
"decimalPlaces": 2
} }
}, },
{ {
...@@ -290,6 +296,12 @@ ...@@ -290,6 +296,12 @@
"units": "degrees", "units": "degrees",
"default": 0.0, "default": 0.0,
"decimalPlaces": 2 "decimalPlaces": 2
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 0.0,
"decimalPlaces": 2
} }
}, },
{ {
......
...@@ -329,7 +329,7 @@ void MissionItem::_setupMetaData(void) ...@@ -329,7 +329,7 @@ void MissionItem::_setupMetaData(void)
if (!_altitudeMetaData) { if (!_altitudeMetaData) {
_altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble); _altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble);
_altitudeMetaData->setRawUnits("meters"); _altitudeMetaData->setRawUnits("meters");
_altitudeMetaData->setDecimalPlaces(3); _altitudeMetaData->setDecimalPlaces(2);
enumStrings.clear(); enumStrings.clear();
enumValues.clear(); enumValues.clear();
...@@ -620,6 +620,7 @@ QmlObjectListModel* MissionItem::textFieldFacts(void) ...@@ -620,6 +620,7 @@ QmlObjectListModel* MissionItem::textFieldFacts(void)
Fact* rgParamFacts[7] = { &_param1Fact, &_param2Fact, &_param3Fact, &_param4Fact, &_param5Fact, &_param6Fact, &_param7Fact }; Fact* rgParamFacts[7] = { &_param1Fact, &_param2Fact, &_param3Fact, &_param4Fact, &_param5Fact, &_param6Fact, &_param7Fact };
FactMetaData* rgParamMetaData[7] = { &_param1MetaData, &_param2MetaData, &_param3MetaData, &_param4MetaData, &_param5MetaData, &_param6MetaData, &_param7MetaData }; FactMetaData* rgParamMetaData[7] = { &_param1MetaData, &_param2MetaData, &_param3MetaData, &_param4MetaData, &_param5MetaData, &_param6MetaData, &_param7MetaData };
bool altitudeAdded = false;
for (int i=1; i<=7; i++) { for (int i=1; i<=7; i++) {
const QMap<int, MavCmdParamInfo*>& paramInfoMap = _missionCommands->getMavCmdInfo(command, _vehicle)->paramInfoMap(); const QMap<int, MavCmdParamInfo*>& paramInfoMap = _missionCommands->getMavCmdInfo(command, _vehicle)->paramInfoMap();
...@@ -634,10 +635,14 @@ QmlObjectListModel* MissionItem::textFieldFacts(void) ...@@ -634,10 +635,14 @@ QmlObjectListModel* MissionItem::textFieldFacts(void)
paramMetaData->setRawUnits(paramInfo->units()); paramMetaData->setRawUnits(paramInfo->units());
paramFact->setMetaData(paramMetaData); paramFact->setMetaData(paramMetaData);
model->append(paramFact); model->append(paramFact);
if (i == 7) {
altitudeAdded = true;
}
} }
} }
if (specifiesCoordinate()) { if (specifiesCoordinate() && !altitudeAdded) {
_param7Fact._setName("Altitude:"); _param7Fact._setName("Altitude:");
_param7Fact.setMetaData(_altitudeMetaData); _param7Fact.setMetaData(_altitudeMetaData);
model->append(&_param7Fact); model->append(&_param7Fact);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment