Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[23277] pkg/trunk
|
From: <bla...@us...> - 2009-08-28 20:42:27
|
Revision: 23277
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23277&view=rev
Author: blaisegassend
Date: 2009-08-28 20:42:19 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Renamed prosilica_cam to prosilica_camera
Modified Paths:
--------------
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/cart_sensors.launch
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/manifest.xml
pkg/trunk/sandbox/hanoi/manifest.xml
pkg/trunk/sandbox/hanoi/src/prosilica_poll.cpp
pkg/trunk/stacks/camera_drivers/camera_launch_files/manifest.xml
pkg/trunk/stacks/camera_drivers/prosilica_camera/CMakeLists.txt
pkg/trunk/stacks/camera_drivers/prosilica_camera/LED.launch
pkg/trunk/stacks/camera_drivers/prosilica_camera/freerun.launch
pkg/trunk/stacks/camera_drivers/prosilica_camera/grab.launch
pkg/trunk/stacks/camera_drivers/prosilica_camera/manifest.xml
pkg/trunk/stacks/camera_drivers/prosilica_camera/prosilica.launch
pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/fake_poll_node.cpp
pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_grab.cpp
pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_node.cpp
pkg/trunk/stacks/pr2/pr2_alpha/manifest.xml
pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml
pkg/trunk/stacks/pr2_simulator/gazebo_plugin/src/ros_prosilica.cpp
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/include/outlet_detection/tracker_base.h
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/manifest.xml
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/tracker_base.cpp
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part1.xml
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part2.xml
pkg/trunk/util/prosilica_capture_rectified/manifest.xml
pkg/trunk/util/prosilica_capture_rectified/src/prosilica_capture.cpp
Added Paths:
-----------
pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_camera_view.launch
pkg/trunk/stacks/camera_drivers/prosilica_camera/
Removed Paths:
-------------
pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_cam_view.launch
pkg/trunk/stacks/camera_drivers/prosilica_cam/
Modified: pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/cart_sensors.launch
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/cart_sensors.launch 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/cart_sensors.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -24,11 +24,11 @@
</group>
<group ns="prosilica">
- <include file="$(find prosilica_cam)/cam_settings.xml" />
+ <include file="$(find prosilica_camera)/cam_settings.xml" />
<param name="acquisition_mode" type="str" value="Triggered" />
<param name="ip_address" type="str" value="10.68.8.20" />
</group>
- <node machine="two" name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="true" />
+ <node machine="two" name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="true" />
<!-- Hokuyo, plug in to machine 2 -->
<node machine="two" pkg="hokuyo_node" type="hokuyo_node" name="tilt_hokuyo_node" args="scan:=tilt_scan">
Modified: pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/manifest.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_head_cart/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -12,7 +12,7 @@
<depend package="hokuyo_node" />
<depend package="dcam" />
<depend package="robot_state_publisher" />
- <depend package="prosilica_cam" />
+ <depend package="prosilica_camera" />
<depend package="teleop_head" />
<depend package="pr2_computer_monitor" />
<depend package="pr2_power_board" />
Modified: pkg/trunk/sandbox/hanoi/manifest.xml
===================================================================
--- pkg/trunk/sandbox/hanoi/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/sandbox/hanoi/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -12,7 +12,7 @@
<depend package="roscpp"/>
<depend package="cmvision"/>
<depend package="sensor_msgs"/>
- <depend package="prosilica_cam"/>
+ <depend package="prosilica_camera"/>
<depend package="gazebo" />
<depend package="gazebo_tools"/>
<depend package="move_arm_tools"/>
Modified: pkg/trunk/sandbox/hanoi/src/prosilica_poll.cpp
===================================================================
--- pkg/trunk/sandbox/hanoi/src/prosilica_poll.cpp 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/sandbox/hanoi/src/prosilica_poll.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,5 +1,5 @@
#include "ros/ros.h"
-#include "prosilica_cam/PolledImage.h"
+#include "prosilica_camera/PolledImage.h"
// NOTE: res must be global! CvBridge assumes it can just point
// to the pixel data in the image message.
Modified: pkg/trunk/stacks/camera_drivers/camera_launch_files/manifest.xml
===================================================================
--- pkg/trunk/stacks/camera_drivers/camera_launch_files/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/camera_drivers/camera_launch_files/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -8,7 +8,7 @@
<review status="unreviewed" notes=""/>
<url>http://www.ros.org/wiki/camera_launch_files</url>
<depend package="forearm_cam"/>
- <depend package="prosilica_cam"/>
+ <depend package="prosilica_camera"/>
<depend package="dcam"/>
<depend package="stereo_image_proc"/>
<depend package="image_view"/>
Deleted: pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_cam_view.launch
===================================================================
--- pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_cam_view.launch 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_cam_view.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,7 +0,0 @@
-<launch>
- <node name="prosilica_view" pkg="image_view" type="image_view" respawn="false" output="screen" cwd="node">
- <param name="window_name" type="str" value="Prosilica camera"/>
- <param name="autosize" type="bool" value="false"/>
- <remap from="image" to="/prosilica/image_rect"/>
- </node>
-</launch>
Copied: pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_camera_view.launch (from rev 23270, pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_cam_view.launch)
===================================================================
--- pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_camera_view.launch (rev 0)
+++ pkg/trunk/stacks/camera_drivers/camera_launch_files/prosilica_camera_view.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -0,0 +1,7 @@
+<launch>
+ <node name="prosilica_view" pkg="image_view" type="image_view" respawn="false" output="screen" cwd="node">
+ <param name="window_name" type="str" value="Prosilica camera"/>
+ <param name="autosize" type="bool" value="false"/>
+ <remap from="image" to="/prosilica/image_rect"/>
+ </node>
+</launch>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/CMakeLists.txt 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/CMakeLists.txt 2009-08-28 20:42:19 UTC (rev 23277)
@@ -3,7 +3,7 @@
#set(ROS_BUILD_TYPE RelWithDebInfo)
set(ROS_BUILD_TYPE Debug)
-rospack(prosilica_cam)
+rospack(prosilica_camera)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/LED.launch
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/LED.launch 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/LED.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -7,8 +7,8 @@
<param name="gain_auto" type="str" value="Manual"/>
<param name="gain" type="int" value="0"/>
</group>
- <node name="prosilica" pkg="prosilica_cam" type="prosilica_node" respawn="false" output="screen"/>
- <node name="prosilica_view" pkg="prosilica_cam" type="prosilica_view" respawn="false" output="screen">
+ <node name="prosilica" pkg="prosilica_camera" type="prosilica_node" respawn="false" output="screen"/>
+ <node name="prosilica_view" pkg="prosilica_camera" type="prosilica_view" respawn="false" output="screen">
<!--remap from="Image" to="/prosilica/image"/-->
<remap from="Image" to="/prosilica/image_rect"/>
</node>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/freerun.launch
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/freerun.launch 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/freerun.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -4,5 +4,5 @@
<param name="acquisition_mode" type="str" value="Continuous"/>
<param name="ip_address" type="str" value="10.68.7.20"/>
</group>
- <node name="prosilica" pkg="prosilica_cam" type="prosilica_node" respawn="false" output="screen"/>
+ <node name="prosilica" pkg="prosilica_camera" type="prosilica_node" respawn="false" output="screen"/>
</launch>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/grab.launch
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/grab.launch 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/grab.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -3,6 +3,6 @@
<include file="cam_settings.xml"/>
<param name="acquisition_mode" type="str" value="Triggered"/>
</group>
- <node name="prosilica" pkg="prosilica_cam" type="prosilica_node" respawn="false" output="screen"/>
- <node name="prosilica_grab" pkg="prosilica_cam" type="prosilica_grab" respawn="false" output="screen" cwd="node"/>
+ <node name="prosilica" pkg="prosilica_camera" type="prosilica_node" respawn="false" output="screen"/>
+ <node name="prosilica_grab" pkg="prosilica_camera" type="prosilica_grab" respawn="false" output="screen" cwd="node"/>
</launch>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/manifest.xml
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/manifest.xml 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -15,5 +15,5 @@
<export>
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lprosilica" cflags="-I${prefix}/include -I${prefix}/srv/cpp"/>
</export>
- <url>http://www.ros.org/wiki/prosilica_cam</url>
+ <url>http://www.ros.org/wiki/prosilica_camera</url>
</package>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/prosilica.launch
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/prosilica.launch 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/prosilica.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,8 +1,8 @@
<launch>
<group ns="prosilica">
- <include file="$(find prosilica_cam)/cam_settings.xml"/>
+ <include file="$(find prosilica_camera)/cam_settings.xml"/>
<param name="acquisition_mode" type="str" value="Triggered"/>
<param name="ip_address" type="str" value="10.68.0.20"/>
</group>
- <node name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="false"/>
+ <node name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="false"/>
</launch>
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/fake_poll_node.cpp
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/src/nodes/fake_poll_node.cpp 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/fake_poll_node.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -2,8 +2,8 @@
#include "sensor_msgs/Image.h"
#include "sensor_msgs/CameraInfo.h"
#include "sensor_msgs/fill_image.h"
-#include "prosilica_cam/PolledImage.h"
-#include "prosilica_cam/CameraInfo.h"
+#include "prosilica_camera/PolledImage.h"
+#include "prosilica_camera/CameraInfo.h"
#include <cv.h>
#include <cvwimage.h>
@@ -63,16 +63,16 @@
cvReleaseMat(&D_);
}
- bool camInfo(prosilica_cam::CameraInfo::Request &req,
- prosilica_cam::CameraInfo::Response &rsp)
+ bool camInfo(prosilica_camera::CameraInfo::Request &req,
+ prosilica_camera::CameraInfo::Response &rsp)
{
memcpy((char*)(&rsp.cam_info.D[0]), (char*)(D_->data.db), 5*sizeof(double));
memcpy((char*)(&rsp.cam_info.K[0]), (char*)(K_->data.db), 9*sizeof(double));
return true;
}
- bool grab(prosilica_cam::PolledImage::Request &req,
- prosilica_cam::PolledImage::Response &res)
+ bool grab(prosilica_camera::PolledImage::Request &req,
+ prosilica_camera::PolledImage::Response &res)
{
if (current_iter_ == end_iter_) {
ros::Node::instance()->unadvertiseService("/prosilica/poll");
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_grab.cpp
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/src/nodes/prosilica_grab.cpp 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_grab.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -4,7 +4,7 @@
#include "opencv/cv.h"
#include "opencv/highgui.h"
-#include "prosilica_cam/PolledImage.h"
+#include "prosilica_camera/PolledImage.h"
static char wndname[] = "Captured image";
@@ -12,8 +12,8 @@
// NOTE: res must be global! CvBridge assumes it can just point
// to the pixel data in the image message.
-prosilica_cam::PolledImage::Request req;
-prosilica_cam::PolledImage::Response res;
+prosilica_camera::PolledImage::Request req;
+prosilica_camera::PolledImage::Response res;
IplImage* callPollProsilica(int timeout)
{
Modified: pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_node.cpp
===================================================================
--- pkg/trunk/stacks/camera_drivers/prosilica_cam/src/nodes/prosilica_node.cpp 2009-08-28 17:36:20 UTC (rev 23270)
+++ pkg/trunk/stacks/camera_drivers/prosilica_camera/src/nodes/prosilica_node.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -55,8 +55,8 @@
#include "prosilica/prosilica.h"
#include "prosilica/rolling_sum.h"
-#include "prosilica_cam/PolledImage.h"
-#include "prosilica_cam/CameraInfo.h"
+#include "prosilica_camera/PolledImage.h"
+#include "prosilica_camera/CameraInfo.h"
class ProsilicaNode
{
@@ -448,8 +448,8 @@
return true;
}
- bool camInfoService(prosilica_cam::CameraInfo::Request &req,
- prosilica_cam::CameraInfo::Response &res)
+ bool camInfoService(prosilica_camera::CameraInfo::Request &req,
+ prosilica_camera::CameraInfo::Response &res)
{
res.cam_info = cam_info_;
res.cam_info.header.stamp = ros::Time::now();
@@ -457,8 +457,8 @@
return true;
}
- bool triggeredGrab(prosilica_cam::PolledImage::Request &req,
- prosilica_cam::PolledImage::Response &res)
+ bool triggeredGrab(prosilica_camera::PolledImage::Request &req,
+ prosilica_camera::PolledImage::Response &res)
{
if (mode_ != prosilica::Triggered)
return false;
Modified: pkg/trunk/stacks/pr2/pr2_alpha/manifest.xml
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2/pr2_alpha/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -29,7 +29,7 @@
<depend package="joint_calibration_monitor" />
<depend package="forearm_cam" />
<depend package="robot_state_publisher" />
- <depend package="prosilica_cam" />
+ <depend package="prosilica_camera" />
<depend package="teleop_pr2" />
<depend package="mechanism_bringup" />
<depend package="robot_mechanism_controllers" />
Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.launch 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -62,11 +62,11 @@
<!-- Prosilica camera setup, 7/14/09 -->
<group ns="prosilica">
- <include file="$(find prosilica_cam)/cam_settings.xml"/>
+ <include file="$(find prosilica_camera)/cam_settings.xml"/>
<param name="acquisition_mode" type="str" value="Triggered"/>
<param name="ip_address" type="str" value="10.68.0.20"/>
</group>
- <node machine="three" name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="true"/>
+ <node machine="three" name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="true"/>
<!-- Double stereo setup, 7/14/09 -->
<!-- Wide is on robot right, goes to four -->
Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.launch 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.launch 2009-08-28 20:42:19 UTC (rev 23277)
@@ -61,12 +61,12 @@
<!-- Prosilica camera setup -->
<!--group ns="prosilica">
- <include file="$(find prosilica_cam)/cam_settings.xml"/>
+ <include file="$(find prosilica_camera)/cam_settings.xml"/>
<param name="acquisition_mode" type="str" value="Triggered"/>
<param name="ip_address" type="str" value="10.68.7.20"/>
</group>
- <node machine="three" name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="true"/-->
+ <node machine="three" name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="true"/-->
<!-- Double stereo setup -->
<!-- Wide is on robot right, goes to four -->
Modified: pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2_simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h 2009-08-28 20:42:19 UTC (rev 23277)
@@ -39,8 +39,8 @@
// prosilica components
#include "prosilica/prosilica.h"
-#include "prosilica_cam/CameraInfo.h"
-#include "prosilica_cam/PolledImage.h"
+#include "prosilica_camera/CameraInfo.h"
+#include "prosilica_camera/PolledImage.h"
namespace gazebo
@@ -128,10 +128,10 @@
private: static void mouse_cb(int event, int x, int y, int flags, void* param) { };
/// \brief Service call to publish images, cam info
- private: bool camInfoService(prosilica_cam::CameraInfo::Request &req,
- prosilica_cam::CameraInfo::Response &res);
- private: bool triggeredGrab(prosilica_cam::PolledImage::Request &req,
- prosilica_cam::PolledImage::Response &res);
+ private: bool camInfoService(prosilica_camera::CameraInfo::Request &req,
+ prosilica_camera::CameraInfo::Response &res);
+ private: bool triggeredGrab(prosilica_camera::PolledImage::Request &req,
+ prosilica_camera::PolledImage::Response &res);
/// \brief A pointer to the parent camera sensor
private: MonoCameraSensor *myParent;
Modified: pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2_simulator/gazebo_plugin/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -10,7 +10,7 @@
<depend package="gazebo"/>
<depend package="opende"/>
<depend package="roscpp"/>
- <depend package="prosilica_cam"/>
+ <depend package="prosilica_camera"/>
<depend package="rospy"/>
<depend package="std_msgs" />
<depend package="nav_msgs" />
Modified: pkg/trunk/stacks/pr2_simulator/gazebo_plugin/src/ros_prosilica.cpp
===================================================================
--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/src/ros_prosilica.cpp 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/pr2_simulator/gazebo_plugin/src/ros_prosilica.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -25,7 +25,7 @@
Date: 24 Sept 2008
SVN info: $Id$
@htmlinclude manifest.html
- @b RosProsilica plugin mimics after prosilica_cam package
+ @b RosProsilica plugin mimics after prosilica_camera package
*/
#include <algorithm>
@@ -170,8 +170,8 @@
////////////////////////////////////////////////////////////////////////////////
// service call to return camera info
-bool RosProsilica::camInfoService(prosilica_cam::CameraInfo::Request &req,
- prosilica_cam::CameraInfo::Response &res)
+bool RosProsilica::camInfoService(prosilica_camera::CameraInfo::Request &req,
+ prosilica_camera::CameraInfo::Response &res)
{
// should return the cam info for the entire camera frame
this->camInfoMsg = &res.cam_info;
@@ -225,8 +225,8 @@
////////////////////////////////////////////////////////////////////////////////
// service call to grab an image
-bool RosProsilica::triggeredGrab(prosilica_cam::PolledImage::Request &req,
- prosilica_cam::PolledImage::Response &res)
+bool RosProsilica::triggeredGrab(prosilica_camera::PolledImage::Request &req,
+ prosilica_camera::PolledImage::Response &res)
{
if (req.region_x <= 0 || req.region_y <= 0 || req.width <= 0 || req.height <= 0)
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/include/outlet_detection/tracker_base.h
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/include/outlet_detection/tracker_base.h 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/include/outlet_detection/tracker_base.h 2009-08-28 20:42:19 UTC (rev 23277)
@@ -39,7 +39,7 @@
#include <sensor_msgs/Image.h>
#include <sensor_msgs/CameraInfo.h>
#include <opencv_latest/CvBridge.h>
-#include <prosilica_cam/PolledImage.h>
+#include <prosilica_camera/PolledImage.h>
#include <tf/transform_broadcaster.h>
#include <tf/transform_listener.h>
#include <visualization_msgs/Marker.h>
@@ -88,8 +88,8 @@
ros::Publisher marker_pub_;
boost::scoped_ptr<boost::thread> active_thread_;
- prosilica_cam::PolledImage::Request req_;
- prosilica_cam::PolledImage::Response res_;
+ prosilica_camera::PolledImage::Request req_;
+ prosilica_camera::PolledImage::Response res_;
std::string image_service_;
std::string cam_info_service_;
sensor_msgs::Image &img_;
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/manifest.xml
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -9,7 +9,7 @@
<depend package="opencv_latest"/>
<depend package="sensor_msgs"/>
<depend package="geometry_msgs"/>
- <depend package="prosilica_cam"/>
+ <depend package="prosilica_camera"/>
<depend package="rospy"/>
<depend package="rostest"/>
<depend package="star_detector"/>
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/tracker_base.cpp
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/tracker_base.cpp 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/src/tracker_base.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,6 +1,6 @@
#include "outlet_detection/tracker_base.h"
#include <geometry_msgs/PoseStamped.h>
-#include <prosilica_cam/CameraInfo.h>
+#include <prosilica_camera/CameraInfo.h>
#include <boost/bind.hpp>
#include <unistd.h> // getpid
@@ -217,8 +217,8 @@
// Try to get calibration parameters
if (!K_) {
if (waitForService(cam_info_service_)) {
- prosilica_cam::CameraInfo::Request cam_req;
- prosilica_cam::CameraInfo::Response cam_rsp;
+ prosilica_camera::CameraInfo::Request cam_req;
+ prosilica_camera::CameraInfo::Response cam_rsp;
if (ros::service::call(cam_info_service_, cam_req, cam_rsp)) {
cam_info_ = cam_rsp.cam_info;
processCameraInfo();
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part1.xml
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part1.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part1.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,6 +1,6 @@
<launch>
<!-- Feed the images from disk. -->
- <node pkg="prosilica_cam" type="fake_poll_node"
+ <node pkg="prosilica_camera" type="fake_poll_node"
args="--roi $(find outlet_detection)/test/outlets_2009_05_20_part1"
output="screen"/>
<!-- Run the detector -->
Modified: pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part2.xml
===================================================================
--- pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part2.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/stacks/visual_feature_detectors/outlet_detection/test/test_outlets_2009_05_20_part2.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -1,6 +1,6 @@
<launch>
<!-- Feed the images from disk. -->
- <node pkg="prosilica_cam" type="fake_poll_node"
+ <node pkg="prosilica_camera" type="fake_poll_node"
args="--roi $(find outlet_detection)/test/outlets_2009_05_20_part2"
output="screen"/>
<!-- Run the detector -->
Modified: pkg/trunk/util/prosilica_capture_rectified/manifest.xml
===================================================================
--- pkg/trunk/util/prosilica_capture_rectified/manifest.xml 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/util/prosilica_capture_rectified/manifest.xml 2009-08-28 20:42:19 UTC (rev 23277)
@@ -13,7 +13,7 @@
<depend package="opencv_latest"/>
<depend package="sensor_msgs"/>
<depend package="tf"/>
- <depend package="prosilica_cam"/>
+ <depend package="prosilica_camera"/>
<depend package="eigen"/>
<depend package="point_cloud_mapping"/>
<depend package="joy"/>
Modified: pkg/trunk/util/prosilica_capture_rectified/src/prosilica_capture.cpp
===================================================================
--- pkg/trunk/util/prosilica_capture_rectified/src/prosilica_capture.cpp 2009-08-28 20:28:02 UTC (rev 23276)
+++ pkg/trunk/util/prosilica_capture_rectified/src/prosilica_capture.cpp 2009-08-28 20:42:19 UTC (rev 23277)
@@ -46,7 +46,7 @@
#include <tf/transform_listener.h>
#include "joy/Joy.h"
-#include "prosilica_cam/PolledImage.h"
+#include "prosilica_camera/PolledImage.h"
#include <point_cloud_mapping/cloud_io.h>
#include <point_cloud_mapping/geometry/angles.h>
@@ -74,8 +74,8 @@
IplImage* image;
IplImage* rectified;
- prosilica_cam::PolledImage::Request req;
- prosilica_cam::PolledImage::Response res;
+ prosilica_camera::PolledImage::Request req;
+ prosilica_camera::PolledImage::Response res;
unsigned int index;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
