|
From: <sf...@us...> - 2009-08-10 11:00:04
|
Revision: 21385
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21385&view=rev
Author: sfkwc
Date: 2009-08-10 10:59:57 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
more robot_msgs cleanup
Modified Paths:
--------------
pkg/trunk/applications/2dnav_pr2_app/stack.xml
pkg/trunk/audio/stack.xml
pkg/trunk/calibration/stack.xml
pkg/trunk/highlevel/stack.xml
pkg/trunk/sandbox/neighborhood_index/include/neighborhood_index/index.h
pkg/trunk/sandbox/neighborhood_index/manifest.xml
Modified: pkg/trunk/applications/2dnav_pr2_app/stack.xml
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/stack.xml 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/applications/2dnav_pr2_app/stack.xml 2009-08-10 10:59:57 UTC (rev 21385)
@@ -16,6 +16,6 @@
<depend stack="common"/> <!-- laser_scan, robot_actions -->
<depend stack="estimation"/> <!-- robot_pose_ekf -->
<depend stack="navigation"/> <!-- amcl, map_server, move_base, nav_robot_actions -->
- <depend stack="common_msgs"/> <!-- robot_msgs -->
+ <depend stack="common_msgs"/>
</stack>
Modified: pkg/trunk/audio/stack.xml
===================================================================
--- pkg/trunk/audio/stack.xml 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/audio/stack.xml 2009-08-10 10:59:57 UTC (rev 21385)
@@ -9,7 +9,7 @@
<depend stack="sound_drivers"/> <!-- sound_play -->
- <depend stack="ros"/> <!-- rospy, roscpp -->
- <depend stack="common_msgs"/> <!-- robot_msgs -->
+ <depend stack="ros"/>
+ <depend stack="common_msgs"/>
</stack>
Modified: pkg/trunk/calibration/stack.xml
===================================================================
--- pkg/trunk/calibration/stack.xml 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/calibration/stack.xml 2009-08-10 10:59:57 UTC (rev 21385)
@@ -7,16 +7,15 @@
<review status="unreviewed" notes=""/>
<url>http://pr.willowgarage.com/wiki/calibration</url>
-
- <depend stack="controllers"/> <!-- pr2_mechanism_controllers, pr2_mechanism_controllers, pr2_mechanism_controllers, pr2_mechanism_controllers -->
+ <depend stack="controllers"/> <!-- pr2_mechanism_controllers -->
<depend stack="opencv"/> <!-- opencv_latest -->
- <depend stack="geometry"/> <!-- kdl, tf, kdl, tf -->
+ <depend stack="geometry"/> <!-- kdl, tf -->
<depend stack="drivers"/> <!-- dense_laser_assembler, phase_space -->
- <depend stack="mechanism"/> <!-- mechanism_model, hardware_interface, mechanism_msgs, mechanism_msgs, mechanism_msgs, mechanism_msgs, mechanism_msgs -->
- <depend stack="util"/> <!-- topic_synchronizer, topic_synchronizer -->
+ <depend stack="mechanism"/> <!-- mechanism_model, hardware_interface, mechanism_msgs -->
+ <depend stack="util"/> <!-- topic_synchronizer -->
<depend stack="openrave_planning"/> <!-- openraveros -->
- <depend stack="common"/> <!-- tinyxml, robot_actions, laser_scan, robot_actions, manipulation_msgs, manipulation_msgs -->
- <depend stack="ros"/> <!-- std_msgs, rospy, rosoct, std_msgs, std_msgs, message_filters, roscpp, message_filters, std_msgs, std_msgs, std_msgs, rosrecord, roscpp, std_msgs, std_msgs, rospy -->
- <depend stack="common_msgs"/> <!-- geometry_msgs, robot_msgs, sensor_msgs, robot_msgs, sensor_msgs, robot_msgs, sensor_msgs, robot_msgs, sensor_msgs, robot_msgs, sensor_msgs, robot_msgs, geometry_msgs, sensor_msgs, robot_msgs, robot_msgs, robot_msgs, diagnostic_msgs -->
+ <depend stack="common"/> <!-- tinyxml, robot_actions, laser_scan, manipulation_msgs -->
+ <depend stack="ros"/>
+ <depend stack="common_msgs"/> <!-- geometry_msgs, sensor_msgs, diagnostic_msgs -->
</stack>
Modified: pkg/trunk/highlevel/stack.xml
===================================================================
--- pkg/trunk/highlevel/stack.xml 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/highlevel/stack.xml 2009-08-10 10:59:57 UTC (rev 21385)
@@ -14,16 +14,16 @@
<depend stack="util"/> <!-- or_robot_self_filter -->
<depend stack="estimation"/> <!-- robot_pose_ekf -->
- <depend stack="geometry"/> <!-- kdl, tf, kdl, tf, tf, tf, tf -->
- <depend stack="navigation"/> <!-- nav_robot_actions, nav_robot_actions, costmap_2d, base_local_planner, fake_localization, map_server, nav_view, move_base, amcl, map_server, fake_localization, nav_view, nav_robot_actions -->
+ <depend stack="geometry"/> <!-- kdl, tf -->
+ <depend stack="navigation"/> <!-- costmap_2d, base_local_planner, map_server, nav_view, move_base, amcl, map_server, fake_localization, nav_view, nav_robot_actions -->
<depend stack="semantic_mapping"/> <!-- plug_onbase_detector, door_handle_detector, point_cloud_mapping -->
<depend stack="mechanism"/> <!-- mechanism_msgs -->
- <depend stack="controllers"/> <!-- pr2_mechanism_controllers, pr2_mechanism_controllers, robot_mechanism_controllers, pr2_mechanism_controllers -->
- <depend stack="simulators"/> <!-- stage, stage -->
- <depend stack="common"/> <!-- robot_actions, manipulation_srvs, robot_actions, robot_actions, manipulation_msgs, robot_actions, laser_scan, robot_actions, robot_actions, robot_actions, python_actions -->
- <depend stack="ros"/> <!-- rospy, roslib, roscpp, rosconsole, std_msgs, roslisp, std_msgs, std_srvs, roscpp, std_msgs, rospy, std_msgs, roscpp, std_msgs, roscpp, gtest, rosrecord, roscpp, std_msgs, roscpp, roscpp, std_msgs, roscpp, roslib -->
- <depend stack="visualization_core"/> <!-- visualization_msgs, visualization_msgs -->
+ <depend stack="controllers"/> <!-- pr2_mechanism_controllers, robot_mechanism_controllers, pr2_mechanism_controllers -->
+ <depend stack="simulators"/> <!-- stage -->
+ <depend stack="common"/> <!-- robot_actions, manipulation_srvs, manipulation_msgs, laser_scan -->
+ <depend stack="ros"/> <!-- rospy, roslib, roscpp, rosconsole, std_msgs, roslisp, gtest, rosrecord -->
+ <depend stack="visualization_core"/> <!-- visualization_msgs -->
<depend stack="vision"/> <!-- people -->
- <depend stack="common_msgs"/> <!-- robot_msgs, robot_msgs, robot_srvs, robot_msgs, robot_msgs, diagnostic_msgs, robot_srvs, nav_msgs, geometry_msgs, geometry_msgs, robot_msgs, robot_srvs, robot_msgs, geometry_msgs, robot_msgs, robot_srvs -->
+ <depend stack="common_msgs"/> <!-- diagnostic_msgs, nav_msgs, geometry_msgs -->
</stack>
Modified: pkg/trunk/sandbox/neighborhood_index/include/neighborhood_index/index.h
===================================================================
--- pkg/trunk/sandbox/neighborhood_index/include/neighborhood_index/index.h 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/sandbox/neighborhood_index/include/neighborhood_index/index.h 2009-08-10 10:59:57 UTC (rev 21385)
@@ -38,31 +38,32 @@
#define _NEIGHBORHOOD_INDEX_
#include <vector>
-#include <robot_msgs/PointCloud.h>
+#include <sensor_msgs/PointCloud.h>
+#include <geometry_msgs/Point32.h>
namespace neighborhood_index
{
class Index {
- virtual void knnSearch(const robot_msgs::Point32 &point, int k,
+ virtual void knnSearch(const geometry_msgs::Point32 &point, int k,
std::vector<int> &k_indices, std::vector<float> &k_distances) = 0;
- virtual void knnSearch(const robot_msgs::PointCloud &pointsToFind, int k,
+ virtual void knnSearch(const sensor_msgs::PointCloud &pointsToFind, int k,
std::vector<std::vector<int> > &k_indices_array, std::vector<std::vector<float> > &k_distances_array) = 0;
- virtual bool radiusSearch (const robot_msgs::Point32 &p_q, double radius,
+ virtual bool radiusSearch (const geometry_msgs::Point32 &p_q, double radius,
std::vector<int> &k_indices, std::vector<float> &k_distances, int max_nn = INT_MAX) = 0;
- virtual bool radiusSearch (const robot_msgs::PointCloud &points, double radius,
+ virtual bool radiusSearch (const sensor_msgs::PointCloud &points, double radius,
std::vector<std::vector<int> > &k_indices_array, std::vector<std::vector<float> > &k_distances_array, int max_nn = INT_MAX) = 0;
};
//Version of Index which supports dynamic resizing
class DynamicIndex : public Index {
- virtual void add(const robot_msgs::Point32 &point) = 0;
- virtual void add(const robot_msgs::PointCloud &points) = 0;
+ virtual void add(const geometry_msgs::Point32 &point) = 0;
+ virtual void add(const sensor_msgs::PointCloud &points) = 0;
- virtual void remove(const robot_msgs::Point32 &point) = 0;
- virtual void remove(const robot_msgs::PointCloud &points) = 0;
+ virtual void remove(const geometry_msgs::Point32 &point) = 0;
+ virtual void remove(const sensor_msgs::PointCloud &points) = 0;
virtual bool canRemove() = 0;
virtual bool optimize(int optimizationLevel = 0) = 0;
Modified: pkg/trunk/sandbox/neighborhood_index/manifest.xml
===================================================================
--- pkg/trunk/sandbox/neighborhood_index/manifest.xml 2009-08-10 10:58:57 UTC (rev 21384)
+++ pkg/trunk/sandbox/neighborhood_index/manifest.xml 2009-08-10 10:59:57 UTC (rev 21385)
@@ -12,7 +12,8 @@
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib"/>
</export>
-
+ <depend package="sensor_msgs" />
+ <depend package="geometry_msgs" />
</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|