From b9d6b6724fd12575e85c78186e6f3f7e151e8860 Mon Sep 17 00:00:00 2001 From: Naser Azizi <naser1@uni-bremen.de> Date: Thu, 15 Jun 2023 17:18:40 +0200 Subject: [PATCH] rename ObjectSize to ShapeSize, readjust CMake file --- CMakeLists.txt | 12 +++++++----- msg/Dimensions.msg | 3 --- msg/ObjectDesignator.msg | 2 +- msg/ObjectSize.msg | 2 -- msg/ShapeSize.msg | 2 ++ 5 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 msg/Dimensions.msg delete mode 100644 msg/ObjectSize.msg create mode 100644 msg/ShapeSize.msg diff --git a/CMakeLists.txt b/CMakeLists.txt index cf92c4f..014f5dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,20 @@ cmake_minimum_required(VERSION 3.0.2) project(robokudo_msgs) -find_package(catkin REQUIRED actionlib message_generation std_msgs geometry_msg> +find_package(catkin REQUIRED actionlib message_generation std_msgs geometry_msgs sensor_msgs) add_message_files( FILES ObjectDesignator.msg - Dimensions.msg - ObjectSize.msg + ShapeSize.msg ) -add_action_files(DIRECTORY action FILES Query.action GenericImgProcAnnotator.ac> +add_action_files(DIRECTORY action FILES + Query.action + GenericImgProcAnnotator.action + GenericImgListProcAnnotator.action) -generate_messages(DEPENDENCIES std_msgs actionlib_msgs geometry_msgs sensor_msg> +generate_messages(DEPENDENCIES std_msgs actionlib_msgs geometry_msgs sensor_msgs) catkin_package( CATKIN_DEPENDS message_runtime rospy actionlib diff --git a/msg/Dimensions.msg b/msg/Dimensions.msg deleted file mode 100644 index de0f556..0000000 --- a/msg/Dimensions.msg +++ /dev/null @@ -1,3 +0,0 @@ -float32 x_size -float32 y_size -float32 z_size \ No newline at end of file diff --git a/msg/ObjectDesignator.msg b/msg/ObjectDesignator.msg index 13e7183..7c5874c 100644 --- a/msg/ObjectDesignator.msg +++ b/msg/ObjectDesignator.msg @@ -3,7 +3,7 @@ string uid # Object's unique identifier string type # Object's type string[] shape # Object's possible shapes -ObjectSize shape_size # Object's possible sizes like dimensions or radius +ShapeSize shape_size # Object's possible sizes like dimensions or radius string[] color # Object's possible colors string location # Object's location string size # Object's size diff --git a/msg/ObjectSize.msg b/msg/ObjectSize.msg deleted file mode 100644 index 9d0959f..0000000 --- a/msg/ObjectSize.msg +++ /dev/null @@ -1,2 +0,0 @@ -Dimensions dimensions -float32 radius \ No newline at end of file diff --git a/msg/ShapeSize.msg b/msg/ShapeSize.msg new file mode 100644 index 0000000..c550745 --- /dev/null +++ b/msg/ShapeSize.msg @@ -0,0 +1,2 @@ +geometry_msgs/Vector3 dimensions +float32 radius \ No newline at end of file -- GitLab