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

Update usage of time in armem_vision

parent fd603121
No related branches found
No related tags found
No related merge requests found
......@@ -6,12 +6,14 @@
#include <RobotAPI/interface/units/LaserScannerUnit.h>
#include <RobotAPI/libraries/armem_vision/aron/LaserScan.aron.generated.h>
#include <RobotAPI/libraries/armem/core/aron_conversions.h>
#include <RobotAPI/libraries/aron/common/aron_conversions.h>
#include <RobotAPI/libraries/aron/converter/common/Converter.h>
#include <RobotAPI/libraries/aron/core/data/variant/complex/NDArray.h>
#include "types.h"
namespace armarx::armem
{
......@@ -20,7 +22,7 @@ namespace armarx::armem
{
return {.agent = aronSensorHeader.agent,
.frame = aronSensorHeader.frame,
.timestamp = aronSensorHeader.timestamp};
.timestamp = aron::fromAron<Time>(aronSensorHeader.timestamp)};
}
void fromAron(const arondto::LaserScanStamped& aronLaserScan,
......@@ -40,7 +42,7 @@ namespace armarx::armem
// laserScan = fromAron(aronLaserScan.data);
timestamp = header.timestamp.toMicroSeconds();
timestamp = header.timestamp.toMicroSecondsSinceEpoch();
frame = header.frame;
agentName = header.agent;
}
......@@ -54,7 +56,7 @@ namespace armarx::armem
int64_t toAron(const armem::Time& timestamp)
{
return timestamp.toMicroSeconds();
return timestamp.toMicroSecondsSinceEpoch();
}
arondto::SensorHeader toAron(const SensorHeader& sensorHeader)
......@@ -63,7 +65,7 @@ namespace armarx::armem
aronSensorHeader.agent = sensorHeader.agent;
aronSensorHeader.frame = sensorHeader.frame;
aronSensorHeader.timestamp = sensorHeader.timestamp;
toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
return aronSensorHeader;
}
......
......@@ -65,7 +65,7 @@ namespace armarx::armem::vision::laser_scans::client
return false;
}
const auto iceTimestamp = Time::microSeconds(timestamp);
const auto iceTimestamp = Time(Duration::MicroSeconds(timestamp));
const auto providerId = armem::MemoryID(result.segmentID);
const auto entityID =
......
......@@ -25,7 +25,7 @@ namespace armarx::armem::vision::occupancy_grid::client
return false;
}
const auto iceTimestamp = Time::microSeconds(timestamp);
const auto iceTimestamp = Time(Duration::MicroSeconds(timestamp));
const auto providerId = armem::MemoryID(result.segmentID);
const auto entityID = providerId.withEntityName(frame).withTimestamp(iceTimestamp);
......
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