Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/CMakeLists.txt

@@ -7,7 +7,7 @@ if(Eigen3_FOUND)
 endif()
 
 set(COMPONENT_LIBS
-ArmarXInterfaces
+ArmarXCoreInterfaces
 ArmarXCore
 RobotAPIInterfaces
 DebugDrawer

scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.h

@@ -24,7 +24,7 @@
 #ifndef ARMARX_COMPONENT_DebugDrawerTest_H
 #define ARMARX_COMPONENT_DebugDrawerTest_H
 
-#include <Core/core/Component.h>
+#include <ArmarXCore/core/Component.h>
 #include <RobotAPI/interface/visualization/DebugDrawerInterface.h>
 
 namespace armarx

scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h

@@ -24,7 +24,7 @@
 
 #include "DebugDrawerTest.h"
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 
 namespace armarx
 {

scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "DebugDrawerTestApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h

@@ -22,7 +22,7 @@
  */
 
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/ForceTorqueObserver.h>
 
 namespace armarx

source/RobotAPI/applications/ForceTorqueObserver/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "ForceTorqueObserverApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h

@@ -22,7 +22,7 @@
  */
 
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/ForceTorqueUnitSimulation.h>
 
 namespace armarx

source/RobotAPI/applications/HandUnitSimulation/CMakeLists.txt

@@ -9,7 +9,7 @@ if (Eigen3_FOUND)
 endif()
 
 
-set(COMPONENT_LIBS RobotAPIUnits ArmarXInterfaces ArmarXCore)
+set(COMPONENT_LIBS RobotAPIUnits ArmarXCoreInterfaces ArmarXCore)
 
 set(EXE_SOURCE main.cpp)
 

source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h

@@ -27,7 +27,7 @@
 
 #include <RobotAPI/components/units/HandUnitSimulation.h>
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 
 namespace armarx
 {

source/RobotAPI/applications/HandUnitSimulation/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "HandUnitSimulationApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/HapticObserver/HapticObserverApp.h

@@ -24,7 +24,7 @@
 #ifndef _ARMARX_APPLICATION_RobotAPI_HapticObserver_H
 #define _ARMARX_APPLICATION_RobotAPI_HapticObserver_H
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/HapticObserver.h>
 
 namespace armarx

source/RobotAPI/applications/HapticObserver/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "HapticObserverApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h

@@ -22,7 +22,7 @@
  */
 
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/HeadIKUnit.h>
 
 namespace armarx

source/RobotAPI/applications/InertialMeasurementUnitObserver/CMakeLists.txt

@@ -9,7 +9,7 @@ armarx_component_set_name("InertialMeasurementUnitObserverApp")
 #    include_directories(${MyLib_INCLUDE_DIRS})
 #endif()
 
-set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreObservers  RobotAPIUnits)
+set(COMPONENT_LIBS ArmarXCoreInterfaces ArmarXCore ArmarXCoreObservers  RobotAPIUnits)
 
 set(EXE_SOURCE InertialMeasurementUnitObserverApp.h main.cpp)
 

source/RobotAPI/applications/InertialMeasurementUnitObserver/InertialMeasurementUnitObserverApp.h

@@ -27,8 +27,8 @@
 
 #include <RobotAPI/components/units/InertialMeasurementUnitObserver.h>
 
-#include <Core/core/application/Application.h>
-#include <Core/core/Component.h>
+#include <ArmarXCore/core/application/Application.h>
+#include <ArmarXCore/core/Component.h>
 
 
 namespace armarx

source/RobotAPI/applications/InertialMeasurementUnitObserver/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "InertialMeasurementUnitObserverApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h

@@ -22,7 +22,7 @@
  */
 
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/KinematicUnitObserver.h>
 
 namespace armarx

source/RobotAPI/applications/KinematicUnitObserver/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "KinematicUnitObserverApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {

source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h

@@ -22,7 +22,7 @@
  */
 
 
-#include <Core/core/application/Application.h>
+#include <ArmarXCore/core/application/Application.h>
 #include <RobotAPI/components/units/KinematicUnitSimulation.h>
 
 namespace armarx

source/RobotAPI/applications/KinematicUnitSimulation/main.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "KinematicUnitSimulationApp.h"
-#include <Core/core/logging/Logging.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 int main(int argc, char* argv[])
 {