Browse Source

Merge pull request #5642 from DonLakeFlyer/DescentRate

Fixed Wing Landing Pattern: Descent rate changes
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
44b4595a02
  1. 4
      src/MissionManager/FWLandingPattern.FactMetaData.json
  2. 2
      src/MissionManager/FixedWingLandingComplexItem.cc
  3. 20
      src/PlanView/FWLandingPatternEditor.qml

4
src/MissionManager/FWLandingPattern.FactMetaData.json

@ -44,8 +44,8 @@ @@ -44,8 +44,8 @@
"defaultValue": 0.0
},
{
"name": "Fall rate",
"shortDescription": "Fall rate between landing and loiter altitude.",
"name": "Descent rate",
"shortDescription": "Descent rate between landing and loiter altitude.",
"type": "double",
"units": "%",
"min": 0.1,

2
src/MissionManager/FixedWingLandingComplexItem.cc

@ -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::_loiterRadiusName = "Loiter radius";
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::_jsonLoiterRadiusKey = "loiterRadius";

20
src/PlanView/FWLandingPatternEditor.qml

@ -77,17 +77,25 @@ Rectangle { @@ -77,17 +77,25 @@ Rectangle {
Item { width: 1; height: _spacer }
FactTextFieldGrid {
anchors.left: parent.left
anchors.right: parent.right
factList: [ missionItem.landingHeading, missionItem.landingAltitude]
}
GridLayout {
anchors.left: parent.left
anchors.right: parent.right
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 {
id: useLandingDistance
text: missionItem.landingDistance.name

Loading…
Cancel
Save