From 8fcd167a0280cf87848ab051627e23de4dc4c465 Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Tue, 14 Mar 2023 08:52:23 +0000
Subject: [PATCH] rename time created into referenced time
---
.../navigation/components/graph_import_export/Component.cpp | 4 ++--
.../navigation/components/navigation_memory/Component.cpp | 6 +++---
.../gui-plugins/LocationGraphEditor/WidgetController.cpp | 4 ++--
source/armarx/navigation/memory/client/costmap/Writer.cpp | 2 +-
source/armarx/navigation/memory/client/events/Writer.cpp | 2 +-
source/armarx/navigation/memory/client/human/Reader.cpp | 4 ++--
source/armarx/navigation/memory/client/human/Writer.cpp | 4 ++--
.../navigation/memory/client/parameterization/Writer.cpp | 2 +-
.../armarx/navigation/memory/client/stack_result/Writer.cpp | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/source/armarx/navigation/components/graph_import_export/Component.cpp b/source/armarx/navigation/components/graph_import_export/Component.cpp
index b4e8cbba..44f16161 100644
--- a/source/armarx/navigation/components/graph_import_export/Component.cpp
+++ b/source/armarx/navigation/components/graph_import_export/Component.cpp
@@ -255,7 +255,7 @@ namespace armarx::navigation::components::graph_import_export
armem::EntityUpdate& update = commit.add();
update.entityID = getLocationProviderSegmentID().withEntityName(name);
- update.timeCreated = time;
+ update.referencedTime = time;
update.instancesData = {data.toAron()};
}
}
@@ -312,7 +312,7 @@ namespace armarx::navigation::components::graph_import_export
const armem::Time time = armem::Time::Now();
armem::EntityUpdate update;
update.entityID = getGraphProviderSegmentID().withEntityName(sceneName);
- update.timeCreated = time;
+ update.referencedTime = time;
update.instancesData = {aron.toAron()};
if (not tab.dryRun.getValue())
diff --git a/source/armarx/navigation/components/navigation_memory/Component.cpp b/source/armarx/navigation/components/navigation_memory/Component.cpp
index 22f674ca..e1e83c07 100644
--- a/source/armarx/navigation/components/navigation_memory/Component.cpp
+++ b/source/armarx/navigation/components/navigation_memory/Component.cpp
@@ -229,7 +229,7 @@ namespace armarx::navigation::components::navigation_memory
// send commit to memory
auto& up = c.add();
up.confidence = 1.0;
- up.timeCreated = now;
+ up.referencedTime = now;
up.timeSent = now;
up.timeArrived = now;
up.entityID = armarx::armem::MemoryID(locationMemoryIdStr);
@@ -303,7 +303,7 @@ namespace armarx::navigation::components::navigation_memory
auto& up = c.add();
up.confidence = 1.0;
- up.timeCreated = now;
+ up.referencedTime = now;
up.timeSent = now;
up.timeArrived = now;
up.entityID = providerID.withEntityName(graphName);
@@ -378,7 +378,7 @@ namespace armarx::navigation::components::navigation_memory
// send commit to memory
auto& up = c.add();
up.confidence = 1.0;
- up.timeCreated = now;
+ up.referencedTime = now;
up.timeSent = now;
up.timeArrived = now;
up.entityID = armarx::armem::MemoryID(roomMemoryIdStr);
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
index c0f9df03..5071191d 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
@@ -536,7 +536,7 @@ namespace armarx::navigation::qt_plugins::location_graph_editor
{
armem::EntityUpdate& update = commit.add();
fromAron(vertex.attrib().aron.locationID, update.entityID);
- update.timeCreated = armem::Time::Now();
+ update.referencedTime = armem::Time::Now();
navigation::location::arondto::Location dto;
dto.globalRobotPose = vertex.attrib().getPose().matrix();
@@ -574,7 +574,7 @@ namespace armarx::navigation::qt_plugins::location_graph_editor
armem::EntityUpdate update;
update.entityID = model.graphEntityID;
- update.timeCreated = armem::Time::Now();
+ update.referencedTime = armem::Time::Now();
update.instancesData = {dto.toAron()};
armem::EntityUpdateResult result = remote.graphWriter.commit(update);
diff --git a/source/armarx/navigation/memory/client/costmap/Writer.cpp b/source/armarx/navigation/memory/client/costmap/Writer.cpp
index 9fcca394..4878f44a 100644
--- a/source/armarx/navigation/memory/client/costmap/Writer.cpp
+++ b/source/armarx/navigation/memory/client/costmap/Writer.cpp
@@ -36,7 +36,7 @@ namespace armarx::navigation::memory::client::costmap
auto aronCostmap = toAron(grid);
update.instancesData = {aronCostmap};
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
ARMARX_DEBUG << "Committing " << update << " at time " << timestamp;
armem::EntityUpdateResult updateResult = memoryWriter().commit(update);
diff --git a/source/armarx/navigation/memory/client/events/Writer.cpp b/source/armarx/navigation/memory/client/events/Writer.cpp
index ebfb0449..70843668 100644
--- a/source/armarx/navigation/memory/client/events/Writer.cpp
+++ b/source/armarx/navigation/memory/client/events/Writer.cpp
@@ -145,7 +145,7 @@ namespace armarx::navigation::memory::client::events
.withProviderSegmentName(clientID)
.withEntityName(eventName)
.withTimestamp(timestamp);
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
const auto dto = core::toAron<AronEventT>(event);
diff --git a/source/armarx/navigation/memory/client/human/Reader.cpp b/source/armarx/navigation/memory/client/human/Reader.cpp
index f5b3398a..32c541f7 100644
--- a/source/armarx/navigation/memory/client/human/Reader.cpp
+++ b/source/armarx/navigation/memory/client/human/Reader.cpp
@@ -90,7 +90,7 @@ namespace armarx::navigation::memory::client::human
entitySnapshot.forEachInstance(
[&](const armem::wm::EntityInstance& entityInstance)
{
- const Duration dtToNow = timestamp - entityInstance.metadata().timeCreated;
+ const Duration dtToNow = timestamp - entityInstance.metadata().referencedTime;
if (dtToNow < maxAge and dtToNow.isPositive())
{
@@ -126,7 +126,7 @@ namespace armarx::navigation::memory::client::human
entitySnapshot.forEachInstance(
[&](const armem::wm::EntityInstance& entityInstance)
{
- const Duration dtToNow = timestamp - entityInstance.metadata().timeCreated;
+ const Duration dtToNow = timestamp - entityInstance.metadata().referencedTime;
if (dtToNow < maxAge and dtToNow.isPositive())
{
diff --git a/source/armarx/navigation/memory/client/human/Writer.cpp b/source/armarx/navigation/memory/client/human/Writer.cpp
index ef31d0aa..e452f331 100644
--- a/source/armarx/navigation/memory/client/human/Writer.cpp
+++ b/source/armarx/navigation/memory/client/human/Writer.cpp
@@ -50,7 +50,7 @@ namespace armarx::navigation::memory::client::human
});
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
ARMARX_DEBUG << "Committing " << update << " at time " << timestamp;
armem::EntityUpdateResult updateResult = memoryWriter().commit(update);
@@ -101,7 +101,7 @@ namespace armarx::navigation::memory::client::human
});
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
ARMARX_DEBUG << "Committing " << update << " at time " << timestamp;
armem::EntityUpdateResult updateResult = memoryWriter().commit(update);
diff --git a/source/armarx/navigation/memory/client/parameterization/Writer.cpp b/source/armarx/navigation/memory/client/parameterization/Writer.cpp
index 7becf03f..e12481a1 100644
--- a/source/armarx/navigation/memory/client/parameterization/Writer.cpp
+++ b/source/armarx/navigation/memory/client/parameterization/Writer.cpp
@@ -28,7 +28,7 @@ namespace armarx::navigation::memory::client::param
.withProviderSegmentName(clientID)
.withEntityName(layerName)
.withTimestamp(timestamp);
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
update.instancesData = {data};
commit.add(update);
}
diff --git a/source/armarx/navigation/memory/client/stack_result/Writer.cpp b/source/armarx/navigation/memory/client/stack_result/Writer.cpp
index 1fbdf8e1..ec0ceea3 100644
--- a/source/armarx/navigation/memory/client/stack_result/Writer.cpp
+++ b/source/armarx/navigation/memory/client/stack_result/Writer.cpp
@@ -79,7 +79,7 @@ namespace armarx::navigation::memory::client::stack_result
// FIXME create Aron type
core::toAron(aronDto, result.trajectory);
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
update.instancesData = {aronDto.toAron()};
commit.add(update);
@@ -109,7 +109,7 @@ namespace armarx::navigation::memory::client::stack_result
// FIXME create Aron type
toAron(aronDto, result.trajectory);
- update.timeCreated = timestamp;
+ update.referencedTime = timestamp;
update.instancesData = {aronDto.toAron()};
commit.add(update);
--
GitLab