diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp b/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp index 7061f3d3ed69e9ac9ff373f0192d9709fbd9d399..42924eeddb98c83e241f310c5ce9bce4d5d9ee77 100644 --- a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp +++ b/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp @@ -109,7 +109,7 @@ namespace armarx if (isChanged) { - providingPoses.push_back(current.toProvidedObjectPose()); + providingPoses.push_back(current.toProvidedObjectPoseGlobal()); objpose::ProvidedObjectPose& providing = providingPoses.back(); providing.providerName = properties.providerName; diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp index 84f3cfc1153ca94a0222a3cd1725f5ebe5e4d3c3..82dc134ee4b958981cf1ebe5d74047f49eb62a2a 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp +++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp @@ -172,7 +172,8 @@ namespace armarx::objpose objpose::fromIce(provided.localOOBB, localOOBB); } - objpose::ProvidedObjectPose ObjectPose::toProvidedObjectPose() const + // ToDo: We can provide ...Robot() and ...Original() versions as well. + objpose::ProvidedObjectPose ObjectPose::toProvidedObjectPoseGlobal() const { objpose::ProvidedObjectPose providedObjectPose; diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h b/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h index 6e56b7dd09fbd2bf8848dd0d0f9677c266c52323..6ee27fa6e039a862217d48601ad8d2d02881a615 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h +++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h @@ -46,7 +46,7 @@ namespace armarx::objpose void toIce(data::ObjectPose& ice) const; void fromProvidedPose(const data::ProvidedObjectPose& provided, VirtualRobot::RobotPtr robot = nullptr); - objpose::ProvidedObjectPose toProvidedObjectPose() const; + objpose::ProvidedObjectPose toProvidedObjectPoseGlobal() const; void setObjectPoseRobot(const Eigen::Matrix4f& objectPoseRobot, bool updateObjectPoseGlobal = true); void setObjectPoseGlobal(const Eigen::Matrix4f& objectPoseGlobal, bool updateObjectPoseRobot = true);