Added option to have 2D and 3D view in parallel

qgroundcontrol.pri

@@ -177,6 +177,12 @@ linux-g++ {
 
         #-lflite_cmu_us_rms \
         #-lflite_cmu_us_slt \
+
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release/.
+
 }
 
 linux-g++-64 {

src/ui/MainWindow.cc

@@ -136,8 +136,8 @@ void MainWindow::buildWidgets()
     protocolWidget    = new XMLCommProtocolWidget(this);
     dataplotWidget    = new QGCDataPlot2D(this);
     #ifdef QGC_OSG_ENABLED
-    //_3DWidget         = Q3DWidgetFactory::get("PIXHAWK");
-    _3DWidget = Q3DWidgetFactory::get("MAP3D");
+    _3DWidget         = Q3DWidgetFactory::get("PIXHAWK");
+    _3DMapWidget = Q3DWidgetFactory::get("MAP3D");
     #endif
 
     // Dock widgets
@@ -232,6 +232,7 @@ void MainWindow::arrangeCenterStack()
     if (mapWidget) centerStack->addWidget(mapWidget);
     #ifdef QGC_OSG_ENABLED
     if (_3DWidget) centerStack->addWidget(_3DWidget);
+    if (_3DMapWidget) centerStack->addWidget(_3DMapWidget);
     #endif
     if (hudWidget) centerStack->addWidget(hudWidget);
     if (dataplotWidget) centerStack->addWidget(dataplotWidget);
@@ -373,6 +374,7 @@ void MainWindow::connectActions()
     connect(ui.actionEngineerView, SIGNAL(triggered()), this, SLOT(loadEngineerView()));
     connect(ui.actionOperatorView, SIGNAL(triggered()), this, SLOT(loadOperatorView()));
     connect(ui.action3DView, SIGNAL(triggered()), this, SLOT(load3DView()));
+    connect(ui.action3DMapView, SIGNAL(triggered()), this, SLOT(load3DMapView()));
     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()));
@@ -960,6 +962,60 @@ void MainWindow::loadGlobalOperatorView()
 
 }
 
+void MainWindow::load3DMapView()
+{
+        #ifdef QGC_OSG_ENABLED
+            clearView();
+
+            // 3D map
+            if (_3DWidget)
+            {
+                QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
+                if (centerStack)
+                {
+                    //map3DWidget->setActive(true);
+                    centerStack->setCurrentWidget(_3DMapWidget);
+                }
+            }
+
+            // UAS CONTROL
+            if (controlDockWidget)
+            {
+                addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
+                controlDockWidget->show();
+            }
+
+            // UAS LIST
+            if (listDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
+                listDockWidget->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();
+                }
+            }
+#endif
+            this->show();
+
+        }
+
+
 void MainWindow::load3DView()
 {
         #ifdef QGC_OSG_ENABLED

src/ui/MainWindow.h

@@ -113,6 +113,8 @@ public slots:
     void loadOperatorView();
     /** @brief Load 3D view */
     void load3DView();
+    /** @brief Load 3D map view */
+    void load3DMapView();
     /** @brief Load view with all widgets */
     void loadAllView();
     /** @brief Load MAVLink XML generator view */
@@ -164,6 +166,7 @@ protected:
     QPointer<QGCDataPlot2D> dataplotWidget;
     #ifdef QGC_OSG_ENABLED
     QPointer<QWidget> _3DWidget;
+    QPointer<QWidget> _3DMapWidget;
     #endif
     // Dock widgets
     QPointer<QDockWidget> controlDockWidget;

src/ui/MainWindow.ui

@@ -75,6 +75,7 @@
     <addaction name="actionEngineerView"/>
     <addaction name="actionPilotView"/>
     <addaction name="actionOperatorView"/>
+    <addaction name="action3DMapView"/>
     <addaction name="action3DView"/>
     <addaction name="actionGlobalOperatorView"/>
     <addaction name="separator"/>
@@ -234,7 +235,7 @@
      <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
    </property>
    <property name="text">
-    <string>Show 3D view</string>
+    <string>Show 3D local view</string>
    </property>
    <property name="toolTip">
     <string>Show 3D view</string>
@@ -318,6 +319,15 @@
     <string>Show Global operator view</string>
    </property>
   </action>
+  <action name="action3DMapView">
+   <property name="icon">
+    <iconset resource="../../mavground.qrc">
+     <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Show 3D Globe view</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>