Skip to content
Snippets Groups Projects
Commit b8d0f81c authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Use AronDictDataNavigator / AronDataDict(Seq) in EntityInstance and EntityUpdate

parent f54efa6a
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ module armarx
struct EntityUpdate
{
MemoryID entityID;
aron::data::AronDataList instancesData;
aron::data::AronDataDictSeq instancesData;
long timeCreatedMicroSeconds;
float confidence = 1.0;
......
......@@ -2,7 +2,7 @@
#include <vector>
#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronDataNavigator.h>
#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronDictDataNavigator.h>
#include "../core/MemoryID.h"
#include "../core/Time.h"
......@@ -20,7 +20,7 @@ namespace armarx::armem
MemoryID entityID;
/// The entity data.
std::vector<aron::datanavigator::AronDataNavigatorPtr> instancesData;
std::vector<aron::datanavigator::AronDictDataNavigatorPtr> instancesData;
/**
* @brief Time when this entity update was created (e.g. time of image recording).
......
......@@ -23,11 +23,6 @@ namespace armarx::armem
{
}
void EntityInstance::setData(const aron::datanavigator::AronDataNavigatorPtr& data)
{
this->_data = data;
}
void EntityInstance::update(const InternalEntityUpdate& update, int index)
{
ARMARX_CHECK_FITS_SIZE(index, update.instancesData.size());
......
......@@ -3,7 +3,7 @@
#include <memory>
#include <RobotAPI/interface/aron.h>
#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronDataNavigator.h>
#include <RobotAPI/libraries/aron/aroncore/navigators/datanavigator/AronDictDataNavigator.h>
#include "../core/Time.h"
......@@ -66,11 +66,14 @@ namespace armarx::armem
return _metadata;
}
inline armarx::aron::datanavigator::AronDataNavigatorPtr data() const
inline armarx::aron::datanavigator::AronDictDataNavigatorPtr data() const
{
return _data;
}
void setData(const aron::datanavigator::AronDataNavigatorPtr& data);
void setData(const aron::datanavigator::AronDictDataNavigatorPtr& data)
{
this->_data = data;
}
......@@ -96,7 +99,7 @@ namespace armarx::armem
EntityInstanceMetadata _metadata;
/// The data. May be nullptr.
armarx::aron::datanavigator::AronDataNavigatorPtr _data;
armarx::aron::datanavigator::AronDictDataNavigatorPtr _data;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment