diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index b8fa3ba19c8a73a298bd36c3296ad87b11b5c7d4..caac1e7b2bd3e5b52e5084d221d0342d5f58f7ff 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -152,8 +152,16 @@ Item { on__GuidedModeSupportedChanged: _outputState() on__PauseVehicleSupportedChanged: _outputState() - on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex) - on_ResumeMissionIndexChanged: console.log("_resumeMissionIndex", _resumeMissionIndex) + on_CurrentMissionIndexChanged: { + if (__debugGuidedStates) { + console.log("_currentMissionIndex", _currentMissionIndex) + } + } + on_ResumeMissionIndexChanged: { + if (__debugGuidedStates) { + console.log("_resumeMissionIndex", _resumeMissionIndex) + } + } onShowResumeMissionChanged: { if (__debugGuidedStates) { console.log("showResumeMission", showResumeMission) diff --git a/src/PlanView/MissionItemStatus.qml b/src/PlanView/MissionItemStatus.qml index 00d1cab92223582af387599a701574e14bc83797..924dc20bebc03adad7ec166a67cdb42f7d74a938 100644 --- a/src/PlanView/MissionItemStatus.qml +++ b/src/PlanView/MissionItemStatus.qml @@ -73,6 +73,7 @@ Rectangle { visible: display property real availableHeight: height - indicator.height + property bool _coordValid: object.coordinate.isValid property bool _terrainAvailable: !isNaN(object.terrainPercent) property real _terrainPercent: _terrainAvailable ? object.terrainPercent : 1 @@ -85,6 +86,7 @@ Rectangle { width: indicator.width height: _terrainAvailable ? Math.max(availableHeight * _terrainPercent, 1) : parent.height color: _terrainAvailable ? (_terrainPercent > object.altPercent ? "red": qgcPal.text) : "yellow" + visible: _coordValid } MissionItemIndexLabel { diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml index b3dd2f71f98c2819b62aa6b5b84439fcce181355..91b1897e88b57c6cbd903fde159e7f046934e04b 100644 --- a/src/QmlControls/DropPanel.qml +++ b/src/QmlControls/DropPanel.qml @@ -162,8 +162,6 @@ Item { Loader { id: panelLoader - x: _dropMargin - y: _dropMargin onHeightChanged: _calcPositions() onWidthChanged: _calcPositions() diff --git a/src/QmlControls/MissionItemIndexLabel.qml b/src/QmlControls/MissionItemIndexLabel.qml index ff88b1f56099823c54a03c44195cb886ccdac42d..28a8eed3a9924700b927d5c471809b42538459b6 100644 --- a/src/QmlControls/MissionItemIndexLabel.qml +++ b/src/QmlControls/MissionItemIndexLabel.qml @@ -109,7 +109,7 @@ Canvas { verticalAlignment: Text.AlignVCenter color: "white" font.pointSize: ScreenTools.defaultFontPointSize - fontSizeMode: Text.HorizontalFit + fontSizeMode: Text.Fit text: _index } }