Skip to content
Snippets Groups Projects
Commit b0166504 authored by Jianfeng Gao's avatar Jianfeng Gao
Browse files

add FramedPositionAndOrientation aron type and add constructor in pose and...

add FramedPositionAndOrientation aron type and add constructor in pose and framed pose related to this type
parent 9ccbd951
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
<!--
The types defined here are deprecated.
Use <Include include="RobotAPI/libraries/aron/common/aron/framed.xml" /> instead.
-->
<GenerateTypes>
<Object name="armarx::arondto::FrameHeader">
......
......@@ -43,6 +43,19 @@
</ObjectChild>
</Object>
<Object name="armarx::arondto::FramedPositionAndOrientation">
<ObjectChild key='header'>
<armarx::arondto::FrameID />
</ObjectChild>
<ObjectChild key='position'>
<Position />
</ObjectChild>
<ObjectChild key='orientation'>
<Orientation />
</ObjectChild>
</Object>
</GenerateTypes>
</AronTypeDefinition>
......@@ -382,6 +382,14 @@ namespace armarx
this->agent = agent;
}
FramedPose::FramedPose(const Eigen::Vector3f& pos, const Eigen::Quaternionf& ori, const std::string& frame, const std::string& agent) :
Pose(pos, ori)
{
this->frame = frame;
this->agent = agent;
}
std::string FramedPose::getFrame() const
{
return frame;
......
......@@ -264,6 +264,7 @@ namespace armarx
FramedPose(const FramedPose& pose);
FramedPose(const Eigen::Matrix3f& m, const Eigen::Vector3f& v, const std::string& frame, const std::string& agent);
FramedPose(const Eigen::Matrix4f& m, const std::string& frame, const std::string& agent);
FramedPose(const Eigen::Vector3f& pos, const Eigen::Quaternionf& ori, const std::string& frame, const std::string& agent);
FramedPose(const armarx::Vector3BasePtr pos, const armarx::QuaternionBasePtr ori, const std::string& frame, const std::string& agent);
FramedPose& operator=(const armarx::FramedPose&) = default;
......
......@@ -315,6 +315,13 @@ namespace armarx
init();
}
Pose::Pose(const Eigen::Vector3f& position, const Eigen::Quaternionf& quaternion)
{
this->position = new Vector3(position);
this->orientation = new Quaternion(quaternion);
init();
}
void
Pose::operator=(const Eigen::Matrix4f& matrix)
{
......
......@@ -246,6 +246,7 @@ namespace armarx
Pose(const Pose& source);
Pose(const Eigen::Matrix4f&);
Pose(const Eigen::Matrix3f&, const Eigen::Vector3f&);
Pose(const Eigen::Vector3f&, const Eigen::Quaternionf&);
Pose(const armarx::Vector3BasePtr pos, const armarx::QuaternionBasePtr ori);
Pose& operator=(const Pose&) = default;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment