Browse Source

GoTo Location fixes

- Don't allow goto click while other guided ui is visible
- Use NoMouseThroughRectangle for guided ui popups
- Better visuals for goto indicator in map
QGC4.4
DonLakeFlyer 8 years ago
parent
commit
394c6b16cc
  1. 1
      src/FlightDisplay/FlightDisplayView.qml
  2. 7
      src/FlightDisplay/FlightDisplayViewMap.qml
  3. 2
      src/FlightDisplay/GuidedActionConfirm.qml
  4. 2
      src/FlightDisplay/GuidedActionList.qml
  5. 3
      src/FlightDisplay/GuidedActionsController.qml

1
src/FlightDisplay/FlightDisplayView.qml

@ -540,6 +540,7 @@ QGCView { @@ -540,6 +540,7 @@ QGCView {
id: guidedActionsController
missionController: _missionController
confirmDialog: guidedActionConfirm
actionList: guidedActionList
altitudeSlider: _altitudeSlider
z: _flightVideoPipControl.z + 1

7
src/FlightDisplay/FlightDisplayViewMap.qml

@ -240,8 +240,9 @@ FlightMap { @@ -240,8 +240,9 @@ FlightMap {
anchorPoint.y: sourceItem.anchorPointY
sourceItem: MissionItemIndexLabel {
checked: true
label: qsTr("G", "Goto here waypoint") // second string is translator's hint.
checked: true
index: -1
label: qsTr("Goto here", "Goto here waypoint")
}
}
@ -260,7 +261,7 @@ FlightMap { @@ -260,7 +261,7 @@ FlightMap {
anchors.fill: parent
onClicked: {
if (guidedActionsController.showGotoLocation) {
if (guidedActionsController.showGotoLocation && !guidedActionsController.guidedUIVisible) {
_gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */)
guidedActionsController.confirmAction(guidedActionsController.actionGoto, _gotoHereCoordinate)
}

2
src/FlightDisplay/GuidedActionConfirm.qml

@ -16,7 +16,7 @@ import QGroundControl.Controls 1.0 @@ -16,7 +16,7 @@ import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
/// Guided actions confirmation dialog
Rectangle {
NoMouseThroughRectangle {
id: _root
border.color: qgcPal.alertBorder
border.width: 1

2
src/FlightDisplay/GuidedActionList.qml

@ -17,7 +17,7 @@ import QGroundControl.Controls 1.0 @@ -17,7 +17,7 @@ import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
/// Dialog showing list of available guided actions
Rectangle {
NoMouseThroughRectangle {
id: _root
width: actionColumn.width + (_margins * 4)
height: actionColumn.height + (_margins * 4)

3
src/FlightDisplay/GuidedActionsController.qml

@ -29,6 +29,7 @@ Item { @@ -29,6 +29,7 @@ Item {
property var missionController
property var confirmDialog
property var actionList
property var altitudeSlider
readonly property string emergencyStopTitle: qsTr("Emergency Stop")
@ -96,6 +97,8 @@ Item { @@ -96,6 +97,8 @@ Item {
property bool showLandAbort: _activeVehicle && _vehicleFlying && _activeVehicle.fixedWing && _vehicleLanding
property bool showGotoLocation: _activeVehicle && _activeVehicle.guidedMode && _vehicleFlying
property bool guidedUIVisible: guidedActionConfirm.visible || guidedActionList.visible
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string _flightMode: _activeVehicle ? _activeVehicle.flightMode : ""
property bool _missionAvailable: missionController.containsItems

Loading…
Cancel
Save