From 65b26bea6ba243d0a39e1176c6c2e168c3639999 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 11 Nov 2019 07:10:47 -0800 Subject: [PATCH] Warn about glide slope altitudes --- src/PlanView/FWLandingPatternEditor.qml | 10 ++++++++++ src/PlanView/FWLandingPatternMapVisual.qml | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/PlanView/FWLandingPatternEditor.qml index 44a1493d7a..4098468e64 100644 --- a/src/PlanView/FWLandingPatternEditor.qml +++ b/src/PlanView/FWLandingPatternEditor.qml @@ -208,6 +208,16 @@ Rectangle { property Fact _stopTakingVideo: missionItem.stopTakingVideo } } + + QGCLabel { + anchors.left: parent.left + anchors.right: parent.right + wrapMode: Text.WordWrap + color: qgcPal.warningText + font.pointSize: ScreenTools.smallFontPointSize + horizontalAlignment: Text.AlignHCenter + text: qsTr("* Glide slope altitudes are approximate. Actual flight path will vary due to environmental conditions and vehicle settings.") + } } Column { diff --git a/src/PlanView/FWLandingPatternMapVisual.qml b/src/PlanView/FWLandingPatternMapVisual.qml index d466345519..22d8592195 100644 --- a/src/PlanView/FWLandingPatternMapVisual.qml +++ b/src/PlanView/FWLandingPatternMapVisual.qml @@ -455,8 +455,8 @@ Item { visible: _missionItem.isCurrentItem sourceItem: HeightIndicator { - heightText: QGroundControl.metersToAppSettingsDistanceUnits(_transitionAltitudeMeters).toFixed(1) + " " + - QGroundControl.appSettingsDistanceUnitsString + heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_transitionAltitudeMeters)) + + QGroundControl.appSettingsDistanceUnitsString + "*" } function recalc() { @@ -486,8 +486,8 @@ Item { visible: _missionItem.isCurrentItem sourceItem: HeightIndicator { - heightText: QGroundControl.metersToAppSettingsDistanceUnits(_midSlopeAltitudeMeters).toFixed(1) + " " + - QGroundControl.appSettingsDistanceUnitsString + heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_midSlopeAltitudeMeters)) + + QGroundControl.appSettingsDistanceUnitsString + "*" } function recalc() { @@ -520,7 +520,7 @@ Item { coordinate: _missionItem.loiterTangentCoordinate sourceItem: HeightIndicator { - heightText: _missionItem.loiterAltitude.value.toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString + heightText: _missionItem.loiterAltitude.value.toFixed(1) + QGroundControl.appSettingsDistanceUnitsString } } } -- GitLab