Merge remote-tracking branch 'upstream/v10release' into v10release

qgroundcontrol.pri

@@ -92,10 +92,12 @@ macx {
     QMAKE_POST_LINK += && cp -f $$BASEDIR/images/style-outdoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
     # Copy parameter tooltip files
     QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
+    # Copy libraries
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/lib/mac32-gcc40/lib/* $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
     # Copy model files
     #QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
 
-    exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
+    #exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
     # No check for GLUT.framework since it's a MAC default
     message("Building support for OpenSceneGraph")
     DEPENDENCIES_PRESENT += osg
@@ -103,24 +105,19 @@ macx {
     # Include OpenSceneGraph libraries
     INCLUDEPATH += -framework GLUT \
             -framework Cocoa \
-            -framework OpenThreads \
-            -framework osg \
-            -framework osgViewer \
-            -framework osgGA \
-            -framework osgDB \
-            -framework osgText \
-            -framework osgWidget
+            $$BASEDIR/lib/mac32-gcc40/include
 
     LIBS += -framework GLUT \
             -framework Cocoa \
-            -framework OpenThreads \
-            -framework osg \
-            -framework osgViewer \
-            -framework osgGA \
-            -framework osgDB \
-            -framework osgText \
-            -framework osgWidget
-    }
+            -L$$BASEDIR/lib/mac32-gcc40/lib \
+            -lOpenThreads \
+            -losg \
+            -losgViewer \
+            -losgGA \
+            -losgDB \
+            -losgText \
+            -losgWidget
+    #}
 
     exists(/opt/local/include/libfreenect)|exists(/usr/local/include/libfreenect) {
     message("Building support for libfreenect")
@@ -182,15 +179,6 @@ message("Compiling for linux 32")
     DEFINES += QGC_OSG_ENABLED
     }
 
-    exists(/usr/include/osgEarth):exists(/usr/include/osg) | exists(/usr/local/include/osgEarth):exists(/usr/include/osg) {
-    message("Building support for osgEarth")
-    DEPENDENCIES_PRESENT += osgearth
-    # Include osgEarth libraries
-    LIBS += -losgEarth \
-            -losgEarthUtil
-    DEFINES += QGC_OSGEARTH_ENABLED
-    }
-
     exists(/usr/local/include/libfreenect/libfreenect.h) {
     message("Building support for libfreenect")
     DEPENDENCIES_PRESENT += libfreenect
@@ -261,15 +249,6 @@ linux-g++-64 {
     DEFINES += QGC_OSG_ENABLED
     }
 
-    exists(/usr/include/osgEarth) {
-    message("Building support for osgEarth")
-    DEPENDENCIES_PRESENT += osgearth
-    # Include osgEarth libraries
-    LIBS += -losgEarth \
-            -losgEarthUtil
-    DEFINES += QGC_OSGEARTH_ENABLED
-    }
-
     exists(/usr/local/include/libfreenect) {
     message("Building support for libfreenect")
     DEPENDENCIES_PRESENT += libfreenect

qgroundcontrol.pro

@@ -232,7 +232,8 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/map/QGCMapToolBar.ui \
     src/ui/QGCMAVLinkInspector.ui \
     src/ui/WaypointViewOnlyView.ui \    
-    src/ui/WaypointEditableView.ui
+    src/ui/WaypointEditableView.ui \    
+    src/ui/UnconnectedUASInfoWidget.ui
 INCLUDEPATH += src \
     src/ui \
     src/ui/linechart \
@@ -348,7 +349,8 @@ HEADERS += src/MG.h \
     src/ui/MAVLinkDecoder.h \
     src/ui/WaypointViewOnlyView.h \
     src/ui/WaypointViewOnlyView.h \
-    src/ui/WaypointEditableView.h
+    src/ui/WaypointEditableView.h \    
+    src/ui/UnconnectedUASInfoWidget.h
 
 # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
 macx|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
@@ -359,7 +361,6 @@ contains(DEPENDENCIES_PRESENT, osg) {
     HEADERS += src/ui/map3D/Q3DWidget.h \
         src/ui/map3D/GCManipulator.h \
         src/ui/map3D/ImageWindowGeode.h \
-        src/ui/map3D/QOSGWidget.h \
         src/ui/map3D/PixhawkCheetahGeode.h \
         src/ui/map3D/Pixhawk3DWidget.h \
         src/ui/map3D/Q3DWidgetFactory.h \
@@ -370,12 +371,6 @@ contains(DEPENDENCIES_PRESENT, osg) {
         src/ui/map3D/Imagery.h \
         src/ui/map3D/HUDScaleGeode.h \
         src/ui/map3D/WaypointGroupNode.h
-    contains(DEPENDENCIES_PRESENT, osgearth) { 
-        message("Including headers for OSGEARTH")
-        
-        # Enable only if OpenSceneGraph is available
-        HEADERS += src/ui/map3D/QMap3D.h
-    }
 }
 contains(DEPENDENCIES_PRESENT, libfreenect) { 
     message("Including headers for libfreenect")
@@ -475,7 +470,8 @@ SOURCES += src/main.cc \
     src/ui/QGCMAVLinkInspector.cc \
     src/ui/MAVLinkDecoder.cc \
     src/ui/WaypointViewOnlyView.cc \
-    src/ui/WaypointEditableView.cc
+    src/ui/WaypointEditableView.cc \
+    src/ui/UnconnectedUASInfoWidget.cc
 
 # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
 macx|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
@@ -488,7 +484,6 @@ contains(DEPENDENCIES_PRESENT, osg) {
     SOURCES += src/ui/map3D/Q3DWidget.cc \
         src/ui/map3D/ImageWindowGeode.cc \
         src/ui/map3D/GCManipulator.cc \
-        src/ui/map3D/QOSGWidget.cc \
         src/ui/map3D/PixhawkCheetahGeode.cc \
         src/ui/map3D/Pixhawk3DWidget.cc \
         src/ui/map3D/Q3DWidgetFactory.cc \

src/uas/UASWaypointManager.cc

@@ -343,7 +343,7 @@ int UASWaypointManager::setCurrentEditable(quint16 seq)
 void UASWaypointManager::addWaypointViewOnly(Waypoint *wp)
 {
     if (wp)
-    {        
+    {
         waypointsViewOnly.insert(waypointsViewOnly.size(), wp);
         connect(wp, SIGNAL(changed(Waypoint*)), this, SLOT(notifyOfChangeViewOnly(Waypoint*)));
 
@@ -451,7 +451,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile)
     QTextStream out(&file);
 
     //write the waypoint list version to the first line for compatibility check
-    out << "QGC WPL 110\r\n";
+    out << "QGC WPL 120\r\n";
 
     for (int i = 0; i < waypointsEditable.size(); i++)
     {
@@ -477,7 +477,7 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile)
 
     const QStringList &version = in.readLine().split(" ");
 
-    if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "110"))
+    if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "120"))
     {
         emit updateStatusString(tr("The waypoint file is not compatible with the current version of QGroundControl."));
     }

src/uas/UASWaypointManager.h

@@ -172,7 +172,7 @@ private:
     QVector<mavlink_mission_item_t *> waypoint_buffer;  ///< buffer for waypoints during communication
     QTimer protocol_timer;                          ///< Timer to catch timeouts
     bool standalone;                                ///< If standalone is set, do not write to UAS
-    int uasid;
+    quint16 uasid;
 };
 
 #endif // UASWAYPOINTMANAGER_H

src/ui/QGCWaypointListMulti.cc

@@ -4,12 +4,17 @@
 
 QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::QGCWaypointListMulti)
+    ui(new Ui::QGCWaypointListMulti),
+    offline_uas_id(0)
 {
     ui->setupUi(this);
     setMinimumSize(600, 80);
     connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(systemCreated(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(activeUASSet(int)), this, SLOT(systemSetActive(int)));
+
+    WaypointList* list = new WaypointList(ui->stackedWidget, NULL);
+    lists.insert(offline_uas_id, list);
+    ui->stackedWidget->addWidget(list);
 }
 
 void QGCWaypointListMulti::systemDeleted(QObject* uas)

src/ui/QGCWaypointListMulti.h

@@ -26,6 +26,7 @@ public slots:
     void systemSetActive(int uas);
 
 protected:
+    quint16 offline_uas_id;
     void changeEvent(QEvent *e);
     QMap<int, WaypointList*> lists;