From d447968e934c38680757f292885e359832ea7688 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Fri, 18 May 2018 10:50:33 -0700 Subject: [PATCH] Show indicator for mission terrain data --- src/PlanView/MissionItemStatus.qml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/PlanView/MissionItemStatus.qml b/src/PlanView/MissionItemStatus.qml index e5a2dd7..00d1cab 100644 --- a/src/PlanView/MissionItemStatus.qml +++ b/src/PlanView/MissionItemStatus.qml @@ -72,9 +72,9 @@ Rectangle { width: display ? (indicator.width + spacing) : 0 visible: display - property real availableHeight: height - indicator.height - property bool showTerrain: !isNaN(object.terrainPercent) - property real _terrainPercent: showTerrain ? object.terrainPercent : 0 + property real availableHeight: height - indicator.height + property bool _terrainAvailable: !isNaN(object.terrainPercent) + property real _terrainPercent: _terrainAvailable ? object.terrainPercent : 1 readonly property bool display: object.specifiesCoordinate && !object.isStandaloneCoordinate readonly property real spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio @@ -83,9 +83,8 @@ Rectangle { anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter width: indicator.width - height: Math.max(availableHeight * _terrainPercent, 1) - color: _terrainPercent > object.altPercent ? "red": qgcPal.text - visible: !isNaN(object.terrainPercent) + height: _terrainAvailable ? Math.max(availableHeight * _terrainPercent, 1) : parent.height + color: _terrainAvailable ? (_terrainPercent > object.altPercent ? "red": qgcPal.text) : "yellow" } MissionItemIndexLabel {