split namespace between left and right arm

pazeshun · Jan 18, 2017 · 10ef638 · 10ef638
1 parent d5a1571
commit 10ef638
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/nextage_ik_plugin/nextage_left_arm_moveit_ikfast_plugin_description.xml b/nextage_ik_plugin/nextage_left_arm_moveit_ikfast_plugin_description.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <library path="lib/libnextage_left_arm_moveit_ikfast_plugin">
-  <class name="nextage_left_arm_kinematics/IKFastKinematicsPlugin" type="ikfast_kinematics_plugin::IKFastKinematicsPlugin" base_class_type="kinematics::KinematicsBase">
+  <class name="nextage_left_arm_kinematics/IKFastKinematicsPlugin" type="nextage_left_arm_ikfast_kinematics_plugin::IKFastKinematicsPlugin" base_class_type="kinematics::KinematicsBase">
     <description>IKFast61 plugin for closed-form kinematics</description>
   </class>
 </library>
diff --git a/nextage_ik_plugin/nextage_right_arm_moveit_ikfast_plugin_description.xml b/nextage_ik_plugin/nextage_right_arm_moveit_ikfast_plugin_description.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <library path="lib/libnextage_right_arm_moveit_ikfast_plugin">
-  <class name="nextage_right_arm_kinematics/IKFastKinematicsPlugin" type="ikfast_kinematics_plugin::IKFastKinematicsPlugin" base_class_type="kinematics::KinematicsBase">
+  <class name="nextage_right_arm_kinematics/IKFastKinematicsPlugin" type="nextage_right_arm_ikfast_kinematics_plugin::IKFastKinematicsPlugin" base_class_type="kinematics::KinematicsBase">
     <description>IKFast61 plugin for closed-form kinematics</description>
   </class>
 </library>
diff --git a/nextage_ik_plugin/src/nextage_left_arm_ikfast_moveit_plugin.cpp b/nextage_ik_plugin/src/nextage_left_arm_ikfast_moveit_plugin.cpp
@@ -55,7 +55,7 @@ const double LIMIT_TOLERANCE = .0000001;
 /// \brief Search modes for searchPositionIK(), see there
 enum SEARCH_MODE { OPTIMIZE_FREE_JOINT=1, OPTIMIZE_MAX_JOINT=2 };
 
-namespace ikfast_kinematics_plugin
+namespace nextage_left_arm_ikfast_kinematics_plugin
 {
 
 #define IKFAST_NO_MAIN // Don't include main() from IKFast
@@ -963,4 +963,4 @@ bool IKFastKinematicsPlugin::getPositionIK(const geometry_msgs::Pose &ik_pose,
 
 //register IKFastKinematicsPlugin as a KinematicsBase implementation
 #include <pluginlib/class_list_macros.h>
-PLUGINLIB_EXPORT_CLASS(ikfast_kinematics_plugin::IKFastKinematicsPlugin, kinematics::KinematicsBase);
+PLUGINLIB_EXPORT_CLASS(nextage_left_arm_ikfast_kinematics_plugin::IKFastKinematicsPlugin, kinematics::KinematicsBase);
diff --git a/nextage_ik_plugin/src/nextage_right_arm_ikfast_moveit_plugin.cpp b/nextage_ik_plugin/src/nextage_right_arm_ikfast_moveit_plugin.cpp
@@ -55,7 +55,7 @@ const double LIMIT_TOLERANCE = .0000001;
 /// \brief Search modes for searchPositionIK(), see there
 enum SEARCH_MODE { OPTIMIZE_FREE_JOINT=1, OPTIMIZE_MAX_JOINT=2 };
 
-namespace ikfast_kinematics_plugin
+namespace nextage_right_arm_ikfast_kinematics_plugin
 {
 
 #define IKFAST_NO_MAIN // Don't include main() from IKFast
@@ -963,4 +963,4 @@ bool IKFastKinematicsPlugin::getPositionIK(const geometry_msgs::Pose &ik_pose,
 
 //register IKFastKinematicsPlugin as a KinematicsBase implementation
 #include <pluginlib/class_list_macros.h>
-PLUGINLIB_EXPORT_CLASS(ikfast_kinematics_plugin::IKFastKinematicsPlugin, kinematics::KinematicsBase);
+PLUGINLIB_EXPORT_CLASS(nextage_right_arm_ikfast_kinematics_plugin::IKFastKinematicsPlugin, kinematics::KinematicsBase);