Made GraspEditor part of VirtualRobot and fixed installing of ui files

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@857 042f3d55-54a8-47e9-b7fb-15903f145c44

VirtualRobot/CMakeLists.txt

@@ -93,6 +93,7 @@ Workspace/WorkspaceGrid.cpp
 Grasping/Grasp.cpp
 Grasping/GraspSet.cpp
 Grasping/BasicGraspQualityMeasure.cpp
+Grasping/GraspEditor/GraspEditorWindow.cpp
 MathTools.cpp
 Robot.cpp
 RobotConfig.cpp
@@ -116,6 +117,7 @@ SphereApproximator.cpp
 Import/SimoxXMLFactory.cpp
 Import/RobotImporterFactory.cpp
 Import/MeshImport/STLReader.cpp
+
 )
 
 if (Simox_USE_RBDL AND RBDL_FOUND)
@@ -205,6 +207,7 @@ Workspace/WorkspaceGrid.h
 Grasping/Grasp.h
 Grasping/GraspSet.h
 Grasping/BasicGraspQualityMeasure.h
+Grasping/GraspEditor/GraspEditorWindow.h
 AbstractFactoryMethod.h
 VirtualRobot.h
 MathTools.h
@@ -369,17 +372,20 @@ ADD_SUBDIRECTORY(examples/)
 
 
 # -----------------------------------------------------------------------------------
-# Adding the example GraspEditor to the library, because it is used in other projects
+# Adding the UI files to the library
+
+set(UI
+    Grasping/GraspEditor/GraspEditor.ui
+)
+QT4_WRAP_UI(UI_HEADERS ${UI})
+set(INCLUDES ${INCLUDES} ${UI_HEADERS})
+QT4_WRAP_CPP(MOC_SRC
+    Grasping/GraspEditor/GraspEditorWindow.h
+)
 
-#SET(SOURCES ${SOURCES} examples/GraspEditor/GraspEditorWindow.cpp)
-#SET(INCLUDES ${INCLUDES} examples/GraspEditor/GraspEditorWindow.h)
-#set(UI examples/GraspEditor/GraspEditor.ui)
-#QT4_WRAP_UI(UIC ${UI})
-#QT4_WRAP_CPP(MOC_SRC examples/GraspEditor/GraspEditorWindow.h)
-#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-#SET(SOURCES ${SOURCES} ${UIC} ${MOC_SRC})
+SET(SOURCES ${SOURCES} ${MOC_SRC})
 
-# Finished adding the example GraspEditor to the library
+# Finished adding UI files
 #-----------------------------------------------------------------------------------
 
 
@@ -412,9 +418,9 @@ install(TARGETS ${PROJECT_NAME}
   COMPONENT dev)
 #  PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/VirtualRobot"
  
-INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION "${Simox_INSTALL_HEADER_DIR}"
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DESTINATION "${Simox_INSTALL_HEADER_DIR}"
 	COMPONENT Headers
-       FILES_MATCHING 
+        FILES_MATCHING
         PATTERN "*.h"
         PATTERN "*.hpp"
         PATTERN ".svn" EXCLUDE

VirtualRobot/examples/GraspEditor/GraspEditorWindow.cpp → VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp

@@ -27,8 +27,7 @@
 
 #include <sstream>
 
-//#include <VirtualRobot/examples/GraspEditor/ui_GraspEditor.h>
-#include <ui_GraspEditor.h>
+#include <VirtualRobot/ui_GraspEditor.h>
 
 
 using namespace std;

VirtualRobot/examples/GraspEditor/CMakeLists.txt

@@ -9,17 +9,8 @@ INCLUDE(${Simox_DIR}/CMakeModules/SimoxMacros.cmake)
 IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
 
 	# the variable "demo_SRCS" contains all .cpp files of this project
-	FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/GraspEditor.cpp ${PROJECT_SOURCE_DIR}/GraspEditorWindow.cpp)
-	FILE(GLOB demo_INCS ${PROJECT_SOURCE_DIR}/GraspEditorWindow.h)
+        FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/GraspEditor.cpp)
 
-	################################## moc'ing ##############################
-	set(GUI_MOC_HDRS
-		${PROJECT_SOURCE_DIR}/GraspEditorWindow.h
-	)
-
-	set(GUI_UIS
-		${PROJECT_SOURCE_DIR}/GraspEditor.ui
-	)
 
 	# create the executable
 	VirtualRobotQtApplication(${PROJECT_NAME} "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")

VirtualRobot/examples/GraspEditor/GraspEditor.cpp

@@ -21,7 +21,7 @@ using namespace VirtualRobot;
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#include "GraspEditorWindow.h"
+#include <VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h>
 
 
 int main(int argc, char* argv[])