diff --git a/README.md b/README.md index d77adfcf..f31964bc 100644 --- a/README.md +++ b/README.md @@ -68,17 +68,17 @@ Currently, the inference feature list is supported: - Face Detection: ```/ros_openvino_toolkit/face_detection```([object_msgs::ObjectsInBoxes](https://github.com/intel/object_msgs/blob/master/msg/ObjectsInBoxes.msg)) - Emotion Recognition: -```/ros_openvino_toolkit/emotions_recognition```([people_msgs::EmotionsStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/EmotionsStamped.msg)) +```/ros_openvino_toolkit/emotions_recognition```([vino_people_msgs::EmotionsStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/EmotionsStamped.msg)) - Age and Gender Recognition: -```/ros_openvino_toolkit/age_genders_Recognition```([people_msgs::AgeGenderStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/AgeGenderStamped.msg)) +```/ros_openvino_toolkit/age_genders_Recognition```([vino_people_msgs::AgeGenderStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/AgeGenderStamped.msg)) - Head Pose Estimation: -```/ros_openvino_toolkit/headposes_estimation```([people_msgs::HeadPoseStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/HeadPoseStamped.msg)) +```/ros_openvino_toolkit/headposes_estimation```([vino_people_msgs::HeadPoseStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/HeadPoseStamped.msg)) - Object Detection: ```/ros_openvino_toolkit/detected_objects```([object_msgs::ObjectsInBoxes](https://github.com/intel/object_msgs/blob/master/msg/ObjectsInBoxes.msg)) - Object Segmentation: -```/ros_openvino_toolkit/segmented_obejcts```([people_msgs::ObjectsInMasks](https://github.com/intel/ros_openvino_toolkit/blob/devel/people_msgs/msg/ObjectsInMasks.msg)) +```/ros_openvino_toolkit/segmented_obejcts```([vino_people_msgs::ObjectsInMasks](https://github.com/intel/ros_openvino_toolkit/blob/devel/vino_people_msgs/msg/ObjectsInMasks.msg)) - Person Reidentification: -```/ros_openvino_toolkit/reidentified_persons```([people_msgs::ReidentificationStamped](https://github.com/intel/ros_openvino_toolkit/blob/devel/people_msgs/msg/ReidentificationStamped.msg)) +```/ros_openvino_toolkit/reidentified_persons```([vino_people_msgs::ReidentificationStamped](https://github.com/intel/ros_openvino_toolkit/blob/devel/vino_people_msgs/msg/ReidentificationStamped.msg)) - Rviz Output: ```/ros_openvino_toolkit/image_rviz```([sensor_msgs::Image](http://docs.ros.org/melodic/api/sensor_msgs/html/msg/Image.html)) @@ -88,11 +88,11 @@ Currently, the inference feature list is supported: - Face Detection Service: ```/detect_face``` ([object_msgs::DetectObject](https://github.com/intel/object_msgs/blob/master/srv/DetectObject.srv)) - Age & Gender Detection Service: -```/detect_age_gender``` ([people_msgs::AgeGender](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/AgeGenderSrv.srv)) +```/detect_age_gender``` ([vino_people_msgs::AgeGender](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/AgeGenderSrv.srv)) - Headpose Detection Service: -```/detect_head_pose``` ([people_msgs::HeadPose](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/HeadPoseSrv.srv)) +```/detect_head_pose``` ([vino_people_msgs::HeadPose](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/HeadPoseSrv.srv)) - Emotion Detection Service: -```/detect_emotion``` ([people_msgs::Emotion](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/EmotionSrv.srv)) +```/detect_emotion``` ([vino_people_msgs::Emotion](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/EmotionSrv.srv)) ### RViz diff --git a/dynamic_vino_lib/CMakeLists.txt b/dynamic_vino_lib/CMakeLists.txt index 86c0679f..8439692d 100644 --- a/dynamic_vino_lib/CMakeLists.txt +++ b/dynamic_vino_lib/CMakeLists.txt @@ -29,7 +29,7 @@ find_package( std_msgs sensor_msgs object_msgs - people_msgs + vino_people_msgs image_transport cv_bridge InferenceEngine diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h index 00cafc1d..97e9ccf1 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h @@ -115,17 +115,17 @@ class BaseOutput virtual void setServiceResponseForFace( boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} virtual void setServiceResponse( - boost::shared_ptr response) {} + boost::shared_ptr response) {} Pipeline* getPipeline() const; cv::Mat getFrame() const; virtual void clearData() {} diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h index 3ce30e74..82c2ea5f 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_service_output.h @@ -23,24 +23,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include @@ -72,12 +72,12 @@ class RosServiceOutput : public RosTopicOutput void setServiceResponse(boost::shared_ptr response); void setResponseForFace(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); - void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); + void setServiceResponse(boost::shared_ptr response); private: const std::string service_name_; diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h index 583c9afd..3b6c024b 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h +++ b/dynamic_vino_lib/include/dynamic_vino_lib/outputs/ros_topic_output.h @@ -26,16 +26,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -119,17 +119,17 @@ class RosTopicOutput : public BaseOutput ros::Publisher pub_face_; std::shared_ptr faces_msg_ptr_; ros::Publisher pub_emotion_; - std::shared_ptr emotions_msg_ptr_; + std::shared_ptr emotions_msg_ptr_; ros::Publisher pub_age_gender_; - std::shared_ptr age_gender_msg_ptr_; + std::shared_ptr age_gender_msg_ptr_; ros::Publisher pub_headpose_; - std::shared_ptr headpose_msg_ptr_; + std::shared_ptr headpose_msg_ptr_; ros::Publisher pub_object_; std::shared_ptr object_msg_ptr_; ros::Publisher pub_person_reid_; - std::shared_ptr person_reid_msg_ptr_; + std::shared_ptr person_reid_msg_ptr_; ros::Publisher pub_segmented_object_; - std::shared_ptr segmented_object_msg_ptr_; + std::shared_ptr segmented_object_msg_ptr_; }; } // namespace Outputs diff --git a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h b/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h index 0284a47c..b69d54c6 100644 --- a/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h +++ b/dynamic_vino_lib/include/dynamic_vino_lib/services/frame_processing_server.h @@ -17,20 +17,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -67,4 +67,4 @@ class FrameProcessingServer //: public ros::NodeHandle bool add3(ros::ServiceEvent &); }; } // namespace vino_service -#endif // DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ \ No newline at end of file +#endif // DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_ diff --git a/dynamic_vino_lib/package.xml b/dynamic_vino_lib/package.xml index fbab9c42..3f9db45f 100644 --- a/dynamic_vino_lib/package.xml +++ b/dynamic_vino_lib/package.xml @@ -32,7 +32,7 @@ limitations under the License. image_transport cv_bridge object_msgs - people_msgs + vino_people_msgs vino_param_lib roscpp @@ -42,6 +42,6 @@ limitations under the License. image_transport cv_bridge object_msgs - people_msgs + vino_people_msgs vino_param_lib diff --git a/dynamic_vino_lib/src/outputs/ros_service_output.cpp b/dynamic_vino_lib/src/outputs/ros_service_output.cpp index f05c21d7..4754d922 100644 --- a/dynamic_vino_lib/src/outputs/ros_service_output.cpp +++ b/dynamic_vino_lib/src/outputs/ros_service_output.cpp @@ -51,7 +51,7 @@ void Outputs::RosServiceOutput::setResponseForFace( } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { if (age_gender_msg_ptr_ != nullptr) { response->age_gender.objects = age_gender_msg_ptr_->objects; @@ -59,7 +59,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { if (emotions_msg_ptr_ != nullptr) { response->emotion.emotions = emotions_msg_ptr_->emotions; @@ -67,7 +67,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { if (headpose_msg_ptr_ != nullptr) { response->headpose.headposes = headpose_msg_ptr_->headposes; @@ -75,7 +75,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { slog::info << "in ObjectsInMasks service::Response ..."; if (segmented_object_msg_ptr_ != nullptr) { @@ -83,7 +83,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { slog::info << "in Reidentification service::Response ..."; if (person_reid_msg_ptr_ != nullptr) { @@ -92,7 +92,7 @@ void Outputs::RosServiceOutput::setServiceResponse( } void Outputs::RosServiceOutput::setServiceResponse( - boost::shared_ptr response) + boost::shared_ptr response) { slog::info << "in People::Response ..."; if (faces_msg_ptr_ != nullptr) { diff --git a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp b/dynamic_vino_lib/src/outputs/ros_topic_output.cpp index 3dab5174..bf49187b 100644 --- a/dynamic_vino_lib/src/outputs/ros_topic_output.cpp +++ b/dynamic_vino_lib/src/outputs/ros_topic_output.cpp @@ -29,17 +29,17 @@ Outputs::RosTopicOutput::RosTopicOutput() { pub_face_ = nh_.advertise("/openvino_toolkit/faces", 16); - pub_emotion_ = nh_.advertise( + pub_emotion_ = nh_.advertise( "/openvino_toolkit/emotions", 16); - pub_age_gender_ = nh_.advertise( + pub_age_gender_ = nh_.advertise( "/openvino_toolkit/age_genders", 16); - pub_headpose_ = nh_.advertise( + pub_headpose_ = nh_.advertise( "/openvino_toolkit/headposes", 16); pub_object_ = nh_.advertise( "/openvino_toolkit/detected_objects", 16); - pub_person_reid_ = nh_.advertise( + pub_person_reid_ = nh_.advertise( "/openvino_toolkit/reidentified_persons", 16); - pub_segmented_object_ = nh_.advertise( + pub_segmented_object_ = nh_.advertise( "/openvino_toolkit/segmented_obejcts", 16); emotions_msg_ptr_ = NULL; @@ -57,8 +57,8 @@ void Outputs::RosTopicOutput::feedFrame(const cv::Mat& frame) {} void Outputs::RosTopicOutput::accept( const std::vector & results) { - person_reid_msg_ptr_ = std::make_shared(); - people_msgs::Reidentification person; + person_reid_msg_ptr_ = std::make_shared(); + vino_people_msgs::Reidentification person; for (auto & r : results) { // slog::info << ">"; auto loc = r.getLocation(); @@ -74,8 +74,8 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector & results) { - segmented_object_msg_ptr_ = std::make_shared(); - people_msgs::ObjectInMask object; + segmented_object_msg_ptr_ = std::make_shared(); + vino_people_msgs::ObjectInMask object; for (auto & r : results) { // slog::info << ">"; auto loc = r.getLocation(); @@ -118,9 +118,9 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector& results) { - emotions_msg_ptr_ = std::make_shared(); + emotions_msg_ptr_ = std::make_shared(); - people_msgs::Emotion emotion; + vino_people_msgs::Emotion emotion; for (auto r : results) { auto loc = r.getLocation(); @@ -136,9 +136,9 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector& results) { - age_gender_msg_ptr_ = std::make_shared(); + age_gender_msg_ptr_ = std::make_shared(); - people_msgs::AgeGender ag; + vino_people_msgs::AgeGender ag; for (auto r : results) { auto loc = r.getLocation(); @@ -165,9 +165,9 @@ void Outputs::RosTopicOutput::accept( void Outputs::RosTopicOutput::accept( const std::vector& results) { - headpose_msg_ptr_ = std::make_shared(); + headpose_msg_ptr_ = std::make_shared(); - people_msgs::HeadPose hp; + vino_people_msgs::HeadPose hp; for (auto r : results) { auto loc = r.getLocation(); @@ -205,7 +205,7 @@ void Outputs::RosTopicOutput::handleOutput() { std_msgs::Header header = getHeader(); if (person_reid_msg_ptr_ != nullptr) { - people_msgs::ReidentificationStamped person_reid_msg; + vino_people_msgs::ReidentificationStamped person_reid_msg; person_reid_msg.header = header; person_reid_msg.reidentified_vector.swap(person_reid_msg_ptr_->reidentified_vector); pub_person_reid_.publish(person_reid_msg); @@ -213,7 +213,7 @@ void Outputs::RosTopicOutput::handleOutput() } if (segmented_object_msg_ptr_ != nullptr) { // slog::info << "publishing faces outputs." << slog::endl; - people_msgs::ObjectsInMasks segmented_msg; + vino_people_msgs::ObjectsInMasks segmented_msg; segmented_msg.header = header; segmented_msg.objects_vector.swap(segmented_object_msg_ptr_->objects_vector); pub_segmented_object_.publish(segmented_msg); @@ -230,7 +230,7 @@ void Outputs::RosTopicOutput::handleOutput() } if (emotions_msg_ptr_ != nullptr) { - people_msgs::EmotionsStamped emotions_msg; + vino_people_msgs::EmotionsStamped emotions_msg; emotions_msg.header = header; emotions_msg.emotions.swap(emotions_msg_ptr_->emotions); @@ -239,7 +239,7 @@ void Outputs::RosTopicOutput::handleOutput() } if (age_gender_msg_ptr_ != nullptr) { - people_msgs::AgeGenderStamped age_gender_msg; + vino_people_msgs::AgeGenderStamped age_gender_msg; age_gender_msg.header = header; age_gender_msg.objects.swap(age_gender_msg_ptr_->objects); @@ -248,7 +248,7 @@ void Outputs::RosTopicOutput::handleOutput() } if (headpose_msg_ptr_ != nullptr) { - people_msgs::HeadPoseStamped headpose_msg; + vino_people_msgs::HeadPoseStamped headpose_msg; headpose_msg.header = header; headpose_msg.headposes.swap(headpose_msg_ptr_->headposes); diff --git a/dynamic_vino_lib/src/services/frame_processing_server.cpp b/dynamic_vino_lib/src/services/frame_processing_server.cpp index baaaae67..b823aab3 100644 --- a/dynamic_vino_lib/src/services/frame_processing_server.cpp +++ b/dynamic_vino_lib/src/services/frame_processing_server.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include "dynamic_vino_lib/services/frame_processing_server.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -96,7 +96,7 @@ bool FrameProcessingServer::cbService( } template class FrameProcessingServer; -template class FrameProcessingServer; -template class FrameProcessingServer; -template class FrameProcessingServer; +template class FrameProcessingServer; +template class FrameProcessingServer; +template class FrameProcessingServer; } // namespace vino_service diff --git a/people_msgs/CMakeLists.txt b/people_msgs/CMakeLists.txt index e2852e10..8ea715de 100644 --- a/people_msgs/CMakeLists.txt +++ b/people_msgs/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 2.8.3) -project(people_msgs) +project(vino_people_msgs) find_package(catkin REQUIRED COMPONENTS std_msgs diff --git a/people_msgs/msg/AgeGenderStamped.msg b/people_msgs/msg/AgeGenderStamped.msg index efa0c724..bbcd3d5e 100644 --- a/people_msgs/msg/AgeGenderStamped.msg +++ b/people_msgs/msg/AgeGenderStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/AgeGender[] objects +vino_people_msgs/AgeGender[] objects diff --git a/people_msgs/msg/EmotionsStamped.msg b/people_msgs/msg/EmotionsStamped.msg index 1636fc02..9809a247 100644 --- a/people_msgs/msg/EmotionsStamped.msg +++ b/people_msgs/msg/EmotionsStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/Emotion[] emotions +vino_people_msgs/Emotion[] emotions diff --git a/people_msgs/msg/HeadPoseStamped.msg b/people_msgs/msg/HeadPoseStamped.msg index 75d97828..43006fd8 100644 --- a/people_msgs/msg/HeadPoseStamped.msg +++ b/people_msgs/msg/HeadPoseStamped.msg @@ -13,4 +13,4 @@ # limitations under the License. std_msgs/Header header -people_msgs/HeadPose[] headposes \ No newline at end of file +vino_people_msgs/HeadPose[] headposes diff --git a/people_msgs/msg/PersonsStamped.msg b/people_msgs/msg/PersonsStamped.msg index 2aae1a08..2eae7eed 100644 --- a/people_msgs/msg/PersonsStamped.msg +++ b/people_msgs/msg/PersonsStamped.msg @@ -14,6 +14,6 @@ std_msgs/Header header object_msgs/ObjectInBox[] faces -people_msgs/Emotion[] emotions -people_msgs/AgeGender[] agegenders -people_msgs/HeadPose[] headposes +vino_people_msgs/Emotion[] emotions +vino_people_msgs/AgeGender[] agegenders +vino_people_msgs/HeadPose[] headposes diff --git a/people_msgs/package.xml b/people_msgs/package.xml index 3d12f136..2960f5e5 100644 --- a/people_msgs/package.xml +++ b/people_msgs/package.xml @@ -14,7 +14,7 @@ limitations under the License. --> - people_msgs + vino_people_msgs 0.3.0 A package containing people message definitions. Weizhi Liu diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index f91efb5c..6fabba0a 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -28,7 +28,7 @@ find_package( roslint cv_bridge object_msgs - people_msgs + vino_people_msgs vino_param_lib dynamic_vino_lib ) diff --git a/sample/package.xml b/sample/package.xml index 08c81d9d..22300c5e 100644 --- a/sample/package.xml +++ b/sample/package.xml @@ -33,7 +33,7 @@ limitations under the License. vino_param_lib cv_bridge object_msgs - people_msgs + vino_people_msgs roscpp roslint @@ -43,5 +43,5 @@ limitations under the License. dynamic_vino_lib vino_param_lib object_msgs - people_msgs + vino_people_msgs diff --git a/sample/src/image_people_client.cpp b/sample/src/image_people_client.cpp index 5dfb1b60..1f2f40f1 100644 --- a/sample/src/image_people_client.cpp +++ b/sample/src/image_people_client.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include @@ -39,9 +39,9 @@ int main(int argc, char ** argv) } - ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); + ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); - people_msgs::PeopleSrv srv; + vino_people_msgs::PeopleSrv srv; if (client.call(srv)) { diff --git a/sample/src/image_people_server.cpp b/sample/src/image_people_server.cpp index 92520ec5..2e799d44 100644 --- a/sample/src/image_people_server.cpp +++ b/sample/src/image_people_server.cpp @@ -89,7 +89,7 @@ int main(int argc, char** argv) slog::info << "service name=" << service_name << slog::endl; auto node = std::make_shared>(service_name, FLAGS_config); + >(service_name, FLAGS_config); slog::info << "Waiting for service request..." << slog::endl; diff --git a/sample/src/image_reidentification_client.cpp b/sample/src/image_reidentification_client.cpp index 70a94991..74f04fd3 100644 --- a/sample/src/image_reidentification_client.cpp +++ b/sample/src/image_reidentification_client.cpp @@ -24,7 +24,7 @@ #include #include "opencv2/opencv.hpp" -#include +#include @@ -34,10 +34,10 @@ int main(int argc, char ** argv) ros::NodeHandle n; - ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); + ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); - people_msgs::ReidentificationSrv srv; + vino_people_msgs::ReidentificationSrv srv; if (client.call(srv)) { @@ -68,4 +68,4 @@ int main(int argc, char ** argv) } - \ No newline at end of file + diff --git a/sample/src/image_reidentification_server.cpp b/sample/src/image_reidentification_server.cpp index 86293ddb..9d3fb035 100644 --- a/sample/src/image_reidentification_server.cpp +++ b/sample/src/image_reidentification_server.cpp @@ -58,7 +58,7 @@ #include "inference_engine.hpp" #include "opencv2/opencv.hpp" #include "sample/utility.hpp" -#include +#include bool parseAndCheckCommandLine(int argc, char** argv) @@ -90,7 +90,7 @@ int main(int argc, char** argv) auto node = std::make_shared>(service_name, FLAGS_config); + >(service_name, FLAGS_config); slog::info << "Waiting for reid service request..." << slog::endl; ros::spin(); diff --git a/sample/src/image_segmentation_client.cpp b/sample/src/image_segmentation_client.cpp index be98d04a..5ce95813 100644 --- a/sample/src/image_segmentation_client.cpp +++ b/sample/src/image_segmentation_client.cpp @@ -24,7 +24,7 @@ #include #include "opencv2/opencv.hpp" -#include +#include @@ -34,10 +34,10 @@ int main(int argc, char ** argv) ros::NodeHandle n; - ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); + ros::ServiceClient client = n.serviceClient("/openvino_toolkit/service"); - people_msgs::ObjectsInMasksSrv srv; + vino_people_msgs::ObjectsInMasksSrv srv; if (client.call(srv)) { @@ -69,4 +69,4 @@ int main(int argc, char ** argv) } - \ No newline at end of file + diff --git a/sample/src/image_segmentation_server.cpp b/sample/src/image_segmentation_server.cpp index 34288a29..cbd6ccec 100644 --- a/sample/src/image_segmentation_server.cpp +++ b/sample/src/image_segmentation_server.cpp @@ -90,7 +90,7 @@ int main(int argc, char** argv) auto node = std::make_shared>(service_name, FLAGS_config); + >(service_name, FLAGS_config); slog::info << "Waiting for seg service request..." << slog::endl; ros::spin();