package: move source directories into source/HumanoidRobotAPI/; adjust some...

package: move source directories into source/HumanoidRobotAPI/; adjust some #includes and rename onInit-/onConnectComponent to onInit-/onConnectStatechart


git-svn-id: https://svn.sfb588.uni-karlsruhe.de/svn/HumanoidRobotAPI@12 e7ad446d-f7d8-486a-9efb-df2f5bbea5c6

CMakeLists.txt

 # HumanoidRobotAPI
 
 cmake_minimum_required(VERSION 2.8)
-if (COMMAND cmake_policy)
-    if (POLICY CMP0011)
-        cmake_policy(SET CMP0011 NEW)
-    endif()
-endif()
 
 find_package("ArmarXCore" REQUIRED
     PATHS "$ENV{HOME}/armarx/Core/build/cmake"
@@ -17,12 +12,7 @@ include(${ArmarXCore_CMAKE_DIR}/ArmarXProject.cmake)
 
 armarx_project("HumanoidRobotAPI")
 
-
-add_subdirectory(core)
-add_subdirectory(motioncontrol)
-add_subdirectory(applications)
-#add_subdirectory(source)
-
+add_subdirectory(source)
 
 install_project()
 

applications/MotionControlTest/MotionControlTestApp.h → source/HumanoidRobotAPI/applications/MotionControlTest/MotionControlTestApp.h

@@ -23,15 +23,15 @@
 
 
 #include <Core/core/application/Application.h>
-#include <motioncontrol/MotionControl.h>
+#include <HumanoidRobotAPI/motioncontrol/MotionControl.h>
 
 namespace armarx
 {
     class MotionControlTestApp :
 		virtual public armarx::Application
 	{
-        void setup(const ManagedIceObjectRegistryInterfacePtr& registry, Ice::PropertiesPtr properties) 
-        { 
+        void setup(const ManagedIceObjectRegistryInterfacePtr& registry, Ice::PropertiesPtr properties)
+        {
             registry->addObject( Component::create<MoveHelpers::MotionControl>(properties) );
         };
     };

core/CMakeLists.txt → source/HumanoidRobotAPI/core/CMakeLists.txt

@@ -20,7 +20,6 @@ if (ARMARX_BUILD)
     set(LIB_FILES RobotStatechartContext.cpp)
     set(LIB_HEADERS RobotStatechartContext.h)
 
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
     use_ice()
 
     add_library(${LIB_NAME} SHARED ${LIB_FILES} ${LIB_HEADERS})

core/RobotStatechartContext.cpp → source/HumanoidRobotAPI/core/RobotStatechartContext.cpp

@@ -38,9 +38,9 @@ namespace armarx
     // ****************************************************************
     // Implementation of Component
     // ****************************************************************
-    void RobotStatechartContext::onInitComponent()
+    void RobotStatechartContext::onInitStatechart()
     {
-        StatechartContext::onInitComponent();
+//        StatechartContext::onInitStatechart();
         ARMARX_LOG << eINFO << "Init Armar4Context" << flush;
 
         RobotStateObjectFactories::addFactories(getIceManager()->getCommunicator());
@@ -52,9 +52,9 @@ namespace armarx
     }
 
 
-    void RobotStatechartContext::onConnectComponent()
+    void RobotStatechartContext::onConnectStatechart()
     {
-        StatechartContext::onConnectComponent();
+//        StatechartContext::onConnectStatechart();
         ARMARX_LOG << eINFO << "Starting Armar4Context" << flush;
 
         // retrieve proxies
@@ -63,7 +63,7 @@ namespace armarx
         kinematicUnitObserverPrx = getProxy<KinematicUnitObserverInterfacePrx>(kinematicUnitObserverName);
         ARMARX_LOG << eINFO << "Fetched proxies" <<  kinematicUnitPrx << " " << robotStateComponent << flush;
 
-		// initialize remote robot	
+		// initialize remote robot
         remoteRobot.reset(new RemoteRobot(robotStateComponent->getSynchronizedRobot()));
         ARMARX_LOG << eINFO << "Created remote robot" << flush;
     }

core/RobotStatechartContext.h → source/HumanoidRobotAPI/core/RobotStatechartContext.h

@@ -63,8 +63,8 @@ namespace armarx
     public:
         // inherited from Component
         virtual std::string getDefaultName() { return "RobotStatechartContext"; };
-        virtual void onInitComponent();
-        virtual void onConnectComponent();
+        virtual void onInitStatechart();
+        virtual void onConnectStatechart();
 
         // todo:read access should only be allowed via const getters ?!
         //const VirtualRobot::RobotPtr getRobot();

motioncontrol/CMakeLists.txt → source/HumanoidRobotAPI/motioncontrol/CMakeLists.txt

@@ -20,7 +20,6 @@ if (ARMARX_BUILD)
     set(LIB_FILES MotionControl.cpp)
     set(LIB_HEADERS MotionControl.h)
 
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
     use_ice()
 
     add_library(${LIB_NAME} SHARED ${LIB_FILES} ${LIB_HEADERS})

motioncontrol/MotionControl.h → source/HumanoidRobotAPI/motioncontrol/MotionControl.h

@@ -2,7 +2,7 @@
 #define MOTIONCONTROL_H
 
 #include <Core/statechart/Statechart.h>
-#include <core/RobotStatechartContext.h>
+#include <HumanoidRobotAPI/core/RobotStatechartContext.h>
 
 namespace armarx
 {