From 914565812f87c6b0d773405ad74e4db59ca92caa Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 13 Jan 2021 12:35:34 +0100
Subject: [PATCH] Fix and re-enable armem components
---
source/RobotAPI/components/CMakeLists.txt | 2 +-
.../armem/ArMemExampleClient/ArMemExampleClient.cpp | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/components/CMakeLists.txt b/source/RobotAPI/components/CMakeLists.txt
index 708305542..cec5e53f7 100644
--- a/source/RobotAPI/components/CMakeLists.txt
+++ b/source/RobotAPI/components/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory(units)
-#add_subdirectory(armem)
+add_subdirectory(armem)
#add_subdirectory(aron)
add_subdirectory(ArViz)
diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
index 49c19b27d..4ebf12662 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
@@ -25,8 +25,7 @@
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/time/CycleUtil.h>
-#include <RobotAPI/interface/aron.h>
-
+#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronPrimitiveDataNavigator.h>
#include <RobotAPI/libraries/armem/component/MemoryRemoteGui.h>
#include <RobotAPI/libraries/armem/client/QueryBuilder.h>
#include <RobotAPI/libraries/armem/memory/ice_conversions.h>
@@ -295,7 +294,11 @@ namespace armarx
update.entityID = entityID;
update.timeCreated = armem::Time::now();
- update.instancesData = { new aron::data::AronData(), new aron::data::AronData() };
+ update.instancesData =
+ {
+ std::make_shared<aron::datanavigator::AronIntDataNavigator>(),
+ std::make_shared<aron::datanavigator::AronIntDataNavigator>()
+ };
ARMARX_IMPORTANT
<< "Committing:"
@@ -320,7 +323,7 @@ namespace armarx
update.timeCreated = armem::Time::now() + armem::Time::seconds(i);
for (int j = 0; j < i; ++j)
{
- update.instancesData.push_back(new aron::data::AronData());
+ update.instancesData.push_back(std::make_shared<aron::datanavigator::AronIntDataNavigator>());
}
}
ARMARX_INFO << "Commiting " << commit.updates.size() << " more updates.";
--
GitLab