Separated Flight map into View and Widget

QGCApplication.pro

@@ -140,12 +140,12 @@ INCLUDEPATH += \
     src/audio \
     src/AutoPilotPlugins \
     src/comm \
+    src/FlightDisplay \
     src/input \
     src/lib/qmapcontrol \
     src/QmlControls \
     src/uas \
     src/ui \
-    src/ui/flightdisplay \
     src/ui/linechart \
     src/ui/map \
     src/ui/mapdisplay \
@@ -238,6 +238,8 @@ HEADERS += \
     src/comm/QGCMAVLink.h \
     src/comm/TCPLink.h \
     src/comm/UDPLink.h \
+    src/FlightDisplay/FlightDisplayWidget.h \
+    src/FlightDisplay/FlightDisplayView.h \
     src/GAudioOutput.h \
     src/HomePositionManager.h \
     src/LogCompressor.h \
@@ -264,7 +266,6 @@ HEADERS += \
     src/uas/UASInterface.h \
     src/uas/UASMessageHandler.h \
     src/uas/UASWaypointManager.h \
-    src/ui/flightdisplay/FlightDisplay.h \
     src/ui/HDDisplay.h \
     src/ui/HSIDisplay.h \
     src/ui/HUD.h \
@@ -373,6 +374,8 @@ SOURCES += \
     src/comm/MockLinkMissionItemHandler.cc \
     src/comm/TCPLink.cc \
     src/comm/UDPLink.cc \
+    src/FlightDisplay/FlightDisplayWidget.cc \
+    src/FlightDisplay/FlightDisplayView.cc \
     src/GAudioOutput.cc \
     src/HomePositionManager.cc \
     src/LogCompressor.cc \
@@ -394,7 +397,6 @@ SOURCES += \
     src/uas/UAS.cc \
     src/uas/UASMessageHandler.cc \
     src/uas/UASWaypointManager.cc \
-    src/ui/flightdisplay/FlightDisplay.cc \
     src/ui/HDDisplay.cc \
     src/ui/HSIDisplay.cc \
     src/ui/HUD.cc \

qgroundcontrol.qrc

@@ -116,7 +116,8 @@
         <file alias="AirframeComponentSummary.qml">src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml</file>
         <file alias="AirframeComponent.qml">src/AutoPilotPlugins/PX4/AirframeComponent.qml</file>
         <file alias="MainToolBar.qml">src/ui/toolbar/MainToolBar.qml</file>
-        <file alias="FlightDisplay.qml">src/ui/flightdisplay/FlightDisplay.qml</file>
+        <file alias="FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
+        <file alias="FlightDisplayWidget.qml">src/FlightDisplay/FlightDisplayWidget.qml</file>
         <file alias="MapDisplay.qml">src/ui/mapdisplay/MapDisplay.qml</file>
 
         <!-- FlightMap module -->

src/ui/flightdisplay/FlightDisplay.cc → src/FlightDisplay/FlightDisplayView.cc

@@ -21,12 +21,6 @@ This file is part of the QGROUNDCONTROL project
 
 ======================================================================*/
 
-/**
- * @file
- *   @brief QGC Main Flight Display
- *   @author Gus Grubba <mavlink@grubba.com>
- */
-
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QSettings>
@@ -36,15 +30,15 @@ This file is part of the QGROUNDCONTROL project
 #include "VideoReceiver.h"
 
 #include "ScreenToolsController.h"
-#include "FlightDisplay.h"
+#include "FlightDisplayView.h"
 
-const char* kMainFlightDisplayGroup = "MainFlightDisplay";
+const char* kMainFlightDisplayViewGroup = "FlightDisplayView";
 
-FlightDisplay::FlightDisplay(QWidget *parent)
+FlightDisplayView::FlightDisplayView(QWidget *parent)
     : QGCQmlWidgetHolder(parent)
 {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    setObjectName("MainFlightDisplay");
+    setObjectName("FlightDisplayView");
     // Get rid of layout default margins
     QLayout* pl = layout();
     if(pl) {
@@ -90,26 +84,26 @@ FlightDisplay::FlightDisplay(QWidget *parent)
 #endif
     setContextPropertyObject("videoReceiver", pReceiver);
 
-    setSource(QUrl::fromUserInput("qrc:/qml/FlightDisplay.qml"));
+    setSource(QUrl::fromUserInput("qrc:/qml/FlightDisplayView.qml"));
     setVisible(true);
 }
 
-FlightDisplay::~FlightDisplay()
+FlightDisplayView::~FlightDisplayView()
 {
 }
 
-void FlightDisplay::saveSetting(const QString &name, const QString& value)
+void FlightDisplayView::saveSetting(const QString &name, const QString& value)
 {
     QSettings settings;
-    QString key(kMainFlightDisplayGroup);
+    QString key(kMainFlightDisplayViewGroup);
     key += "/" + name;
     settings.setValue(key, value);
 }
 
-QString FlightDisplay::loadSetting(const QString &name, const QString& defaultValue)
+QString FlightDisplayView::loadSetting(const QString &name, const QString& defaultValue)
 {
     QSettings settings;
-    QString key(kMainFlightDisplayGroup);
+    QString key(kMainFlightDisplayViewGroup);
     key += "/" + name;
     return settings.value(key, defaultValue).toString();
 }

src/ui/flightdisplay/FlightDisplay.h → src/FlightDisplay/FlightDisplayView.h

@@ -21,25 +21,17 @@ This file is part of the QGROUNDCONTROL project
 
 ======================================================================*/
 
-/**
- * @file
- *   @brief QGC Main Flight Display
- *   @author Gus Grubba <mavlink@grubba.com>
- */
-
-#ifndef QGCFLIGHTDISPLAY_H
-#define QGCFLIGHTDISPLAY_H
+#ifndef FlightDisplayView_H
+#define FlightDisplayView_H
 
 #include "QGCQmlWidgetHolder.h"
 
-class UASInterface;
-
-class FlightDisplay : public QGCQmlWidgetHolder
+class FlightDisplayView : public QGCQmlWidgetHolder
 {
     Q_OBJECT
 public:
-    FlightDisplay(QWidget* parent = NULL);
-    ~FlightDisplay();
+    FlightDisplayView(QWidget* parent = NULL);
+    ~FlightDisplayView();
 
     /// @brief Invokes the Flight Display Options menu
     void showOptionsMenu() { emit showOptionsMenuChanged(); }
@@ -60,4 +52,4 @@ signals:
 
 };
 
-#endif // QGCFLIGHTDISPLAY_H
+#endif

src/FlightDisplay/FlightDisplayView.qml

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+import QtQuick                  2.4
+import QtQuick.Controls         1.3
+import QtQuick.Controls.Styles  1.2
+import QtQuick.Dialogs          1.2
+
+import QGroundControl.FlightMap     1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+
+
+/// Flight Display View
+Item {
+    id: root
+
+    property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
+
+    property var _activeVehicle: multiVehicleManager.activeVehicle
+
+    readonly property real _defaultLatitude:        37.803784
+    readonly property real _defaultLongitude:       -122.462276
+    readonly property real _defaultRoll:            0
+    readonly property real _defaultPitch:           0
+    readonly property real _defaultHeading:         0
+    readonly property real _defaultAltitudeWGS84:   0
+    readonly property real _defaultGroundSpeed:     0
+    readonly property real _defaultAirSpeed:        0
+    readonly property real _defaultClimbRate:       0
+
+    property real _roll:            _activeVehicle ? (isNaN(_activeVehicle.roll) ? _defaultRoll : _activeVehicle.roll) : _defaultRoll
+    property real _pitch:           _activeVehicle ? (isNaN(_activeVehicle.pitch) ? _defaultPitch : _activeVehicle.pitch) : _defaultPitch
+    property real _latitude:        _activeVehicle ? ((_activeVehicle.latitude  === 0) ? _defaultLatitude : _activeVehicle.latitude) : _defaultLatitude
+    property real _longitude:       _activeVehicle ? ((_activeVehicle.longitude === 0) ? _defaultLongitude : _activeVehicle.longitude) : _defaultLongitude
+    property real _heading:         _activeVehicle ? (isNaN(_activeVehicle.heading) ? _defaultHeading : _activeVehicle.heading) : _defaultHeading
+    property real _altitudeWGS84:   _activeVehicle ? _activeVehicle.altitudeWGS84 : _defaultAltitudeWGS84
+    property real _groundSpeed:     _activeVehicle ? _activeVehicle.groundSpeed : _defaultGroundSpeed
+    property real _airSpeed:        _activeVehicle ? _activeVehicle.airSpeed : _defaultAirSpeed
+    property real _climbRate:       _activeVehicle ? _activeVehicle.climbRate : _defaultClimbRate
+
+    function getBool(value) {
+        return value === '0' ? false : true;
+    }
+
+    function setBool(value) {
+        return value ? "1" : "0";
+    }
+
+    FlightMap {
+        id:             flightMap
+        anchors.fill:   parent
+        mapName:        "FlightDisplayView"
+        latitude:       _latitude
+        longitude:      _longitude
+        z:              10
+        showVehicles:   true
+    }
+
+    QGCCompassWidget {
+        x:          ScreenTools.defaultFontPixelSize * (7.1)
+        y:          ScreenTools.defaultFontPixelSize * (0.42)
+        size:       ScreenTools.defaultFontPixelSize * (13.3)
+        heading:    _heading
+        active:     multiVehicleManager.activeVehicleAvailable
+        z:          flightMap.z + 2
+    }
+
+    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
+        z:                      flightMap.z + 2
+    }
+
+    QGCAltitudeWidget {
+        anchors.right:  parent.right
+        height:         parent.height * 0.65 > ScreenTools.defaultFontPixelSize * (23.4) ? ScreenTools.defaultFontPixelSize * (23.4) : parent.height * 0.65
+        width:          ScreenTools.defaultFontPixelSize * (5)
+        altitude:       _altitudeWGS84
+        z:              30
+    }
+
+    QGCSpeedWidget {
+        anchors.left:   parent.left
+        width:          ScreenTools.defaultFontPixelSize * (5)
+        height:         parent.height * 0.65 > ScreenTools.defaultFontPixelSize * (23.4) ? ScreenTools.defaultFontPixelSize * (23.4) : parent.height * 0.65
+        speed:          _groundSpeed
+        z:              40
+    }
+
+    QGCCurrentSpeed {
+        anchors.left:       parent.left
+        width:              ScreenTools.defaultFontPixelSize * (6.25)
+        airspeed:           _airSpeed
+        groundspeed:        _groundSpeed
+        active:             multiVehicleManager.activeVehicleAvailable
+        z:                  50
+    }
+
+    QGCCurrentAltitude {
+        anchors.right:      parent.right
+        width:              ScreenTools.defaultFontPixelSize * (6.25)
+        altitude:           _altitudeWGS84
+        vertZ:              _climbRate
+        active:             multiVehicleManager.activeVehicleAvailable
+        z:                  60
+    }
+}

src/FlightDisplay/FlightDisplayWidget.cc

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QSettings>
+
+#include <VideoItem.h>
+#include <VideoSurface.h>
+#include "VideoReceiver.h"
+
+#include "ScreenToolsController.h"
+#include "FlightDisplayWidget.h"
+
+const char* kMainFlightDisplayWidgetGroup = "FlightDisplayWidget";
+
+FlightDisplayWidget::FlightDisplayWidget(QWidget *parent)
+    : QGCQmlWidgetHolder(parent)
+{
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setObjectName("FlightDisplayWidget");
+    // Get rid of layout default margins
+    QLayout* pl = layout();
+    if(pl) {
+        pl->setContentsMargins(0,0,0,0);
+    }
+#ifndef __android__
+    setMinimumWidth( 31 * ScreenToolsController::defaultFontPixelSize_s());
+    setMinimumHeight(33 * ScreenToolsController::defaultFontPixelSize_s());
+#endif
+    setContextPropertyObject("flightDisplay", this);
+
+    /*
+     * This is the receiving end of an UDP RTP stream. The sender can be setup with this command:
+     *
+     * gst-launch-1.0 uvch264src initial-bitrate=1000000 average-bitrate=1000000 iframe-period=1000 name=src auto-start=true src.vidsrc ! \
+     * video/x-h264,width=1280,height=720,framerate=24/1 ! h264parse ! rtph264pay ! udpsink host=192.168.1.9 port=5000
+     *
+     * Where the main parameters are:
+     *
+     *  uvch264src:         Your h264 video source (the example above uses a Logitech C920 on an Raspberry PI 2+ or Odroid C1
+     *  host=192.168.1.9    This is the IP address of QGC. You can use Avahi/Zeroconf to find QGC using the "_qgroundcontrol._udp" service.
+     *
+     * Advanced settings (you should probably read the gstreamer documentation before changing these):
+     *
+     * initial-bitrate=1000000 average-bitrate=1000000
+     * The bit rate to use. The greater, the better quality at the cost of higher bandwidth.
+     *
+     * width=1280,height=720,framerate=24/1
+     * The video resolution and frame rate. This depends on the camera used.
+     *
+     * iframe-period=1000
+     * Interval between iFrames. The greater the interval the lesser bandwidth at the cost of a longer time to recover from lost packets.
+     *
+     * Do not change anything else unless you know what you are doing. Any other change will require a matching change on the receiving end.
+     *
+     */
+    VideoSurface* pSurface = new VideoSurface;
+    setContextPropertyObject("videoDisplay", pSurface);
+    VideoReceiver* pReceiver = new VideoReceiver(this);
+    pReceiver->setUri(QLatin1Literal("udp://0.0.0.0:5000"));
+#if defined(QGC_GST_STREAMING)
+    pReceiver->setVideoSink(pSurface->videoSink());
+#endif
+    setContextPropertyObject("videoReceiver", pReceiver);
+
+    setSource(QUrl::fromUserInput("qrc:/qml/FlightDisplayWidget.qml"));
+    setVisible(true);
+}
+
+FlightDisplayWidget::~FlightDisplayWidget()
+{
+}
+
+void FlightDisplayWidget::saveSetting(const QString &name, const QString& value)
+{
+    QSettings settings;
+    QString key(kMainFlightDisplayWidgetGroup);
+    key += "/" + name;
+    settings.setValue(key, value);
+}
+
+QString FlightDisplayWidget::loadSetting(const QString &name, const QString& defaultValue)
+{
+    QSettings settings;
+    QString key(kMainFlightDisplayWidgetGroup);
+    key += "/" + name;
+    return settings.value(key, defaultValue).toString();
+}

src/FlightDisplay/FlightDisplayWidget.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+#ifndef FlightDisplayWidget_H
+#define FlightDisplayWidget_H
+
+#include "QGCQmlWidgetHolder.h"
+
+class FlightDisplayWidget : public QGCQmlWidgetHolder
+{
+    Q_OBJECT
+public:
+    FlightDisplayWidget(QWidget* parent = NULL);
+    ~FlightDisplayWidget();
+
+    /// @brief Invokes the Flight Display Options menu
+    void showOptionsMenu() { emit showOptionsMenuChanged(); }
+
+    Q_PROPERTY(bool hasVideo READ hasVideo CONSTANT)
+
+    Q_INVOKABLE void    saveSetting (const QString &key, const QString& value);
+    Q_INVOKABLE QString loadSetting (const QString &key, const QString& defaultValue);
+
+#if defined(QGC_GST_STREAMING)
+    bool    hasVideo            () { return true; }
+#else
+    bool    hasVideo            () { return false; }
+#endif
+
+signals:
+    void showOptionsMenuChanged ();
+
+};
+
+#endif

src/ui/flightdisplay/FlightDisplay.qml → src/FlightDisplay/FlightDisplayWidget.qml

@@ -21,12 +21,6 @@ This file is part of the QGROUNDCONTROL project
 
 ======================================================================*/
 
-/**
- * @file
- *   @brief QGC Main Flight Display
- *   @author Gus Grubba <mavlink@grubba.com>
- */
-
 import QtQuick                  2.4
 import QtQuick.Controls         1.3
 import QtQuick.Controls.Styles  1.2
@@ -37,6 +31,7 @@ import QGroundControl.ScreenTools 1.0
 import QGroundControl.Controls      1.0
 import QGroundControl.Palette       1.0
 
+/// Flight Display Widget
 Item {
     id: root
 
@@ -91,19 +86,15 @@ Item {
     Component.onCompleted:
     {
         mapBackground.visible               = getBool(flightDisplay.loadSetting("showMapBackground",        "0"));
-        mapBackground.alwaysNorth           = getBool(flightDisplay.loadSetting("mapAlwaysPointsNorth",     "0"));
         videoBackground.visible             = getBool(flightDisplay.loadSetting("showVideoBackground",      "0"));
         showPitchIndicator                  = getBool(flightDisplay.loadSetting("showPitchIndicator",       "1"));
-        compassWidget.visible               = getBool(flightDisplay.loadSetting("showCompassWidget",        "0"));
-        compassHUD.visible                  = getBool(flightDisplay.loadSetting("showCompassHUD",           "1"));
-        attitudeWidget.visible              = getBool(flightDisplay.loadSetting("showAttitudeWidget",       "0"));
-        attitudeHUD.visible                 = getBool(flightDisplay.loadSetting("showAttitudeHUD",          "1"));
         altitudeWidget.visible              = getBool(flightDisplay.loadSetting("showAltitudeWidget",       "1"));
         speedWidget.visible                 = getBool(flightDisplay.loadSetting("showSpeedWidget",          "1"));
         currentSpeed.showAirSpeed           = getBool(flightDisplay.loadSetting("showCurrentAirSpeed",      "1"));
         currentSpeed.showGroundSpeed        = getBool(flightDisplay.loadSetting("showCurrentGroundSpeed",   "1"));
         currentAltitude.showClimbRate       = getBool(flightDisplay.loadSetting("showCurrentClimbRate",     "1"));
         currentAltitude.showAltitude        = getBool(flightDisplay.loadSetting("showCurrentAltitude",      "1"));
+
         // Insert Map Type menu before separator
         contextMenu.insertItem(2, mapBackground.mapMenu);
         // Video or Map. Not both:
@@ -111,16 +102,6 @@ Item {
             videoBackground.visible = false;
             flightDisplay.saveSetting("showVideoBackground", setBool(videoBackground.visible));
         }
-        // Compass HUD or Widget. Not both:
-        if(compassWidget.visible && compassHUD.visible) {
-            compassWidget.visible = false;
-            flightDisplay.saveSetting("showCompassWidget", setBool(compassWidget.visible));
-        }
-        // Attitude HUD or Widget. Not both:
-        if(attitudeWidget.visible && attitudeHUD.visible) {
-            attitudeWidget.visible = false;
-            flightDisplay.saveSetting("showAttitudeWidget", setBool(attitudeWidget.visible));
-        }
         // Disable video if we don't have support for it
         if(!flightDisplay.hasVideo) {
             videoBackground.visible = false;
@@ -143,20 +124,6 @@ Item {
             }
         }
 
-        /*
-        //-- Off until Qt 5.5.x, which fixes bug in 5.4.x
-        MenuItem {
-            text: "Map Always Points North"
-            checkable: true
-            checked: mapBackground.alwaysNorth
-            onTriggered:
-            {
-                mapBackground.alwaysNorth = !mapBackground.alwaysNorth;
-                flightDisplay.saveSetting("mapAlwaysPointsNorth", setBool(mapBackground.alwaysNorth));
-            }
-        }
-        */
-
         MenuSeparator {}
 
         MenuItem {
@@ -172,26 +139,6 @@ Item {
 
         MenuSeparator {}
 
-        MenuItem {
-            text: "Attitude Widget"
-            checkable:  true
-            checked:    attitudeWidget.visible
-            onTriggered:
-            {
-                enforceExclusiveOption(attitudeWidget, attitudeHUD, "showAttitudeWidget", "showAttitudeHUD");
-            }
-        }
-
-        MenuItem {
-            text: "Attitude HUD"
-            checkable:  true
-            checked:    attitudeHUD.visible
-            onTriggered:
-            {
-                enforceExclusiveOption(attitudeHUD, attitudeWidget, "showAttitudeHUD", "showAttitudeWidget");
-            }
-        }
-
         MenuItem {
             text: "Pitch Indicator"
             checkable:  true
@@ -204,26 +151,6 @@ Item {
             }
         }
 
-        MenuItem {
-            text: "Compass Widget"
-            checkable: true
-            checked: compassWidget.visible
-            onTriggered:
-            {
-                enforceExclusiveOption(compassWidget, compassHUD, "showCompassWidget", "showCompassHUD");
-            }
-        }
-
-        MenuItem {
-            text: "Compass HUD"
-            checkable: true
-            checked: compassHUD.visible
-            onTriggered:
-            {
-                enforceExclusiveOption(compassHUD, compassWidget, "showCompassHUD", "showCompassWidget");
-            }
-        }
-
         MenuItem {
             text: "Altitude Indicator"
             checkable: true
@@ -300,12 +227,8 @@ Item {
                 flightDisplay.saveSetting("showPitchIndicator", setBool(showPitchIndicator));
                 attitudeWidget.visible = false;
                 flightDisplay.saveSetting("showAttitudeWidget", setBool(attitudeWidget.visible));
-                attitudeHUD.visible = true;
-                flightDisplay.saveSetting("showAttitudeHUD", setBool(attitudeHUD.visible));
                 compassWidget.visible = false
                 flightDisplay.saveSetting("showCompassWidget", setBool(compassWidget.visible));
-                compassHUD.visible = true
-                flightDisplay.saveSetting("showCompassHUD", setBool(compassHUD.visible));
                 altitudeWidget.visible = true;
                 flightDisplay.saveSetting("showAltitudeWidget", setBool(altitudeWidget.visible));
                 currentAltitude.showAltitude = true;
@@ -320,10 +243,6 @@ Item {
                 flightDisplay.saveSetting("showCurrentGroundSpeed", setBool(currentSpeed.showGroundSpeed));
                 mapBackground.visible = false;
                 flightDisplay.saveSetting("showMapBackground", setBool(mapBackground.visible));
-                mapBackground.alwaysNorth = false;
-                flightDisplay.saveSetting("mapAlwaysPointsNorth", setBool(mapBackground.alwaysNorth));
-                mapBackground.showWaypoints = false
-                flightDisplay.saveSetting("mapShowWaypoints", setBool(mapBackground.showWaypoints));
                 videoBackground.visible = false;
                 flightDisplay.saveSetting("showVideoBackground", setBool(videoBackground.visible));
             }
@@ -344,31 +263,12 @@ Item {
     FlightMap {
         id:                 mapBackground
         anchors.fill:       parent
-        mapName:            'MainFlightDisplay'
+        mapName:            'FlightDisplayWidget'
         latitude:           mapBackground.visible ? root.latitude : root.defaultLatitude
         longitude:          mapBackground.visible ? root.longitude : root.defaultLongitude
-        readOnly:           true
         z:                  10
     }
 
-    // Floating (Top Left) Compass Widget
-
-    QGCCompassWidget {
-        id:                 compassWidget
-        y:                  ScreenTools.defaultFontPixelSize * (0.42)
-        x:                  ScreenTools.defaultFontPixelSize * (7.1)
-        size:               ScreenTools.defaultFontPixelSize * (13.3)
-        heading:            root.heading
-        z:                  mapBackground.z + 2
-        onResetRequested: {
-            y               = ScreenTools.defaultFontPixelSize * (0.42)
-            x               = ScreenTools.defaultFontPixelSize * (7.1)
-            size            = ScreenTools.defaultFontPixelSize * (13.3)
-            tForm.xScale    = 1
-            tForm.yScale    = 1
-        }
-    }
-
     // HUD (lower middle) Compass
 
     QGCCompassHUD {
@@ -378,6 +278,7 @@ Item {
         width:              ScreenTools.defaultFontPixelSize * (10)
         height:             ScreenTools.defaultFontPixelSize * (10)
         heading:            root.heading
+        active:             multiVehicleManager.activeVehicleAvailable
         z:                  70
     }
 
@@ -391,28 +292,6 @@ Item {
         visible:            !videoBackground.visible && !mapBackground.visible
     }
 
-    // Floating (Top Right) Attitude Widget
-
-    QGCAttitudeWidget {
-        id:                 attitudeWidget
-        y:                  ScreenTools.defaultFontPixelSize * (0.42)
-        size:               ScreenTools.defaultFontPixelSize * (13.3)
-        rollAngle:          roll
-        pitchAngle:         pitch
-        showPitch:          showPitchIndicator
-        anchors.right:      root.right
-        anchors.rightMargin: ScreenTools.defaultFontPixelSize * (7.1)
-        z:                  mapBackground.z + 2
-        onResetRequested: {
-            y                   = ScreenTools.defaultFontPixelSize * (0.42)
-            anchors.right       = root.right
-            anchors.rightMargin = ScreenTools.defaultFontPixelSize * (7.1)
-            size                = ScreenTools.defaultFontPixelSize * (13.3)
-            tForm.xScale        = 1
-            tForm.yScale        = 1
-        }
-    }
-
     // HUD (center) Attitude Indicator
 
     QGCAttitudeHUD {
@@ -422,6 +301,7 @@ Item {
         showPitch:          showPitchIndicator
         width:              ScreenTools.defaultFontPixelSize * (30)
         height:             ScreenTools.defaultFontPixelSize * (30)
+        active:             multiVehicleManager.activeVehicleAvailable
         z:                  20
     }
 
@@ -449,6 +329,7 @@ Item {
         width:              ScreenTools.defaultFontPixelSize * (6.25)
         airspeed:           root.airSpeed
         groundspeed:        root.groundSpeed
+        active:             multiVehicleManager.activeVehicleAvailable
         showAirSpeed:       true
         showGroundSpeed:    true
         visible:            (currentSpeed.showGroundSpeed || currentSpeed.showAirSpeed)
@@ -463,6 +344,7 @@ Item {
         vertZ:              root.climbRate
         showAltitude:       true
         showClimbRate:      true
+        active:             multiVehicleManager.activeVehicleAvailable
         visible:            (currentAltitude.showAltitude || currentAltitude.showClimbRate)
         z:                  60
     }

src/FlightMap/FlightMap.qml

@@ -46,21 +46,17 @@ Item {
     property real   longitude:          0
     property real   zoomLevel:          18
     property real   heading:            0
-    property bool   alwaysNorth:        true
     property bool   interactive:        true
-    property bool   showVehicles:       true
     property string mapName:            'defaultMap'
     property alias  mapItem:            map
     property alias  mapMenu:            mapTypeMenu
-    property alias  readOnly:           map.readOnly
+    property bool showVehicles:         false
 
     Component.onCompleted: {
         map.zoomLevel   = 18
         mapTypeMenu.update();
-        if (showVehicles) {
         addExistingVehicles()
     }
-    }
 
     //-- Menu to select supported map types
     Menu {
@@ -116,6 +112,7 @@ Item {
         }
     }
 
+/*
     function formatDistance(meters)
     {
         var dist = Math.round(meters)
@@ -134,34 +131,53 @@ Item {
         }
         return dist
     }
+*/
+
+    // The following code is used to add and remove Vehicle markers from the map. Due to the following
+    // problems this code must be here is the base FlightMap control:
+    //      - If you pass a reference to the Map control into another object and then try to call
+    //          functions such as addMapItem on it, it will fail telling you addMapItem is not a function
+    //          on that object
+    //      - Due to the fact that you need to dynamically add the MapQuickItems, they need to be able
+    //          to reference the Vehicle they are associated with in some way. In order to do that
+    //          we need to keep a separate array of Vehicles which must be at the top level of the object
+    //          hierarchy in order for the dynamically added object to see it.
+
+
+    property var _vehicles: []          ///< List of known vehicles
+    property var _vehicleMapItems: []   ///< List of known vehicle map items
+
+    Connections {
+        target: multiVehicleManager
 
-    property var vehicles: []           ///< List of known vehicles
-    property var vehicleMapItems: []    ///< List of know vehicle map items
+        onVehicleAdded:     addVehicle(vehicle)
+        onVehicleRemoved:   removeVehicle(vehicle)
+    }
 
     function addVehicle(vehicle) {
         var qmlItemTemplate = "VehicleMapItem { " +
-                                        "coordinate:    vehicles[%1].coordinate; " +
-                                        "heading:       vehicles[%1].heading " +
+                                    "coordinate:    _vehicles[%1].coordinate; " +
+                                    "heading:       _vehicles[%1].heading " +
                                 "}"
 
-            var i = vehicles.length
+        var i = _vehicles.length
         qmlItemTemplate = qmlItemTemplate.replace("%1", i)
         qmlItemTemplate = qmlItemTemplate.replace("%1", i)
 
-            vehicles.push(vehicle)
+        _vehicles.push(vehicle)
         var mapItem = Qt.createQmlObject (qmlItemTemplate, map)
-            vehicleMapItems.push(mapItem)
+        _vehicleMapItems.push(mapItem)
 
         mapItem.z = map.z + 1
         map.addMapItem(mapItem)
     }
 
     function removeVehicle(vehicle) {
-            for (var i=0; i<vehicles.length; i++) {
-                if (vehicles[i] == vehicle) {
-                    vehicle[i] = undefined
-                    map.removeMapItem(vehicleMapItems[i])
-                    vehicleMapItems[i] = undefined
+        for (var i=0; i<_vehicles.length; i++) {
+            if (_vehicles[i] == vehicle) {
+                _vehicle[i] = undefined
+                map.removeMapItem(_vehicleMapItems[i])
+                _vehicleMapItems[i] = undefined
                 break
             }
         }
@@ -173,18 +189,12 @@ Item {
         }
     }
 
+
     Plugin {
         id:   mapPlugin
         name: "QGroundControl"
     }
 
-    Connections {
-        target: multiVehicleManager
-
-        onVehicleAdded: addVehicle(vehicle)
-        onVehicleRemoved: removeVehicle(vehicle)
-    }
-
     Map {
         id: map
 
@@ -194,7 +204,6 @@ Item {
         property int    pressX : -1
         property int    pressY : -1
         property bool   changed:  false
-        property bool   readOnly: false
         property variant scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
 
         plugin:     mapPlugin
@@ -206,18 +215,7 @@ Item {
         gesture.flickDeceleration: 3000
         gesture.enabled: root.interactive
 
-        /*
-        // There is a bug currently in Qt where it fails to render a map taller than 6 tiles high. Until
-        // that's fixed, we can't rotate the map as it would require a larger map, which can easily grow
-        // larger than 6 tiles high.
-        // https://bugreports.qt.io/browse/QTBUG-45508
-        transform: Rotation {
-            origin.x: map.width  / 2
-            origin.y: map.height / 2
-            angle: map.visible ? (alwaysNorth ? 0 : -heading) : 0
-        }
-        */
-
+/*
         onWidthChanged: {
             scaleTimer.restart()
         }
@@ -229,6 +227,7 @@ Item {
         onZoomLevelChanged:{
             scaleTimer.restart()
         }
+*/
 
         MouseArea {
             anchors.fill: parent
@@ -240,6 +239,7 @@ Item {
             }
         }
 
+/*
         function calculateScale() {
             var coord1, coord2, dist, text, f
             f = 0
@@ -265,7 +265,45 @@ Item {
             scaleImage.width = (scaleImage.sourceSize.width * f) - 2 * scaleImageLeft.sourceSize.width
             scaleText.text = text
         }
+*/
+    }
+
+    Column {
+        anchors.margins:    ScreenTools.defaultFontPixelWidth
+        anchors.right:      parent.right
+        anchors.bottom:     parent.bottom
+        spacing:            ScreenTools.defaultFontPixelWidth / 2
+
+        QGCButton {
+            id:     optionsButton
+            text:   "Options"
+            menu:   mapTypeMenu
+        }
+
+        Row {
+            layoutDirection:    Qt.RightToLeft
+            spacing:            ScreenTools.defaultFontPixelWidth / 2
+
+            property real zoomIncrement: 1.0
+            property real buttonWidth: (optionsButton.width - spacing) / 2
+
+            QGCButton {
+                width:  parent.buttonWidth
+                text:   "+"
+                onClicked: map.zoomLevel = map.zoomLevel + parent.zoomIncrement
+            }
+            QGCButton {
+                width:  parent.buttonWidth
+                text:   "-"
+                onClicked: map.zoomLevel = map.zoomLevel - parent.zoomIncrement
+            }
         }
+    }
+
+/*
+
+The slider and scale display are commented out for now to try to save real estate - DonLakeFlyer
+Not sure if I'll bring them back or not. Need room for waypoint list at bottom
 
     QGCSlider {
         id: zoomSlider;
@@ -345,15 +383,12 @@ Item {
             map.calculateScale()
         }
     }
+*/
 
     onVisibleChanged: {
         adjustSize();
     }
 
-    onAlwaysNorthChanged: {
-        adjustSize();
-    }
-
     onWidthChanged: {
         adjustSize();
     }

src/FlightMap/Widgets/QGCAttitudeHUD.qml

@@ -32,11 +32,20 @@ import QGroundControl.ScreenTools 1.0
 
 Item {
     id: root
-    anchors.centerIn: parent
-    property real rollAngle :   0
-    property real pitchAngle:   0
+
+    property bool active:       false  ///< true: actively connected to data provider, false: show inactive control
+    property real rollAngle :   _defaultRollAngle
+    property real pitchAngle:   _defaultPitchAngle
     property bool showPitch:    true
 
+    readonly property real _defaultRollAngle:   0
+    readonly property real _defaultPitchAngle:  0
+
+    property real _rollAngle:   active ? rollAngle : _defaultRollAngle
+    property real _pitchAngle:  active ? pitchAngle : _defaultPitchAngle
+
+    anchors.centerIn: parent
+
     Image {
         id: rollDial
         anchors     { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter}
@@ -47,7 +56,7 @@ Item {
         transform: Rotation {
             origin.x: rollDial.width / 2
             origin.y: rollDial.height
-            angle:   -rollAngle
+            angle:   -_rollAngle
         }
     }
 
@@ -72,9 +81,9 @@ Item {
     QGCPitchIndicator {
         id:                 pitchIndicator
         anchors.verticalCenter: parent.verticalCenter
-        visible:            root.showPitch
-        pitchAngle:         root.pitchAngle
-        rollAngle:          root.rollAngle
+        visible:            showPitch
+        pitchAngle:         _pitchAngle
+        rollAngle:          _rollAngle
         color:              Qt.rgba(0,0,0,0)
         size:               ScreenTools.defaultFontPixelSize * (10)
     }

src/FlightMap/Widgets/QGCAttitudeWidget.qml

@@ -32,19 +32,27 @@ import QGroundControl.Controls 1.0
 
 QGCMovableItem {
     id: root
-    property real rollAngle:    0
-    property real pitchAngle:   0
+
+    property bool active:       false  ///< true: actively connected to data provider, false: show inactive control
+    property real rollAngle :   _defaultRollAngle
+    property real pitchAngle:   _defaultPitchAngle
     property bool showPitch:    true
     property real size
 
+    readonly property real _defaultRollAngle:   0
+    readonly property real _defaultPitchAngle:  0
+
+    property real _rollAngle:   active ? rollAngle : _defaultRollAngle
+    property real _pitchAngle:  active ? pitchAngle : _defaultPitchAngle
+
     width:  size
     height: size
 
     //----------------------------------------------------
     //-- Artificial Horizon
     QGCArtificialHorizon {
-        rollAngle:      root.rollAngle
-        pitchAngle:     root.pitchAngle
+        rollAngle:      _rollAngle
+        pitchAngle:     _pitchAngle
         anchors.fill:   parent
     }
     //----------------------------------------------------
@@ -67,7 +75,7 @@ QGCMovableItem {
         transform: Rotation {
             origin.x: root.width  / 2
             origin.y: root.height / 2
-            angle: -rollAngle
+            angle: -_rollAngle
         }
     }
     //----------------------------------------------------
@@ -77,8 +85,8 @@ QGCMovableItem {
         visible:            root.showPitch
         size:               root.size * 0.65
         anchors.verticalCenter: parent.verticalCenter
-        pitchAngle:         root.pitchAngle
-        rollAngle:          root.rollAngle
+        pitchAngle:         _pitchAngle
+        rollAngle:          _rollAngle
         color:              Qt.rgba(0,0,0,0)
     }
     //----------------------------------------------------

src/FlightMap/Widgets/QGCCompassHUD.qml

@@ -33,7 +33,14 @@ import QGroundControl.ScreenTools 1.0
 
 Item {
     id:    root
-    property real heading : 0
+
+    property bool active:   false  ///< true: actively connected to data provider, false: show inactive control
+    property real heading:  _defaultHeading
+
+    readonly property real _defaultHeading:   0
+
+    property real _heading: active ? heading : _defaultHeading
+
     Image {
         id:                 compass
         anchors.centerIn:   parent
@@ -41,12 +48,14 @@ Item {
         mipmap:             true
         width:              root.width
         fillMode:           Image.PreserveAspectFit
+
         transform: Rotation {
             origin.x:   compass.width  / 2
             origin.y:   compass.height / 2
-            angle: -heading
+            angle:      -_heading
         }
     }
+
     Image {
         id:                         pointer
         anchors.bottom:             compass.top
@@ -56,17 +65,20 @@ Item {
         width:                      compass.width * 0.1
         fillMode:                   Image.PreserveAspectFit
     }
+
     Rectangle {
         anchors.centerIn:   compass
         width:              ScreenTools.defaultFontPixelSize * (3.33)
         height:             ScreenTools.defaultFontPixelSize * (2.08)
         border.color:       Qt.rgba(1,1,1,0.15)
         color:              Qt.rgba(0,0,0,0.25)
+
         QGCLabel {
-            text: heading.toFixed(0)
+            text:               _heading.toFixed(0)
             font.weight:        Font.DemiBold
             color:              "white"
             anchors.centerIn:   parent
+            visible:            active
         }
     }
 }

src/FlightMap/Widgets/QGCCompassWidget.qml

@@ -33,9 +33,16 @@ import QGroundControl.ScreenTools 1.0
 
 QGCMovableItem {
     id:                     root
-    property real heading:  0
+
+    property bool active:   false  ///< true: actively connected to data provider, false: show inactive control
+    property real heading:  _defaultHeading
     property real size:     ScreenTools.defaultFontPixelSize * (10)
     property int _fontSize: ScreenTools.defaultFontPixelSize
+
+    readonly property real _defaultHeading:   0
+
+    property real _heading: active ? heading : _defaultHeading
+
     width:                  size
     height:                 size
     Rectangle {
@@ -53,7 +60,7 @@ QGCMovableItem {
         transform: Rotation {
             origin.x:   pointer.width  / 2
             origin.y:   pointer.height / 2
-            angle:      heading
+            angle:      _heading
         }
     }
     Image {
@@ -69,14 +76,14 @@ QGCMovableItem {
         height:             size * 0.2
         border.color:       Qt.rgba(1,1,1,0.15)
         color:              Qt.rgba(0,0,0,0.65)
+
         QGCLabel {
-            text:           heading.toFixed(0)
+            text:           _heading.toFixed(0)
             font.weight:    Font.DemiBold
             font.pixelSize: _fontSize < 1 ? 1 : _fontSize;
             color: "white"
             anchors.centerIn: parent
+            visible:        active
         }
     }
 }
-
-

src/FlightMap/Widgets/QGCCurrentAltitude.qml

@@ -33,10 +33,13 @@ import QGroundControl.ScreenTools 1.0
 
 Rectangle {
     id: root
+
+    property bool active:           false  ///< true: actively connected to data provider, false: show inactive control
     property real altitude:         0
     property real vertZ:            0
     property bool showAltitude:     true
     property bool showClimbRate:    true
+
     anchors.verticalCenter: parent.verticalCenter
     width:  parent.width
     height: (showAltitude && showClimbRate) ? ScreenTools.defaultFontPixelSize * (4.16) : ScreenTools.defaultFontPixelSize * (2.08)
@@ -47,14 +50,14 @@ Rectangle {
         anchors.centerIn: parent
         spacing: ScreenTools.defaultFontPixelSize * (0.33)
         QGCLabel {
-            text: 'h: ' + altitude.toFixed(0)
+            text: 'h: ' + (active ? altitude.toFixed(0) : "")
             font.weight: Font.DemiBold
             color: "white"
             anchors.right: parent.right
             visible: showAltitude
         }
         QGCLabel {
-            text: 'vZ: ' + vertZ.toFixed(0)
+            text: 'vZ: ' + (active ? vertZ.toFixed(0) : "")
             color: "white"
             font.weight: showAltitude ? Font.Normal : Font.DemiBold
             anchors.right: parent.right

src/FlightMap/Widgets/QGCCurrentSpeed.qml

@@ -33,10 +33,13 @@ import QGroundControl.ScreenTools 1.0
 
 Rectangle {
     id: root
+
+    property bool active:           false  ///< true: actively connected to data provider, false: show inactive control
     property real airspeed:         0
     property real groundspeed:      0
     property bool showAirSpeed:     true
     property bool showGroundSpeed:  true
+
     anchors.verticalCenter: parent.verticalCenter
     width:  parent.width
     height: (showAirSpeed && showGroundSpeed) ? ScreenTools.defaultFontPixelSize * (4.16) : ScreenTools.defaultFontPixelSize * (2.08)
@@ -47,14 +50,14 @@ Rectangle {
         anchors.centerIn: parent
         spacing: ScreenTools.defaultFontPixelSize * (0.33)
         QGCLabel {
-            text: 'GS: ' + groundspeed.toFixed(0)
+            text: 'GS: ' + (active ? groundspeed.toFixed(0) : "")
             font.weight: Font.DemiBold
             color: "white"
             anchors.right: parent.right
             visible: showGroundSpeed
         }
         QGCLabel {
-            text: 'AS: ' + airspeed.toFixed(0)
+            text: 'AS: ' + (active ? airspeed.toFixed(0) : "")
             color: "white"
             anchors.right: parent.right
             font.weight: showAirSpeed ? Font.Normal : Font.DemiBold

src/ui/MainWindow.cc

@@ -64,7 +64,8 @@ This file is part of the QGROUNDCONTROL project
 #include "Linecharts.h"
 #include "QGCTabbedInfoView.h"
 #include "UASRawStatusView.h"
-#include "FlightDisplay.h"
+#include "FlightDisplayView.h"
+#include "FlightDisplayWidget.h"
 #include "SetupView.h"
 #include "QGCUASFileViewMulti.h"
 #include "QGCApplication.h"
@@ -451,7 +452,7 @@ void MainWindow::_buildExperimentalPlanView(void)
 void MainWindow::_buildFlightView(void)
 {
     if (!_flightView) {
-        _flightView = new FlightDisplay(this);
+        _flightView = new FlightDisplayView(this);
         _flightView->setVisible(false);
     }
 }
@@ -549,7 +550,7 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
 
         widget = hddisplay;
     } else if (widgetName == _pfdDockWidgetName) {
-        widget = new FlightDisplay(this);
+        widget = new FlightDisplayWidget(this);
     } else if (widgetName == _hudDockWidgetName) {
         widget = new HUD(320,240,this);
     } else if (widgetName == _uasInfoViewDockWidgetName) {

src/ui/MainWindow.h

@@ -59,7 +59,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MainToolBar.h"
 #include "LogCompressor.h"
 
-#include "FlightDisplay.h"
+#include "FlightDisplayView.h"
 #include "QGCMAVLinkInspector.h"
 #include "QGCMAVLinkLogPlayer.h"
 #include "MAVLinkDecoder.h"
@@ -74,7 +74,6 @@ class QGCStatusBar;
 class Linecharts;
 class QGCDataPlot2D;
 class QGCUASFileViewMulti;
-class FlightDisplay;
 
 /**
  * @brief Main Application Window
@@ -126,7 +125,7 @@ public:
     MainToolBar* getMainToolBar(void) { return _mainToolBar; }
 
     /// @brief Gets a pointer to the Main Flight Display
-    FlightDisplay* getFlightDisplay() { return dynamic_cast<FlightDisplay*>(_flightView.data()); }
+    FlightDisplayView* getFlightDisplay() { return dynamic_cast<FlightDisplayView*>(_flightView.data()); }
     
     QWidget* getCurrentViewWidget(void) { return _currentViewWidget; }
 

src/ui/toolbar/MainToolBar.cc

@@ -35,7 +35,7 @@ This file is part of the QGROUNDCONTROL project
 #include "MainWindow.h"
 #include "UASMessageView.h"
 #include "UASMessageHandler.h"
-#include "FlightDisplay.h"
+#include "FlightDisplayView.h"
 #include "QGCApplication.h"
 #include "MultiVehicleManager.h"
 
@@ -154,7 +154,7 @@ void MainToolBar::onFlyView()
 
 void MainToolBar::onFlyViewMenu()
 {
-    FlightDisplay* fdsp = MainWindow::instance()->getFlightDisplay();
+    FlightDisplayView* fdsp = MainWindow::instance()->getFlightDisplay();
     if(fdsp) {
         fdsp->showOptionsMenu();
     }