Skip to content
Snippets Groups Projects

Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time"

3 files
+ 29
23
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -53,14 +53,14 @@ namespace armarx::armem::robot
void fromAron(const arondto::RobotState& dto, RobotState& bo)
{
bo.timestamp = dto.timestamp;
fromAron(dto.timestamp, bo.timestamp);
bo.globalPose.matrix() = dto.globalPose;
bo.jointMap = dto.jointMap;
}
void toAron(arondto::RobotState& dto, const RobotState& bo)
{
dto.timestamp = bo.timestamp;
toAron(dto.timestamp, bo.timestamp);
dto.globalPose = bo.globalPose.matrix();
dto.jointMap = bo.jointMap;
}
@@ -97,14 +97,14 @@ namespace armarx::armem
void robot::fromAron(const objpose::arondto::ObjectPose& dto, RobotState& bo)
{
bo.timestamp = dto.timestamp;
fromAron(dto.timestamp, bo.timestamp);
bo.globalPose = dto.objectPoseGlobal;
bo.jointMap = dto.objectJointValues;
}
void robot::toAron(objpose::arondto::ObjectPose& dto, const RobotState& bo)
{
dto.timestamp = bo.timestamp;
toAron(dto.timestamp, bo.timestamp);
dto.objectPoseGlobal = bo.globalPose.matrix();
dto.objectJointValues = bo.jointMap;
}
Loading