From b64b77d64ce4de26c0b6a05ff013bd1bdbfee159 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 30 Jul 2021 08:01:29 +0200
Subject: [PATCH] Update namespaces and includes
---
.../server/RobotStateMemory/RobotStateMemory.cpp | 4 ++--
.../server/RobotStateMemory/RobotStateMemory.h | 16 +++++++---------
.../server/proprioception/RobotStateWriter.cpp | 2 +-
.../server/proprioception/RobotStateWriter.h | 3 +--
.../server/proprioception/RobotUnitData.cpp | 2 +-
.../server/proprioception/RobotUnitData.h | 2 +-
.../server/proprioception/RobotUnitReader.cpp | 9 ++++-----
.../server/proprioception/RobotUnitReader.h | 6 ++----
.../converters/Armar6RobotUnitDataConverter.cpp | 4 ++--
.../converters/Armar6RobotUnitDataConverter.h | 15 ++-------------
.../RobotUnitDataConverterInterface.cpp | 2 +-
11 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
index c269bd56e..bb49ff310 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
@@ -38,7 +38,7 @@
#include <RobotAPI/libraries/armem_robot_state/server/common/Visu.h>
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.h>
-#include "aron_conversions.h"
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.h>
namespace armarx::armem::server::robot_state
@@ -215,7 +215,7 @@ namespace armarx::armem::server::robot_state
{
ARMARX_INFO << "Found a configuration file at: " << robotUnit.configPath;
// A simple self-made parser for the config file. Extend it if you need to.
- robotUnit.reader.configSensorMapping = RobotUnitReader::readConfig(robotUnit.configPath);
+ robotUnit.reader.configSensorMapping = proprioception::RobotUnitReader::readConfig(robotUnit.configPath);
}
else
{
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h
index 5a9f0e2e3..bde3c50aa 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h
@@ -35,13 +35,12 @@
#include <RobotAPI/libraries/armem/server/ComponentPlugin.h>
#include <RobotAPI/libraries/armem_robot_state/server/description/Segment.h>
-#include <RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.h>
#include <RobotAPI/libraries/armem_robot_state/server/localization/Segment.h>
#include <RobotAPI/libraries/armem_robot_state/server/common/Visu.h>
-
-#include "RobotUnitData.h"
-#include "RobotUnitReader.h"
-#include "RobotStateWriter.h"
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.h>
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h>
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h>
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h>
namespace armarx::plugins
@@ -49,7 +48,6 @@ namespace armarx::plugins
class DebugObserverComponentPlugin;
class RobotUnitComponentPlugin;
}
-
namespace armarx::armem::server::robot_state
{
@@ -121,11 +119,11 @@ namespace armarx::armem::server::robot_state
std::string configPath = "NO CONFIG SET";
armarx::plugins::RobotUnitComponentPlugin* plugin = nullptr;
- RobotUnitReader reader;
- RobotStateWriter writer;
+ proprioception::RobotUnitReader reader;
+ proprioception::RobotStateWriter writer;
// queue
- std::queue<RobotUnitData> dataQueue;
+ std::queue<proprioception::RobotUnitData> dataQueue;
mutable std::mutex dataMutex;
};
RobotUnit robotUnit;
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
index 39f9bc05b..ef0e82425 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
@@ -42,7 +42,7 @@
#include <RobotAPI/libraries/armem_robot_state/server/localization/Segment.h>
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
void RobotStateWriter::connect(armarx::plugins::DebugObserverComponentPlugin& debugObserver)
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h
index 319a76893..3f8d33ef8 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h
@@ -48,9 +48,8 @@ namespace armarx::armem::server::robot_state::localization
{
class Segment;
}
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
-
class RobotStateWriter : public armarx::Logging
{
public:
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp
index 9a9b72e2a..4262bf76e 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.cpp
@@ -3,7 +3,7 @@
#include <RobotAPI/libraries/aron/core/navigator/data/container/Dict.h>
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h
index 5e5f810fe..a066754e8 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h
@@ -4,7 +4,7 @@
#include <RobotAPI/libraries/armem_robot_state/aron/Proprioception.aron.generated.h>
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
struct RobotUnitData
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
index b3c7b49ba..b26ec93b6 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
@@ -1,14 +1,13 @@
#include "RobotUnitReader.h"
-#include "aron_conversions.h"
-#include "Armar6RobotUnitConverter.h"
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h>
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/aron_conversions.h>
+#include <RobotAPI/libraries/armem_robot_state/aron/Proprioception.aron.generated.h>
#include <RobotAPI/libraries/aron/core/navigator/data/container/Dict.h>
#include <RobotAPI/libraries/aron/core/navigator/data/primitive/Long.h>
#include <RobotAPI/libraries/aron/core/navigator/data/primitive/String.h>
-#include <RobotAPI/libraries/armem_robot_state/aron/Proprioception.aron.generated.h>
-
#include <RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.h>
#include <ArmarXCore/core/time/CycleUtil.h>
@@ -21,7 +20,7 @@
#include <fstream>
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
std::map<std::string, std::string> RobotUnitReader::readConfig(const std::string& configPath)
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
index 30bb083bc..97574b00b 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
@@ -14,7 +14,7 @@
#include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.h>
#include "RobotUnitData.h"
-#include "RobotUnitConverterInterface.h"
+#include "converters/RobotUnitDataConverterInterface.h"
namespace armarx::plugins
@@ -27,10 +27,8 @@ namespace armarx
using RobotUnitDataStreamingReceiverPtr = std::shared_ptr<class RobotUnitDataStreamingReceiver>;
}
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
- class Armar6RobotUnitConverter;
-
class RobotUnitReader : public armarx::Logging
{
public:
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
index 0a56703f5..6054259a5 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.cpp
@@ -1,4 +1,4 @@
-#include "Armar6RobotUnitConverter.h"
+#include "Armar6RobotUnitDataConverter.h"
#include <SimoxUtility/algorithm/get_map_keys_values.h>
#include <SimoxUtility/algorithm/advanced.h>
@@ -6,7 +6,7 @@
#include <RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.h>
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
Armar6RobotUnitConverter::Armar6RobotUnitConverter()
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h
index 0e4b1c0c7..4f9875649 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/Armar6RobotUnitDataConverter.h
@@ -7,23 +7,12 @@
#include <RobotAPI/libraries/armem_robot_state/aron/Proprioception.aron.generated.h>
-#include "RobotUnitConverterInterface.h"
+#include "RobotUnitDataConverterInterface.h"
-namespace armarx::armem::server::robot_state
+namespace armarx::armem::server::robot_state::proprioception
{
- class Setter
- {
-
- };
-
- class Vector3Setter
- {
-
- };
-
-
class Armar6RobotUnitConverter : public RobotUnitConverterInterface
{
struct Value;
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp
index b72742bbc..f4f1fb914 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.cpp
@@ -1,4 +1,4 @@
-#include "RobotUnitConverterInterface.h"
+#include "RobotUnitDataConverterInterface.h"
namespace armarx::armem::server::robot_state
--
GitLab