From 28eaa0299ccfd04057abf879034e57d9ee63a608 Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Tue, 14 Mar 2023 11:19:40 +0000
Subject: [PATCH] also rename strings in gui and constantes
---
.../libraries/armem/core/base/EntityInstanceBase.cpp | 2 +-
.../RobotAPI/libraries/armem/core/wm/aron_conversions.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
index fc5357515..4f202b43f 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
+++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
@@ -16,7 +16,7 @@ namespace armarx::armem::base
std::ostream& armarx::armem::base::operator<<(std::ostream& os, const EntityInstanceMetadata& d)
{
os << "EntityInstanceMetadata: "
- << "\n- t_create = \t" << armem::toStringMicroSeconds(d.referencedTime) << " us"
+ << "\n- t_referenced = \t" << armem::toStringMicroSeconds(d.referencedTime) << " us"
<< "\n- t_sent = \t" << armem::toStringMicroSeconds(d.sentTime) << " us"
<< "\n- t_arrived = \t" << armem::toStringMicroSeconds(d.arrivedTime) << " us"
<< "\n- confidence = \t" << d.confidence << " us"
diff --git a/source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp b/source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
index a3b13469b..e2ceb0f2a 100644
--- a/source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
@@ -6,7 +6,7 @@
namespace armarx::armem
{
constexpr const char* DATA_WRAPPER_TIME_STORED_FIELD = "__WRITER_METADATA__TIME_STORED";
- constexpr const char* DATA_WRAPPER_TIME_CREATED_FIELD = "__ENTITY_METADATA__TIME_CREATED";
+ constexpr const char* DATA_WRAPPER_TIME_REFERENCED_FIELD = "__ENTITY_METADATA__TIME_REFERENCED";
constexpr const char* DATA_WRAPPER_TIME_SENT_FIELD = "__ENTITY_METADATA__TIME_SENT";
constexpr const char* DATA_WRAPPER_TIME_ARRIVED_FIELD = "__ENTITY_METADATA__TIME_ARRIVED";
constexpr const char* DATA_WRAPPER_CONFIDENCE_FIELD = "__ENTITY_METADATA__CONFIDENCE";
@@ -22,7 +22,7 @@ void armarx::armem::from_aron(const aron::data::DictPtr& metadata, const aron::d
e.data() = data;
- auto referencedTime = aron::data::Long::DynamicCastAndCheck(metadata->getElement(DATA_WRAPPER_TIME_CREATED_FIELD));
+ auto referencedTime = aron::data::Long::DynamicCastAndCheck(metadata->getElement(DATA_WRAPPER_TIME_REFERENCED_FIELD));
m.referencedTime = Time(Duration::MicroSeconds(referencedTime->toAronLongDTO()->value));
auto timeSent = aron::data::Long::DynamicCastAndCheck(metadata->getElement(DATA_WRAPPER_TIME_SENT_FIELD));
@@ -46,9 +46,9 @@ void armarx::armem::to_aron(aron::data::DictPtr& metadata, aron::data::DictPtr&
metadata->addElement(DATA_WRAPPER_TIME_STORED_FIELD, timeWrapped);
const wm::EntityInstanceMetadata& m = e.metadata();
- auto referencedTime = std::make_shared<aron::data::Long>(armarx::aron::Path(std::vector<std::string>{DATA_WRAPPER_TIME_CREATED_FIELD}));
+ auto referencedTime = std::make_shared<aron::data::Long>(armarx::aron::Path(std::vector<std::string>{DATA_WRAPPER_TIME_REFERENCED_FIELD}));
referencedTime->setValue(m.referencedTime.toMicroSecondsSinceEpoch());
- metadata->addElement(DATA_WRAPPER_TIME_CREATED_FIELD, referencedTime);
+ metadata->addElement(DATA_WRAPPER_TIME_REFERENCED_FIELD, referencedTime);
auto timeSent = std::make_shared<aron::data::Long>(armarx::aron::Path(std::vector<std::string>{DATA_WRAPPER_TIME_SENT_FIELD}));
timeSent->setValue(m.sentTime.toMicroSecondsSinceEpoch());
--
GitLab