diff --git a/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt b/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt index 57878bbbdea5f9724bc16002ffaf570aa7659298..e4f5bb40c1eac258c36963b1628d716475b04826 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt +++ b/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt @@ -37,7 +37,9 @@ armarx_enable_aron_file_generation_for_target( TARGET_NAME "${LIB_NAME}" ARON_FILES + aron/ObjectID.xml aron/ObjectPose.xml + aron/OrientedBox.xml ) diff --git a/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectID.xml b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectID.xml new file mode 100644 index 0000000000000000000000000000000000000000..59fe1663561a303993f1697bf001719af5d42471 --- /dev/null +++ b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectID.xml @@ -0,0 +1,20 @@ +<!-- The ARON DTO of armarx::ObjectID. --> +<?xml version="1.0" encoding="UTF-8" ?> +<AronTypeDefinition> + <GenerateTypes> + + <Object name="armarx::arondto::ObjectID"> + <ObjectChild key='dataset'> + <string /> + </ObjectChild> + <ObjectChild key='className'> + <string /> + </ObjectChild> + <ObjectChild key='instanceName'> + <string /> + </ObjectChild> + </Object> + + </GenerateTypes> +</AronTypeDefinition> + diff --git a/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml index 441ec9b60ac7cd6cee5be2be62cf3e391b117862..51106bb79aa2ba3981231a271109fc9b3680273a 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml +++ b/source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml @@ -1,30 +1,24 @@ -<!--This class contains the data structure for ObjectPose --> +<!-- ARON DTO of armarx::objpose::ObjectPose. --> <?xml version="1.0" encoding="UTF-8" ?> <AronTypeDefinition> <CodeIncludes> <Include include="<Eigen/Core>" /> + <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectID.aron.generated.h>" /> + <Include include="<RobotAPI/libraries/ArmarXObjects/aron/OrientedBox.aron.generated.h>" /> </CodeIncludes> + <AronIncludes> + <Include include="<RobotAPI/libraries/ArmarXObjects/aron/ObjectID.xml>" /> + <Include include="<RobotAPI/libraries/ArmarXObjects/aron/OrientedBox.xml>" /> + </AronIncludes> <GenerateTypes> - <IntEnum name="armarx::objpose::aron::ObjectTypes"> - <EnumValue key="ANY_OBJECT" value="0" /> - <EnumValue key="KNOWN_OBJECT" value="1" /> - <EnumValue key="UNKNOWN_OBJECT" value="2" /> + <IntEnum name="armarx::objpose::arondto::ObjectType"> + <EnumValue key="AnyObject" value="0" /> + <EnumValue key="KnownObject" value="1" /> + <EnumValue key="UnknownObject" value="2" /> </IntEnum> - <Object name="armarx::objpose::aron::ObjectID"> - <ObjectChild key='dataset'> - <string /> - </ObjectChild> - <ObjectChild key='className'> - <string /> - </ObjectChild> - <ObjectChild key='instanceName'> - <string /> - </ObjectChild> - </Object> - - <Object name="armarx::objpose::aron::ObjectAttachmentInfo"> + <Object name="armarx::objpose::arondto::ObjectAttachmentInfo"> <ObjectChild key='frameName'> <string /> </ObjectChild> @@ -36,27 +30,18 @@ </ObjectChild> </Object> - <Object name="armarx::objpose::aron::OrientedBoundingBox"> - <ObjectChild key='centerPose'> - <Pose /> - </ObjectChild> - <ObjectChild key='extends'> - <Position /> - </ObjectChild> - </Object> - - <Object name='armarx::objpose::aron::ObjectPose'> + <Object name='armarx::objpose::arondto::ObjectPose'> <ObjectChild key='providerName'> <string /> </ObjectChild> <ObjectChild key='objectType'> - <armarx::objpose::aron::ObjectTypes /> + <armarx::objpose::arondto::ObjectType /> </ObjectChild> <ObjectChild key='objectID'> - <armarx::objpose::aron::ObjectID /> + <armarx::arondto::ObjectID /> </ObjectChild> <ObjectChild key='objectPoseRobot'> @@ -78,15 +63,18 @@ <ObjectChild key='robotConfig'> <Dict> <Float /> - </Dict> + </Dict> </ObjectChild> <ObjectChild key='robotPose'> <Pose /> </ObjectChild> + <ObjectChild key='attachmentValid'> + <bool /> + </ObjectChild> <ObjectChild key='attachment'> - <armarx::objpose::aron::ObjectAttachmentInfo /> + <armarx::objpose::arondto::ObjectAttachmentInfo /> </ObjectChild> <ObjectChild key='confidence'> @@ -96,9 +84,12 @@ <ObjectChild key='timestamp'> <Time /> </ObjectChild> - + + <ObjectChild key='localOOBBValid'> + <bool /> + </ObjectChild> <ObjectChild key='localOOBB'> - <armarx::objpose::aron::OrientedBoundingBox /> + <simox::arondto::OrientedBox /> </ObjectChild> </Object> diff --git a/source/RobotAPI/libraries/ArmarXObjects/aron/OrientedBox.xml b/source/RobotAPI/libraries/ArmarXObjects/aron/OrientedBox.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ecf50c4066c3ed32d4edeecc71a065530576266 --- /dev/null +++ b/source/RobotAPI/libraries/ArmarXObjects/aron/OrientedBox.xml @@ -0,0 +1,20 @@ +<!-- The ARON DTO of simox::OrientedBoxf. --> +<?xml version="1.0" encoding="UTF-8" ?> +<AronTypeDefinition> + <CodeIncludes> + <Include include="<Eigen/Core>" /> + </CodeIncludes> + <GenerateTypes> + + <Object name="simox::arondto::OrientedBox"> + <ObjectChild key='centerPose'> + <Pose /> + </ObjectChild> + <ObjectChild key='extends'> + <Position /> + </ObjectChild> + </Object> + + </GenerateTypes> +</AronTypeDefinition> +