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

[<sf...@us...>]

Revision: 21382
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21382&view=rev
Author:   sfkwc
Date:     2009-08-10 10:18:26 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
more robot_msgs->geometry_msgs migratio

Modified Paths:
--------------
    pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/test/test_move_base_local.py
    pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py
    pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py
    pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py
    pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py
    pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
    pkg/trunk/demos/handhold/src/handhold.py
    pkg/trunk/demos/plug_in/move_to_pickup.py
    pkg/trunk/demos/plug_in/outlet_pose_filter.py
    pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/manifest.xml
    pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/approachtable.py
    pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/executive.py
    pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/movearm.py
    pkg/trunk/deprecated/python_actions/src/python_actions/action_client.py
    pkg/trunk/highlevel/executive_python/manifest.xml
    pkg/trunk/highlevel/executive_python/src/battery_monitor_adapter.py
    pkg/trunk/highlevel/executive_python/src/navigation_adapter.py
    pkg/trunk/highlevel/executive_python/src/print_goal.py
    pkg/trunk/highlevel/writing/writing_core/manifest.xml
    pkg/trunk/highlevel/writing/writing_core/nodes/run_ask_for_pen.py
    pkg/trunk/highlevel/writing/writing_core/nodes/run_generate_text_trajectory.py
    pkg/trunk/highlevel/writing/writing_core/nodes/run_grip_pen.py
    pkg/trunk/highlevel/writing/writing_core/nodes/run_write_trajectory.py
    pkg/trunk/pr2/life_test/arm_life_test/random_poses_left.py
    pkg/trunk/pr2/life_test/arm_life_test/random_poses_right.py
    pkg/trunk/pr2/life_test/manifest.xml
    pkg/trunk/pr2/teleop/teleop_spacenav/manifest.xml
    pkg/trunk/pr2/teleop/teleop_spacenav/spacenav_teleop.py
    pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/record_goals.py
    pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/select_interesting_images.py
    pkg/trunk/sandbox/annotated_map_builder/test/test_head.py
    pkg/trunk/sandbox/annotated_map_builder/test/test_head2.py
    pkg/trunk/sandbox/person_follower/manifest.xml
    pkg/trunk/sandbox/person_follower/src/record_goals.py
    pkg/trunk/sandbox/person_follower/src/select_interesting_images.py
    pkg/trunk/stacks/geometry/tf/src/tf/listener.py
    pkg/trunk/stacks/geometry/tf/test/test_datatype_conversion.py
    pkg/trunk/stacks/pr2_power_drivers/ocean_battery_driver/scripts/battery_notifier.py
    pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/find_door.py
    pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/point_cloud_cropper.py
    pkg/trunk/vision/people/src/stereo_face_feature_tracker.py

Modified: pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/test/test_move_base_local.py
===================================================================
--- pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/test/test_move_base_local.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/applications/2dnav_pr2_app/2dnav_pr2/test/test_move_base_local.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -14,7 +14,7 @@
 import bullet
 import time
 
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 from robot_actions.msg import ActionStatus
 from nav_robot_actions.msg import MoveBaseState
 from tf.msg import tfMessage

Modified: pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/calibration/kinematic_calibration/scripts/joy_cmd_head.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -3,7 +3,7 @@
 import roslib; roslib.load_manifest('kinematic_calibration') 
 import sys
 import rospy
-from robot_msgs.msg import PointStamped, Point
+from geometry_msgs.msg import PointStamped, Point
 from time import sleep
 from joy.msg import Joy 
 

Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 from time import sleep
 
 import rospy
-from robot_msgs.msg import PointStamped, Point
+from geometry_msgs.msg import PointStamped, Point
 
 
 def control_base_pose_odom_frame(x,y,w):

Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/control_base_position_ground_truth.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 from time import sleep
 
 import rospy
-from robot_msgs.msg import PointStamped, Point
+from geometry_msgs.msg import PointStamped, Point
 
 
 def control_base_pose_odom_frame(x,y,w):

Modified: pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/scripts/send_track_link_cmd.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -11,7 +11,7 @@
 import rospy
 from std_msgs import *
 
-from robot_msgs.msg import Point
+from geometry_msgs.msg import Point
 from pr2_mechanism_controllers.msg import TrackLinkCmd
 from time import sleep
 

Modified: pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/controllers/robot_mechanism_controllers/scripts/moveto_pose.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -24,7 +24,7 @@
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.from robot_msgs.msg import *
+# POSSIBILITY OF SUCH DAMAGE.
 
 
 import roslib; roslib.load_manifest('pr2_mechanism_controllers')

Modified: pkg/trunk/demos/handhold/src/handhold.py
===================================================================
--- pkg/trunk/demos/handhold/src/handhold.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/handhold/src/handhold.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -3,7 +3,7 @@
 import roslib; roslib.load_manifest('handhold')
 import rospy
 from tf import TransformListener
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 from geometry_msgs.msg import Twist
 #import numpy
 

Modified: pkg/trunk/demos/plug_in/move_to_pickup.py
===================================================================
--- pkg/trunk/demos/plug_in/move_to_pickup.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/plug_in/move_to_pickup.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -8,7 +8,7 @@
 import rospy
 
 from plugs_msgs.msg import PlugStow
-from robot_msgs.msg import Point, PoseStamped
+from geometry_msgs.msg import Point, PoseStamped
 from mechanism_msgs.msg import JointTraj, JointTrajPoint
 from mechanism_control import mechanism
 from robot_mechanism_controllers.srv import *

Modified: pkg/trunk/demos/plug_in/outlet_pose_filter.py
===================================================================
--- pkg/trunk/demos/plug_in/outlet_pose_filter.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/plug_in/outlet_pose_filter.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -29,7 +29,7 @@
 import sys, time
 import roslib; roslib.load_manifest('plug_in')
 import rospy
-from robot_msgs.msg import PoseStamped, TransformStamped
+from geometry_msgs.msg import PoseStamped, TransformStamped
 import tf.msg
 from std_srvs.srv import Empty
 

Modified: pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/manifest.xml
===================================================================
--- pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -8,7 +8,13 @@
   <depend package="3dnav_pr2"/>
   <depend package="planning_environment"/>
   <depend package="nav_msgs"/>
+  <depend package="tf"/>
+  <depend package="geometry_msgs"/>
+  <depend package="visualization_msgs"/>
+  <depend package="nav_msgs"/>
+  <depend package="tabletop_srvs"/>
 
+
 <!--
   <depend package="2dnav_pr2"/>
   <depend package="pr2_gazebo"/>

Modified: pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/approachtable.py
===================================================================
--- pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/approachtable.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/approachtable.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -36,8 +36,8 @@
 import roslib
 roslib.load_manifest('tabletop_manipulation')
 import rospy
-from robot_srvs.srv import FindTable, FindTableRequest
-from robot_msgs.msg import Polygon3D, Point
+from tabletop_srvs.srv import FindTable, FindTableRequest
+from geometry_msgs.msg import Point
 from visualization_msgs.msg import Marker
 from nav_msgs.msg import Odometry
 from tf.msg import tfMessage

Modified: pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/executive.py
===================================================================
--- pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/executive.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/executive.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -126,8 +126,9 @@
 import random
 import sys
 from visualization_msgs.msg import Marker
-from robot_msgs.msg import AttachedObject, PoseConstraint
-from robot_srvs.srv import FindTable, FindTableRequest, SubtractObjectFromCollisionMap, SubtractObjectFromCollisionMapRequest, RecordStaticMapTrigger, RecordStaticMapTriggerRequest
+from mapping_msgs.msg import AttachedObject
+from motion_planning_msgs import PoseConstraint
+from tabletop_srvs.srv import FindTable, FindTableRequest, SubtractObjectFromCollisionMap, SubtractObjectFromCollisionMapRequest, RecordStaticMapTrigger, RecordStaticMapTriggerRequest
 from pr2_mechanism_controllers.srv import SetProfile, SetProfileRequest
 from highlevel_controllers.msg import *
 from executive_python.navigation_adapter import *

Modified: pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/movearm.py
===================================================================
--- pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/movearm.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/demos/tabletop_manipulation/tabletop_scripts/old/scripts/movearm.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -37,7 +37,7 @@
 roslib.load_manifest('tabletop_manipulation')
 import rospy
 from pr2_msgs.msg import MoveArmGoal, MoveArmState
-from robot_msgs.msg import PoseConstraint, ControllerStatus
+from geometry_msgs.msg import PoseConstraint, ControllerStatus
 from mechanism_msgs.msg import JointState
 
 import sys

Modified: pkg/trunk/deprecated/python_actions/src/python_actions/action_client.py
===================================================================
--- pkg/trunk/deprecated/python_actions/src/python_actions/action_client.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/deprecated/python_actions/src/python_actions/action_client.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -40,7 +40,6 @@
 import time
 
 from robot_actions.msg import ActionStatus
-import robot_msgs.msg
 from std_msgs.msg import Empty
 
 RESET = ActionStatus.RESET

Modified: pkg/trunk/highlevel/executive_python/manifest.xml
===================================================================
--- pkg/trunk/highlevel/executive_python/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/executive_python/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -8,4 +8,5 @@
   <depend package="std_msgs" />
   <depend package="geometry_msgs" />
   <depend package="pr2_robot_actions" />
+  <depend package="pr2_msgs"/>
 </package>

Modified: pkg/trunk/highlevel/executive_python/src/battery_monitor_adapter.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/battery_monitor_adapter.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/executive_python/src/battery_monitor_adapter.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -37,7 +37,7 @@
 import roslib
 roslib.load_manifest('executive_python')
 import rospy
-from robot_msgs.msg import BatteryState
+from pr2_msgs.msg import BatteryState
 import os
 
 class BatteryMonitorAdapter:

Modified: pkg/trunk/highlevel/executive_python/src/navigation_adapter.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/navigation_adapter.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/executive_python/src/navigation_adapter.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 import rospy
 import random
 from nav_robot_actions.msg import MoveBaseState
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 class NavigationAdapter:
   def __init__(self, no_plan_limit, time_limit, state_topic, goal_topic):

Modified: pkg/trunk/highlevel/executive_python/src/print_goal.py
===================================================================
--- pkg/trunk/highlevel/executive_python/src/print_goal.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/executive_python/src/print_goal.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -45,7 +45,7 @@
 import rospy
 import random
 import sys
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 class GoalPrinter:
   def __init__(self, goal_topic):

Modified: pkg/trunk/highlevel/writing/writing_core/manifest.xml
===================================================================
--- pkg/trunk/highlevel/writing/writing_core/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/writing/writing_core/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -17,6 +17,7 @@
   <depend package="tf" />
   <depend package="people" />
   <depend package="python_actions" />
+  <depend package="geometry_msgs"/>
   
   <export>
     <cpp cflags="-I${prefix}/msg/cpp -I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib"/>

Modified: pkg/trunk/highlevel/writing/writing_core/nodes/run_ask_for_pen.py
===================================================================
--- pkg/trunk/highlevel/writing/writing_core/nodes/run_ask_for_pen.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/writing/writing_core/nodes/run_ask_for_pen.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -49,7 +49,7 @@
 import robot_actions.msg
 import std_msgs.msg
 import pr2_robot_actions.msg
-import robot_msgs.msg
+from geometry_msgs.msg import PoseStamped, Twist
 import robot_srvs.srv
 import python_actions
 
@@ -81,7 +81,7 @@
     #open the gripper 
     self.gripper_controller_publisher.publish(std_msgs.msg.Float64(0.03))
 
-    mtp = robot_msgs.msg.PoseStamped()
+    mtp = PoseStamped()
     mtp.header.stamp = rospy.get_rostime()
     mtp.header.frame_id = "torso_lift_link"
     mtp.pose.position.x =0.56
@@ -91,7 +91,7 @@
     mtp.pose.orientation.y =0.181
     mtp.pose.orientation.z =0.412
     mtp.pose.orientation.w =-0.029
-    twist = robot_msgs.msg.Twist()
+    twist = Twist()
 
     #move the arm 
     try:

Modified: pkg/trunk/highlevel/writing/writing_core/nodes/run_generate_text_trajectory.py
===================================================================
--- pkg/trunk/highlevel/writing/writing_core/nodes/run_generate_text_trajectory.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/writing/writing_core/nodes/run_generate_text_trajectory.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -47,7 +47,7 @@
 
 import pr2_robot_actions.msg
 
-import robot_msgs
+import geometry_msgs
 import python_actions
 
 # http://local.wasp.uwa.edu.au/~pbourke/dataformats/hershey/
@@ -145,8 +145,8 @@
     msg = nav_msgs.msg.Path()
     msg.poses = []
     for (x, y, z) in points:
-      ps = robot_msgs.msg.PoseStamped()
-      ps.pose.position = robot_msgs.msg.Point(x/goal.scale, y/goal.scale, z)
+      ps = geometry_msgs.msg.PoseStamped()
+      ps.pose.position = geometry_msgs.msg.Point(x/goal.scale, y/goal.scale, z)
       msg.poses.append(ps)
     self.feedback = msg
 

Modified: pkg/trunk/highlevel/writing/writing_core/nodes/run_grip_pen.py
===================================================================
--- pkg/trunk/highlevel/writing/writing_core/nodes/run_grip_pen.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/writing/writing_core/nodes/run_grip_pen.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -48,7 +48,6 @@
 import robot_actions.msg
 import std_msgs.msg
 import pr2_robot_actions.msg
-import robot_msgs.msg
 import python_actions
 import mechanism_msgs.msg
 

Modified: pkg/trunk/highlevel/writing/writing_core/nodes/run_write_trajectory.py
===================================================================
--- pkg/trunk/highlevel/writing/writing_core/nodes/run_write_trajectory.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/highlevel/writing/writing_core/nodes/run_write_trajectory.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -47,7 +47,7 @@
 from robot_actions.msg import NoArgumentsActionState
 import robot_actions.msg
 import std_msgs.msg
-import robot_msgs.msg
+import geometry_msgs.msg
 import python_actions
 
 
@@ -66,7 +66,7 @@
       self.arm_controller = "r_arm_cartesian_pose_controller"
       rospy.set_param(self.name + "/arm_controller", self.arm_controller)
 
-    self.arm_controller_publisher = rospy.Publisher("r_arm_cartesian_pose_controller/command",  robot_msgs.msg.PoseStamped)
+    self.arm_controller_publisher = rospy.Publisher("r_arm_cartesian_pose_controller/command",  geometry_msgs.msg.PoseStamped)
     
     
   def execute(self, goal):

Modified: pkg/trunk/pr2/life_test/arm_life_test/random_poses_left.py
===================================================================
--- pkg/trunk/pr2/life_test/arm_life_test/random_poses_left.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/pr2/life_test/arm_life_test/random_poses_left.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -31,7 +31,7 @@
 
 import random, time
 import rospy
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 #pub = rospy.Publisher('cartesian_pose/command', PoseStamped)
 pub = rospy.Publisher('cartesian_trajectory_left/command', PoseStamped)

Modified: pkg/trunk/pr2/life_test/arm_life_test/random_poses_right.py
===================================================================
--- pkg/trunk/pr2/life_test/arm_life_test/random_poses_right.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/pr2/life_test/arm_life_test/random_poses_right.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -31,7 +31,7 @@
 
 import random, time
 import rospy
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 #pub = rospy.Publisher('cartesian_pose_right/command', PoseStamped)
 pub = rospy.Publisher('r_arm_cartesian_trajectory_controller/command', PoseStamped)

Modified: pkg/trunk/pr2/life_test/manifest.xml
===================================================================
--- pkg/trunk/pr2/life_test/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/pr2/life_test/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -33,4 +33,5 @@
   <depend package="diagnostic_msgs" />
   <depend package="wg_hardware_roslaunch" />
   <depend package="mechanism_msgs" />
+  <depend package="geometry_msgs" />
 </package>

Modified: pkg/trunk/pr2/teleop/teleop_spacenav/manifest.xml
===================================================================
--- pkg/trunk/pr2/teleop/teleop_spacenav/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/pr2/teleop/teleop_spacenav/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -7,6 +7,7 @@
   <review status="unreviewed" notes=""/>
   <depend package="rospy" />
   <depend package="std_msgs" />
+  <depend package="geometry_msgs" />
   <depend package="robot_mechanism_controllers" />
   <depend package="mechanism_control" />
   <depend package="spacenav_node" />

Modified: pkg/trunk/pr2/teleop/teleop_spacenav/spacenav_teleop.py
===================================================================
--- pkg/trunk/pr2/teleop/teleop_spacenav/spacenav_teleop.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/pr2/teleop/teleop_spacenav/spacenav_teleop.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -30,7 +30,7 @@
 
 import roslib; roslib.load_manifest('teleop_spacenav')
 import rospy, sys, math
-from robot_msgs.msg import Vector3
+from geometry_msgs.msg import Vector3
 
 def print_usage(code = 0):
     print sys.argv[0], '<velocity topic> <rotational velocity topic>'

Modified: pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/record_goals.py
===================================================================
--- pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/record_goals.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/record_goals.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 import rospy
 import random
 import sys
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 class RecordGoals:
   def __init__(self,filename):

Modified: pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/select_interesting_images.py
===================================================================
--- pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/select_interesting_images.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/annotated_map_builder/src/annotated_map_builder/select_interesting_images.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 import rospy
 import random
 import sys
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 from annotated_map_builder.msg import WaitActionState
 from stereo_msgs.msg import RawStereo
 

Modified: pkg/trunk/sandbox/annotated_map_builder/test/test_head.py
===================================================================
--- pkg/trunk/sandbox/annotated_map_builder/test/test_head.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/annotated_map_builder/test/test_head.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -51,7 +51,7 @@
 
 from pr2_msgs.msg import BaseControllerState
 from geometry_msgs.msg import Twist
-from robot_msgs.msg import JointCmd
+from deprecated_msgs.msg import JointCmd
 
 from python_actions import *
 

Modified: pkg/trunk/sandbox/annotated_map_builder/test/test_head2.py
===================================================================
--- pkg/trunk/sandbox/annotated_map_builder/test/test_head2.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/annotated_map_builder/test/test_head2.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -51,7 +51,7 @@
 
 from pr2_msgs.msg import BaseControllerState
 from geometry_msgs.msg import Twist
-from robot_msgs.msg import JointCmd
+from deprecated_msgs.msg import JointCmd
 
 from python_actions import *
 

Modified: pkg/trunk/sandbox/person_follower/manifest.xml
===================================================================
--- pkg/trunk/sandbox/person_follower/manifest.xml	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/person_follower/manifest.xml	2009-08-10 10:18:26 UTC (rev 21382)
@@ -8,6 +8,7 @@
   <depend package="tf" />
   <depend package="nav_robot_actions" />
   <depend package="std_msgs" />
+  <depend package="geometry_msgs" />
   <depend package="pr2_robot_actions" />
   <depend package="robot_actions" />
   <depend package="milestone2_actions" />

Modified: pkg/trunk/sandbox/person_follower/src/record_goals.py
===================================================================
--- pkg/trunk/sandbox/person_follower/src/record_goals.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/person_follower/src/record_goals.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 import rospy
 import random
 import sys
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 
 class RecordGoals:
   def __init__(self,filename):

Modified: pkg/trunk/sandbox/person_follower/src/select_interesting_images.py
===================================================================
--- pkg/trunk/sandbox/person_follower/src/select_interesting_images.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/sandbox/person_follower/src/select_interesting_images.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -39,7 +39,7 @@
 import rospy
 import random
 import sys
-from robot_msgs.msg import PoseStamped
+from geometry_msgs.msg import PoseStamped
 from annotated_map_builder.msg import WaitActionState
 from stereo_msgs.msg import RawStereo
 

Modified: pkg/trunk/stacks/geometry/tf/src/tf/listener.py
===================================================================
--- pkg/trunk/stacks/geometry/tf/src/tf/listener.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/stacks/geometry/tf/src/tf/listener.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -70,9 +70,9 @@
     def fromTranslationRotation(self, translation, rotation):
         return numpy.dot(transformations.translation_matrix(translation), transformations.quaternion_matrix(rotation))
 
-    ## Transforms a robot_msgs PointStamped message to frame target_frame, returns the resulting PointStamped.
+    ## Transforms a geometry_msgs PointStamped message to frame target_frame, returns the resulting PointStamped.
     # @param target_frame The target frame
-    # @param ps           robot_msgs.msg.PointStamped object
+    # @param ps           geometry_msgs.msg.PointStamped object
 
     def transformPoint(self, target_frame, ps):
         mat44 = self.asMatrix(target_frame, ps.header)
@@ -83,9 +83,9 @@
         r.point = geometry_msgs.msg.Point(*xyz)
         return r
 
-    ## Transforms a robot_msgs QuaternionStamped message to frame target_frame, returns the resulting QuaternionStamped.
+    ## Transforms a geometry_msgs QuaternionStamped message to frame target_frame, returns the resulting QuaternionStamped.
     # @param target_frame The target frame
-    # @param ps           robot_msgs.msg.QuaternionStamped object
+    # @param ps           geometry_msgs.msg.QuaternionStamped object
 
     def transformQuaternion(self, target_frame, ps):
         # mat44 is frame-to-frame transform as a 4x4
@@ -107,9 +107,9 @@
         r.quaternion = geometry_msgs.msg.Quaternion(*quat)
         return r
 
-    ## Transforms a robot_msgs PoseStamped message to frame target_frame, returns the resulting PoseStamped.
+    ## Transforms a geometry_msgs PoseStamped message to frame target_frame, returns the resulting PoseStamped.
     # @param target_frame The target frame
-    # @param ps           robot_msgs.msg.PoseStamped object
+    # @param ps           geometry_msgs.msg.PoseStamped object
 
     def transformPose(self, target_frame, ps):
         # mat44 is frame-to-frame transform as a 4x4

Modified: pkg/trunk/stacks/geometry/tf/test/test_datatype_conversion.py
===================================================================
--- pkg/trunk/stacks/geometry/tf/test/test_datatype_conversion.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/stacks/geometry/tf/test/test_datatype_conversion.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -4,7 +4,7 @@
 import sys
 import unittest
 import tf
-import robot_msgs.msg
+import geometry_msgs.msg
 import rospy
 
 ## A sample python unit test
@@ -16,7 +16,7 @@
         self.tfpose_stamped.frame_id = "frame1"
         self.tfpose_stamped.stamp = roslib.rostime.Time(10,0)
 
-        self.msgpose_stamped = robot_msgs.msg.PoseStamped()
+        self.msgpose_stamped = geometry_msgs.msg.PoseStamped()
         self.msgpose_stamped.pose.position.x = 0
         self.msgpose_stamped.pose.position.y = 0
         self.msgpose_stamped.pose.position.z = 0
@@ -35,7 +35,7 @@
         self.tfpoint_stamped.frame_id = "frame1"
         self.tfpoint_stamped.stamp = roslib.rostime.Time(10,0)
 
-        self.msgpoint_stamped = robot_msgs.msg.PointStamped()
+        self.msgpoint_stamped = geometry_msgs.msg.PointStamped()
         self.msgpoint_stamped.point.x = 0
         self.msgpoint_stamped.point.y = 0
         self.msgpoint_stamped.point.z = 0
@@ -50,7 +50,7 @@
         self.tfvector_stamped.frame_id = "frame1"
         self.tfvector_stamped.stamp = roslib.rostime.Time(10, 0)
 
-        self.msgvector_stamped = robot_msgs.msg.Vector3Stamped()
+        self.msgvector_stamped = geometry_msgs.msg.Vector3Stamped()
         self.msgvector_stamped.vector.x = 0
         self.msgvector_stamped.vector.y = 0
         self.msgvector_stamped.vector.z = 0
@@ -66,7 +66,7 @@
         self.tfquaternion_stamped.frame_id = "frame1"
         self.tfquaternion_stamped.stamp = roslib.rostime.Time(10, 0)
 
-        self.msgquaternion_stamped = robot_msgs.msg.QuaternionStamped()
+        self.msgquaternion_stamped = geometry_msgs.msg.QuaternionStamped()
         self.msgquaternion_stamped.quaternion.x = 0
         self.msgquaternion_stamped.quaternion.y = 0
         self.msgquaternion_stamped.quaternion.z = 0

Modified: pkg/trunk/stacks/pr2_power_drivers/ocean_battery_driver/scripts/battery_notifier.py
===================================================================
--- pkg/trunk/stacks/pr2_power_drivers/ocean_battery_driver/scripts/battery_notifier.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/stacks/pr2_power_drivers/ocean_battery_driver/scripts/battery_notifier.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -38,7 +38,7 @@
 import roslib
 roslib.load_manifest('ocean_battery_driver')
 import rospy
-from robot_msgs.msg import BatteryState
+from pr2_msgs.msg import BatteryState
 import os, sys
 
 class BatteryNotifier:

Modified: pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/find_door.py
===================================================================
--- pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/find_door.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/find_door.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -45,7 +45,7 @@
 import string
 
 import rospy
-from robot_msgs.msg import Point, Point32
+from geometry_msgs.msg import Point, Point32
 from door_msgs.msg import Door
 from door_handle_detector.srv import DoorDetector
 

Modified: pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/point_cloud_cropper.py
===================================================================
--- pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/point_cloud_cropper.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/stacks/semantic_mapping/door_handle_detector/scripts/point_cloud_cropper.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -46,7 +46,8 @@
 import bullet
 
 import rospy
-from robot_msgs.msg import PointCloud, ChannelFloat32, Point32
+from sensor_msgs.msg import PointCloud, ChannelFloat32, Point32
+from geometry_msgs.msg import Point32
 
 NAME='point_cloud_cropper'
 

Modified: pkg/trunk/vision/people/src/stereo_face_feature_tracker.py
===================================================================
--- pkg/trunk/vision/people/src/stereo_face_feature_tracker.py	2009-08-10 10:06:20 UTC (rev 21381)
+++ pkg/trunk/vision/people/src/stereo_face_feature_tracker.py	2009-08-10 10:18:26 UTC (rev 21382)
@@ -695,7 +695,7 @@
         pass
 
   #  if people_tracker.visualize:
-  #    people_tracker.pub = rospy.Publisher('/robot_msgs/full_cloud',PointCloud)
+  #    people_tracker.pub = rospy.Publisher('sensor_msgs/full_cloud',PointCloud)
   #    rospy.init_node('videre_face_tracker',anonymous=True)
 
     num_frames = 0


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