Add settings, add lock north

- Add setting for Heading to Next WP and Nort Up lock
- Add check for vehicle for every indicator to avoid showig them while
  no vehicle

src/FlightMap/Widgets/QGCCompassWidget.qml

@@ -45,20 +45,26 @@ Item {
             return false
         }
         else{
-            return true
+            return vehicle
         }
     }
 
     function isHeadingAngleOK(){
-        return _showHomeHeadingCompass && !isNaN(_headingToHome)
+        return vehicle && _showHomeHeadingCompass && !isNaN(_headingToHome)
     }
 
     function isHeadingToNextWPOK(){
-        return !isNaN(_headingToNextWP)
+        return vehicle && _showHeadingToNextWP && !isNaN(_headingToNextWP)
+    }
+
+    function isNorthUpLocked(){
+        return _lockNorthUpCompass
     }
 
     readonly property bool _showHomeHeadingCompass:     QGroundControl.settingsManager.flyViewSettings.showHomeHeadingCompass.value
     readonly property bool _showCOGAngleCompass:        QGroundControl.settingsManager.flyViewSettings.showCOGAngleCompass.value
+    readonly property bool _showHeadingToNextWP:        QGroundControl.settingsManager.flyViewSettings.showHeadingToNextWP.value
+    readonly property bool _lockNorthUpCompass:        QGroundControl.settingsManager.flyViewSettings.lockNorthUpCompass.value
 
     QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
@@ -85,9 +91,10 @@ Item {
             sourceSize.height:  parent.height
 
             transform: Rotation {
+                property var _angle: isNorthUpLocked()?_headingToNextWP-_heading:_headingToNextWP
                 origin.x:       cOGPointer.width  / 2
                 origin.y:       cOGPointer.height / 2
-                angle:         _headingToNextWP - _heading
+                angle:         _angle
             }
         }
 
@@ -100,9 +107,10 @@ Item {
             sourceSize.height:  parent.height
 
             transform: Rotation {
+                property var _angle:isNorthUpLocked()?_courseOverGround-_heading:_courseOverGround
                 origin.x:       cOGPointer.width  / 2
                 origin.y:       cOGPointer.height / 2
-                angle:         _courseOverGround - _heading
+                angle:         _angle
             }
         }
 
@@ -114,6 +122,11 @@ Item {
             sourceSize.width:   width
             fillMode:           Image.PreserveAspectFit
             anchors.centerIn:   parent
+            transform: Rotation {
+                origin.x:       pointer.width  / 2
+                origin.y:       pointer.height / 2
+                angle:          isNorthUpLocked()?0:_heading
+            }
         }
 
         Image {
@@ -127,8 +140,9 @@ Item {
             visible:                _showHomeHeadingCompass
 
             transform: Translate {
-                x: size/2.3 * Math.sin((-_heading + _headingToHome)*(3.14/180))
-                y: - size/2.3 * Math.cos((-_heading + _headingToHome)*(3.14/180))
+                property double _angle: isNorthUpLocked()?-_heading+_headingToHome:_headingToHome
+                x: size/2.3 * Math.sin((_angle)*(3.14/180))
+                y: - size/2.3 * Math.cos((_angle)*(3.14/180))
             }
         }
 
@@ -143,7 +157,7 @@ Item {
             transform: Rotation {
                 origin.x:       compassDial.width  / 2
                 origin.y:       compassDial.height / 2
-                angle:          -_heading
+                angle:          isNorthUpLocked()?-_heading:0
             }
         }
 

src/Settings/FlyView.SettingsGroup.json

@@ -27,14 +27,26 @@
 },
 {
     "name":             "showHomeHeadingCompass",
-    "shortDescription": "Show/Hide Home heading on the Compass",
+    "shortDescription": "Show/Hide Home heading on Compass",
     "type":             "bool",
     "defaultValue":     false
 },
 {
     "name":             "showCOGAngleCompass",
-    "shortDescription": "Show/Hide Course Over Ground angle on the Compass",
+    "shortDescription": "Show/Hide Course Over Ground angle on Compass",
     "type":             "bool",
     "defaultValue":     false
+},
+{
+    "name":             "showHeadingToNextWP",
+    "shortDescription": "Show/Hide Heading to Next Waypoint on Compass",
+    "type":             "bool",
+    "defaultValue":     false
+},
+{
+    "name":             "lockNorthUpCompass",
+    "shortDescription": "Lock North up on Compass",
+    "type":             "bool",
+    "defaultValue":     true
 }
 ]

src/Settings/FlyViewSettings.cc

@@ -23,3 +23,5 @@ DECLARE_SETTINGSFACT(FlyViewSettings, showLogReplayStatusBar)
 DECLARE_SETTINGSFACT(FlyViewSettings, alternateInstrumentPanel)
 DECLARE_SETTINGSFACT(FlyViewSettings, showHomeHeadingCompass)
 DECLARE_SETTINGSFACT(FlyViewSettings, showCOGAngleCompass)
+DECLARE_SETTINGSFACT(FlyViewSettings, showHeadingToNextWP)
+DECLARE_SETTINGSFACT(FlyViewSettings, lockNorthUpCompass)

src/Settings/FlyViewSettings.h

@@ -25,4 +25,6 @@ public:
     DEFINE_SETTINGFACT(alternateInstrumentPanel)
     DEFINE_SETTINGFACT(showHomeHeadingCompass)
     DEFINE_SETTINGFACT(showCOGAngleCompass)
+    DEFINE_SETTINGFACT(showHeadingToNextWP)
+    DEFINE_SETTINGFACT(lockNorthUpCompass)
 };

src/Vehicle/Vehicle.cc

@@ -3810,8 +3810,6 @@ void Vehicle::_updateHeadingToNextWP(void)
     else{
         _headingToNextWPFact.setRawValue(qQNaN());
     }
-
-    qDebug() << " Vehicle updateHeadingToNextWP "<< _currentIndex;
 }
 
 void Vehicle::_updateDistanceToGCS(void)

src/ui/preferences/GeneralSettings.qml

@@ -476,19 +476,33 @@ Rectangle {
                                 property Fact _alternateInstrumentPanel: QGroundControl.settingsManager.flyViewSettings.alternateInstrumentPanel
                             }
                             FactCheckBox {
-                                text:       qsTr("Show/Hide Home heading on the Compass")
+                                text:       qsTr("Show/Hide Home heading on Compass")
                                 visible:    _showHomeHeadingCompass.visible
                                 fact:       _showHomeHeadingCompass
 
                                 property Fact _showHomeHeadingCompass: QGroundControl.settingsManager.flyViewSettings.showHomeHeadingCompass
                             }
                             FactCheckBox {
-                                text:       qsTr("Show/Hide Course Over Ground angle on the Compass")
+                                text:       qsTr("Show/Hide Course Over Ground angle on Compass")
                                 visible:    _showCOGAngleCompass.visible
                                 fact:       _showCOGAngleCompass
 
                                 property Fact _showCOGAngleCompass: QGroundControl.settingsManager.flyViewSettings.showCOGAngleCompass
                             }
+                            FactCheckBox {
+                                text:       qsTr("Show/Hide Heading to Next Waypoint on Compass")
+                                visible:    _showHeadingToNextWP.visible
+                                fact:       _showHeadingToNextWP
+
+                                property Fact _showHeadingToNextWP: QGroundControl.settingsManager.flyViewSettings.showHeadingToNextWP
+                            }
+                            FactCheckBox {
+                                text:       qsTr("Lock North up on Compass")
+                                visible:    _lockNorthUpCompass.visible
+                                fact:       _lockNorthUpCompass
+
+                                property Fact _lockNorthUpCompass: QGroundControl.settingsManager.flyViewSettings.lockNorthUpCompass
+                            }
 
 
                             GridLayout {