Nodelets: Changed ROS_INFO/ROS_ERROR to NODELET_INFO/NODELET_ERROR

This commit is contained in:
matlabbe
2016-02-29 17:27:00 -05:00
parent b424e97d5f
commit 6b5ccf99fb
6 changed files with 17 additions and 17 deletions
+4 -4
View File
@@ -91,16 +91,16 @@ private:
bool approxSync = true; bool approxSync = true;
if(private_nh.getParam("max_rate", rate_)) if(private_nh.getParam("max_rate", rate_))
{ {
ROS_WARN("\"max_rate\" is now known as \"rate\"."); NODELET_WARN("\"max_rate\" is now known as \"rate\".");
} }
private_nh.param("rate", rate_, rate_); private_nh.param("rate", rate_, rate_);
private_nh.param("queue_size", queueSize, queueSize); private_nh.param("queue_size", queueSize, queueSize);
private_nh.param("approx_sync", approxSync, approxSync); private_nh.param("approx_sync", approxSync, approxSync);
private_nh.param("decimation", decimation_, decimation_); private_nh.param("decimation", decimation_, decimation_);
ROS_ASSERT(decimation_ >= 1); ROS_ASSERT(decimation_ >= 1);
ROS_INFO("Rate=%f Hz", rate_); NODELET_INFO("Rate=%f Hz", rate_);
ROS_INFO("Decimation=%d", decimation_); NODELET_INFO("Decimation=%d", decimation_);
ROS_INFO("Approximate time sync = %s", approxSync?"true":"false"); NODELET_INFO("Approximate time sync = %s", approxSync?"true":"false");
if(approxSync) if(approxSync)
{ {
+1 -1
View File
@@ -63,7 +63,7 @@ private:
{ {
if(disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1) !=0) if(disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1) !=0)
{ {
ROS_ERROR("Input type must be disparity=32FC1"); NODELET_ERROR("Input type must be disparity=32FC1");
return; return;
} }
+3 -3
View File
@@ -119,7 +119,7 @@ private:
{ {
if(!tfListener_.waitForTransform(frameId_, cloudMsg->header.frame_id, cloudMsg->header.stamp, ros::Duration(1))) if(!tfListener_.waitForTransform(frameId_, cloudMsg->header.frame_id, cloudMsg->header.stamp, ros::Duration(1)))
{ {
ROS_ERROR("Could not get transform from %s to %s after 1 second!", frameId_.c_str(), cloudMsg->header.frame_id.c_str()); NODELET_ERROR("Could not get transform from %s to %s after 1 second!", frameId_.c_str(), cloudMsg->header.frame_id.c_str());
return; return;
} }
} }
@@ -129,7 +129,7 @@ private:
} }
catch(tf::TransformException & ex) catch(tf::TransformException & ex)
{ {
ROS_ERROR("%s",ex.what()); NODELET_ERROR("%s",ex.what());
return; return;
} }
@@ -255,7 +255,7 @@ private:
obstaclesPub_.publish(rosCloud); obstaclesPub_.publish(rosCloud);
} }
//ROS_INFO("Obstacles segmentation time = %f s", (ros::Time::now() - time).toSec()); //NODELET_INFO("Obstacles segmentation time = %f s", (ros::Time::now() - time).toSec());
} }
private: private:
+3 -3
View File
@@ -108,7 +108,7 @@ private:
pnh.param("cut_right", cut_right_, cut_right_); pnh.param("cut_right", cut_right_, cut_right_);
pnh.param("special_filter_close_object", create_close_obstacle_if_depth_is_missing_, create_close_obstacle_if_depth_is_missing_); pnh.param("special_filter_close_object", create_close_obstacle_if_depth_is_missing_, create_close_obstacle_if_depth_is_missing_);
ROS_INFO("Approximate time sync = %s", approxSync?"true":"false"); NODELET_INFO("Approximate time sync = %s", approxSync?"true":"false");
if(approxSync) if(approxSync)
{ {
@@ -149,7 +149,7 @@ private:
depth->encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1)!=0 && depth->encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1)!=0 &&
depth->encoding.compare(sensor_msgs::image_encodings::MONO16)!=0) depth->encoding.compare(sensor_msgs::image_encodings::MONO16)!=0)
{ {
ROS_ERROR("Input type depth=32FC1,16UC1,MONO16"); NODELET_ERROR("Input type depth=32FC1,16UC1,MONO16");
return; return;
} }
@@ -224,7 +224,7 @@ private:
if(disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1) !=0 && if(disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1) !=0 &&
disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_16SC1) !=0) disparityMsg->image.encoding.compare(sensor_msgs::image_encodings::TYPE_16SC1) !=0)
{ {
ROS_ERROR("Input type must be disparity=32FC1 or 16SC1"); NODELET_ERROR("Input type must be disparity=32FC1 or 16SC1");
return; return;
} }
+3 -3
View File
@@ -102,7 +102,7 @@ private:
pnh.param("noise_filter_radius", noiseFilterRadius_, noiseFilterRadius_); pnh.param("noise_filter_radius", noiseFilterRadius_, noiseFilterRadius_);
pnh.param("noise_filter_min_neighbors", noiseFilterMinNeighbors_, noiseFilterMinNeighbors_); pnh.param("noise_filter_min_neighbors", noiseFilterMinNeighbors_, noiseFilterMinNeighbors_);
ROS_INFO("Approximate time sync = %s", approxSync?"true":"false"); NODELET_INFO("Approximate time sync = %s", approxSync?"true":"false");
cloudPub_ = nh.advertise<sensor_msgs::PointCloud2>("cloud", 1); cloudPub_ = nh.advertise<sensor_msgs::PointCloud2>("cloud", 1);
@@ -167,7 +167,7 @@ private:
imageDepth->encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1)==0 || imageDepth->encoding.compare(sensor_msgs::image_encodings::TYPE_32FC1)==0 ||
imageDepth->encoding.compare(sensor_msgs::image_encodings::MONO16)==0)) imageDepth->encoding.compare(sensor_msgs::image_encodings::MONO16)==0))
{ {
ROS_ERROR("Input type must be image=mono8,mono16,rgb8,bgr8 and image_depth=32FC1,16UC1,mono16"); NODELET_ERROR("Input type must be image=mono8,mono16,rgb8,bgr8 and image_depth=32FC1,16UC1,mono16");
return; return;
} }
@@ -212,7 +212,7 @@ private:
imageRight->encoding.compare(sensor_msgs::image_encodings::BGR8) == 0 || imageRight->encoding.compare(sensor_msgs::image_encodings::BGR8) == 0 ||
imageRight->encoding.compare(sensor_msgs::image_encodings::RGB8) == 0)) imageRight->encoding.compare(sensor_msgs::image_encodings::RGB8) == 0))
{ {
ROS_ERROR("Input type must be image=mono8,mono16,rgb8,bgr8 (enc=%s)", imageLeft->encoding.c_str()); NODELET_ERROR("Input type must be image=mono8,mono16,rgb8,bgr8 (enc=%s)", imageLeft->encoding.c_str());
return; return;
} }
+3 -3
View File
@@ -93,9 +93,9 @@ private:
pnh.param("queue_size", queueSize, queueSize); pnh.param("queue_size", queueSize, queueSize);
pnh.param("decimation", decimation_, decimation_); pnh.param("decimation", decimation_, decimation_);
ROS_ASSERT(decimation_ >= 1); ROS_ASSERT(decimation_ >= 1);
ROS_INFO("Rate=%f Hz", rate_); NODELET_INFO("Rate=%f Hz", rate_);
ROS_INFO("Decimation=%d", decimation_); NODELET_INFO("Decimation=%d", decimation_);
ROS_INFO("Approximate time sync = %s", approxSync?"true":"false"); NODELET_INFO("Approximate time sync = %s", approxSync?"true":"false");
if(approxSync) if(approxSync)
{ {