diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index 09a7502102c009e07733934a998385dc5703a9db..47dce8075cc3bcf7e80db2273f2a663268e91b3e 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -103,8 +103,8 @@ set(SLICE_FILES
aron/Aron.ice
armem.ice
- armem/ReadingInterface.ice
- armem/WritingInterface.ice
+ armem/ReadingMemoryInterface.ice
+ armem/WritingMemoryInterface.ice
armem/MemoryInterface.ice
armem/MemoryListenerInterface.ice
armem/MemoryNameSystemInterface.ice
diff --git a/source/RobotAPI/interface/armem.ice b/source/RobotAPI/interface/armem.ice
index a01037e52a60b33cf9422b5c69b61eeb858a4e44..c86d4d5fb6588a716a5b1f4cfe0cdbab29066bb8 100644
--- a/source/RobotAPI/interface/armem.ice
+++ b/source/RobotAPI/interface/armem.ice
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingInterface.ice>
-#include <RobotAPI/interface/armem/WritingInterface.ice>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
#include <RobotAPI/interface/armem/MemoryInterface.ice>
#include <RobotAPI/interface/armem/MemoryListenerInterface.ice>
diff --git a/source/RobotAPI/interface/armem/MemoryInterface.ice b/source/RobotAPI/interface/armem/MemoryInterface.ice
index 90be8cb274e8fa2f136c1fb63b316e2ca6700c1d..b44718d2285757e67c4edf59d8b21f41b7b97d7b 100644
--- a/source/RobotAPI/interface/armem/MemoryInterface.ice
+++ b/source/RobotAPI/interface/armem/MemoryInterface.ice
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingInterface.ice>
-#include <RobotAPI/interface/armem/WritingInterface.ice>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
module armarx
@@ -9,7 +9,7 @@ module armarx
module armem
{
- interface MemoryInterface extends ReadingInterface, WritingInterface
+ interface MemoryInterface extends ReadingMemoryInterface, WritingMemoryInterface
{
};
diff --git a/source/RobotAPI/interface/armem/ReadingInterface.ice b/source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
similarity index 82%
rename from source/RobotAPI/interface/armem/ReadingInterface.ice
rename to source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
index a50056efb2fa78671f62e6173296d352affb5e07..e38e3dc44fd96b76b218c634229a4dcbca8ef4e7 100644
--- a/source/RobotAPI/interface/armem/ReadingInterface.ice
+++ b/source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
@@ -8,7 +8,7 @@ module armarx
module armem
{
- interface ReadingInterface
+ interface ReadingMemoryInterface
{
data::QueryResult query(data::QueryInput input);
};
diff --git a/source/RobotAPI/interface/armem/WritingInterface.ice b/source/RobotAPI/interface/armem/WritingMemoryInterface.ice
similarity index 97%
rename from source/RobotAPI/interface/armem/WritingInterface.ice
rename to source/RobotAPI/interface/armem/WritingMemoryInterface.ice
index 902e80dded2f9717bd3570ca3dd1051b308b3fd0..8d586054de6e6961c1327f904d15d25a72e4fdbf 100644
--- a/source/RobotAPI/interface/armem/WritingInterface.ice
+++ b/source/RobotAPI/interface/armem/WritingMemoryInterface.ice
@@ -61,7 +61,7 @@ module armarx
}
- interface WritingInterface
+ interface WritingMemoryInterface
{
/// Register multiple core or provider segments.
data::AddSegmentsResult addSegments(data::AddSegmentsInput input);
diff --git a/source/RobotAPI/libraries/armem/client/QueryBuilder.h b/source/RobotAPI/libraries/armem/client/QueryBuilder.h
index dcfd855cc064a6addccf7b3b57c64c0b9789b4ca..2e38d09865a192123f30f061fdadeeef42d8eee5 100644
--- a/source/RobotAPI/libraries/armem/client/QueryBuilder.h
+++ b/source/RobotAPI/libraries/armem/client/QueryBuilder.h
@@ -1,7 +1,6 @@
#pragma once
#include <RobotAPI/interface/armem/query.h>
-#include <RobotAPI/interface/armem/ReadingInterface.h>
#include "../core/DataMode.h"
#include "Query.h"
diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp
index e0869b987cfb6d4280706716666ced809c8aec4f..558703dcc1cc1110dc244b6f596cb220d7996f31 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem/client/Reader.cpp
@@ -9,7 +9,7 @@
namespace armarx::armem::client
{
- Reader::Reader(ReadingInterfacePrx memory) : memory(memory)
+ Reader::Reader(ReadingMemoryInterfacePrx memory) : memory(memory)
{
}
@@ -112,7 +112,7 @@ namespace armarx::armem::client
void
- Reader::setReadingMemory(ReadingInterfacePrx memory)
+ Reader::setReadingMemory(ReadingMemoryInterfacePrx memory)
{
this->memory = memory;
}
diff --git a/source/RobotAPI/libraries/armem/client/Reader.h b/source/RobotAPI/libraries/armem/client/Reader.h
index fe293ddbabdf4aaca6856db5bd6fb99dfbe21e04..2a7e4f4c1101b5924f11f9e52faebbc8cad79dcf 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.h
+++ b/source/RobotAPI/libraries/armem/client/Reader.h
@@ -7,7 +7,7 @@
#include <vector>
// RobotAPI
-#include <RobotAPI/interface/armem/ReadingInterface.h>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.h>
#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
#include <RobotAPI/libraries/armem/memory/Memory.h>
@@ -32,7 +32,7 @@ namespace armarx::armem::client
* @brief Construct a memory reader.
* @param memory The memory proxy.
*/
- Reader(ReadingInterfacePrx memory = nullptr);
+ Reader(ReadingMemoryInterfacePrx memory = nullptr);
QueryResult query(const QueryInput& input);
@@ -50,7 +50,7 @@ namespace armarx::armem::client
void subscribe(const MemoryID& entityID, callback callback);
- void setReadingMemory(ReadingInterfacePrx memory);
+ void setReadingMemory(ReadingMemoryInterfacePrx memory);
operator bool() const
{
@@ -59,7 +59,7 @@ namespace armarx::armem::client
public:
- ReadingInterfacePrx memory;
+ ReadingMemoryInterfacePrx memory;
private:
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
index d7eeff0feb7bda07299ce6791643feef38980284..fca6d9442ba419d26a3d6ca9cda23ad90ebb436c 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
@@ -45,7 +45,7 @@ armarx::armem::client::ReaderComponentPluginUser::memoryUpdated(
void
-armarx::armem::client::ReaderComponentPluginUser::setReadingMemory(ReadingInterfacePrx memory)
+armarx::armem::client::ReaderComponentPluginUser::setReadingMemory(ReadingMemoryInterfacePrx memory)
{
memoryReader.setReadingMemory(memory);
}
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index 66c3cd3631560ba21e441edf10adf191c0a758d1..4ed9bea8fa74e455c2ccf976eb00d97b0828295c 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -49,7 +49,7 @@ namespace armarx::armem::client
protected:
- void setReadingMemory(ReadingInterfacePrx memory);
+ void setReadingMemory(ReadingMemoryInterfacePrx memory);
protected:
diff --git a/source/RobotAPI/libraries/armem/client/Writer.cpp b/source/RobotAPI/libraries/armem/client/Writer.cpp
index c7a14a15d4816e1991337c41f321188ed18ede5e..f506221179100c532d71d341b1462fa8273d5951 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.cpp
+++ b/source/RobotAPI/libraries/armem/client/Writer.cpp
@@ -8,7 +8,7 @@
namespace armarx::armem::client
{
- Writer::Writer(WritingInterfacePrx memory) : memory(memory)
+ Writer::Writer(WritingMemoryInterfacePrx memory) : memory(memory)
{
}
@@ -108,7 +108,7 @@ namespace armarx::armem::client
void
- Writer::setWritingMemory(WritingInterfacePrx memory)
+ Writer::setWritingMemory(WritingMemoryInterfacePrx memory)
{
this->memory = memory;
}
diff --git a/source/RobotAPI/libraries/armem/client/Writer.h b/source/RobotAPI/libraries/armem/client/Writer.h
index 7ed6e44a3964e4003c69e36cba1b4855d699f3fc..67e7f57d0ff3733ebf6d2e7a007309875ba5c03e 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.h
+++ b/source/RobotAPI/libraries/armem/client/Writer.h
@@ -1,6 +1,6 @@
#pragma once
-#include <RobotAPI/interface/armem/WritingInterface.h>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
@@ -19,7 +19,7 @@ namespace armarx::armem::client
* @brief Construct a memory writer.
* @param memory The memory proxy.
*/
- Writer(WritingInterfacePrx memory = nullptr);
+ Writer(WritingMemoryInterfacePrx memory = nullptr);
data::AddSegmentResult addSegment(const std::string& coreSegmentName, const std::string& providerSegmentName);
@@ -33,7 +33,7 @@ namespace armarx::armem::client
EntityUpdateResult commit(const EntityUpdate& update);
- void setWritingMemory(WritingInterfacePrx memory);
+ void setWritingMemory(WritingMemoryInterfacePrx memory);
operator bool() const
{
@@ -46,7 +46,7 @@ namespace armarx::armem::client
public:
- WritingInterfacePrx memory;
+ WritingMemoryInterfacePrx memory;
};
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
index f5c648090570b5eb0a1bf4cf6947efdce2aed9d7..5ed4dc1f79cd130f5090411c413bd5a8122c4df3 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
@@ -27,7 +27,7 @@ armarx::armem::client::WriterComponentPluginUser::~WriterComponentPluginUser()
void
-armarx::armem::client::WriterComponentPluginUser::setWritingMemory(WritingInterfacePrx memory)
+armarx::armem::client::WriterComponentPluginUser::setWritingMemory(WritingMemoryInterfacePrx memory)
{
memoryWriter.setWritingMemory(memory);
}
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index f93c9a230e26c00bd7d89d51cd37e2afd83ca27f..4f3eeb3bdcbd474bab5c1d068d31d50dc6d66f56 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -38,7 +38,7 @@ namespace armarx::armem::client
protected:
- void setWritingMemory(WritingInterfacePrx memory);
+ void setWritingMemory(WritingMemoryInterfacePrx memory);
protected: