From 899cd0a0763eef84db866371efa2492a6653cf75 Mon Sep 17 00:00:00 2001
From: "fabian.peller-konrad@kit.edu" <fabian.peller-konrad@kit.edu>
Date: Wed, 3 Mar 2021 22:58:44 +0100
Subject: [PATCH] fix build errors
---
.../components/armem/client/ExampleClient/ExampleClient.cpp | 2 +-
.../armem/server/ExampleMemory/aron/ExampleData.xml | 6 ++----
.../armem/server/ExampleMemory/test/ExampleMemoryTest.cpp | 2 +-
source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp | 5 ++---
source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp | 3 +--
.../RobotAPI/libraries/armem_gui/instance/InstanceView.cpp | 4 ++--
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.cpp b/source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.cpp
index b69d0aa53..2b3d2f011 100644
--- a/source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleClient/ExampleClient.cpp
@@ -349,7 +349,7 @@ namespace armarx
{ "three", 3 },
};
{
- CByteImage& image = *data.the_ivt_image;
+ CByteImage& image = data.the_ivt_image;
image.Set(20, 10, CByteImage::ImageType::eRGB24);
simox::ColorMap cmap = simox::color::cmaps::plasma();
cmap.set_vmax(image.width + image.height);
diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml b/source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml
index 25a8fe286..7acb4e6d4 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml
@@ -6,7 +6,7 @@
<Include include="<Image/ByteImage.h>" />
</CodeIncludes>
<GenerateTypes>
- <GenerateType name='armarx::armem::example::ExampleData'>
+ <Object name='armarx::armem::example::ExampleData'>
<ObjectChild key='the_int'>
<Int />
</ObjectChild>
@@ -26,7 +26,6 @@
<Bool />
</ObjectChild>
-
<ObjectChild key='the_eigen_position'>
<EigenMatrix rows="3" cols="1" type="float" />
</ObjectChild>
@@ -37,7 +36,6 @@
<IVTCByteImage type="GrayScale" />
</ObjectChild>
-
<ObjectChild key='the_float_list'>
<List>
<Float />
@@ -81,6 +79,6 @@
</Dict>
</ObjectChild>
- </GenerateType>
+ </Object>
</GenerateTypes>
</AronTypeDefinition>
diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
index 78e26f122..6cc169273 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(test_ExampleData_type)
{
armarx::aron::typenavigator::ObjectNavigatorPtr type = ExampleData::toInitialAronType();
- BOOST_CHECK_EQUAL(type->getAcceptedTypes().size(), 15);
+ BOOST_CHECK_EQUAL(type->childrenSize(), 15);
armem::Memory memory;
armem::CoreSegment& core = memory.addCoreSegment("ExampleData", type);
diff --git a/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
index 13c097c4a..dea566c5e 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
@@ -31,14 +31,13 @@
#include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
#include <RobotAPI/libraries/aron/core/navigator/type/AllNavigators.h>
#include <RobotAPI/libraries/armem/core/io/MemoryFileSystemStorage.h>
-#include <RobotAPI/libraries/aron/core/AronRandomizer.h>
+#include <RobotAPI/libraries/aron/core/Randomizer.h>
#include <RobotAPI/libraries/aron/core/Debug.h>
#include <filesystem>
#include <iostream>
-
namespace armem = armarx::armem;
namespace aron = armarx::aron;
namespace fs = std::filesystem;
@@ -76,7 +75,7 @@ namespace ArMemLTMTest
unsigned int numSnapshots,
unsigned int numInstances)
{
- aron::AronRandomizer r;
+ aron::Randomizer r;
armem::Memory memory(memoryName);
BOOST_CHECK_EQUAL(memory.name(), memoryName);
diff --git a/source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp
index c288a63d2..b7ba95c63 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp
@@ -31,8 +31,7 @@
#include <iostream>
-#include <RobotAPI/libraries/aron/core/navigator/data/DictNavigator.h>
-
+#include <RobotAPI/libraries/aron/core/navigator/data/container/Dict.h>
namespace armem = armarx::armem;
namespace aron = armarx::aron;
diff --git a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
index c2fc15391..a5c4f41bd 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
@@ -15,7 +15,7 @@
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-#include <RobotAPI/libraries/aron/core/navigator/data/NDArrayNavigator.h>
+#include <RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.h>
#include <RobotAPI/libraries/aron/core/navigator/type/container/Object.h>
#include <RobotAPI/libraries/armem_gui/gui_utils.h>
@@ -208,7 +208,7 @@ namespace armarx::armem::gui::instance
aron::type::Descriptor type = static_cast<aron::type::Descriptor>(item->data(int(Columns::TYPE), Qt::UserRole).toInt());
switch (type)
{
- case aron::type::Descriptor::eIVTCByteImageType:
+ case aron::type::Descriptor::eIVTCByteImage:
{
QStringList qpath = item->data(int(Columns::KEY), Qt::UserRole).toStringList();
aron::Path path = InstanceTreeTypedDataVisitor::deserializePath(qpath);
--
GitLab