Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[21386] pkg/trunk
|
From: <ehb...@us...> - 2009-08-10 11:07:24
|
Revision: 21386
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21386&view=rev
Author: ehberger
Date: 2009-08-10 11:07:16 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
Fixing robot_msgs references
Modified Paths:
--------------
pkg/trunk/calibration/kinematic_calibration/deprecated/camera_cal_sampler.h
pkg/trunk/calibration/kinematic_calibration/deprecated/mech_state_cache.h
pkg/trunk/calibration/kinematic_calibration/deprecated/state_history.h
pkg/trunk/controllers/pr2_mechanism_controllers/test/test_arm_trajectory_controller.cpp
pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/plug_controller.h
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_assembler_srv.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_bind.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_query_snapshotter.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_snapshotter.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_planar_patch_map_builder.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_pcd_via_service.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/patch_map_assembler_srv.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/pcd_assembler_srv.cpp
pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp
pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h
pkg/trunk/sandbox/functional_m3n_ros/include/functional_m3n_ros/random_field_creator.h
pkg/trunk/sandbox/functional_m3n_ros/src/random_field_creator.cpp
pkg/trunk/sandbox/planar_objects/src/rectangular_fit.cpp
pkg/trunk/stacks/common/actionlib/src/move_base_client_old.cpp
pkg/trunk/stacks/common_msgs/sensor_msgs/msg/PointCloud.msg
pkg/trunk/stacks/navigation/costmap_2d/src/costmap_test.cpp
pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/outlet_spotting.cpp
Removed Paths:
-------------
pkg/trunk/sandbox/planar_objects/update_eclipse
Modified: pkg/trunk/calibration/kinematic_calibration/deprecated/camera_cal_sampler.h
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/deprecated/camera_cal_sampler.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/calibration/kinematic_calibration/deprecated/camera_cal_sampler.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -44,7 +44,7 @@
#include "kinematic_calibration/image_point_cache.h"
#include "kinematic_calibration/Capture.h"
-#include "robot_msgs/MechanismState.h"
+#include "mechanism_msgs/MechanismState.h"
#include "sensor_msgs/Image.h"
#include "sensor_msgs/CameraInfo.h"
#include "topic_synchronizer/topic_synchronizer.h"
@@ -129,7 +129,7 @@
private:
ros::Node* node_ ;
- MsgCacheListener<robot_msgs::MechanismState> mech_state_cache_ ;
+ MsgCacheListener<mechanism_msgs::MechanismState> mech_state_cache_ ;
Interval interval_msg_ ;
std::vector<ImagePointHandler*> stream_handlers_ ;
} ;
Modified: pkg/trunk/calibration/kinematic_calibration/deprecated/mech_state_cache.h
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/deprecated/mech_state_cache.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/calibration/kinematic_calibration/deprecated/mech_state_cache.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -40,7 +40,7 @@
#include "kinematic_calibration/msg_cache.h"
-#include "robot_msgs/MechanismState.h"
+#include "mechanism_msgs/MechanismState.h"
#include "kinematic_calibration/Interval.h"
#include "tinyxml/tinyxml.h"
@@ -48,10 +48,10 @@
namespace kinematic_calibration
{
-class MechStateCache : public MsgCache<robot_msgs::MechanismState>
+class MechStateCache : public MsgCache<mechanism_msgs::MechanismState>
{
public:
- MechStateCache(unsigned int N) : MsgCache<robot_msgs::MechanismState>(N)
+ MechStateCache(unsigned int N) : MsgCache<mechanism_msgs::MechanismState>(N)
{
}
@@ -132,7 +132,7 @@
if (interval.start > interval.end)
return false ;
- deque<robot_msgs::MechanismState>::iterator it ;
+ deque<mechanism_msgs::MechanismState>::iterator it ;
it = storage_.begin() ;
// Walk along list to just inside beginning of interval
Modified: pkg/trunk/calibration/kinematic_calibration/deprecated/state_history.h
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/deprecated/state_history.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/calibration/kinematic_calibration/deprecated/state_history.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -38,7 +38,7 @@
#include "kinematic_calibration/msg_cache.h"
-#include "robot_msgs/MechanismState.h"
+#include "mechanism_msgs/MechanismState.h"
#include "geometry_msgs/PointStamped.h"
#include "sensor_msgs/Image.h"
#include "kinematic_calibration/CameraCalSample.h"
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/test/test_arm_trajectory_controller.cpp
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/test/test_arm_trajectory_controller.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/test/test_arm_trajectory_controller.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -55,7 +55,7 @@
/*********** Start moving the robot ************/
- robot_msgs::JointTraj cmd;
+ manipulation_msgs::JointTraj cmd;
int num_points = 3;
int num_joints = 14;
@@ -109,7 +109,7 @@
cmd.points[2].positions[6] = 0.0;
cmd.points[2].time = 0.0;
- node->advertise<robot_msgs::JointTraj>("/arm/trajectory_controller/arm_trajectory_command",1);
+ node->advertise<manipulation_msgs::JointTraj>("/arm/trajectory_controller/arm_trajectory_command",1);
node->publish("/arm/trajectory_controller/arm_trajectory_command",cmd);
sleep(4);
Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/plug_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/plug_controller.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/plug_controller.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -42,8 +42,8 @@
#include "kdl/chainfksolver.hpp"
#include "ros/node.h"
#include "geometry_msgs/Wrench.h"
-#include "robot_msgs/PoseStamped.h"
-#include "robot_msgs/Transform.h"
+#include "geometry_msgs/PoseStamped.h"
+#include "geometry_msgs/Transform.h"
#include "robot_mechanism_controllers/PlugInternalState.h"
#include "robot_srvs/SetPoseStamped.h"
#include "control_toolbox/pid.h"
@@ -167,11 +167,11 @@
AdvertisedServiceGuard guard_set_tool_frame_;
geometry_msgs::Wrench wrench_msg_;
- robot_msgs::PoseStamped outlet_pose_msg_;
+ geometry_msgs::PoseStamped outlet_pose_msg_;
unsigned int loop_count_;
tf::TransformListener TF; /**< The transform for converting from point to head and tilt frames. */
- realtime_tools::RealtimePublisher <robot_msgs::Transform>* current_frame_publisher_;
+ realtime_tools::RealtimePublisher <geometry_msgs::Transform>* current_frame_publisher_;
realtime_tools::RealtimePublisher <robot_mechanism_controllers::PlugInternalState>* internal_state_publisher_;
};
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_assembler_srv.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_assembler_srv.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_assembler_srv.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -38,7 +38,6 @@
#include "annotated_planar_patch_map/map_base_assembler_srv.h"
-using namespace robot_msgs;
using namespace annotated_map_msgs;
using namespace std ;
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_bind.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_bind.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_bind.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -42,8 +42,6 @@
//include "sensor_msgs/PointCloud.h"
//include "pr2_mechanism_controllers/LaserScannerSignal.h"
-using namespace robot_msgs ;
-
/***
* This uses the point_cloud_assembler's build_cloud service call to grab all the scans/clouds between two tilt-laser shutters
* params
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_query_snapshotter.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_query_snapshotter.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_query_snapshotter.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -42,8 +42,6 @@
//include "sensor_msgs/PointCloud.h"
//include "pr2_mechanism_controllers/LaserScannerSignal.h"
-using namespace robot_msgs ;
-
/***
* This uses the point_cloud_assembler's build_cloud service call to grab all the scans/clouds between two tilt-laser shutters
* params
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_snapshotter.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_snapshotter.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_snapshotter.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -42,8 +42,6 @@
//include "sensor_msgs/PointCloud.h"
//include "pr2_mechanism_controllers/LaserScannerSignal.h"
-using namespace robot_msgs ;
-
/***
* This uses the point_cloud_assembler's build_cloud service call to grab all the scans/clouds between two tilt-laser shutters
* params
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_planar_patch_map_builder.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_planar_patch_map_builder.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_planar_patch_map_builder.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -12,7 +12,7 @@
#include "ros/node.h"
#include "ros/publisher.h"
#include <tf/transform_listener.h>
-#include "robot_msgs/PolygonalMap.h"
+#include "mapping_msgs/PolygonalMap.h"
#include <annotated_map_msgs/TaggedPolygonalMap.h>
#include <annotated_map_msgs/TaggedPolygon3D.h>
@@ -38,14 +38,14 @@
void advertise_maps(){
- advertise<robot_msgs::PolygonalMap>(std::string("global_object_map"),1);
+ advertise<mapping_msgs::PolygonalMap>(std::string("global_object_map"),1);
}
void handlePolygon(){
try{
printf("Polygon\n");
- robot_msgs::PolygonalMap polymapOut;
+ mapping_msgs::PolygonalMap polymapOut;
transformPolygonalMap(target_frame_, poly_object_, polymapOut);
add_to_map(polymapOut,global_map_);
@@ -63,7 +63,7 @@
};
- void add_to_map(robot_msgs::PolygonalMap newMap,robot_msgs::PolygonalMap& output_map)
+ void add_to_map(mapping_msgs::PolygonalMap newMap,mapping_msgs::PolygonalMap& output_map)
{
unsigned int num_polygons_to_add = newMap.get_polygons_size();
unsigned int old_num_polygons = output_map.get_polygons_size();
@@ -78,7 +78,7 @@
//From tf
-void transformPolygonalMap(const std::string & target_frame, const robot_msgs::PolygonalMap & polymapIn, robot_msgs::PolygonalMap & polymapOut)
+void transformPolygonalMap(const std::string & target_frame, const mapping_msgs::PolygonalMap & polymapIn, mapping_msgs::PolygonalMap & polymapOut)
{
Stamped<Transform> transform;
tf_->lookupTransform(target_frame, polymapIn.header.frame_id, polymapIn.header.stamp, transform);
@@ -86,8 +86,8 @@
transformPolygonalMap(target_frame, transform, polymapIn.header.stamp, polymapIn, polymapOut);
};
void transformPolygonalMap(const std::string& target_frame, const ros::Time& target_time,
- const robot_msgs::PolygonalMap& polymapIn,
- const std::string& fixed_frame, robot_msgs::PolygonalMap& polymapOut)
+ const mapping_msgs::PolygonalMap& polymapIn,
+ const std::string& fixed_frame, mapping_msgs::PolygonalMap& polymapOut)
{
Stamped<Transform> transform;
tf_->lookupTransform(target_frame, target_time,
@@ -101,7 +101,7 @@
};
- void transformPolygonalMap(const std::string & target_frame, const Transform& net_transform, const ros::Time& target_time, const robot_msgs::PolygonalMap & polymapIn, robot_msgs::PolygonalMap & polymapOut)
+ void transformPolygonalMap(const std::string & target_frame, const Transform& net_transform, const ros::Time& target_time, const mapping_msgs::PolygonalMap & polymapIn, mapping_msgs::PolygonalMap & polymapOut)
{
boost::numeric::ublas::matrix<double> transform = transformAsMatrix(net_transform);
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_pcd_via_service.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_pcd_via_service.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_pcd_via_service.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -148,7 +148,7 @@
tf_ = boost::shared_ptr<tf::TransformListener>(new tf::TransformListener(lifting_delay_*2+ros::Duration(12)));
lifted_pub_=n_.advertise<sensor_msgs::PointCloud>(out_topic_name_,1);
- //original_pub_=n_.advertise<robot_msgs::PointCloud>(out_topic_name_,1);
+ //original_pub_=n_.advertise<sensor_msgs::PointCloud>(out_topic_name_,1);
annotation_notifier_=new tf::MessageNotifier<cv_mech_turk::ExternalAnnotation>(*tf_,
boost::bind(&AnnotationLifterToPcdViaService::handleAnnotation, this,_1),
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/patch_map_assembler_srv.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/patch_map_assembler_srv.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/patch_map_assembler_srv.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -37,7 +37,6 @@
#include "planar_patch_map_msgs/PolygonalMap.h"
#include "annotated_planar_patch_map/patch_map_base_assembler_srv.h"
-using namespace robot_msgs;
using namespace annotated_map_msgs;
using namespace std ;
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/pcd_assembler_srv.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/pcd_assembler_srv.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/pcd_assembler_srv.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -40,8 +40,6 @@
// Service
#include "point_cloud_assembler/BuildCloud.h"
-
-using namespace robot_msgs;
using namespace annotated_map_msgs;
using namespace std ;
using namespace point_cloud_assembler;
Modified: pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp
===================================================================
--- pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -52,7 +52,6 @@
#include <mapping_msgs/PolygonalMap.h>
#include <geometry_msgs/Point32.h>
-//#include <robot_msgs/Hallway.h>
#include <visualization_msgs/Marker.h>
// Sample Consensus
Modified: pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h
===================================================================
--- pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/sandbox/experimental_controllers/include/experimental_controllers/trajectory_controller.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -85,7 +85,7 @@
std::vector<boost::shared_ptr<controller::PIDPositionVelocityController> > joint_controllers_;
// reatltime publisher
-// boost::scoped_ptr<realtime_tools::RealtimePublisher<robot_msgs::Twist> > state_error_publisher_;
+// boost::scoped_ptr<realtime_tools::RealtimePublisher<geometry_msgs::Twist> > state_error_publisher_;
// boost::scoped_ptr<realtime_tools::RealtimePublisher<> > spline_info_publisher_;
Modified: pkg/trunk/sandbox/functional_m3n_ros/include/functional_m3n_ros/random_field_creator.h
===================================================================
--- pkg/trunk/sandbox/functional_m3n_ros/include/functional_m3n_ros/random_field_creator.h 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/sandbox/functional_m3n_ros/include/functional_m3n_ros/random_field_creator.h 2009-08-10 11:07:16 UTC (rev 21386)
@@ -36,7 +36,7 @@
#include <vector>
-#include <robot_msgs/PointCloud.h>
+#include <sensor_msgs/PointCloud.h>
#include <point_cloud_clustering/kmeans.h>
@@ -53,25 +53,25 @@
RandomFieldCreator();
- boost::shared_ptr<RandomField> createRandomField(const robot_msgs::PointCloud& pt_cloud)
+ boost::shared_ptr<RandomField> createRandomField(const sensor_msgs::PointCloud& pt_cloud)
{
std::vector<float> labels;
return createRandomField(pt_cloud, labels);
}
- boost::shared_ptr<RandomField> createRandomField(const robot_msgs::PointCloud& pt_cloud,
+ boost::shared_ptr<RandomField> createRandomField(const sensor_msgs::PointCloud& pt_cloud,
const std::vector<float>& labels);
private:
void createDescriptors();
void createNodes(RandomField& rf,
- const robot_msgs::PointCloud& pt_cloud,
+ const sensor_msgs::PointCloud& pt_cloud,
cloud_kdtree::KdTree& pt_cloud_kdtree,
const vector<float>& labels,
set<unsigned int>& failed_indices);
void createCliqueSet(RandomField& rf,
- const robot_msgs::PointCloud& pt_cloud,
+ const sensor_msgs::PointCloud& pt_cloud,
cloud_kdtree::KdTree& pt_cloud_kdtree,
const set<unsigned int>& node_indices,
const unsigned int clique_set_idx);
Modified: pkg/trunk/sandbox/functional_m3n_ros/src/random_field_creator.cpp
===================================================================
--- pkg/trunk/sandbox/functional_m3n_ros/src/random_field_creator.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/sandbox/functional_m3n_ros/src/random_field_creator.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -187,7 +187,7 @@
*/
// --------------------------------------------------------------
void RandomFieldCreator::createNodes(RandomField& rf,
- const robot_msgs::PointCloud& pt_cloud,
+ const sensor_msgs::PointCloud& pt_cloud,
cloud_kdtree::KdTree& pt_cloud_kdtree,
const vector<float>& labels,
set<unsigned int>& failed_indices)
@@ -198,7 +198,7 @@
// ----------------------------------------------
// Create interests points over the whole point cloud
unsigned int nbr_pts = pt_cloud.points.size();
- cv::Vector<const robot_msgs::Point32*> interest_pts(nbr_pts, NULL);
+ cv::Vector<const sensor_msgs::Point32*> interest_pts(nbr_pts, NULL);
for (unsigned int i = 0 ; i < nbr_pts ; i++)
{
interest_pts[(size_t) i] = &(pt_cloud.points[i]);
@@ -260,7 +260,7 @@
*/
// --------------------------------------------------------------
void RandomFieldCreator::createCliqueSet(RandomField& rf,
- const robot_msgs::PointCloud& pt_cloud,
+ const sensor_msgs::PointCloud& pt_cloud,
cloud_kdtree::KdTree& pt_cloud_kdtree,
const set<unsigned int>& node_indices,
const unsigned int clique_set_idx)
@@ -391,7 +391,7 @@
ROS_INFO(" ########### Created clique set %u with %u cliques from %u clusters #############", clique_set_idx, nbr_created_cliques, nbr_created_clusters);
}
-boost::shared_ptr<RandomField> RandomFieldCreator::createRandomField(const robot_msgs::PointCloud& pt_cloud, const vector<
+boost::shared_ptr<RandomField> RandomFieldCreator::createRandomField(const sensor_msgs::PointCloud& pt_cloud, const vector<
float>& labels)
{
createDescriptors();
Modified: pkg/trunk/sandbox/planar_objects/src/rectangular_fit.cpp
===================================================================
--- pkg/trunk/sandbox/planar_objects/src/rectangular_fit.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/sandbox/planar_objects/src/rectangular_fit.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -8,7 +8,6 @@
#include <visualization_msgs/Marker.h>
using namespace std;
-using namespace robot_msgs;
#define MIN(a,b) ((a<b)?a:b)
#define MAX(a,b) ((a>b)?a:b)
Deleted: pkg/trunk/sandbox/planar_objects/update_eclipse
===================================================================
--- pkg/trunk/sandbox/planar_objects/update_eclipse 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/sandbox/planar_objects/update_eclipse 2009-08-10 11:07:16 UTC (rev 21386)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-mv Makefile Makefile.ros
-$HOME/cmake-2.6.4/bin/cmake -G"Eclipse CDT4 - Unix Makefiles" -Wno-dev .
-rm Makefile
-rm CMakeCache.txt
-rm -rf CMakeFiles
-mv Makefile.ros Makefile
-
Modified: pkg/trunk/stacks/common/actionlib/src/move_base_client_old.cpp
===================================================================
--- pkg/trunk/stacks/common/actionlib/src/move_base_client_old.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/stacks/common/actionlib/src/move_base_client_old.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -40,8 +40,9 @@
#include "geometry_msgs/PoseStamped.h"
using namespace action_tools;
-using namespace robot_msgs;
+using geometry_msgs::PoseStamped;
+
typedef ActionClient<MoveBaseGoal, PoseStamped, MoveBaseResult, PoseStamped> MoveBaseClient;
void callback(const TerminalStatuses::TerminalStatus& status, const boost::shared_ptr<const PoseStamped>& result)
Modified: pkg/trunk/stacks/common_msgs/sensor_msgs/msg/PointCloud.msg
===================================================================
--- pkg/trunk/stacks/common_msgs/sensor_msgs/msg/PointCloud.msg 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/stacks/common_msgs/sensor_msgs/msg/PointCloud.msg 2009-08-10 11:07:16 UTC (rev 21386)
@@ -1,3 +1,6 @@
+#This message holds a collection of 3d points, plus optional additional information about each point.
+#Each Point32 should be interpreted as a 3d point in the frame given in the header
+
Header header
-geometry_msgs/Point32[] points
-ChannelFloat32[] channels
+geometry_msgs/Point32[] points #Array of 3d points
+ChannelFloat32[] channels #Each channel should have the same number of elements as points array, and the data in each channel should correspond 1:1 with each point
Modified: pkg/trunk/stacks/navigation/costmap_2d/src/costmap_test.cpp
===================================================================
--- pkg/trunk/stacks/navigation/costmap_2d/src/costmap_test.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/stacks/navigation/costmap_2d/src/costmap_test.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -57,7 +57,7 @@
using namespace costmap_2d;
using namespace tf;
-using namespace robot_msgs;
+using sensor_msgs::PointCloud;
class CostmapTester {
public:
Modified: pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp
===================================================================
--- pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -64,8 +64,7 @@
#include <sys/time.h>
-using namespace std;
-using namespace robot_msgs;
+using namespace std;
class SemanticPointAnnotator
{
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/outlet_spotting.cpp
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/outlet_spotting.cpp 2009-08-10 10:59:57 UTC (rev 21385)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/outlet_spotting.cpp 2009-08-10 11:07:16 UTC (rev 21386)
@@ -86,7 +86,6 @@
#include <boost/thread.hpp>
using namespace std;
-using namespace robot_msgs;
template <typename T>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
