From a6f9d722246ce05e76197d7cdf19392cd2d71f04 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 10 Oct 2015 14:09:27 -0700
Subject: [PATCH] Add Center tool support

- Follow Vehicle
- Center map on vehicle
---
 src/FlightDisplay/FlightDisplayView.qml | 92 +++++++++++++++++++++----
 1 file changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index d9e5dcfeb..5f476822c 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -70,6 +70,10 @@ Item {
 
     property bool _showMap: getBool(QGroundControl.flightMapSettings.loadMapSetting(flightMap.mapName, _showMapBackgroundKey, "1"))
 
+    ExclusiveGroup {
+        id: _dropButtonsExclusiveGroup
+    }
+
     // Validate _showMap setting
     Component.onCompleted: _setShowMap(_showMap)
 
@@ -90,10 +94,25 @@ Item {
         id:             flightMap
         anchors.fill:   parent
         mapName:        _mapName
-        latitude:       parent._latitude
-        longitude:      parent._longitude
         visible:        _showMap
 
+        property real rootLatitude:     root._latitude
+        property real rootLongitude:    root._longitude
+
+        Component.onCompleted: updateMapPosition(true /* force */)
+
+        onRootLatitudeChanged: updateMapPosition(false /* force */)
+        onRootLongitudeChanged: updateMapPosition(false /* force */)
+
+        function updateMapPosition(force) {
+            if (_followVehicle || force) {
+                latitude = root._latitude
+                longitude = root._longitude
+            }
+        }
+
+        property bool _followVehicle: true
+
         // Home position
         MissionItemIndicator {
             label:          "H"
@@ -145,21 +164,65 @@ Item {
         }
 
         QGCCompassWidget {
-            x:          ScreenTools.defaultFontPixelSize * (7.1)
-            y:          ScreenTools.defaultFontPixelSize * (0.42)
-            size:       ScreenTools.defaultFontPixelSize * (13.3)
-            heading:    _heading
-            active:     multiVehicleManager.activeVehicleAvailable
+            anchors.margins:    ScreenTools.defaultFontPixelHeight
+            anchors.left:       parent.left
+            anchors.top:        parent.top
+            size:               ScreenTools.defaultFontPixelSize * (13.3)
+            heading:            _heading
+            active:             multiVehicleManager.activeVehicleAvailable
         }
 
         QGCAttitudeWidget {
-            anchors.rightMargin:    ScreenTools.defaultFontPixelSize * (7.1)
-            anchors.right:          parent.right
-            y:                      ScreenTools.defaultFontPixelSize * (0.42)
-            size:                   ScreenTools.defaultFontPixelSize * (13.3)
-            rollAngle:              _roll
-            pitchAngle:             _pitch
-            active:                 multiVehicleManager.activeVehicleAvailable
+            anchors.margins:    ScreenTools.defaultFontPixelHeight
+            anchors.left:       parent.left
+            anchors.bottom:     parent.bottom
+            size:               ScreenTools.defaultFontPixelSize * (13.3)
+            rollAngle:          _roll
+            pitchAngle:         _pitch
+            active:             multiVehicleManager.activeVehicleAvailable
+        }
+
+        DropButton {
+            id:                     centerMapDropButton
+            anchors.rightMargin:    ScreenTools.defaultFontPixelHeight
+            anchors.right:          mapTypeButton.left
+            anchors.top:            mapTypeButton.top
+            dropDirection:          dropDown
+            buttonImage:            "/qmlimages/MapCenter.svg"
+            viewportMargins:        ScreenTools.defaultFontPixelWidth / 2
+            exclusiveGroup:         _dropButtonsExclusiveGroup
+
+            dropDownComponent: Component {
+                Row {
+                    spacing: ScreenTools.defaultFontPixelWidth
+
+                    QGCCheckBox {
+                        id:                 followVehicleCheckBox
+                        text:               "Follow Vehicle"
+                        checked:            flightMap._followVehicle
+                        anchors.baseline:   centerMapButton.baseline
+
+                        onClicked: {
+                            centerMapDropButton.hideDropDown()
+                            flightMap._followVehicle = !flightMap._followVehicle
+                        }
+                    }
+
+                    QGCButton {
+                        id:         centerMapButton
+                        text:       "Center map on Vehicle"
+                        enabled:    _activeVehicle && !followVehicleCheckBox.checked
+
+                        property var activeVehicle: multiVehicleManager.activeVehicle
+
+                        onClicked: {
+                            centerMapDropButton.hideDropDown()
+                            flightMap.latitude = activeVehicle.latitude
+                            flightMap.longitude = activeVehicle.longitude
+                        }
+                    }
+                }
+            }
         }
 
         DropButton {
@@ -170,6 +233,7 @@ Item {
             dropDirection:      dropDown
             buttonImage:        "/qmlimages/MapType.svg"
             viewportMargins:    ScreenTools.defaultFontPixelWidth / 2
+            exclusiveGroup:     _dropButtonsExclusiveGroup
 
             dropDownComponent: Component {
                 Row {
-- 
2.22.0