Skip to content

Commit

Permalink
Making scan_to_cloud_filter_chain robust to a likely user migration e…
Browse files Browse the repository at this point in the history
…rror.

git-svn-id: https://code.ros.org/svn/ros-pkg/stacks/laser_pipeline/trunk@24660 eb33c2ac-9c88-4c90-87e0-44a10359b0c3
  • Loading branch information
jleibs-test committed Sep 29, 2009
1 parent 21f7b7d commit cd726be
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/scan_to_cloud_filter_chain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class ScanToCloudFilterChain
bool using_filter_window_deprecated_;
bool using_scan_filters_deprecated_;
bool using_cloud_filters_deprecated_;
bool using_scan_filters_wrong_deprecated_;
bool using_cloud_filters_wrong_deprecated_;

////////////////////////////////////////////////////////////////////////////////
ScanToCloudFilterChain () : laser_max_range_ (DBL_MAX), private_nh("~"), filter_(tf_, "", 50),
Expand All @@ -113,6 +115,8 @@ class ScanToCloudFilterChain
using_filter_window_deprecated_ = private_nh.hasParam("filter_window");
using_cloud_filters_deprecated_ = private_nh.hasParam("cloud_filters/filter_chain");
using_scan_filters_deprecated_ = private_nh.hasParam("scan_filters/filter_chain");
using_cloud_filters_wrong_deprecated_ = private_nh.hasParam("cloud_filters/cloud_filter_chain");
using_scan_filters_wrong_deprecated_ = private_nh.hasParam("scan_filters/scan_filter_chain");


private_nh.param("filter_window", window_, 2);
Expand Down Expand Up @@ -142,11 +146,15 @@ class ScanToCloudFilterChain

if (using_cloud_filters_deprecated_)
cloud_filter_chain_.configure("cloud_filters/filter_chain", private_nh);
else if (using_cloud_filters_wrong_deprecated_)
cloud_filter_chain_.configure("cloud_filters/cloud_filter_chain", private_nh);
else
cloud_filter_chain_.configure("cloud_filter_chain", private_nh);

if (using_scan_filters_deprecated_)
scan_filter_chain_.configure("scan_filter/filter_chain", private_nh);
else if (using_scan_filters_wrong_deprecated_)
scan_filter_chain_.configure("scan_filters/scan_filter_chain", private_nh);
else
scan_filter_chain_.configure("scan_filter_chain", private_nh);

Expand Down Expand Up @@ -179,6 +187,13 @@ class ScanToCloudFilterChain

if (using_scan_filters_deprecated_)
ROS_WARN("Use of '~scan_filters/filter_chain' parameter in scan_to_cloud_filter_chain has been deprecated. Replace with '~scan_filter_chain'");

if (using_cloud_filters_wrong_deprecated_)
ROS_WARN("Use of '~cloud_filters/cloud_filter_chain' parameter in scan_to_cloud_filter_chain is incorrect. Please Replace with '~cloud_filter_chain'");

if (using_scan_filters_wrong_deprecated_)
ROS_WARN("Use of '~scan_filters/scan_filter_chain' parameter in scan_to_scan_filter_chain is incorrect. Please Replace with '~scan_filter_chain'");

}


Expand Down

0 comments on commit cd726be

Please sign in to comment.