Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[18033] pkg/trunk
|
From: <is...@us...> - 2009-06-30 23:45:05
|
Revision: 18033
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=18033&view=rev
Author: isucan
Date: 2009-06-30 23:45:03 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
fixes for polygonal map
Modified Paths:
--------------
pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/annotated_map_lib.h
pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/binding.h
pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/projection.h
pkg/trunk/mapping/annotated_planar_patch_map/manifest.xml
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_info.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_lib.cpp
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_planar_patch_map.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map_via_service.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/empty_annotated_map.cpp
pkg/trunk/mapping/annotated_planar_patch_map/src/image_value_node.cpp
pkg/trunk/mapping/door_stereo_detector/manifest.xml
pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp
pkg/trunk/mapping/door_tracker/manifest.xml
pkg/trunk/mapping/door_tracker/src/door_tracker.cpp
pkg/trunk/mapping/hallway_tracker/manifest.xml
pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp
pkg/trunk/mapping/planar_patch_map/manifest.xml
pkg/trunk/mapping/planar_patch_map/src/planar_patch_map.cpp
pkg/trunk/mapping/planar_patch_map/src/planar_patch_map_omp.cpp
pkg/trunk/mapping/stereo_convex_patch_histogram/manifest.xml
pkg/trunk/mapping/stereo_convex_patch_histogram/src/convex_patch_histogram.cpp
pkg/trunk/mapping/table_object_detector/manifest.xml
pkg/trunk/mapping/table_object_detector/src/table_object_detector.cpp
pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/include/plug_onbase_detector/plug_onbase_detector.h
pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/manifest.xml
pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp
Modified: pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/annotated_map_lib.h
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/annotated_map_lib.h 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/annotated_map_lib.h 2009-06-30 23:45:03 UTC (rev 18033)
@@ -49,7 +49,7 @@
#include <tf/transform_datatypes.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>
@@ -63,8 +63,8 @@
//This will generate compile time error if you got no implementation.
void transformAnyObject(const std::string & target_frame,
const tf::Transform* net_transform,
- const robot_msgs::PolygonalMap & polymap_in,
- robot_msgs::PolygonalMap & polymap_out);
+ const mapping_msgs::PolygonalMap & polymap_in,
+ mapping_msgs::PolygonalMap & polymap_out);
void transformAnyObject(const std::string & target_frame,
Modified: pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/binding.h
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/binding.h 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/binding.h 2009-06-30 23:45:03 UTC (rev 18033)
@@ -49,7 +49,7 @@
#include <tf/transform_datatypes.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>
Modified: pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/projection.h
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/projection.h 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/include/annotated_planar_patch_map/projection.h 2009-06-30 23:45:03 UTC (rev 18033)
@@ -49,7 +49,7 @@
#include <tf/transform_datatypes.h>
#include <tf/transform_listener.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <sensor_msgs/CamInfo.h>
#include <annotated_map_msgs/TaggedPolygonalMap.h>
@@ -72,7 +72,7 @@
-void projectPolygonalMap(const sensor_msgs::StereoInfo& stereo_info_, const robot_msgs::PolygonalMap& transformed_map_3D, robot_msgs::PolygonalMap &transformed_map_2D);
+void projectPolygonalMap(const sensor_msgs::StereoInfo& stereo_info_, const mapping_msgs::PolygonalMap& transformed_map_3D, mapping_msgs::PolygonalMap &transformed_map_2D);
void projectPolygonPoints(double* projection,double img_w, double img_h, robot_msgs::Polygon3D polyIn,robot_msgs::Polygon3D& polyOut);
void projectPolygonPointsNOP(double* projection,double img_w, double img_h, robot_msgs::Polygon3D polyIn,robot_msgs::Polygon3D& polyOut);
Modified: pkg/trunk/mapping/annotated_planar_patch_map/manifest.xml
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -11,6 +11,7 @@
<depend package="roscpp" />
<depend package="std_msgs"/>
<depend package="robot_msgs" />
+ <depend package="mapping_msgs" />
<depend package="sensor_msgs" />
<depend package="point_cloud_mapping" />
<depend package="cv_mech_turk" />
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_info.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_info.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_info.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -48,7 +48,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <cv_mech_turk/ExternalAnnotation.h>
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_lib.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_lib.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotated_map_lib.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -45,8 +45,8 @@
void annotated_map_lib::transformAnyObject(const std::string & target_frame,
const tf::Transform* net_transform,
- const robot_msgs::PolygonalMap & polymapIn,
- robot_msgs::PolygonalMap & polymapOut)
+ 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-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_pcd_via_service.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -52,7 +52,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <sensor_msgs/CamInfo.h>
#include "tf/message_notifier.h"
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_planar_patch_map.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_planar_patch_map.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_planar_patch_map.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -52,7 +52,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <cv_mech_turk/ExternalAnnotation.h>
@@ -149,9 +149,9 @@
void liftAnnotation(cv_mech_turk::ExternalAnnotation annotation2d_object_,annotated_map_msgs::TaggedPolygonalMap& polymapOut)
{
- robot_msgs::PolygonalMap transformed_map_3D;
- robot_msgs::PolygonalMap transformed_map_3D_fixed_frame;
- robot_msgs::PolygonalMap transformed_map_2D;
+ mapping_msgs::PolygonalMap transformed_map_3D;
+ mapping_msgs::PolygonalMap transformed_map_3D_fixed_frame;
+ mapping_msgs::PolygonalMap transformed_map_2D;
//Get the 3D map into the coordinate frame of the camera
ROS_DEBUG("Transform 3D map to frame: %s",annotation2d_object_.reference_frame.c_str());
@@ -174,7 +174,7 @@
}
- void bindAnnotationsToMap(cv_mech_turk::ExternalAnnotation annotation2d_object, robot_msgs::PolygonalMap transformed_map_3D, robot_msgs::PolygonalMap transformed_map_2D,annotated_map_msgs::TaggedPolygonalMap &polymapOut)
+ void bindAnnotationsToMap(cv_mech_turk::ExternalAnnotation annotation2d_object, mapping_msgs::PolygonalMap transformed_map_3D, mapping_msgs::PolygonalMap transformed_map_2D,annotated_map_msgs::TaggedPolygonalMap &polymapOut)
{
//CvMemStorage* storage = cvCreateMemStorage();
@@ -326,7 +326,7 @@
- void printPolygon3D(robot_msgs::PolygonalMap transformed_map,std::string tag)
+ void printPolygon3D(mapping_msgs::PolygonalMap transformed_map,std::string tag)
{
std::string fname=std::string("/u/sorokin/bags/run_may_21/dump/polygons3D__")+tag+std::string(".txt");
@@ -357,7 +357,7 @@
tf::TransformListener *tf_;
cv_mech_turk::ExternalAnnotation annotation2d_object_;
- robot_msgs::PolygonalMap unlabeled_map_;
+ mapping_msgs::PolygonalMap unlabeled_map_;
sensor_msgs::StereoInfo stereo_info_;
std::string target_frame_;
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -52,7 +52,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <sensor_msgs/CamInfo.h>
@@ -353,7 +353,7 @@
- void printPolygon3D(robot_msgs::PolygonalMap transformed_map,std::string tag)
+ void printPolygon3D(mapping_msgs::PolygonalMap transformed_map,std::string tag)
{
std::string fname=std::string("/u/sorokin/bags/run_may_21/dump/polygons3D__")+tag+std::string(".txt");
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map_via_service.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map_via_service.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/annotation2d_lifter_to_tagged_patch_map_via_service.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -52,7 +52,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <sensor_msgs/CamInfo.h>
#include "tf/message_notifier.h"
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/empty_annotated_map.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/empty_annotated_map.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/empty_annotated_map.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -49,7 +49,7 @@
#include <tf/transform_datatypes.h>
#include <tf/transform_listener.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/StereoInfo.h>
#include <annotated_map_msgs/TaggedPolygonalMap.h>
@@ -84,20 +84,20 @@
if (fixed_frame_ == "ERROR_NO_NAME")
ROS_ERROR("Need to set parameter fixed_frame") ;
- sub_=node_handle_.subscribe<robot_msgs::PolygonalMap>("planar_map", 100, &EmptyAnnotatedMap::handleUnlabeledMap, this);
+ sub_=node_handle_.subscribe<mapping_msgs::PolygonalMap>("planar_map", 100, &EmptyAnnotatedMap::handleUnlabeledMap, this);
pub_=node_handle_.advertise<annotated_map_msgs::TaggedPolygonalMap>(out_topic_name_,1);
};
- void handleUnlabeledMap(const robot_msgs::PolygonalMapConstPtr& unlabeled_map)
+ void handleUnlabeledMap(const mapping_msgs::PolygonalMapConstPtr& unlabeled_map)
{
try
{
annotated_map_msgs::TaggedPolygonalMap polymapOut;
- robot_msgs::PolygonalMap transformed_map_3D;
+ mapping_msgs::PolygonalMap transformed_map_3D;
annotated_map_lib::transformAnyObject(fixed_frame_,tf_,*unlabeled_map,transformed_map_3D);
unsigned int num_polygons = transformed_map_3D.get_polygons_size();
Modified: pkg/trunk/mapping/annotated_planar_patch_map/src/image_value_node.cpp
===================================================================
--- pkg/trunk/mapping/annotated_planar_patch_map/src/image_value_node.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/annotated_planar_patch_map/src/image_value_node.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -48,7 +48,7 @@
#include <cv.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <sensor_msgs/CamInfo.h>
#include <cv_mech_turk/ExternalAnnotation.h>
Modified: pkg/trunk/mapping/door_stereo_detector/manifest.xml
===================================================================
--- pkg/trunk/mapping/door_stereo_detector/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/door_stereo_detector/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -11,6 +11,7 @@
<depend package="roscpp" />
<depend package="robot_msgs" />
<depend package="robot_srvs" />
+ <depend package="mapping_msgs" />
<depend package="kdl" />
<depend package="angles" />
<depend package="point_cloud_mapping" />
Modified: pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp
===================================================================
--- pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/door_stereo_detector/src/door_stereo_detector.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -46,7 +46,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <robot_msgs/Point32.h>
#include <visualization_msgs/Marker.h>
Modified: pkg/trunk/mapping/door_tracker/manifest.xml
===================================================================
--- pkg/trunk/mapping/door_tracker/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/door_tracker/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -18,6 +18,7 @@
<depend package="angles" />
<depend package="point_cloud_mapping" />
<depend package="std_msgs" />
+ <depend package="mapping_msgs" />
<depend package="door_handle_detector" />
<depend package="filters" />
<depend package="visualization_msgs" />
Modified: pkg/trunk/mapping/door_tracker/src/door_tracker.cpp
===================================================================
--- pkg/trunk/mapping/door_tracker/src/door_tracker.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/door_tracker/src/door_tracker.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -48,7 +48,7 @@
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <robot_msgs/Point32.h>
#include <door_msgs/Door.h>
@@ -89,6 +89,7 @@
using namespace std;
using namespace robot_msgs;
+using namespace mapping_msgs;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Comparison operator for a vector of vectors
Modified: pkg/trunk/mapping/hallway_tracker/manifest.xml
===================================================================
--- pkg/trunk/mapping/hallway_tracker/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/hallway_tracker/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -11,6 +11,7 @@
<depend package="roscpp" />
<depend package="robot_msgs" />
<depend package="robot_srvs" />
+ <depend package="mapping_msgs" />
<depend package="kdl" />
<depend package="point_cloud_mapping" />
<depend package="std_msgs" />
Modified: pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp
===================================================================
--- pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/hallway_tracker/src/hallway_tracker.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -49,7 +49,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <robot_msgs/Point32.h>
//#include <robot_msgs/Hallway.h>
@@ -86,6 +86,7 @@
using namespace std;
using namespace robot_msgs;
+using namespace mapping_msgs;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: pkg/trunk/mapping/planar_patch_map/manifest.xml
===================================================================
--- pkg/trunk/mapping/planar_patch_map/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/planar_patch_map/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -10,5 +10,6 @@
<depend package="roscpp" />
<depend package="robot_msgs" />
+ <depend package="mapping_msgs" />
<depend package="point_cloud_mapping" />
</package>
Modified: pkg/trunk/mapping/planar_patch_map/src/planar_patch_map.cpp
===================================================================
--- pkg/trunk/mapping/planar_patch_map/src/planar_patch_map.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/planar_patch_map/src/planar_patch_map.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -44,7 +44,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
// Sample Consensus
#include <point_cloud_mapping/sample_consensus/sac.h>
@@ -67,6 +67,7 @@
using namespace std;
using namespace robot_msgs;
+using namespace mapping_msgs;
class PlanarPatchMap
{
Modified: pkg/trunk/mapping/planar_patch_map/src/planar_patch_map_omp.cpp
===================================================================
--- pkg/trunk/mapping/planar_patch_map/src/planar_patch_map_omp.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/planar_patch_map/src/planar_patch_map_omp.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -44,7 +44,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
// Sample Consensus
#include <point_cloud_mapping/sample_consensus/sac.h>
@@ -65,6 +65,7 @@
using namespace std;
using namespace robot_msgs;
+using namespace mapping_msgs;
class PlanarPatchMap
{
Modified: pkg/trunk/mapping/stereo_convex_patch_histogram/manifest.xml
===================================================================
--- pkg/trunk/mapping/stereo_convex_patch_histogram/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/stereo_convex_patch_histogram/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -12,5 +12,6 @@
<depend package="roscpp" />
<depend package="robot_msgs" />
+ <depend package="mapping_msgs" />
<depend package="point_cloud_mapping" />
</package>
Modified: pkg/trunk/mapping/stereo_convex_patch_histogram/src/convex_patch_histogram.cpp
===================================================================
--- pkg/trunk/mapping/stereo_convex_patch_histogram/src/convex_patch_histogram.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/stereo_convex_patch_histogram/src/convex_patch_histogram.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -46,7 +46,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
// Sample Consensus
#include <point_cloud_mapping/sample_consensus/sac.h>
@@ -66,6 +66,7 @@
using namespace std;
using namespace robot_msgs;
+using namespace mapping_msgs;
class ConvexPatchHistogram
{
Modified: pkg/trunk/mapping/table_object_detector/manifest.xml
===================================================================
--- pkg/trunk/mapping/table_object_detector/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/table_object_detector/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -16,4 +16,5 @@
<depend package="robot_srvs" />
<depend package="tabletop_msgs" />
<depend package="tabletop_srvs" />
+ <depend package="mapping_msgs" />
</package>
Modified: pkg/trunk/mapping/table_object_detector/src/table_object_detector.cpp
===================================================================
--- pkg/trunk/mapping/table_object_detector/src/table_object_detector.cpp 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/mapping/table_object_detector/src/table_object_detector.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -44,7 +44,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
// Sample Consensus
#include <point_cloud_mapping/sample_consensus/sac.h>
@@ -77,6 +77,7 @@
using namespace std;
using namespace std_msgs;
using namespace robot_msgs;
+using namespace mapping_msgs;
using namespace tabletop_msgs;
using namespace tabletop_srvs;
Modified: pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/include/plug_onbase_detector/plug_onbase_detector.h
===================================================================
--- pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/include/plug_onbase_detector/plug_onbase_detector.h 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/include/plug_onbase_detector/plug_onbase_detector.h 2009-06-30 23:45:03 UTC (rev 18033)
@@ -46,7 +46,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
#include <plugs_msgs/PlugStow.h>
// Sample Consensus
@@ -81,6 +81,7 @@
using namespace std;
using namespace std_msgs;
using namespace robot_msgs;
+using namespace mapping_msgs;
// Comparison operator for a vector of vectors
inline bool
Modified: pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/manifest.xml
===================================================================
--- pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/manifest.xml 2009-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/manifest.xml 2009-06-30 23:45:03 UTC (rev 18033)
@@ -12,6 +12,7 @@
<depend package="std_msgs" />
<depend package="point_cloud_mapping" />
<depend package="robot_msgs" />
+ <depend package="mapping_msgs" />
<depend package="plugs_msgs"/>
<export>
<cpp cflags="-I${prefix}/msg/cpp -I${prefix}/include"/>
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-06-30 23:44:21 UTC (rev 18032)
+++ pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/src/semantic_point_annotator.cpp 2009-06-30 23:45:03 UTC (rev 18033)
@@ -45,7 +45,7 @@
// ROS messages
#include <robot_msgs/PointCloud.h>
#include <robot_msgs/Polygon3D.h>
-#include <robot_msgs/PolygonalMap.h>
+#include <mapping_msgs/PolygonalMap.h>
// Sample Consensus
#include <point_cloud_mapping/sample_consensus/sac.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
