-
Notifications
You must be signed in to change notification settings - Fork 108
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
separate collision_object creation from publishing #55
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for making this more general!
* \param pose - location of center of block | ||
* \param name - semantic name of MoveIt collision object | ||
* \param size - height=width=depth=size | ||
* \param color to display the collision object with | ||
* \return true on sucess | ||
**/ | ||
moveit_msgs::CollisionObject createCollisionBlock(const geometry_msgs::Pose& block_pose, const std::string& name, | ||
double block_size); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it possible for the CollisionObject msgs type to support color as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we would have to change the msg
@@ -323,33 +323,40 @@ class MoveItVisualTools : public rviz_visual_tools::RvizVisualTools | |||
const rviz_visual_tools::colors& color = rviz_visual_tools::GREEN); | |||
|
|||
/** | |||
* \brief Create a MoveIt Collision block at the given pose | |||
* \brief Create/Publish a MoveIt Collision block at the given pose | |||
* \param pose - location of center of block | |||
* \param name - semantic name of MoveIt collision object | |||
* \param size - height=width=depth=size |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename to block size
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@@ -323,33 +323,40 @@ class MoveItVisualTools : public rviz_visual_tools::RvizVisualTools | |||
const rviz_visual_tools::colors& color = rviz_visual_tools::GREEN); | |||
|
|||
/** | |||
* \brief Create a MoveIt Collision block at the given pose | |||
* \brief Create/Publish a MoveIt Collision block at the given pose |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'd rather you copy this doxygen for reach function. it seems these two functions due fairly different things, and the \brief should explain that difference better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@@ -323,33 +323,40 @@ class MoveItVisualTools : public rviz_visual_tools::RvizVisualTools | |||
const rviz_visual_tools::colors& color = rviz_visual_tools::GREEN); | |||
|
|||
/** | |||
* \brief Create a MoveIt Collision block at the given pose | |||
* \brief Create/Publish a MoveIt Collision block at the given pose | |||
* \param pose - location of center of block |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
block_pose
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
* \param point1 - top left of rectangle | ||
* \param point2 - bottom right of rectangle | ||
* \param name - semantic name of MoveIt collision object | ||
* \param color to display the collision object with | ||
* \return true on sucess | ||
**/ | ||
moveit_msgs::CollisionObject createCollisionObject(const Eigen::Vector3d& point1, const Eigen::Vector3d& point2, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be createCollisionCuboid
right? Even better: createCollisionCuboidMsg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@@ -358,6 +365,10 @@ class MoveItVisualTools : public rviz_visual_tools::RvizVisualTools | |||
* \param color to display the collision object with | |||
* \return true on sucess | |||
**/ | |||
moveit_msgs::CollisionObject createCollisionObject(const Eigen::Isometry3d& pose, double width, double depth, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same comments:
rename function to include Cuboid
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
src/moveit_visual_tools.cpp
Outdated
double depth, double height, | ||
const std::string& name) | ||
{ | ||
geometry_msgs::Pose pose_msg = tf2::toMsg(pose); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typically in *_visual_tools, we use the built-in converter helper function rather than tf2, could you use that? e.g. convertPose()
same below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
e626338
to
6c354a5
Compare
6c354a5
to
b274866
Compare
@davetcoleman Done |
Ive just retriggered travis, but i think you need to rebase on master with the travis fix you just made? |
Git seems to have messed up the diff. Any suggestions to avoid this?