Merge branch 'master' of git://github.com/pixhawk/qgroundcontrol

src/ui/MainWindow.cc

@@ -131,6 +131,7 @@ void MainWindow::buildWidgets()
     mapWidget         = new MapWidget(this);
     protocolWidget    = new XMLCommProtocolWidget(this);
     dataplotWidget    = new QGCDataPlot2D(this);
+    map3DWidget       = new QWidget(this); // FIXME Lionel, insert visualizer here
 
     // Dock widgets
     controlDockWidget = new QDockWidget(tr("Control"), this);
@@ -354,7 +355,7 @@ void MainWindow::connectActions()
     connect(ui.actionPilotView, SIGNAL(triggered()), this, SLOT(loadPilotView()));
     connect(ui.actionEngineerView, SIGNAL(triggered()), this, SLOT(loadEngineerView()));
     connect(ui.actionOperatorView, SIGNAL(triggered()), this, SLOT(loadOperatorView()));
-    connect(ui.actionSettingsView, SIGNAL(triggered()), this, SLOT(loadSettingsView()));
+    connect(ui.action3DView, SIGNAL(triggered()), this, SLOT(load3DView()));
     connect(ui.actionShow_full_view, SIGNAL(triggered()), this, SLOT(loadAllView()));
     connect(ui.actionShow_MAVLink_view, SIGNAL(triggered()), this, SLOT(loadMAVLinkView()));
     connect(ui.actionShow_data_analysis_view, SIGNAL(triggered()), this, SLOT(loadDataView()));
@@ -869,36 +870,56 @@ void MainWindow::loadOperatorView()
     this->show();
 }
 
-void MainWindow::loadSettingsView()
+void MainWindow::load3DView()
 {
-    clearView();
+            clearView();
 
-    // LINE CHART
-    if (linechartWidget)
-    {
-        QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
-        if (centerStack)
-        {
-            linechartWidget->setActive(true);
-            centerStack->setCurrentWidget(linechartWidget);
-        }
-    }
+            // 3D map
+            if (map3DWidget)
+            {
+                QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
+                if (centerStack)
+                {
+                    //map3DWidget->setActive(true);
+                    centerStack->setCurrentWidget(map3DWidget);
+                }
+            }
 
-    /*
-    // COMM XML
-    QDockWidget* container1 = new QDockWidget(tr("MAVLink XML to C Code Generator"), this);
-    container1->setWidget(protocol);
-    addDockWidget(Qt::LeftDockWidgetArea, container1);*/
+            // UAS CONTROL
+            if (controlDockWidget)
+            {
+                addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
+                controlDockWidget->show();
+            }
 
-    // ONBOARD PARAMETERS
-    if (parametersDockWidget)
-    {
-        addDockWidget(Qt::RightDockWidgetArea, parametersDockWidget);
-        parametersDockWidget->show();
-    }
+            // UAS LIST
+            if (listDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
+                listDockWidget->show();
+            }
 
-    this->show();
-}
+            // WAYPOINT LIST
+            if (waypointsDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, waypointsDockWidget);
+                waypointsDockWidget->show();
+            }
+
+            // HORIZONTAL SITUATION INDICATOR
+            if (hsiDockWidget)
+            {
+                HSIDisplay* hsi = dynamic_cast<HSIDisplay*>( hsiDockWidget->widget() );
+                if (hsi)
+                {
+                    hsi->start();
+                    addDockWidget(Qt::LeftDockWidgetArea, hsiDockWidget);
+                    hsiDockWidget->show();
+                }
+            }
+
+            this->show();
+        }
 
 void MainWindow::loadEngineerView()
 {

src/ui/MainWindow.h

@@ -111,8 +111,8 @@ public slots:
     void loadEngineerView();
     /** @brief Load view for operator */
     void loadOperatorView();
-    /** @brief Load view for general settings */
-    void loadSettingsView();
+    /** @brief Load 3D view */
+    void load3DView();
     /** @brief Load view with all widgets */
     void loadAllView();
     /** @brief Load MAVLink XML generator view */
@@ -160,6 +160,7 @@ protected:
     QPointer<MapWidget> mapWidget;
     QPointer<XMLCommProtocolWidget> protocolWidget;
     QPointer<QGCDataPlot2D> dataplotWidget;
+    QPointer<QWidget> map3DWidget;
     // Dock widgets
     QPointer<QDockWidget> controlDockWidget;
     QPointer<QDockWidget> infoDockWidget;

src/ui/MainWindow.ui

@@ -38,7 +38,7 @@
      <x>0</x>
      <y>0</y>
      <width>1000</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuMGround">
@@ -75,7 +75,7 @@
     <addaction name="actionEngineerView"/>
     <addaction name="actionPilotView"/>
     <addaction name="actionOperatorView"/>
-    <addaction name="actionSettingsView"/>
+    <addaction name="action3DView"/>
     <addaction name="separator"/>
     <addaction name="actionShow_MAVLink_view"/>
     <addaction name="actionShow_data_analysis_view"/>
@@ -240,13 +240,16 @@
     <string>Shop the 2D map and system status</string>
    </property>
   </action>
-  <action name="actionSettingsView">
+  <action name="action3DView">
    <property name="icon">
     <iconset resource="../../mavground.qrc">
      <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
    </property>
    <property name="text">
-    <string>Show settings view</string>
+    <string>Show 3D view</string>
+   </property>
+   <property name="toolTip">
+    <string>Show 3D view</string>
    </property>
   </action>
   <action name="actionSimulate">