diff --git a/src/MissionManager/FWLandingPattern.FactMetaData.json b/src/MissionManager/FWLandingPattern.FactMetaData.json index fb781e10e201ebed5166abcdb35671f6133d8a4c..8d5a21f0022332061542c2e67f99cfa00ef6cc7d 100644 --- a/src/MissionManager/FWLandingPattern.FactMetaData.json +++ b/src/MissionManager/FWLandingPattern.FactMetaData.json @@ -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, diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index 028ef1bf8900b469f139c4467e883c42bd809efb..03e69b8e9932ea6d12b277a664a4cf5797d9d152 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -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"; diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/PlanView/FWLandingPatternEditor.qml index a4ecc8a2c2b2209e27e50c9a856beb61288ca464..6ce790a4f33a2c36b3ddc09031ba42ae6c7d41b3 100644 --- a/src/PlanView/FWLandingPatternEditor.qml +++ b/src/PlanView/FWLandingPatternEditor.qml @@ -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