Commit 44b4595a authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5642 from DonLakeFlyer/DescentRate

Fixed Wing Landing Pattern: Descent rate changes
parents 0ce70271 19f7306b
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
"defaultValue": 0.0 "defaultValue": 0.0
}, },
{ {
"name": "Fall rate", "name": "Descent rate",
"shortDescription": "Fall rate between landing and loiter altitude.", "shortDescription": "Descent rate between landing and loiter altitude.",
"type": "double", "type": "double",
"units": "%", "units": "%",
"min": 0.1, "min": 0.1,
......
...@@ -25,7 +25,7 @@ const char* FixedWingLandingComplexItem::_landingHeadingName = "Landing ...@@ -25,7 +25,7 @@ const char* FixedWingLandingComplexItem::_landingHeadingName = "Landing
const char* FixedWingLandingComplexItem::_loiterAltitudeName = "Loiter altitude"; const char* FixedWingLandingComplexItem::_loiterAltitudeName = "Loiter altitude";
const char* FixedWingLandingComplexItem::_loiterRadiusName = "Loiter radius"; const char* FixedWingLandingComplexItem::_loiterRadiusName = "Loiter radius";
const char* FixedWingLandingComplexItem::_landingAltitudeName = "Landing altitude"; const char* FixedWingLandingComplexItem::_landingAltitudeName = "Landing altitude";
const char* FixedWingLandingComplexItem::_fallRateName = "Fall rate"; const char* FixedWingLandingComplexItem::_fallRateName = "Descent rate";
const char* FixedWingLandingComplexItem::_jsonLoiterCoordinateKey = "loiterCoordinate"; const char* FixedWingLandingComplexItem::_jsonLoiterCoordinateKey = "loiterCoordinate";
const char* FixedWingLandingComplexItem::_jsonLoiterRadiusKey = "loiterRadius"; const char* FixedWingLandingComplexItem::_jsonLoiterRadiusKey = "loiterRadius";
......
...@@ -77,17 +77,25 @@ Rectangle { ...@@ -77,17 +77,25 @@ Rectangle {
Item { width: 1; height: _spacer } Item { width: 1; height: _spacer }
FactTextFieldGrid {
anchors.left: parent.left
anchors.right: parent.right
factList: [ missionItem.landingHeading, missionItem.landingAltitude]
}
GridLayout { GridLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
columns: 2 columns: 2
QGCLabel { text: missionItem.landingHeading.name }
FactTextField {
Layout.fillWidth: true
fact: missionItem.landingHeading
}
QGCLabel { text: missionItem.landingAltitude.name }
FactTextField {
Layout.fillWidth: true
fact: missionItem.landingAltitude
}
QGCRadioButton { QGCRadioButton {
id: useLandingDistance id: useLandingDistance
text: missionItem.landingDistance.name text: missionItem.landingDistance.name
......
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