consai_visualizer_msgs->crane_visualization_interfaces

ibis-ssl · Dec 23, 2024 · 4f270e7 · 4f270e7
1 parent 61f5868
commit 4f270e7
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 100 deletions.
diff --git a/consai_ros2/consai_visualizer/package.xml b/consai_ros2/consai_visualizer/package.xml
@@ -10,7 +10,7 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <exec_depend>ament_index_python</exec_depend>
-  <exec_depend>consai_visualizer_msgs</exec_depend>
+  <exec_depend>crane_visualization_interfaces</exec_depend>
   <exec_depend version_gte="0.2.19">python_qt_binding</exec_depend>
   <exec_depend>rclpy</exec_depend>
   <exec_depend>rqt_gui</exec_depend>

diff --git a/consai_ros2/consai_visualizer/src/consai_visualizer/field_widget.py b/consai_ros2/consai_visualizer/src/consai_visualizer/field_widget.py
@@ -19,9 +19,9 @@
 import math
 from typing import Dict
 
-from consai_visualizer_msgs.msg import Color as VisColor
-from consai_visualizer_msgs.msg import Objects as VisObjects
-from consai_visualizer_msgs.msg import (
+from crane_visualization_interfaces.msg import Color as VisColor
+from crane_visualization_interfaces.msg import Objects as VisObjects
+from crane_visualization_interfaces.msg import (
     ShapeAnnotation,
     ShapeArc,
     ShapeCircle,

diff --git a/consai_ros2/consai_visualizer/src/consai_visualizer/visualizer.py b/consai_ros2/consai_visualizer/src/consai_visualizer/visualizer.py
@@ -24,7 +24,7 @@
 
 from ament_index_python.resources import get_resource
 from consai_visualizer.field_widget import FieldWidget
-from consai_visualizer_msgs.msg import ObjectsArray
+from crane_visualization_interfaces.msg import ObjectsArray
 from crane_msgs.msg import PingStatusArray, RobotFeedbackArray
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import QPointF, Qt, QTimer

diff --git a/crane_game_analyzer/package.xml b/crane_game_analyzer/package.xml
@@ -10,9 +10,9 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>closest_point_vendor</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>std_msgs</depend>

diff --git a/crane_local_planner/package.xml b/crane_local_planner/package.xml
@@ -11,9 +11,9 @@
 
   <depend>backward_ros</depend>
   <depend>closest_point_vendor</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>rvo2_vendor</depend>

diff --git a/crane_play_switcher/package.xml b/crane_play_switcher/package.xml
@@ -9,9 +9,9 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>robocup_ssl_msgs</depend>

diff --git a/crane_robot_receiver/package.xml b/crane_robot_receiver/package.xml
@@ -10,9 +10,9 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>boost</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>std_msgs</depend>
 

diff --git a/crane_robot_skills/package.xml b/crane_robot_skills/package.xml
@@ -10,11 +10,11 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>boost</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_basics</depend>
   <depend>crane_game_analyzer</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>magic_enum</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/crane_sender/package.xml b/crane_sender/package.xml
@@ -9,10 +9,10 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_basics</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>libboost-dev</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/crane_simple_ai/package.xml b/crane_simple_ai/package.xml
@@ -9,10 +9,10 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
   <depend>crane_robot_skills</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>libqt5-core</depend>
   <depend>libqt5-gui</depend>
   <depend>libqt5-widgets</depend>

diff --git a/crane_visualization_interfaces/include/consai_visualizer_msgs/manual_conversions.hpp b/crane_visualization_interfaces/include/consai_visualizer_msgs/manual_conversions.hpp
diff --git a/crane_visualization_interfaces/include/crane_visualization_interfaces/manual_conversions.hpp b/crane_visualization_interfaces/include/crane_visualization_interfaces/manual_conversions.hpp
@@ -0,0 +1,12 @@
+// Copyright (c) 2024 ibis-ssl
+//
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+#ifndef CRANE_VISUALIZATION_INTERFACES__MANUAL_CONVERSIONS_HPP_
+#define CRANE_VISUALIZATION_INTERFACES__MANUAL_CONVERSIONS_HPP_
+
+// IMPLEMENT MANUAL CONVERSIONS HERE
+
+#endif  // CRANE_VISUALIZATION_INTERFACES__MANUAL_CONVERSIONS_HPP_
diff --git a/crane_visualization_interfaces/src/manual_conversions.cpp b/crane_visualization_interfaces/src/manual_conversions.cpp
@@ -4,5 +4,6 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-// NOTE: 名前もmanual_conversions.cppで固定
-#include <consai_visualizer_msgs/manual_conversions.hpp>
+#include <crane_visualization_interfaces/manual_conversions.hpp>
+
+// IMPLEMENT MANUAL CONVERSIONS HERE
diff --git a/..._world_model_publisher/include/crane_world_model_publisher/visualization_data_handler.hpp b/..._world_model_publisher/include/crane_world_model_publisher/visualization_data_handler.hpp
@@ -18,15 +18,15 @@
 #include <robocup_ssl_msgs/ssl_vision_geometry.pb.h>
 #include <robocup_ssl_msgs/ssl_vision_wrapper_tracked.pb.h>
 
-#include <consai_visualizer_msgs/msg/objects_array.hpp>
+#include <crane_visualization_interfaces/msg/objects_array.hpp>
 #include <rclcpp/rclcpp.hpp>
 #include <robocup_ssl_msgs/msg/referee.hpp>
 
 namespace crane
 {
 
-using VisualizerObjects = consai_visualizer_msgs::msg::Objects;
-using VisualizerObjectsArray = consai_visualizer_msgs::msg::ObjectsArray;
+using VisualizerObjects = crane_visualization_interfaces::msg::Objects;
+using VisualizerObjectsArray = crane_visualization_interfaces::msg::ObjectsArray;
 using Referee = robocup_ssl_msgs::msg::Referee;
 
 class VisualizationDataHandler

diff --git a/crane_world_model_publisher/package.xml b/crane_world_model_publisher/package.xml
@@ -10,10 +10,10 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>boost</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_basics</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>libgoogle-glog-dev</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/crane_world_model_publisher/src/visualization_data_handler.cpp b/crane_world_model_publisher/src/visualization_data_handler.cpp
@@ -14,25 +14,25 @@
 
 #include "crane_world_model_publisher/visualization_data_handler.hpp"
 
-#include <consai_visualizer_msgs/msg/shape_arc.hpp>
-#include <consai_visualizer_msgs/msg/shape_circle.hpp>
-#include <consai_visualizer_msgs/msg/shape_line.hpp>
-#include <consai_visualizer_msgs/msg/shape_point.hpp>
-#include <consai_visualizer_msgs/msg/shape_rectangle.hpp>
-#include <consai_visualizer_msgs/msg/shape_robot.hpp>
+#include <crane_visualization_interfaces/msg/shape_arc.hpp>
+#include <crane_visualization_interfaces/msg/shape_circle.hpp>
+#include <crane_visualization_interfaces/msg/shape_line.hpp>
+#include <crane_visualization_interfaces/msg/shape_point.hpp>
+#include <crane_visualization_interfaces/msg/shape_rectangle.hpp>
+#include <crane_visualization_interfaces/msg/shape_robot.hpp>
 #include <robocup_ssl_msgs/msg/robot_id.hpp>
 
 namespace crane
 {
-using VisColor = consai_visualizer_msgs::msg::Color;
-using VisArc = consai_visualizer_msgs::msg::ShapeArc;
-using VisAnnotation = consai_visualizer_msgs::msg::ShapeAnnotation;
-using VisCircle = consai_visualizer_msgs::msg::ShapeCircle;
-using VisLine = consai_visualizer_msgs::msg::ShapeLine;
-using VisPoint = consai_visualizer_msgs::msg::ShapePoint;
-using VisRect = consai_visualizer_msgs::msg::ShapeRectangle;
-using VisRobot = consai_visualizer_msgs::msg::ShapeRobot;
-using VisText = consai_visualizer_msgs::msg::ShapeText;
+using VisColor = crane_visualization_interfaces::msg::Color;
+using VisArc = crane_visualization_interfaces::msg::ShapeArc;
+using VisAnnotation = crane_visualization_interfaces::msg::ShapeAnnotation;
+using VisCircle = crane_visualization_interfaces::msg::ShapeCircle;
+using VisLine = crane_visualization_interfaces::msg::ShapeLine;
+using VisPoint = crane_visualization_interfaces::msg::ShapePoint;
+using VisRect = crane_visualization_interfaces::msg::ShapeRectangle;
+using VisRobot = crane_visualization_interfaces::msg::ShapeRobot;
+using VisText = crane_visualization_interfaces::msg::ShapeText;
 using RobotId = robocup_ssl_msgs::msg::RobotId;
 
 VisualizationDataHandler::VisualizationDataHandler(rclcpp::Node & node)

diff --git a/session/crane_planner_base/package.xml b/session/crane_planner_base/package.xml
@@ -9,9 +9,9 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>std_msgs</depend>
 

diff --git a/session/crane_planner_plugins/package.xml b/session/crane_planner_plugins/package.xml
@@ -9,13 +9,13 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_basics</depend>
   <depend>crane_game_analyzer</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
   <depend>crane_planner_base</depend>
   <depend>crane_robot_skills</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>matplotlib_cpp_17_vendor</depend>
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>

diff --git a/session/crane_session_controller/package.xml b/session/crane_session_controller/package.xml
@@ -10,10 +10,10 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>closest_point_vendor</depend>
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msg_wrappers</depend>
   <depend>crane_msgs</depend>
   <depend>crane_planner_plugins</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>libgoogle-glog-dev</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/utility/crane_grsim_operator/package.xml b/utility/crane_grsim_operator/package.xml
@@ -9,8 +9,8 @@
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
-  <depend>consai_visualizer_msgs</depend>
   <depend>crane_msgs</depend>
+  <depend>crane_visualization_interfaces</depend>
   <depend>rclcpp</depend>
   <depend>robocup_ssl_msgs</depend>
   <depend>std_msgs</depend>