From 2a7b36a7910f9211b11476454e74a8d04c7f900e Mon Sep 17 00:00:00 2001 From: Antonio Andriella <aandriella@lenor> Date: Mon, 16 Oct 2017 13:12:09 +0200 Subject: [PATCH] Including the package in the image file name --- iri_rock_paper_scissor/CMakeLists.txt | 2 +- iri_rock_paper_scissor/include/rock_paper_scissor_alg_node.h | 1 + iri_rock_paper_scissor/src/rock_paper_scissor_alg_node.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iri_rock_paper_scissor/CMakeLists.txt b/iri_rock_paper_scissor/CMakeLists.txt index 82dbc45..b540509 100644 --- a/iri_rock_paper_scissor/CMakeLists.txt +++ b/iri_rock_paper_scissor/CMakeLists.txt @@ -6,7 +6,7 @@ find_package(catkin REQUIRED) # ******************************************************************** # Add catkin additional components here # ******************************************************************** -find_package(catkin REQUIRED COMPONENTS iri_base_algorithm cv_bridge image_transport camera_info_manager sensor_msgs std_msgs std_srvs) +find_package(catkin REQUIRED COMPONENTS iri_base_algorithm cv_bridge image_transport camera_info_manager sensor_msgs std_msgs std_srvs roslib) find_package(OpenCV) diff --git a/iri_rock_paper_scissor/include/rock_paper_scissor_alg_node.h b/iri_rock_paper_scissor/include/rock_paper_scissor_alg_node.h index 8b94e57..4424533 100644 --- a/iri_rock_paper_scissor/include/rock_paper_scissor_alg_node.h +++ b/iri_rock_paper_scissor/include/rock_paper_scissor_alg_node.h @@ -27,6 +27,7 @@ #include <iri_base_algorithm/iri_base_algorithm.h> #include "rock_paper_scissor_alg.h" +#include <ros/package.h> #include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" diff --git a/iri_rock_paper_scissor/src/rock_paper_scissor_alg_node.cpp b/iri_rock_paper_scissor/src/rock_paper_scissor_alg_node.cpp index cc99429..5dba6af 100644 --- a/iri_rock_paper_scissor/src/rock_paper_scissor_alg_node.cpp +++ b/iri_rock_paper_scissor/src/rock_paper_scissor_alg_node.cpp @@ -97,7 +97,7 @@ bool RockPaperScissorAlgNode::game_outcomeCallback(std_srvs::SetBool::Request &r this->speech_String_msg_.data = "Press 1. for Rock, 2. for Paper, 3. for Scissors"; this->speech_publisher_.publish(this->speech_String_msg_); - cv::Mat OutIm = cv::imread("/home/aandriella/iri-lab/iri_ws/src/rock_paper_scissors/iri_rock_paper_scissor/images/Rock.PNG"); + cv::Mat OutIm = cv::imread(ros::package::getPath("iri_rock_paper_scissor")+"/images/Rock.PNG"); this->image_Image_msg_ = *cv_bridge::CvImage(std_msgs::Header(), "bgr8", OutIm).toImageMsg(); -- GitLab