Browse Source

Disable waypoint drag in Fly view

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
300cd31cc8
  1. 2
      src/FlightDisplay/FlightDisplayViewMap.qml
  2. 1
      src/FlightMap/FlightMap.qml
  3. 2
      src/PlanView/SimpleItemMapVisual.qml

2
src/FlightDisplay/FlightDisplayViewMap.qml

@ -29,9 +29,11 @@ FlightMap {
mapName: _mapName mapName: _mapName
allowGCSLocationCenter: !userPanned allowGCSLocationCenter: !userPanned
allowVehicleLocationCenter: !_keepVehicleCentered allowVehicleLocationCenter: !_keepVehicleCentered
planView: false
property alias scaleState: mapScale.state property alias scaleState: mapScale.state
// The following properties must be set by the consumer
property var missionController property var missionController
property var geoFenceController property var geoFenceController
property var rallyPointController property var rallyPointController

1
src/FlightMap/FlightMap.qml

@ -38,6 +38,7 @@ Map {
property bool allowVehicleLocationCenter: false ///< true: map will center/zoom to vehicle location one time property bool allowVehicleLocationCenter: false ///< true: map will center/zoom to vehicle location one time
property bool firstGCSPositionReceived: false ///< true: first gcs position update was responded to property bool firstGCSPositionReceived: false ///< true: first gcs position update was responded to
property bool firstVehiclePositionReceived: false ///< true: first vehicle position update was responded to property bool firstVehiclePositionReceived: false ///< true: first vehicle position update was responded to
property bool planView: false ///< true: map being using for Plan view, items should be draggable
readonly property real maxZoomLevel: 20 readonly property real maxZoomLevel: 20

2
src/PlanView/SimpleItemMapVisual.qml

@ -62,7 +62,7 @@ Item {
Component.onCompleted: { Component.onCompleted: {
showItemVisuals() showItemVisuals()
if (_missionItem.isCurrentItem) { if (_missionItem.isCurrentItem && map.planView) {
showDragArea() showDragArea()
} }
} }

Loading…
Cancel
Save