From 0ed7bb594127b8259c980f7bd7259998a7cece48 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 22 Mar 2022 14:11:55 +0100
Subject: [PATCH] Use armarx::core::time::dto::DateTime in ice types
---
source/RobotAPI/interface/armem/commit.ice | 6 +++---
source/RobotAPI/interface/armem/memory.ice | 12 +++++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/source/RobotAPI/interface/armem/commit.ice b/source/RobotAPI/interface/armem/commit.ice
index 526188ecf..17260a213 100644
--- a/source/RobotAPI/interface/armem/commit.ice
+++ b/source/RobotAPI/interface/armem/commit.ice
@@ -34,10 +34,10 @@ module armarx
{
armem::data::MemoryID entityID;
aron::data::dto::AronDictSeq instancesData;
- long timeCreatedMicroSeconds;
+ armarx::core::time::dto::DateTime timeCreated;
float confidence = 1.0;
- long timeSentMicroSeconds = -1;
+ armarx::core::time::dto::DateTime timeSent;
};
sequence<EntityUpdate> EntityUpdateList;
@@ -46,7 +46,7 @@ module armarx
bool success = false;
armem::data::MemoryID snapshotID;
- long timeArrivedMicroSeconds;
+ armarx::core::time::dto::DateTime timeArrived;
string errorMessage;
};
diff --git a/source/RobotAPI/interface/armem/memory.ice b/source/RobotAPI/interface/armem/memory.ice
index a4cdd0cde..617f7043f 100644
--- a/source/RobotAPI/interface/armem/memory.ice
+++ b/source/RobotAPI/interface/armem/memory.ice
@@ -1,5 +1,7 @@
#pragma once
+#include <ArmarXCore/interface/core/time.ice>
+
#include <RobotAPI/interface/aron.ice>
@@ -15,7 +17,7 @@ module armarx
string coreSegmentName = "";
string providerSegmentName = "";
string entityName = "";
- long timestampMicroSeconds = -1;
+ armarx::core::time::dto::DateTime timestamp;
int instanceIndex = -1;
}
@@ -36,9 +38,9 @@ module armarx
/// Ice Twin of `armarx::armem::EntityInstanceMetadata`.
class EntityInstanceMetadata
{
- long timeCreatedMicroSeconds;
- long timeSentMicroSeconds;
- long timeArrivedMicroSeconds;
+ armarx::core::time::dto::DateTime timeCreated;
+ armarx::core::time::dto::DateTime timeSent;
+ armarx::core::time::dto::DateTime timeArrived;
float confidence = 1.0;
};
@@ -57,7 +59,7 @@ module armarx
{
EntityInstanceSeq instances;
};
- dictionary<long, EntitySnapshot> EntityHistory;
+ dictionary<armarx::core::time::dto::DateTime, EntitySnapshot> EntityHistory;
/// Ice Twin of `armarx::armem::Entity`.
--
GitLab