From 5b8f653aa712ee211107279bddf781f773f1e8ed Mon Sep 17 00:00:00 2001
From: Peter Kaiser <peter.kaiser@kit.edu>
Date: Tue, 21 Jul 2015 15:25:54 +0200
Subject: [PATCH] RobotStateComponent: Renamed base directory
---
.../RobotStateComponent/RobotStateComponentApp.h | 2 +-
source/RobotAPI/components/CMakeLists.txt | 2 +-
.../components/RobotIK/test/RobotIKTestEnvironment.h | 2 +-
.../{robotstate => RobotState}/CMakeLists.txt | 0
.../RobotStateComponent.cpp | 0
.../{robotstate => RobotState}/RobotStateComponent.h | 12 +++++++-----
.../SharedRobotServants.cpp | 0
.../{robotstate => RobotState}/SharedRobotServants.h | 0
8 files changed, 10 insertions(+), 8 deletions(-)
rename source/RobotAPI/components/{robotstate => RobotState}/CMakeLists.txt (100%)
rename source/RobotAPI/components/{robotstate => RobotState}/RobotStateComponent.cpp (100%)
rename source/RobotAPI/components/{robotstate => RobotState}/RobotStateComponent.h (95%)
rename source/RobotAPI/components/{robotstate => RobotState}/SharedRobotServants.cpp (100%)
rename source/RobotAPI/components/{robotstate => RobotState}/SharedRobotServants.h (100%)
diff --git a/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h b/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
index 5ec854e50..38fc1f7ee 100644
--- a/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
+++ b/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
@@ -24,7 +24,7 @@
#include <Core/core/application/Application.h>
-#include <RobotAPI/components/robotstate/RobotStateComponent.h>
+#include <RobotAPI/components/RobotState/RobotStateComponent.h>
namespace armarx
{
diff --git a/source/RobotAPI/components/CMakeLists.txt b/source/RobotAPI/components/CMakeLists.txt
index 5426b819f..06399d58c 100644
--- a/source/RobotAPI/components/CMakeLists.txt
+++ b/source/RobotAPI/components/CMakeLists.txt
@@ -2,6 +2,6 @@
add_subdirectory(units)
add_subdirectory(DebugDrawer)
add_subdirectory(MMMPlayer)
-add_subdirectory(robotstate)
+add_subdirectory(RobotState)
add_subdirectory(RobotIK)
diff --git a/source/RobotAPI/components/RobotIK/test/RobotIKTestEnvironment.h b/source/RobotAPI/components/RobotIK/test/RobotIKTestEnvironment.h
index 70cd7c155..5f704e781 100644
--- a/source/RobotAPI/components/RobotIK/test/RobotIKTestEnvironment.h
+++ b/source/RobotAPI/components/RobotIK/test/RobotIKTestEnvironment.h
@@ -22,7 +22,7 @@
*/
#include <RobotAPI/components/RobotIK/RobotIK.h>
-#include <RobotAPI/components/robotstate/RobotStateComponent.h>
+#include <RobotAPI/components/RobotState/RobotStateComponent.h>
#include <Core/core/test/IceTestHelper.h>
#include <Core/core/application/Application.h>
diff --git a/source/RobotAPI/components/robotstate/CMakeLists.txt b/source/RobotAPI/components/RobotState/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/components/robotstate/CMakeLists.txt
rename to source/RobotAPI/components/RobotState/CMakeLists.txt
diff --git a/source/RobotAPI/components/robotstate/RobotStateComponent.cpp b/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
similarity index 100%
rename from source/RobotAPI/components/robotstate/RobotStateComponent.cpp
rename to source/RobotAPI/components/RobotState/RobotStateComponent.cpp
diff --git a/source/RobotAPI/components/robotstate/RobotStateComponent.h b/source/RobotAPI/components/RobotState/RobotStateComponent.h
similarity index 95%
rename from source/RobotAPI/components/robotstate/RobotStateComponent.h
rename to source/RobotAPI/components/RobotState/RobotStateComponent.h
index b7fed65a8..0afb8f32c 100644
--- a/source/RobotAPI/components/robotstate/RobotStateComponent.h
+++ b/source/RobotAPI/components/RobotState/RobotStateComponent.h
@@ -39,7 +39,8 @@
namespace armarx
{
/**
- * RobotStatePropertyDefinition Property Definitions
+ * \class RobotStatePropertyDefinition
+ * \brief
*/
class RobotStatePropertyDefinitions:
public ComponentPropertyDefinitions
@@ -56,10 +57,11 @@ namespace armarx
/**
- * @class RobotStateComponent
- * @ingroup RobotAPI-Components
- * The RobotStateComponent creates an internal robot representation from
- * a VirtualRobot (see [Simox](http://simox.sourceforge.net/)) XML file.
+ * \class RobotStateComponent
+ * \ingroup RobotAPI-Components
+ * \brief Maintains a robot representation based on VirtualRobot (see [Simox](http://simox.sourceforge.net/)).
+ *
+ * The robot can be loaded from a Simox robot XML file.
* Upon request, an Ice proxy to a shared instance of this internal robot
* can be acquired through a call to RobotStateComponent::getSynchronizedRobot().
* Additionally it is possible to retrieve a proxy for robot snapshot with
diff --git a/source/RobotAPI/components/robotstate/SharedRobotServants.cpp b/source/RobotAPI/components/RobotState/SharedRobotServants.cpp
similarity index 100%
rename from source/RobotAPI/components/robotstate/SharedRobotServants.cpp
rename to source/RobotAPI/components/RobotState/SharedRobotServants.cpp
diff --git a/source/RobotAPI/components/robotstate/SharedRobotServants.h b/source/RobotAPI/components/RobotState/SharedRobotServants.h
similarity index 100%
rename from source/RobotAPI/components/robotstate/SharedRobotServants.h
rename to source/RobotAPI/components/RobotState/SharedRobotServants.h
--
GitLab