From c4309b6e3e1017f71e891067ce9b5c978c841b64 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 30 Jul 2021 08:04:04 +0200
Subject: [PATCH] Update class names
---
.../proprioception/RobotStateWriter.cpp | 9 +++------
.../server/proprioception/RobotUnitReader.cpp | 2 +-
.../server/proprioception/RobotUnitReader.h | 2 +-
.../Armar6RobotUnitDataConverter.cpp | 20 +++++++++----------
.../converters/Armar6RobotUnitDataConverter.h | 6 +++---
.../RobotUnitDataConverterInterface.cpp | 2 +-
.../RobotUnitDataConverterInterface.h | 4 ++--
7 files changed, 21 insertions(+), 24 deletions(-)
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 ef0e82425..99592121e 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp
@@ -47,12 +47,9 @@ namespace armarx::armem::server::robot_state::proprioception
void RobotStateWriter::connect(armarx::plugins::DebugObserverComponentPlugin& debugObserver)
{
- {
- // Thread-local copy of debug observer helper.
- this->debugObserver = DebugObserverHelper(
- Logging::tag.tagName, debugObserver.getDebugObserver(), true
- );
- }
+ // Thread-local copy of debug observer helper.
+ this->debugObserver =
+ DebugObserverHelper(Logging::tag.tagName, debugObserver.getDebugObserver(), true);
}
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 b26ec93b6..c0856f4da 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
@@ -63,7 +63,7 @@ namespace armarx::armem::server::robot_state::proprioception
RobotUnitReader::RobotUnitReader() :
- converter(new Armar6RobotUnitConverter())
+ converter(new Armar6RobotUnitDataConverter())
{
}
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 97574b00b..6301db171 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h
@@ -77,7 +77,7 @@ namespace armarx::armem::server::robot_state::proprioception
/// RobotUnit name -> group name.
std::map<std::string, std::string> configSensorMapping;
- std::unique_ptr<RobotUnitConverterInterface> converter;
+ std::unique_ptr<RobotUnitDataConverterInterface> converter;
armarx::SimpleRunningTask<>::pointer_type task = nullptr;
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 6054259a5..292bd120f 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
@@ -9,7 +9,7 @@
namespace armarx::armem::server::robot_state::proprioception
{
- Armar6RobotUnitConverter::Armar6RobotUnitConverter()
+ Armar6RobotUnitDataConverter::Armar6RobotUnitDataConverter()
{
{
vector3fSetters["X"] = [](Eigen::Vector3f & v, float f)
@@ -159,12 +159,12 @@ namespace armarx::armem::server::robot_state::proprioception
}
- Armar6RobotUnitConverter::~Armar6RobotUnitConverter()
+ Armar6RobotUnitDataConverter::~Armar6RobotUnitDataConverter()
{
}
- arondto::Proprioception Armar6RobotUnitConverter::convert(
+ arondto::Proprioception Armar6RobotUnitDataConverter::convert(
const RobotUnitDataStreaming::TimeStep& data,
const RobotUnitDataStreaming::DataStreamingDescription& description)
{
@@ -179,10 +179,10 @@ namespace armarx::armem::server::robot_state::proprioception
}
- void Armar6RobotUnitConverter::process(
+ void Armar6RobotUnitDataConverter::process(
arondto::Proprioception dto,
const std::string& entryName,
- const Armar6RobotUnitConverter::Value& value)
+ const Armar6RobotUnitDataConverter::Value& value)
{
const std::vector<std::string> split = simox::alg::split(entryName, ".", false, false);
ARMARX_CHECK_GREATER_EQUAL(split.size(), 3);
@@ -273,7 +273,7 @@ namespace armarx::armem::server::robot_state::proprioception
}
- void Armar6RobotUnitConverter::processPlatformEntry(
+ void Armar6RobotUnitDataConverter::processPlatformEntry(
prop::arondto::Platform& dto,
const std::string& fieldName,
const Value& value)
@@ -300,7 +300,7 @@ namespace armarx::armem::server::robot_state::proprioception
}
- void Armar6RobotUnitConverter::processForceTorqueEntry(
+ void Armar6RobotUnitDataConverter::processForceTorqueEntry(
std::map<std::string, prop::arondto::ForceTorque>& fts,
const std::vector<std::string>& split,
const Value& value)
@@ -318,7 +318,7 @@ namespace armarx::armem::server::robot_state::proprioception
}
- void Armar6RobotUnitConverter::processForceTorqueEntry(
+ void Armar6RobotUnitDataConverter::processForceTorqueEntry(
prop::arondto::ForceTorque& dto,
const std::vector<std::string>& split,
const Value& value)
@@ -345,7 +345,7 @@ namespace armarx::armem::server::robot_state::proprioception
}
- bool Armar6RobotUnitConverter::processJointEntry(
+ bool Armar6RobotUnitDataConverter::processJointEntry(
prop::arondto::Joints& dto,
const std::vector<std::string>& split,
const Value& value)
@@ -387,7 +387,7 @@ namespace armarx::armem::server::robot_state::proprioception
template<class T>
- T Armar6RobotUnitConverter::getValueAs(const Value& value)
+ T Armar6RobotUnitDataConverter::getValueAs(const Value& value)
{
return RobotUnitDataStreamingReceiver::GetAs<T>(value.data, value.entry);
}
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 4f9875649..71d06cfb2 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
@@ -13,14 +13,14 @@
namespace armarx::armem::server::robot_state::proprioception
{
- class Armar6RobotUnitConverter : public RobotUnitConverterInterface
+ class Armar6RobotUnitDataConverter : public RobotUnitDataConverterInterface
{
struct Value;
public:
- Armar6RobotUnitConverter();
- virtual ~Armar6RobotUnitConverter() override;
+ Armar6RobotUnitDataConverter();
+ virtual ~Armar6RobotUnitDataConverter() override;
arondto::Proprioception convert(
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 f4f1fb914..740f37b3b 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
@@ -4,7 +4,7 @@
namespace armarx::armem::server::robot_state
{
- RobotUnitConverterInterface::~RobotUnitConverterInterface()
+ RobotUnitDataConverterInterface::~RobotUnitDataConverterInterface()
{
}
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h
index f7ba3fcbf..7ff34a1dc 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/proprioception/converters/RobotUnitDataConverterInterface.h
@@ -14,11 +14,11 @@ namespace armarx::armem::arondto
namespace armarx::armem::server::robot_state
{
- class RobotUnitConverterInterface
+ class RobotUnitDataConverterInterface
{
public:
- virtual ~RobotUnitConverterInterface();
+ virtual ~RobotUnitDataConverterInterface();
virtual arondto::Proprioception convert(
const RobotUnitDataStreaming::TimeStep& data,
--
GitLab