Remove support for...

- Local 3d View - Custom Tool Widgets - MockUAS/MockUASManager
pupaman · Apr 27, 2015 · 2d2ed7a · 2d2ed7a
1 parent 7411b3c
commit 2d2ed7a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 150 deletions.
diff --git a/QGCApplication.pro b/QGCApplication.pro
@@ -149,11 +149,9 @@ INCLUDEPATH += \
     src/uas \
     src/ui \
     src/ui/configuration \
-    src/ui/designer \
     src/ui/flightdisplay \
     src/ui/linechart \
     src/ui/map \
-    src/ui/map3D \
     src/ui/mapdisplay \
     src/ui/mavlink \
     src/ui/mission \
@@ -168,13 +166,6 @@ FORMS += \
     src/ui/configuration/SerialSettingsDialog.ui \
     src/ui/configuration/terminalconsole.ui \
     src/ui/DebugConsole.ui \
-    src/ui/designer/QGCActionButton.ui \
-    src/ui/designer/QGCCommandButton.ui \
-    src/ui/designer/QGCParamSlider.ui \
-    src/ui/designer/QGCTextLabel.ui \
-    src/ui/designer/QGCToolWidget.ui \
-    src/ui/designer/QGCToolWidgetComboBox.ui \
-    src/ui/designer/QGCXYPlot.ui \
     src/ui/HDDisplay.ui \
     src/ui/Linechart.ui \
     src/ui/MainWindow.ui \
@@ -213,7 +204,6 @@ FORMS += \
     src/ui/QGCUASFileViewMulti.ui \
     src/ui/QGCUDPLinkConfiguration.ui \
     src/ui/QGCWaypointListMulti.ui \
-    src/ui/QMap3D.ui \
     src/ui/SerialSettings.ui \
     src/ui/SettingsDialog.ui \
     src/ui/uas/QGCUnconnectedInfoWidget.ui \
@@ -277,30 +267,17 @@ HEADERS += \
     src/QmlControls/ScreenTools.h \
     src/uas/QGCMAVLinkUASFactory.h \
     src/uas/QGCUASFileManager.h \
-    src/uas/QGCUASParamManager.h \
-    src/uas/QGCUASParamManagerInterface.h \
     src/uas/UAS.h \
     src/uas/UASInterface.h \
     src/uas/UASManager.h \
     src/uas/UASManagerInterface.h \
     src/uas/UASMessageHandler.h \
-    src/uas/UASParameterCommsMgr.h \
-    src/uas/UASParameterDataModel.h \
     src/uas/UASWaypointManager.h \
     src/ui/configuration/ApmHighlighter.h \
     src/ui/configuration/console.h \
     src/ui/configuration/SerialSettingsDialog.h \
     src/ui/configuration/terminalconsole.h \
     src/ui/DebugConsole.h \
-    src/ui/designer/QGCCommandButton.h \
-    src/ui/designer/QGCParamSlider.h \
-    src/ui/designer/QGCRadioChannelDisplay.h \
-    src/ui/designer/QGCTextLabel.h \
-    src/ui/designer/QGCToolWidget.h \
-    src/ui/designer/QGCToolWidgetComboBox.h \
-    src/ui/designer/QGCToolWidgetItem.h \
-    src/ui/designer/QGCXYPlot.h \
-    src/ui/designer/RCChannelWidget.h \
     src/ui/flightdisplay/QGCFlightDisplay.h \
     src/ui/HDDisplay.h \
     src/ui/HSIDisplay.h \
@@ -421,27 +398,15 @@ SOURCES += \
     src/QmlControls/ScreenTools.cc \
     src/uas/QGCMAVLinkUASFactory.cc \
     src/uas/QGCUASFileManager.cc \
-    src/uas/QGCUASParamManager.cc \
     src/uas/UAS.cc \
     src/uas/UASManager.cc \
     src/uas/UASMessageHandler.cc \
-    src/uas/UASParameterCommsMgr.cc \
-    src/uas/UASParameterDataModel.cc \
     src/uas/UASWaypointManager.cc \
     src/ui/configuration/ApmHighlighter.cc \
     src/ui/configuration/console.cpp \
     src/ui/configuration/SerialSettingsDialog.cc \
     src/ui/configuration/terminalconsole.cpp \
     src/ui/DebugConsole.cc \
-    src/ui/designer/QGCCommandButton.cc \
-    src/ui/designer/QGCParamSlider.cc \
-    src/ui/designer/QGCRadioChannelDisplay.cpp \
-    src/ui/designer/QGCTextLabel.cc \
-    src/ui/designer/QGCToolWidget.cc \
-    src/ui/designer/QGCToolWidgetComboBox.cc \
-    src/ui/designer/QGCToolWidgetItem.cc \
-    src/ui/designer/QGCXYPlot.cc \
-    src/ui/designer/RCChannelWidget.cc \
     src/ui/flightdisplay/QGCFlightDisplay.cc \
     src/ui/HDDisplay.cc \
     src/ui/HSIDisplay.cc \
@@ -551,11 +516,7 @@ HEADERS += \
     src/qgcunittest/FlightGearTest.h \
     src/qgcunittest/MockMavlinkFileServer.h \
     src/qgcunittest/MockMavlinkInterface.h \
-    src/qgcunittest/MockQGCUASParamManager.h \
-    src/qgcunittest/MockUAS.h \
-    src/qgcunittest/MockUASManager.h \
     src/qgcunittest/MultiSignalSpy.h \
-    src/qgcunittest/QGCUASFileManagerTest.h \
     src/qgcunittest/TCPLinkTest.h \
     src/qgcunittest/TCPLoopBackServer.h \
     src/FactSystem/FactSystemTestBase.h \
@@ -575,11 +536,7 @@ HEADERS += \
 SOURCES += \
     src/qgcunittest/FlightGearTest.cc \
     src/qgcunittest/MockMavlinkFileServer.cc \
-    src/qgcunittest/MockQGCUASParamManager.cc \
-    src/qgcunittest/MockUAS.cc \
-    src/qgcunittest/MockUASManager.cc \
     src/qgcunittest/MultiSignalSpy.cc \
-    src/qgcunittest/QGCUASFileManagerTest.cc \
     src/qgcunittest/TCPLinkTest.cc \
     src/qgcunittest/TCPLoopBackServer.cc \
     src/FactSystem/FactSystemTestBase.cc \

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
@@ -55,113 +55,6 @@ exists($$MAVLINKPATH/common) {
     error($$sprintf("MAVLink folder does not exist at '%1'! Run 'git submodule init && git submodule update' on the command line.",$$MAVLINKPATH_REL))
 }
 
-#
-# [OPTIONAL] OpenSceneGraph
-# Allow the user to override OpenSceneGraph compilation through a DISABLE_OPEN_SCENE_GRAPH
-# define like: `qmake DEFINES=DISABLE_OPEN_SCENE_GRAPH`
-contains(DEFINES, DISABLE_OPEN_SCENE_GRAPH) {
-    message("Skipping support for OpenSceneGraph (manual override from command line)")
-    DEFINES -= DISABLE_OPEN_SCENE_GRAPH
-}
-# Otherwise the user can still disable this feature in the user_config.pri file.
-else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_OPEN_SCENE_GRAPH) {
-    message("Skipping support for OpenSceneGraph (manual override from user_config.pri)")
-}
-else:MacBuild {
-    # GLUT and OpenSceneGraph are part of standard install on Mac
-	message("Including support for OpenSceneGraph")
-	CONFIG += OSGDependency
-
-    INCLUDEPATH += \
-        $$BASEDIR/libs/lib/mac64/include
-
-	LIBS += \
-        -L$$BASEDIR/libs/lib/mac64/lib \
-        -losgWidget
-} else:LinuxBuild {
-	exists(/usr/include/osg) | exists(/usr/local/include/osg) {
-		message("Including support for OpenSceneGraph")
-        CONFIG += OSGDependency
-	} else {
-		warning("Skipping support for OpenSceneGraph (missing libraries, see README)")
-	}
-} else:WindowsBuild {
-	exists($$BASEDIR/libs/lib/osg123) {
-		message("Including support for OpenSceneGraph")
-        CONFIG += OSGDependency
-
-		INCLUDEPATH += \
-            $$BASEDIR/libs/lib/osgEarth/win32/include \
-			$$BASEDIR/libs/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/include
-
-		LIBS += -L$$BASEDIR/libs/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib
-	} else {
-		warning("Skipping support for OpenSceneGraph (missing libraries, see README)")
-	}
-} else {
-    message("Skipping support for OpenSceneGraph (unsupported platform)")
-}
-
-OSGDependency {
-	DEFINES += QGC_OSG_ENABLED
-
-    LIBS += \
-        -losg \
-        -losgViewer \
-        -losgGA \
-        -losgDB \
-        -losgText \
-        -lOpenThreads
-
-    HEADERS += \
-        src/ui/map3D/gpl.h \
-        src/ui/map3D/CameraParams.h \
-        src/ui/map3D/ViewParamWidget.h \
-        src/ui/map3D/SystemContainer.h \
-        src/ui/map3D/SystemViewParams.h \
-        src/ui/map3D/GlobalViewParams.h \
-        src/ui/map3D/SystemGroupNode.h \
-        src/ui/map3D/Q3DWidget.h \
-        src/ui/map3D/GCManipulator.h \
-        src/ui/map3D/ImageWindowGeode.h \
-        src/ui/map3D/PixhawkCheetahNode.h \
-        src/ui/map3D/Pixhawk3DWidget.h \
-        src/ui/map3D/Q3DWidgetFactory.h \
-        src/ui/map3D/WebImageCache.h \
-        src/ui/map3D/WebImage.h \
-        src/ui/map3D/TextureCache.h \
-        src/ui/map3D/Texture.h \
-        src/ui/map3D/Imagery.h \
-        src/ui/map3D/HUDScaleGeode.h \
-        src/ui/map3D/WaypointGroupNode.h \
-        src/ui/map3D/TerrainParamDialog.h \
-        src/ui/map3D/ImageryParamDialog.h
-
-    SOURCES += \
-        src/ui/map3D/gpl.cc \
-        src/ui/map3D/CameraParams.cc \
-        src/ui/map3D/ViewParamWidget.cc \
-        src/ui/map3D/SystemContainer.cc \
-        src/ui/map3D/SystemViewParams.cc \
-        src/ui/map3D/GlobalViewParams.cc \
-        src/ui/map3D/SystemGroupNode.cc \
-        src/ui/map3D/Q3DWidget.cc \
-        src/ui/map3D/ImageWindowGeode.cc \
-        src/ui/map3D/GCManipulator.cc \
-        src/ui/map3D/PixhawkCheetahNode.cc \
-        src/ui/map3D/Pixhawk3DWidget.cc \
-        src/ui/map3D/Q3DWidgetFactory.cc \
-        src/ui/map3D/WebImageCache.cc \
-        src/ui/map3D/WebImage.cc \
-        src/ui/map3D/TextureCache.cc \
-        src/ui/map3D/Texture.cc \
-        src/ui/map3D/Imagery.cc \
-        src/ui/map3D/HUDScaleGeode.cc \
-        src/ui/map3D/WaypointGroupNode.cc \
-        src/ui/map3D/TerrainParamDialog.cc \
-        src/ui/map3D/ImageryParamDialog.cc
-}
-
 #
 # [REQUIRED] EIGEN matrix library
 # NOMINMAX constant required to make internal min/max work.