Merged Audio branch to trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@560 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-06-24 17:19:34 +00:00
parent 6de31a4080
commit ffcfa9236c
79 changed files with 3608 additions and 1349 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ void PreferencesDialogROS::readCameraSettings(const QString & filePath)
double imgRate = 0;
ros::NodeHandle nh;
nh.getParam("camera/image_hz", imgRate);
this->setImgRate(imgRate);
this->setInputRate(imgRate);
}
QString PreferencesDialogROS::getParamMessage()