Skip to content
Snippets Groups Projects
Commit 17c26687 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

landmarks 3d pose better representation

parent 4bf38159
No related branches found
No related tags found
1 merge request!16Devel
...@@ -410,31 +410,57 @@ bool PublisherGraph::fillLandmarkMarkers(LandmarkBaseConstPtr lmk, ...@@ -410,31 +410,57 @@ bool PublisherGraph::fillLandmarkMarkers(LandmarkBaseConstPtr lmk,
return false; return false;
// SHAPE ------------------------------------------------------ // SHAPE ------------------------------------------------------
// Pose
// 2d: ARROW
// 3d: FRAME
// Position // Position
// 2d: CYLINDER // 2d: CYLINDER
// 3d: SPHERE // 3d: SPHERE
// Pose -> ARROW if (lmk->getO() and lmk->getO())
if (lmk->getO() != nullptr)
{ {
landmark_marker_.type = visualization_msgs::Marker::ARROW; if (lmk->getP()->getSize() == 2)
lmk_marker.scale.x = viz_scale_*landmark_length_; {
lmk_marker.scale.y = viz_scale_*landmark_width_; landmark_marker_.type = visualization_msgs::Marker::ARROW;
lmk_marker.scale.z = viz_scale_*landmark_width_; lmk_marker.scale.x = viz_scale_*landmark_length_;
lmk_marker.scale.y = viz_scale_*landmark_width_;
lmk_marker.scale.z = viz_scale_*landmark_width_;
}
else if (lmk->getP()->getSize() == 3)
{
landmark_marker_.type = visualization_msgs::Marker::LINE_LIST;
lmk_marker.scale.x = viz_scale_*landmark_width_;
lmk_marker.points = frame_marker_.points;
lmk_marker.points[1].x = viz_scale_*landmark_length_;
lmk_marker.points[3].y = viz_scale_*landmark_length_;
lmk_marker.points[5].z = viz_scale_*landmark_length_;
lmk_marker.colors = frame_marker_.colors;
}
else
return false;
} }
else if (lmk->getP()->getSize() == 2) else if (lmk->getP())
{ {
landmark_marker_.type = visualization_msgs::Marker::CYLINDER; if (lmk->getP()->getSize() == 2)
lmk_marker.scale.x = viz_scale_*landmark_width_; {
lmk_marker.scale.y = viz_scale_*landmark_width_; landmark_marker_.type = visualization_msgs::Marker::CYLINDER;
lmk_marker.scale.z = viz_scale_*landmark_length_; lmk_marker.scale.x = viz_scale_*landmark_width_;
lmk_marker.scale.y = viz_scale_*landmark_width_;
lmk_marker.scale.z = viz_scale_*landmark_length_;
}
else if (lmk->getP()->getSize() == 3)
{
landmark_marker_.type = visualization_msgs::Marker::SPHERE;
lmk_marker.scale.x = viz_scale_*landmark_width_;
lmk_marker.scale.y = viz_scale_*landmark_width_;
lmk_marker.scale.z = viz_scale_*landmark_width_;
}
else
return false;
} }
else else
{ return false;
landmark_marker_.type = visualization_msgs::Marker::SPHERE;
lmk_marker.scale.x = viz_scale_*landmark_width_;
lmk_marker.scale.y = viz_scale_*landmark_width_;
lmk_marker.scale.z = viz_scale_*landmark_width_;
}
// COLOR ------------------------------------------------------ // COLOR ------------------------------------------------------
if (lmk->getHits() > landmark_max_hits_) if (lmk->getHits() > landmark_max_hits_)
......
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