[Personalrobots-commit] SF.net SVN: personalrobots:[10173] pkg/trunk

[<is...@us...>]

Revision: 10173
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=10173&view=rev
Author:   isucan
Date:     2009-01-25 06:52:02 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
fixed moved msgs error

Modified Paths:
--------------
    pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt
    pkg/trunk/motion_planning/kinematic_planning/include/kinematic_planning/CollisionSpaceMonitor.h
    pkg/trunk/motion_planning/kinematic_planning/manifest.xml

Added Paths:
-----------
    pkg/trunk/prcore/robot_msgs/msg/AttachedObject.msg

Removed Paths:
-------------
    pkg/trunk/motion_planning/kinematic_planning/msg/

Modified: pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt
===================================================================
--- pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt	2009-01-25 06:43:52 UTC (rev 10172)
+++ pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt	2009-01-25 06:52:02 UTC (rev 10173)
@@ -4,8 +4,6 @@
 
 rospack_add_boost_directories()
 
-genmsg()
-
 rospack_add_executable(kinematic_planning src/kinematic_planning.cpp)
 rospack_add_executable(motion_validator src/motion_validator.cpp)
 rospack_add_executable(state_validity_monitor src/state_validity_monitor.cpp)

Modified: pkg/trunk/motion_planning/kinematic_planning/include/kinematic_planning/CollisionSpaceMonitor.h
===================================================================
--- pkg/trunk/motion_planning/kinematic_planning/include/kinematic_planning/CollisionSpaceMonitor.h	2009-01-25 06:43:52 UTC (rev 10172)
+++ pkg/trunk/motion_planning/kinematic_planning/include/kinematic_planning/CollisionSpaceMonitor.h	2009-01-25 06:52:02 UTC (rev 10173)
@@ -38,9 +38,9 @@
 #include <collision_space/environmentODE.h>
 
 #include <std_msgs/PointCloud.h>
+#include <robot_msgs/CollisionMap.h>
+#include <robot_msgs/AttachedObject.h>
 #include <robot_srvs/CollisionCheckState.h>
-#include <collision_map/CollisionMap.h>
-#include <kinematic_planning/AttachedObject.h>
 
 /** Main namespace */
 namespace kinematic_planning
@@ -199,11 +199,11 @@
 	
     protected:
 	
-	collision_map::CollisionMap           m_collisionMap;
+	robot_msgs::CollisionMap              m_collisionMap;
 	collision_space::EnvironmentModel    *m_collisionSpace;
 
 	// add or remove objects to be attached to a link
-	kinematic_planning::AttachedObject    m_attachedObject;
+	robot_msgs::AttachedObject            m_attachedObject;
 
 	void addSelfCollisionGroups(unsigned int cid, robot_desc::URDF *model)
 	{

Modified: pkg/trunk/motion_planning/kinematic_planning/manifest.xml
===================================================================
--- pkg/trunk/motion_planning/kinematic_planning/manifest.xml	2009-01-25 06:43:52 UTC (rev 10172)
+++ pkg/trunk/motion_planning/kinematic_planning/manifest.xml	2009-01-25 06:52:02 UTC (rev 10173)
@@ -17,7 +17,6 @@
   <depend package="wg_robot_description_parser"/>
   <depend package="planning_models"/>
   <depend package="collision_space"/>
-  <depend package="collision_map"/>
 
   <depend package="ompl" />
 

Added: pkg/trunk/prcore/robot_msgs/msg/AttachedObject.msg
===================================================================
--- pkg/trunk/prcore/robot_msgs/msg/AttachedObject.msg	                        (rev 0)
+++ pkg/trunk/prcore/robot_msgs/msg/AttachedObject.msg	2009-01-25 06:52:02 UTC (rev 10173)
@@ -0,0 +1,7 @@
+# This mesage defines what objects are attached to a link. The objects
+# are assumed to be defined in the reference frame of the link they
+# are attached to
+
+string robot_name
+string link_name
+CollisionMap objects


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.