From c4aed1cb0cf86e2c216b7c710eab59f61fc6bfcd Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Wed, 19 Dec 2012 16:52:09 -0800 Subject: [PATCH] clean up shared parameters --- pcl_ros/cfg/Filter.cfg | 12 +++++++----- pcl_ros/cfg/VoxelGrid.cfg | 11 +++++++---- pcl_ros/cfg/{Filter_common.py => common.py} | 0 3 files changed, 14 insertions(+), 9 deletions(-) rename pcl_ros/cfg/{Filter_common.py => common.py} (100%) diff --git a/pcl_ros/cfg/Filter.cfg b/pcl_ros/cfg/Filter.cfg index c6b29abb..398af1aa 100755 --- a/pcl_ros/cfg/Filter.cfg +++ b/pcl_ros/cfg/Filter.cfg @@ -3,13 +3,15 @@ # set up parameters that we care about PACKAGE = 'pcl_ros' -import roslib; -roslib.load_manifest (PACKAGE); -from dynamic_reconfigure.parameter_generator_catkin import *; -import Filter_common as common +import os +import sys +sys.path.insert(0, os.path.dirname(__file__)) +from common import add_common_parameters + +from dynamic_reconfigure.parameter_generator_catkin import * gen = ParameterGenerator () -common.add_common_parameters (gen) +add_common_parameters (gen) exit (gen.generate (PACKAGE, "pcl_ros", "Filter")) diff --git a/pcl_ros/cfg/VoxelGrid.cfg b/pcl_ros/cfg/VoxelGrid.cfg index 71db1e89..332f1f0a 100755 --- a/pcl_ros/cfg/VoxelGrid.cfg +++ b/pcl_ros/cfg/VoxelGrid.cfg @@ -3,13 +3,16 @@ # set up parameters that we care about PACKAGE = 'pcl_ros' -import roslib; roslib.load_manifest (PACKAGE); -from dynamic_reconfigure.parameter_generator_catkin import *; -import Filter_common as common +import os +import sys +sys.path.insert(0, os.path.dirname(__file__)) +from common import add_common_parameters + +from dynamic_reconfigure.parameter_generator_catkin import * gen = ParameterGenerator () # def add (self, name, paramtype, level, description, default = None, min = None, max = None, edit_method = ""): gen.add ("leaf_size", double_t, 0, "The size of a leaf (on x,y,z) used for downsampling.", 0.01, 0, 1.0) -common.add_common_parameters (gen) +add_common_parameters (gen) exit (gen.generate (PACKAGE, "pcl_ros", "VoxelGrid")) diff --git a/pcl_ros/cfg/Filter_common.py b/pcl_ros/cfg/common.py similarity index 100% rename from pcl_ros/cfg/Filter_common.py rename to pcl_ros/cfg/common.py