diff --git a/source/RobotAPI/libraries/armem_objects/CMakeLists.txt b/source/RobotAPI/libraries/armem_objects/CMakeLists.txt index ed02a9adf315ef755af2c8da64d4a37c3d4817b6..30a1f2ef68e625ce9b6ed210defb365e6b89ebf1 100644 --- a/source/RobotAPI/libraries/armem_objects/CMakeLists.txt +++ b/source/RobotAPI/libraries/armem_objects/CMakeLists.txt @@ -70,8 +70,8 @@ armarx_enable_aron_file_generation_for_target( aron/ObjectClass.xml aron/ObjectInstance.xml - # aron/Attachment.xml - aron/Constraint.xml + aron/Attachment.xml + # aron/Constraint.xml ) add_library(${PROJECT_NAME}::armem_objects ALIAS armem_objects) diff --git a/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml b/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml index 6b0227772cb6c40b0b449dcd3e931e5314ad1548..530e1df927933749db478f5b2adf63b63eb49915 100644 --- a/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml +++ b/source/RobotAPI/libraries/armem_objects/aron/Attachment.xml @@ -1,27 +1,55 @@ <!--This class contains the data structure for ObjectPose --> <?xml version="1.0" encoding="UTF-8" ?> <AronTypeDefinition> - <CodeIncludes> - <Include include="<Eigen/Core>" /> + <CodeIncludes> + <Include include="<RobotAPI/libraries/armem/aron/MemoryID.aron.generated.h>" /> </CodeIncludes> + <AronIncludes> + <Include include="<RobotAPI/libraries/armem/aron/MemoryID.xml>" /> + </AronIncludes> <GenerateTypes> - <Object name="armarx::armem::arondto::Attachment"> + <Object name="armarx::armem::arondto::attachment::AgentDescription"> - <ObjectChild key="constraintType"> + <!-- Memory link pointing to arondto::Robot or arondto::ArticulatedObject --> + <ObjectChild key="id"> + <armarx::armem::arondto::MemoryID /> + </ObjectChild> + + <!-- one of the robot's frames --> + <ObjectChild key="frame"> + <string/> + </ObjectChild> + </Object> + <!-- Fixed transformation between agent and object --> + <Object name="armarx::armem::arondto::attachment::ObjectAttachment"> + <ObjectChild key="agent"> + <armarx::armem::arondto::attachment::AgentDescription /> </ObjectChild> <ObjectChild key="transformation"> <Pose/> </ObjectChild> - <ObjectChild key="objectName"> - <string/> + <ObjectChild key="object"> + <armarx::armem::arondto::MemoryID /> </ObjectChild> + </Object> - <ObjectChild key="objectNode"> - <string/> + <!-- Fixed transformation between agent and articulated object --> + <Object name="armarx::armem::arondto::attachment::ArticulatedObjectAttachment"> + + <ObjectChild key="agent"> + <armarx::armem::arondto::attachment::AgentDescription /> + </ObjectChild> + + <ObjectChild key="transformation"> + <Pose/> + </ObjectChild> + + <ObjectChild key="object"> + <armarx::armem::arondto::attachment::AgentDescription /> </ObjectChild> </Object>