Merge pull request IntelRealSense#13 from sgutlian/dev

rename person tracking output topic
icarpis · Feb 15, 2017 · d5a9744 · d5a9744
2 parents a7aaa17 + f9a10e4
commit d5a9744
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/realsense_ros_person/README.md b/realsense_ros_person/README.md
@@ -39,8 +39,8 @@ This package contains a ROS wrapper for Intel's PersonTracking library. The real
     camera/color/image_view (sensor_msgs/Image)
         Color image got from realsense camera
   3.1.2 Published Topics
-    person_tracking/person_tracking_output (realsense_pt_msgs/Frame) Informations of person tracked
-    person_tracking/person_tracking_output_test (realsense_pt_msgs/FrameTest) Informations of person tracked + color image from camera
+    person_tracking_output (realsense_pt_msgs/Frame) Informations of person tracked
+    person_tracking_output_test (realsense_pt_msgs/FrameTest) Informations of person tracked + color image from camera
 
   3.1.3 Services
     person_tracking/tracking_config (realsense_srvs/TrackingConfig)

diff --git a/realsense_ros_person/src/apiwrapper/publisher/PersonTrackingDefaultPublisher.cpp b/realsense_ros_person/src/apiwrapper/publisher/PersonTrackingDefaultPublisher.cpp
@@ -6,8 +6,8 @@ namespace realsense_ros_person
 {
     void PersonTrackingDefaultPublisher::onInit(ros::NodeHandle &nodeHandle)
     {
-        std::string personTrackingTopic = "person_tracking/person_tracking_output";
-        std::string personTrackingTestTopic = "person_tracking/person_tracking_output_test";
+        std::string personTrackingTopic = "person_tracking_output";
+        std::string personTrackingTestTopic = "person_tracking_output_test";
         ROS_INFO_STREAM("Publishing to " << personTrackingTopic);
         mPublisher = nodeHandle.advertise<realsense_ros_person::Frame>(personTrackingTopic, 1);
         mTestPublisher = nodeHandle.advertise<realsense_ros_person::FrameTest>(personTrackingTestTopic,

diff --git a/realsense_ros_person/src/sample/PersonTrackingSample.cpp b/realsense_ros_person/src/sample/PersonTrackingSample.cpp
@@ -46,7 +46,7 @@ void PersonTrackingSample::ProcessCommandLineArgs()
 void PersonTrackingSample::InitMessaging(ros::NodeHandle& nodeHandle)
 {
     EnableTrackingFeatures(nodeHandle);
-    mTrackingOutputSubscriber = nodeHandle.subscribe("person_tracking/person_tracking_output_test", 1, &PersonTrackingSample::PersonTrackingCallback, this);
+    mTrackingOutputSubscriber = nodeHandle.subscribe("person_tracking_output_test", 1, &PersonTrackingSample::PersonTrackingCallback, this);
     mRecognitionRequestClient = nodeHandle.serviceClient<realsense_ros_person::Recognition>("person_tracking/recognition_request");
     mRegisterRequestClient = nodeHandle.serviceClient<realsense_ros_person::RecognitionRegister>("person_tracking/register_request");
     mTrackingRequestClient = nodeHandle.serviceClient<realsense_ros_person::TrackingRequest>("person_tracking/tracking_request");