Merge pull request #490 from fqez/issue_442

[issue #442] Reduced uav_viewer GUI to be more usable
JdeRobot · Jun 13, 2016 · 556ff3d · 556ff3d
2 parents ea662a9 + 3f55aa3
commit 556ff3d
Show file tree

Hide file tree

Showing 9 changed files with 697 additions and 462 deletions.
diff --git a/src/stable/tools/uav_viewer/CMakeLists.txt b/src/stable/tools/uav_viewer/CMakeLists.txt
@@ -20,15 +20,12 @@ if (${QT_COMPILE} AND ${QWT_COMPILE})
 	ENDMACRO (QT4_WRAP_UI_CUSTOM)
 
 	SET(qt_SOURCES ./sensors/threadsensors.cpp ./gui/threadgui.cpp ./gui/mainwindow.cpp 
-		./gui/attitudeindicator.cpp ./gui/speedometer.cpp)
+                ./gui/attitudeindicator.cpp ./gui/speedometer.cpp gui/velwidget.cpp gui/datawidget.cpp)
 
 	SET(qt_HEADERS	./sensors/threadsensors.h ./gui/threadgui.h ./gui/mainwindow.h 
-		./gui/attitudeindicator.h ./gui/speedometer.h)
-
-	SET(qt_FORMS ./gui/mainwindow.ui)
+                ./gui/attitudeindicator.h ./gui/speedometer.h gui/velwidget.h gui/datawidget.h)
 
 	QT4_WRAP_CPP(qt_HEADERS_MOC ${qt_HEADERS})
-	QT4_WRAP_UI_CUSTOM(qt_FORMS_HEADERS ${qt_FORMS})
 	INCLUDE(${QT_USE_FILE})
 	ADD_DEFINITIONS(${QT_DEFINITIONS})
 
@@ -50,7 +47,6 @@ if (${QT_COMPILE} AND ${QWT_COMPILE})
 	add_executable(uav_viewer 
 		${SOURCE_FILES}
 		${qt_SOURCES} 
-		${qt_FORMS} 
         ${qt_HEADERS_MOC}
 		${INTERFACES_CPP_DIR})