From 07e7d5336dba98d5ac25a959f091c32ecdfca89a Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Tue, 19 Jul 2022 13:33:21 +0200
Subject: [PATCH] xml updates
---
.../ArmarXObjects/aron/ObjectPose.xml | 12 +++++------
.../libraries/armem/aron/MemoryLink.xml | 6 +++---
.../armem_motions/aron/MDBReference.xml | 4 ++--
.../armem_objects/aron/Attachment.xml | 6 +++---
.../armem_objects/aron/ObjectClass.xml | 20 ++++++-------------
.../armem_objects/aron/ObjectInstance.xml | 8 ++++----
.../armem_objects/server/instance/Segment.cpp | 2 +-
.../armem_reasoning/aron/Anticipation.xml | 6 +++---
.../libraries/armem_robot/aron/Robot.xml | 10 +++++-----
.../armem_robot/aron/RobotDescription.xml | 7 ++++---
.../libraries/armem_robot/aron/RobotState.xml | 2 +-
.../armem_robot_state/aron/Proprioception.xml | 4 ++--
.../armem_robot_state/aron/Transform.xml | 8 +++++---
13 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
index 714a8edc0..21b71d9a2 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
+++ b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
@@ -4,12 +4,12 @@ ARON DTO of armarx::objpose::ObjectPose.
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/aron/common/aron/OrientedBox.xml" />
- <Include package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectID.xml" />
- <Include package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectType.xml" />
- <Include package="RobotAPI" path="libraries/ArmarXObjects/aron/PoseManifoldGaussian.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/aron/common/aron/OrientedBox.xml" />
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectID.xml" />
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectType.xml" />
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/PoseManifoldGaussian.xml" />
+ </AronIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem/aron/MemoryLink.xml b/source/RobotAPI/libraries/armem/aron/MemoryLink.xml
index d38cd43a3..11060aebd 100644
--- a/source/RobotAPI/libraries/armem/aron/MemoryLink.xml
+++ b/source/RobotAPI/libraries/armem/aron/MemoryLink.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
+ </AronIncludes>
<GenerateTypes>
<Object name="armarx::armem::arondto::MemoryLink" template="T">
diff --git a/source/RobotAPI/libraries/armem_motions/aron/MDBReference.xml b/source/RobotAPI/libraries/armem_motions/aron/MDBReference.xml
index dc4428a4d..a03dc5b5d 100644
--- a/source/RobotAPI/libraries/armem_motions/aron/MDBReference.xml
+++ b/source/RobotAPI/libraries/armem_motions/aron/MDBReference.xml
@@ -3,11 +3,11 @@
<AronTypeDefinition>
<CodeIncludes>
- <Include include="<Eigen/Core>" />
+ <SystemInclude include="Eigen/Core" />
</CodeIncludes>
<AronIncludes>
- <Include include="<RobotAPI/libraries/armem/aron/MemoryID.xml>" autoinclude="true"/>
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml"/>
</AronIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml b/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml
index 43c864165..928df4b4e 100644
--- a/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml
+++ b/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml
@@ -1,9 +1,9 @@
<!--This class contains the data structure for ObjectPose -->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
+ </AronIncludes>
<GenerateTypes>
<Object name="armarx::armem::arondto::attachment::AgentDescription">
diff --git a/source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml b/source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
index cb3c418e6..a90821817 100644
--- a/source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
+++ b/source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
@@ -3,21 +3,13 @@ Core segment type of Object/Class.
-->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<RobotAPI/libraries/aron/common/aron/AxisAlignedBoundingBox.aron.generated.h>" />
- <Include include="<RobotAPI/libraries/aron/common/aron/OrientedBox.aron.generated.h>" />
- <Include include="<RobotAPI/libraries/aron/common/aron/PackagePath.aron.generated.h>" />
- <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectID.aron.generated.h>" />
- <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectNames.aron.generated.h>" />
- <Include include="<RobotAPI/libraries/armem/aron/MemoryID.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="<RobotAPI/libraries/aron/common/aron/AxisAlignedBoundingBox.xml>" />
- <Include include="<RobotAPI/libraries/aron/common/aron/OrientedBox.xml>" />
- <Include include="<RobotAPI/libraries/aron/common/aron/PackagePath.xml>" />
- <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectID.xml>" />
- <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectNames.xml>" />
- <Include include="<RobotAPI/libraries/armem/aron/MemoryID.xml>" />
+ <PackagePath package="RobotAPI" path="libraries/aron/common/aron/AxisAlignedBoundingBox.xml" />
+ <PackagePath package="RobotAPI" path="libraries/aron/common/aron/OrientedBox.xml" />
+ <PackagePath package="RobotAPI" path="libraries/aron/common/aron/PackagePath.xml" />
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectID.xml" />
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectNames.xml" />
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_objects/aron/ObjectInstance.xml b/source/RobotAPI/libraries/armem_objects/aron/ObjectInstance.xml
index 27acad2fa..03c63a12f 100644
--- a/source/RobotAPI/libraries/armem_objects/aron/ObjectInstance.xml
+++ b/source/RobotAPI/libraries/armem_objects/aron/ObjectInstance.xml
@@ -3,10 +3,10 @@ Core segment type of Object/Instance.
-->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectPose.xml" />
- <Include package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/ArmarXObjects/aron/ObjectPose.xml" />
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
+ </AronIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
index 6ba35fd20..46fe311e3 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
@@ -153,7 +153,7 @@ namespace armarx::armem::server::obj::instance
stats.numUpdated = 0;
// timestamp used to reduce the rpc calls for robot sync
- Time robotSyncTimestamp = -1;
+ Time robotSyncTimestamp = Time::Invalid();
for (const objpose::data::ProvidedObjectPose& provided : providedPoses)
{
diff --git a/source/RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml b/source/RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml
index 1767413e7..ababa79c7 100644
--- a/source/RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml
+++ b/source/RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
+ </AronIncludes>
<GenerateTypes>
<Object name='armarx::reasoning::arondto::Anticipation'>
diff --git a/source/RobotAPI/libraries/armem_robot/aron/Robot.xml b/source/RobotAPI/libraries/armem_robot/aron/Robot.xml
index 95227b98b..7303d707d 100644
--- a/source/RobotAPI/libraries/armem_robot/aron/Robot.xml
+++ b/source/RobotAPI/libraries/armem_robot/aron/Robot.xml
@@ -1,11 +1,11 @@
<!--This class contains the data structure for ObjectPose -->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/armem_robot/aron/RobotDescription.xml" />
- <Include package="RobotAPI" path="libraries/armem_robot/aron/RobotState.xml" />
- <Include package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/armem_robot/aron/RobotDescription.xml" />
+ <PackagePath package="RobotAPI" path="libraries/armem_robot/aron/RobotState.xml" />
+ <PackagePath package="RobotAPI" path="libraries/armem/aron/MemoryID.xml" />
+ </AronIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_robot/aron/RobotDescription.xml b/source/RobotAPI/libraries/armem_robot/aron/RobotDescription.xml
index 727a9b831..f3326b90e 100644
--- a/source/RobotAPI/libraries/armem_robot/aron/RobotDescription.xml
+++ b/source/RobotAPI/libraries/armem_robot/aron/RobotDescription.xml
@@ -1,9 +1,10 @@
<!--This class cotains information on how to create a VirtualRobot::Robot -->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
- <Include package="RobotAPI" path="libraries/aron/common/aron/PackagePath.xml" />
- </Includes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/aron/common/aron/PackagePath.xml" />
+ </AronIncludes>
+
<GenerateTypes>
<Object name='armarx::armem::arondto::RobotDescription'>
diff --git a/source/RobotAPI/libraries/armem_robot/aron/RobotState.xml b/source/RobotAPI/libraries/armem_robot/aron/RobotState.xml
index eaf9b41a7..d5db40210 100644
--- a/source/RobotAPI/libraries/armem_robot/aron/RobotState.xml
+++ b/source/RobotAPI/libraries/armem_robot/aron/RobotState.xml
@@ -2,7 +2,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
<CodeIncludes>
- <Include include="<Eigen/Core>" />
+ <SystemInclude include="<Eigen/Core>" />
</CodeIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_robot_state/aron/Proprioception.xml b/source/RobotAPI/libraries/armem_robot_state/aron/Proprioception.xml
index da176a1f9..c7ac7670d 100644
--- a/source/RobotAPI/libraries/armem_robot_state/aron/Proprioception.xml
+++ b/source/RobotAPI/libraries/armem_robot_state/aron/Proprioception.xml
@@ -4,8 +4,8 @@
-->
<AronTypeDefinition>
<CodeIncludes>
- <Include include="<Eigen/Core>" />
- <Include include="<Eigen/Geometry>" />
+ <SystemInclude include="Eigen/Core" />
+ <SystemInclude include="Eigen/Geometry" />
</CodeIncludes>
<GenerateTypes>
diff --git a/source/RobotAPI/libraries/armem_robot_state/aron/Transform.xml b/source/RobotAPI/libraries/armem_robot_state/aron/Transform.xml
index 6408b9a11..2fdbe01dd 100644
--- a/source/RobotAPI/libraries/armem_robot_state/aron/Transform.xml
+++ b/source/RobotAPI/libraries/armem_robot_state/aron/Transform.xml
@@ -1,10 +1,12 @@
<!--This class contains the data structure for ObjectPose -->
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <Includes>
+ <CodeIncludes>
<SystemInclude include="Eigen/Core" />
- <Include package="RobotAPI" path="libraries/armem_robot_state/aron/TransformHeader.xml" />
- </Includes>
+ </CodeIncludes>
+ <AronIncludes>
+ <PackagePath package="RobotAPI" path="libraries/armem_robot_state/aron/TransformHeader.xml" />
+ </AronIncludes>
<GenerateTypes>
<Object name="armarx::armem::arondto::Transform">
--
GitLab