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

Use armarx::core::time::dto::DateTime in ice types

parent 86445bac
No related branches found
No related tags found
1 merge request!228Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time"
......@@ -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;
};
......
#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`.
......
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