i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 08:47:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated camera dynamic parameters' name

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@565 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-06-24 20:32:54 +00:00
parent 262a80c33c
commit c353a0aee1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtabmap/launch/loop_closure_detection.launch
+3 -3
View File
@@ -12,8 +12,8 @@
<node name="camera" pkg="rtabmap_image" type="camera" output="screen"> <node name="camera" pkg="rtabmap_image" type="camera" output="screen">
<remap from="/camera/image" to="/image"/> <remap from="/camera/image" to="/image"/>
<param name="device_id" value="0" type="int"/> <param name="device_id" value="0" type="int"/>
<param name="image_hz" value="1.0" type="double"/> <param name="frame_rate" value="1.0" type="double"/>
<param name="image_width" value="640" type="int"/> <param name="width" value="640" type="int"/>
<param name="image_height" value="480" type="int"/> <param name="height" value="480" type="int"/>
</node> </node>
</launch> </launch>
rtabmap_image/cfg/Camera.cfg
+2 -2
View File
@@ -6,8 +6,8 @@ from dynamic_reconfigure.parameter_generator import *
gen = ParameterGenerator() gen = ParameterGenerator()
gen.add("deviceId", int_t, 0, "Camera device ID", 0, 0, 7) gen.add("device_id", int_t, 0, "Camera device ID", 0, 0, 7)
gen.add("frameRate", double_t, 0, "Frame rate", 15.0, 0.0, 100.0) gen.add("frame_rate", double_t, 0, "Frame rate", 15.0, 0.0, 100.0)
gen.add("width", int_t, 0, "Width", 640, 1, 1920) gen.add("width", int_t, 0, "Width", 640, 1, 1920)
gen.add("height", int_t, 0, "Image height", 480, 1, 1080) gen.add("height", int_t, 0, "Image height", 480, 1, 1080)
rtabmap_image/launch/test_rtabmap_image.launch
+3 -3
View File
@@ -3,9 +3,9 @@
<node name="camera" pkg="rtabmap_image" type="camera" output="screen"> <node name="camera" pkg="rtabmap_image" type="camera" output="screen">
<remap from="camera/image" to="image"/> <remap from="camera/image" to="image"/>
<param name="device_id" value="0" type="int"/> <param name="device_id" value="0" type="int"/>
<param name="image_hz" value="0" type="double"/> <param name="frame_rate" value="0" type="double"/>
<param name="image_width" value="640" type="int"/> <param name="width" value="640" type="int"/>
<param name="image_height" value="480" type="int"/> <param name="height" value="480" type="int"/>
</node> </node>
<node name="rgb2ind" pkg="rtabmap_image" type="rgb2ind"/> <node name="rgb2ind" pkg="rtabmap_image" type="rgb2ind"/>
rtabmap_image/src/CameraNode.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ void callback(rtabmap_image::cameraConfig &config, uint32_t level)
{ {
if(camera) if(camera)
{ {
camera->setParameters(config.deviceId, config.frameRate, config.width, config.height); camera->setParameters(config.device_id, config.frame_rate, config.width, config.height);
} }
} }