Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[17991] pkg/trunk
|
From: <tf...@us...> - 2009-06-30 19:43:02
|
Revision: 17991
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17991&view=rev
Author: tfoote
Date: 2009-06-30 19:43:00 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
ColoredLine(s) going to visualization_markers as per robot_msgs API review
Modified Paths:
--------------
pkg/trunk/vision/people/src/face_detection.cpp
pkg/trunk/vision/people/src/pedestrian_detector_HOG.cpp
pkg/trunk/vision/people/src/stereo_color_tracker.cpp
pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp
pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp
pkg/trunk/vision/stereo_view/manifest.xml
pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp
Added Paths:
-----------
pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLine.msg
pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLines.msg
Removed Paths:
-------------
pkg/trunk/stacks/common/image_msgs/msg/ColoredLine.msg
pkg/trunk/stacks/common/image_msgs/msg/ColoredLines.msg
Deleted: pkg/trunk/stacks/common/image_msgs/msg/ColoredLine.msg
===================================================================
--- pkg/trunk/stacks/common/image_msgs/msg/ColoredLine.msg 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/stacks/common/image_msgs/msg/ColoredLine.msg 2009-06-30 19:43:00 UTC (rev 17991)
@@ -1,9 +0,0 @@
-Header header
-string label
-uint8 r
-uint8 g
-uint8 b
-int16 x0
-int16 y0
-int16 x1
-int16 y1
Deleted: pkg/trunk/stacks/common/image_msgs/msg/ColoredLines.msg
===================================================================
--- pkg/trunk/stacks/common/image_msgs/msg/ColoredLines.msg 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/stacks/common/image_msgs/msg/ColoredLines.msg 2009-06-30 19:43:00 UTC (rev 17991)
@@ -1,3 +0,0 @@
-Header header
-string label
-ColoredLine[] lines
Copied: pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLine.msg (from rev 17963, pkg/trunk/stacks/common/image_msgs/msg/ColoredLine.msg)
===================================================================
--- pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLine.msg (rev 0)
+++ pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLine.msg 2009-06-30 19:43:00 UTC (rev 17991)
@@ -0,0 +1,9 @@
+Header header
+string label
+uint8 r
+uint8 g
+uint8 b
+int16 x0
+int16 y0
+int16 x1
+int16 y1
Property changes on: pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLine.msg
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/image_msgs/msg/ColoredLine.msg:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLines.msg (from rev 17963, pkg/trunk/stacks/common/image_msgs/msg/ColoredLines.msg)
===================================================================
--- pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLines.msg (rev 0)
+++ pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLines.msg 2009-06-30 19:43:00 UTC (rev 17991)
@@ -0,0 +1,3 @@
+Header header
+string label
+ColoredLine[] lines
Property changes on: pkg/trunk/stacks/visualization_core/visualization_msgs/msg/ColoredLines.msg
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/image_msgs/msg/ColoredLines.msg:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/vision/people/src/face_detection.cpp
===================================================================
--- pkg/trunk/vision/people/src/face_detection.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/people/src/face_detection.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -49,8 +49,8 @@
#include "image_msgs/CamInfo.h"
#include "image_msgs/Image.h"
#include "opencv_latest/CvBridge.h"
-#include "image_msgs/ColoredLine.h"
-#include "image_msgs/ColoredLines.h"
+#include "visualization_msgs/ColoredLine.h"
+#include "visualization_msgs/ColoredLines.h"
#include "topic_synchronizer2/topic_synchronizer.h"
#include "tf/transform_listener.h"
#include "visualization_msgs/Marker.h"
@@ -201,7 +201,7 @@
// Advertise the rectangles to draw if stereo_view is running.
if (do_display_ == "remote") {
- clines_pub_ = nh_.advertise<image_msgs::ColoredLines>("lines_to_draw",1);
+ clines_pub_ = nh_.advertise<visualization_msgs::ColoredLines>("lines_to_draw",1);
ROS_INFO_STREAM_NAMED("face_detector","Advertising colored lines to draw remotely.");
}
// Subscribe to filter measurements.
@@ -352,8 +352,8 @@
bool published = false;
- image_msgs::ColoredLines all_cls;
- vector<image_msgs::ColoredLine> lines;
+ visualization_msgs::ColoredLines all_cls;
+ vector<visualization_msgs::ColoredLine> lines;
// Clear out the old visualization markers.
markers_sub_.markers.clear();
markers_sub_.markers = markers_add_.markers;
Modified: pkg/trunk/vision/people/src/pedestrian_detector_HOG.cpp
===================================================================
--- pkg/trunk/vision/people/src/pedestrian_detector_HOG.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/people/src/pedestrian_detector_HOG.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -46,7 +46,7 @@
#include "image_msgs/CamInfo.h"
#include "image_msgs/Image.h"
#include "opencv_latest/CvBridge.h"
-#include "image_msgs/ColoredLines.h"
+#include "visualization_msgs/ColoredLines.h"
#include "topic_synchronizer/topic_synchronizer.h"
#include "tf/transform_listener.h"
#include <tf/message_notifier.h>
@@ -120,7 +120,7 @@
// Advertise the display boxes.
if (do_display_) {
- node_->advertise<image_msgs::ColoredLines>("lines_to_draw",1);
+ node_->advertise<visualization_msgs::ColoredLines>("lines_to_draw",1);
ROS_INFO_STREAM_NAMED("pedestrian_detector_HOG","Advertising colored lines to draw remotely.");
//cv::namedWindow("people detector", 1);
}
Modified: pkg/trunk/vision/people/src/stereo_color_tracker.cpp
===================================================================
--- pkg/trunk/vision/people/src/stereo_color_tracker.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/people/src/stereo_color_tracker.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -46,7 +46,7 @@
#include "image_msgs/CamInfo.h"
#include "image_msgs/Image.h"
#include "opencv_latest/CvBridge.h"
-#include "image_msgs/ColoredLines.h"
+#include "visualization_msgs/ColoredLines.h"
#include "topic_synchronizer/topic_synchronizer.h"
#include "tf/transform_listener.h"
#include <tf/message_notifier.h>
@@ -160,7 +160,7 @@
node_->advertise<people::PositionMeasurement>("people_tracker_measurements",1);
if (do_display_) {
- node_->advertise<image_msgs::ColoredLines>("lines_to_draw",1);
+ node_->advertise<visualization_msgs::ColoredLines>("lines_to_draw",1);
ROS_INFO_STREAM_NAMED("color_tracker","Advertising colored lines to draw remotely.");
}
@@ -740,8 +740,8 @@
if (do_display_) {
- image_msgs::ColoredLines all_cls;
- vector<image_msgs::ColoredLine> lines;
+ visualization_msgs::ColoredLines all_cls;
+ vector<visualization_msgs::ColoredLine> lines;
lines.resize(4);
lines[0].r = 255; lines[0].g = 0; lines[0].b = 0;
lines[1].r = 255; lines[1].g = 0; lines[1].b = 0;
Modified: pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp
===================================================================
--- pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/people/src/stereo_face_color_tracker.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -49,7 +49,6 @@
#include "image_msgs/CamInfo.h"
#include "image_msgs/Image.h"
#include "opencv_latest/CvBridge.h"
-#include "image_msgs/ColoredLines.h"
#include "topic_synchronizer/topic_synchronizer.h"
#include "tf/transform_listener.h"
Modified: pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp
===================================================================
--- pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/stereo_capture/src/stereo_capture.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -46,19 +46,12 @@
#include "opencv/cv.h"
#include "opencv/highgui.h"
-//#include "ros/node.h"
-//#include "image_msgs/StereoInfo.h"
-//#include "image_msgs/DisparityInfo.h"
-//#include "image_msgs/Image.h"
-
#include "ros/node.h"
#include "image_msgs/DisparityInfo.h"
#include "image_msgs/StereoInfo.h"
#include "image_msgs/Image.h"
#include "image_msgs/CamInfo.h"
-#include "image_msgs/ColoredLines.h"
-#include "image_msgs/ColoredLine.h"
//#include "CvStereoCamModel.h"
Modified: pkg/trunk/vision/stereo_view/manifest.xml
===================================================================
--- pkg/trunk/vision/stereo_view/manifest.xml 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/stereo_view/manifest.xml 2009-06-30 19:43:00 UTC (rev 17991)
@@ -9,6 +9,7 @@
<depend package="std_msgs"/>
<depend package="std_srvs"/>
<depend package="image_msgs"/>
+ <depend package="visualization_msgs"/>
<depend package="roscpp"/>
<depend package="topic_synchronizer"/>
<depend package="color_calib"/>
Modified: pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp
===================================================================
--- pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp 2009-06-30 19:39:48 UTC (rev 17990)
+++ pkg/trunk/vision/stereo_view/stereo_view_pixel_info.cpp 2009-06-30 19:43:00 UTC (rev 17991)
@@ -54,8 +54,8 @@
#include "image_msgs/StereoInfo.h"
#include "image_msgs/Image.h"
#include "image_msgs/CamInfo.h"
-#include "image_msgs/ColoredLines.h"
-#include "image_msgs/ColoredLine.h"
+#include "visualization_msgs/ColoredLines.h"
+#include "visualization_msgs/ColoredLine.h"
#include "CvStereoCamModel.h"
@@ -159,8 +159,8 @@
image_msgs::CvBridge lbridge; /**< CvBridge for the left camera. */
image_msgs::CvBridge rbridge; /**< CvBridge for the right camera. */
image_msgs::CvBridge dbridge; /**< CvBridge for the disparity image. */
- image_msgs::ColoredLines cls;
- map<string,image_msgs::ColoredLines> map_cls;
+ visualization_msgs::ColoredLines cls;
+ map<string,visualization_msgs::ColoredLines> map_cls;
color_calib::Calibration lcal; /**< Color calibration for the left image. */
color_calib::Calibration rcal; /**< Color calibration for the right image. */
@@ -213,7 +213,7 @@
sync.subscribe("stereo/right/cam_info", rcaminfo, 1);
sync.ready();
- subscribe<image_msgs::ColoredLines>("lines_to_draw",cls,&StereoView::line_cb,1);
+ subscribe<visualization_msgs::ColoredLines>("lines_to_draw",cls,&StereoView::line_cb,1);
}
~StereoView()
@@ -234,10 +234,10 @@
boost::mutex::scoped_lock linelock(lines_mutex_);
// Find if there's already a message with this label.
- map<string,image_msgs::ColoredLines>::iterator it = map_cls.find(cls.label);
+ map<string,visualization_msgs::ColoredLines>::iterator it = map_cls.find(cls.label);
if (it == map_cls.end()) {
// If not, inset this new message into the map.
- map_cls.insert(pair<string,image_msgs::ColoredLines>(cls.label,cls));
+ map_cls.insert(pair<string,visualization_msgs::ColoredLines>(cls.label,cls));
}
else {
// If so, overwrite the old list of lines.
@@ -275,7 +275,7 @@
boost::mutex::scoped_lock linelock(lines_mutex_);
// Draw the lines on the image.
- map<string,image_msgs::ColoredLines>::iterator it;
+ map<string,visualization_msgs::ColoredLines>::iterator it;
for (it = map_cls.begin(); it != map_cls.end(); it++) {
for (uint il=0; il<it->second.lines.size(); il++) {
cvLine(lcalimage,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
