From f2a063f820affee58638e9755ce0964b6739e942 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 22 Mar 2022 14:15:56 +0100
Subject: [PATCH] Update usage of time in armem_skills
---
.../server/segment/ExecutableSkillLibrarySegment.cpp | 2 +-
.../libraries/armem_skills/server/segment/SkillEventSegment.cpp | 2 +-
.../server/segment/SkillExecutionRequestSegment.cpp | 2 +-
.../armem_skills/server/segment/StatechartListenerSegment.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp
index 1419ddf44..3af3b0eb1 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp
@@ -43,7 +43,7 @@ namespace armarx::skills::segment
armem::Commit commit;
auto& entityUpdate = commit.add();
entityUpdate.confidence = 1.0;
- entityUpdate.timeCreated = armem::Time::now();
+ entityUpdate.timeCreated = armem::Time::Now();
entityUpdate.instancesData = {skillDescription.toAron()};
entityUpdate.entityID = provId.withEntityName(skillDescription.skillName);
diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/SkillEventSegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/SkillEventSegment.cpp
index 43e314fc8..3c9afac1f 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/SkillEventSegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/SkillEventSegment.cpp
@@ -60,7 +60,7 @@ namespace armarx::skills::segment
armem::Commit comm;
auto& entityUpdate = comm.add();
entityUpdate.confidence = 1.0;
- entityUpdate.timeCreated = armem::Time::now();
+ entityUpdate.timeCreated = armem::Time::Now();
entityUpdate.instancesData = { aron };
entityUpdate.entityID = commitId;
diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/SkillExecutionRequestSegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/SkillExecutionRequestSegment.cpp
index 5068cb04d..784d56f17 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/SkillExecutionRequestSegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/SkillExecutionRequestSegment.cpp
@@ -68,7 +68,7 @@ namespace armarx::skills::segment
entityUpdate.entityID = skillExecutionMemID;
entityUpdate.instancesData = { aron };
entityUpdate.confidence = 1.0;
- entityUpdate.timeCreated = armem::Time::now();
+ entityUpdate.timeCreated = armem::Time::Now();
iceMemory.commit(comm);
}
diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/StatechartListenerSegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/StatechartListenerSegment.cpp
index cee0e3a18..46629f7cd 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/StatechartListenerSegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/StatechartListenerSegment.cpp
@@ -26,7 +26,7 @@ namespace armarx::skills::segment
void StatechartListenerProviderSegment::reportStatechartTransitionWithParameters(const ProfilerStatechartTransitionWithParameters& t)
{
const std::string& entityName = getStatechartName(t.targetStateIdentifier);
- IceUtil::Time transitionTime = IceUtil::Time::microSeconds(t.timestamp);
+ armem::Time transitionTime = armem::Time(armem::Duration::MicroSeconds(t.timestamp));
armem::EntityUpdate update;
update.entityID = segmentPtr->id().withEntityName(entityName);
--
GitLab