From 4210e7594a6d51ea0fb0710eedd07de034109b2f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 6 Jul 2016 15:18:27 -0700 Subject: [PATCH] Fix goto enabled state handling --- src/FlightDisplay/FlightDisplayViewMap.qml | 10 ++++++---- src/FlightDisplay/FlightDisplayViewWidgets.qml | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index 14926396f..a80689968 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -126,11 +126,13 @@ FlightMap { onClicked: { if (_activeVehicle) { - if (_activeVehicle.guidedMode && flightWidgets.guidedModeBar.state == "Shown") { - _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y)) - flightWidgets.guidedModeBar.confirmAction(flightWidgets.guidedModeBar.confirmGoTo) - } else { + if (flightWidgets.guidedModeBar.state != "Shown") { flightWidgets.guidedModeBar.state = "Shown" + } else { + if (flightWidgets.gotoEnabled) { + _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y)) + flightWidgets.guidedModeBar.confirmAction(flightWidgets.guidedModeBar.confirmGoTo) + } } } } diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 66923a98d..cfea5e63e 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -25,7 +25,8 @@ import QGroundControl.FlightMap 1.0 Item { id: _root - property alias guidedModeBar: _guidedModeBar + property alias guidedModeBar: _guidedModeBar + property bool gotoEnabled: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property bool _isSatellite: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true @@ -444,7 +445,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter color: _lightWidgetBorders ? qgcPal.mapWidgetBorderDark : qgcPal.mapWidgetBorderLight text: "Click in map to move vehicle" - visible: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying + visible: gotoEnabled } Row { -- 2.22.0