Skip to content

Commit

Permalink
Migrate srv files from jsk_pcl_ros to jsk_recognition_msgs
Browse files Browse the repository at this point in the history
  • Loading branch information
wkentaro committed Oct 22, 2016
1 parent 3250218 commit 55819be
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions jsk_smart_gui/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<run_depend>roseus</run_depend>
<run_depend>jsk_gui_msgs</run_depend>
<run_depend>jsk_pcl_ros</run_depend>
<run_depend>jsk_recognition_msgs</run_depend>
<run_depend>jsk_maps</run_depend>
<run_depend>image_view2</run_depend>
<run_depend>tf</run_depend>
Expand Down
4 changes: 2 additions & 2 deletions jsk_smart_gui/src/get_template.l
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions jsk_smart_gui/src/utils.l
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 55819be

Please sign in to comment.