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

[<tpr...@us...>]

Revision: 17677
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17677&view=rev
Author:   tpratkanis
Date:     2009-06-25 16:41:27 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Renaming executive_trex_pr2 to trex_ros.

Modified Paths:
--------------
    pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
    pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
    pkg/trunk/highlevel/executive_python/milestone1/m1.launch
    pkg/trunk/stacks/trex/trex_pr2/manifest.xml
    pkg/trunk/stacks/trex/trex_ros/CMakeLists.txt
    pkg/trunk/stacks/trex/trex_ros/include/executive_trex_pr2/ros_reactor.h
    pkg/trunk/stacks/trex/trex_ros/src/monitor.cpp

Added Paths:
-----------
    pkg/trunk/stacks/trex/trex_ros/

Removed Paths:
-------------
    pkg/trunk/stacks/trex/executive_trex_pr2/

Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml	2009-06-25 16:21:40 UTC (rev 17676)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml	2009-06-25 16:41:27 UTC (rev 17677)
@@ -4,7 +4,7 @@
 
   <!-- start up trex -->
   <param name="/trex/input_file" value="pr2.cfg"/>
-  <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
+  <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
   <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
   <node pkg="trex_pr2" type="trexfast" output="screen" />
 </launch>

Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml	2009-06-25 16:21:40 UTC (rev 17676)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml	2009-06-25 16:41:27 UTC (rev 17677)
@@ -4,7 +4,7 @@
 
   <!-- start up trex -->
   <param name="/trex/input_file" value="pr2.cfg"/>
-  <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
+  <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find trex_ros)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find trex_ros)"/>
   <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
   <node pkg="trex_pr2" type="trexfast" output="screen" />
 </launch>

Modified: pkg/trunk/highlevel/executive_python/milestone1/m1.launch
===================================================================
--- pkg/trunk/highlevel/executive_python/milestone1/m1.launch	2009-06-25 16:21:40 UTC (rev 17676)
+++ pkg/trunk/highlevel/executive_python/milestone1/m1.launch	2009-06-25 16:41:27 UTC (rev 17677)
@@ -6,7 +6,7 @@
 
 <launch>
 
-  <node pkg="executive_trex_pr2" type="fake_battery_controller.py">
+  <node pkg="trex_ros" type="fake_battery_controller.py">
     <remap from="battery_state" to="bogus_battery_state"/>
   </node>
   <node pkg="highlevel_controllers" type="recharge_controller">

Modified: pkg/trunk/stacks/trex/trex_pr2/manifest.xml
===================================================================
--- pkg/trunk/stacks/trex/trex_pr2/manifest.xml	2009-06-25 16:21:40 UTC (rev 17676)
+++ pkg/trunk/stacks/trex/trex_pr2/manifest.xml	2009-06-25 16:41:27 UTC (rev 17677)
@@ -20,7 +20,7 @@
   <depend package="door_msgs" />
   <depend package="deprecated_msgs" />
   <depend package="gtest" />
-  <depend package="executive_trex_pr2" />
+  <depend package="trex_ros" />
 
   <export>
     <nddl iflags="-I${prefix}/nddl  -I${prefix}/deprecated  -I${prefix} "/>

Modified: pkg/trunk/stacks/trex/trex_ros/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/trex/executive_trex_pr2/CMakeLists.txt	2009-06-25 00:50:05 UTC (rev 17643)
+++ pkg/trunk/stacks/trex/trex_ros/CMakeLists.txt	2009-06-25 16:41:27 UTC (rev 17677)
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 #set(ROS_BUILD_TYPE Release)
-rospack(executive_trex_pr2)
+rospack(trex_ros)
 
 genmsg()
 gensrv()

Modified: pkg/trunk/stacks/trex/trex_ros/include/executive_trex_pr2/ros_reactor.h
===================================================================
--- pkg/trunk/stacks/trex/executive_trex_pr2/include/executive_trex_pr2/ros_reactor.h	2009-06-25 00:50:05 UTC (rev 17643)
+++ pkg/trunk/stacks/trex/trex_ros/include/executive_trex_pr2/ros_reactor.h	2009-06-25 16:41:27 UTC (rev 17677)
@@ -4,12 +4,13 @@
 #include "ros/ros.h"
 #include "ros/node.h"
 #include "executive_trex_pr2/executive.h"
-#include "executive_trex_pr2/ExecuteGoals.h"
+#include "trex_ros/ExecuteGoals.h"
 
 #include "DbCore.hh"
 
 using namespace TREX;
 using namespace EUROPA;
+using namespace trex_ros;
 namespace executive_trex_pr2 {
 
   /**

Modified: pkg/trunk/stacks/trex/trex_ros/src/monitor.cpp
===================================================================
--- pkg/trunk/stacks/trex/executive_trex_pr2/src/monitor.cpp	2009-06-25 00:50:05 UTC (rev 17643)
+++ pkg/trunk/stacks/trex/trex_ros/src/monitor.cpp	2009-06-25 16:41:27 UTC (rev 17677)
@@ -5,7 +5,7 @@
 #include "Domains.hh"
 #include "executive_trex_pr2/executive.h"
 #include <vector>
-#include <executive_trex_pr2/TrexMonitor.h>
+#include <trex_ros/TrexMonitor.h>
 
 namespace TREX {
 
@@ -32,7 +32,7 @@
 	ROS_ERROR("No topic for monitor, setting default: %s.", m_topic_name.c_str());
       }
       ros::NodeHandle node_handle;
-      ros::Publisher m_pub = node_handle.advertise<executive_trex_pr2::TrexMonitor>(m_topic_name, 10);
+      ros::Publisher m_pub = node_handle.advertise<trex_ros::TrexMonitor>(m_topic_name, 10);
     }
 
     ~Monitor() { 
@@ -40,7 +40,7 @@
     }
 
     void notify(Observation const &obs) {
-      executive_trex_pr2::TrexMonitor msg;
+      trex_ros::TrexMonitor msg;
       msg.timeline = obs.getObjectName().c_str();
       msg.set_variable_names_size(obs.countParameters());
       msg.set_variable_values_size(obs.countParameters());


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