From 55819bef342c612c9a95467dfcb94751c04a0de1 Mon Sep 17 00:00:00 2001 From: Kentaro Wada Date: Sat, 22 Oct 2016 21:19:09 +0900 Subject: [PATCH] Migrate srv files from jsk_pcl_ros to jsk_recognition_msgs see - https://github.com/jsk-ros-pkg/jsk_recognition/pull/1827 - https://github.com/jsk-ros-pkg/jsk_recognition/pull/1914 --- jsk_smart_gui/package.xml | 1 + jsk_smart_gui/src/get_template.l | 4 ++-- jsk_smart_gui/src/utils.l | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jsk_smart_gui/package.xml b/jsk_smart_gui/package.xml index 9308f39d..802c17aa 100644 --- a/jsk_smart_gui/package.xml +++ b/jsk_smart_gui/package.xml @@ -30,6 +30,7 @@ roseus jsk_gui_msgs jsk_pcl_ros + jsk_recognition_msgs jsk_maps image_view2 tf diff --git a/jsk_smart_gui/src/get_template.l b/jsk_smart_gui/src/get_template.l index 858f54e8..e8f5026c 100644 --- a/jsk_smart_gui/src/get_template.l +++ b/jsk_smart_gui/src/get_template.l @@ -1,6 +1,6 @@ #!/usr/bin/env roseus (ros::load-ros-manifest "jsk_smart_gui") -(ros::load-ros-manifest "jsk_pcl_ros") +(ros::load-ros-manifest "jsk_recognition_msgs") (ros::load-ros-manifest "dynamic_tf_publisher") ;; This script depends on tablet_callback.l ;; Use when creating template from imagesift @@ -460,7 +460,7 @@ ;; (ros::service-call "cropbox_manager/set_parameters" req))) (defun save_img (name) - (let ((req (instance jsk_pcl_ros::CallPolygonRequest :init)) res) + (let ((req (instance jsk_recognition_msgs::CallPolygonRequest :init)) res) (send req :filename name) (if (and (ros::service-exists "/save_image") diff --git a/jsk_smart_gui/src/utils.l b/jsk_smart_gui/src/utils.l index 51bae0ea..b0f9de0c 100644 --- a/jsk_smart_gui/src/utils.l +++ b/jsk_smart_gui/src/utils.l @@ -75,7 +75,7 @@ ;; (defun point-srvcall (msg) ;; deprecated ;; (let* ((x (send msg :point :x)) (y (send msg :point :y)) -;; (req (instance jsk_pcl_ros::TransformScreenpointRequest :init +;; (req (instance jsk_recognition_msgs::TransformScreenpointRequest :init ;; :x x :y y)) res) ;; ;;(ros::wait-for-service *ray_srv* 1) ;; (setq res (ros::service-call *ray_srv* req)) @@ -113,7 +113,7 @@ ;; ))) (defun screenpoint-srvcall (x y) - (let* ((req (instance jsk_pcl_ros::TransformScreenpointRequest :init + (let* ((req (instance jsk_recognition_msgs::TransformScreenpointRequest :init :x x :y y)) res) ;;(ros::wait-for-service *ray_srv* 1) (setq res (ros::service-call *ray_srv* req))