Renamed ros packages.

This commit is contained in:
Daniel
2025-01-21 18:11:49 +01:00
parent 9778c75bf0
commit 9ce51f90b3
15 changed files with 23 additions and 23 deletions

View File

@ -35,7 +35,7 @@ services:
- DISPLAY - DISPLAY
- QT_X11_NO_MITSHM=1 - QT_X11_NO_MITSHM=1
- "PYTHONUNBUFFERED=1" - "PYTHONUNBUFFERED=1"
command: /bin/bash -i -c 'export ROS_DOMAIN_ID=18 && ros2 run rpt2D_wrapper_cpp rpt2D_wrapper' command: /bin/bash -i -c 'export ROS_DOMAIN_ID=18 && ros2 run rpt2d_wrapper_cpp rpt2d_wrapper'
pose_visualizer: pose_visualizer:
image: rapidposetriangulation_ros image: rapidposetriangulation_ros
@ -52,7 +52,7 @@ services:
- DISPLAY - DISPLAY
- QT_X11_NO_MITSHM=1 - QT_X11_NO_MITSHM=1
- "PYTHONUNBUFFERED=1" - "PYTHONUNBUFFERED=1"
command: /bin/bash -i -c 'sleep 2 && export ROS_DOMAIN_ID=18 && ros2 run pose2D_visualizer pose2D_visualizer' command: /bin/bash -i -c 'sleep 2 && export ROS_DOMAIN_ID=18 && ros2 run pose2d_visualizer pose2d_visualizer'
pose_viewer: pose_viewer:
image: rapidposetriangulation_ros image: rapidposetriangulation_ros

View File

@ -62,12 +62,12 @@ RUN pip3 install --no-cache-dir "setuptools<=58.2.0"
# Copy modules # Copy modules
COPY ./extras/include/ /RapidPoseTriangulation/extras/include/ COPY ./extras/include/ /RapidPoseTriangulation/extras/include/
COPY ./scripts/ /RapidPoseTriangulation/scripts/ COPY ./scripts/ /RapidPoseTriangulation/scripts/
COPY ./extras/ros/pose2D_visualizer/ /RapidPoseTriangulation/extras/ros/pose2D_visualizer/ COPY ./extras/ros/pose2d_visualizer/ /RapidPoseTriangulation/extras/ros/pose2d_visualizer/
COPY ./extras/ros/rpt2D_wrapper_cpp/ /RapidPoseTriangulation/extras/ros/rpt2D_wrapper_cpp/ COPY ./extras/ros/rpt2d_wrapper_cpp/ /RapidPoseTriangulation/extras/ros/rpt2d_wrapper_cpp/
# Link and build as ros package # Link and build as ros package
RUN ln -s /RapidPoseTriangulation/extras/ros/pose2D_visualizer/ /project/dev_ws/src/pose2D_visualizer RUN ln -s /RapidPoseTriangulation/extras/ros/pose2d_visualizer/ /project/dev_ws/src/pose2d_visualizer
RUN ln -s /RapidPoseTriangulation/extras/ros/rpt2D_wrapper_cpp/ /project/dev_ws/src/rpt2D_wrapper_cpp RUN ln -s /RapidPoseTriangulation/extras/ros/rpt2d_wrapper_cpp/ /project/dev_ws/src/rpt2d_wrapper_cpp
RUN /bin/bash -i -c 'cd /project/dev_ws/; colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release' RUN /bin/bash -i -c 'cd /project/dev_ws/; colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release'
# Update ros packages -> autocompletion and check # Update ros packages -> autocompletion and check

View File

@ -1,4 +0,0 @@
[develop]
script_dir=$base/lib/pose2D_visualizer
[install]
install_scripts=$base/lib/pose2D_visualizer

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?> <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3"> <package format="3">
<name>pose2D_visualizer</name> <name>pose2d_visualizer</name>
<version>0.0.0</version> <version>0.0.0</version>
<description>TODO: Package description</description> <description>TODO: Package description</description>
<maintainer email="root@todo.todo">root</maintainer> <maintainer email="root@todo.todo">root</maintainer>

View File

@ -111,7 +111,7 @@ def main():
# Start node # Start node
rclpy.init(args=sys.argv) rclpy.init(args=sys.argv)
node = rclpy.create_node("pose2D_visualizer") node = rclpy.create_node("pose2d_visualizer")
# Quality of service settings # Quality of service settings
qos_profile = QoSProfile( qos_profile = QoSProfile(

View File

@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/pose2d_visualizer
[install]
install_scripts=$base/lib/pose2d_visualizer

View File

@ -1,6 +1,6 @@
from setuptools import setup from setuptools import setup
package_name = "pose2D_visualizer" package_name = "pose2d_visualizer"
setup( setup(
name=package_name, name=package_name,
@ -18,6 +18,6 @@ setup(
license="TODO: License declaration", license="TODO: License declaration",
tests_require=["pytest"], tests_require=["pytest"],
entry_points={ entry_points={
"console_scripts": ["pose2D_visualizer = pose2D_visualizer.pose2D_visualizer:main"], "console_scripts": ["pose2d_visualizer = pose2d_visualizer.pose2d_visualizer:main"],
}, },
) )

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(rpt2D_wrapper_cpp) project(rpt2d_wrapper_cpp)
# Default to C99 # Default to C99
if(NOT CMAKE_C_STANDARD) if(NOT CMAKE_C_STANDARD)
@ -29,13 +29,13 @@ include_directories(/onnxruntime/include/
/onnxruntime/include/onnxruntime/core/providers/tensorrt/) /onnxruntime/include/onnxruntime/core/providers/tensorrt/)
link_directories(/onnxruntime/build/Linux/Release/) link_directories(/onnxruntime/build/Linux/Release/)
add_executable(rpt2D_wrapper src/rpt2D_wrapper.cpp) add_executable(rpt2d_wrapper src/rpt2d_wrapper.cpp)
ament_target_dependencies(rpt2D_wrapper rclcpp std_msgs sensor_msgs cv_bridge) ament_target_dependencies(rpt2d_wrapper rclcpp std_msgs sensor_msgs cv_bridge)
target_include_directories(rpt2D_wrapper PUBLIC target_include_directories(rpt2d_wrapper PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
target_link_libraries(rpt2D_wrapper target_link_libraries(rpt2d_wrapper
${OpenCV_LIBS} ${OpenCV_LIBS}
onnxruntime_providers_tensorrt onnxruntime_providers_tensorrt
onnxruntime_providers_shared onnxruntime_providers_shared
@ -43,12 +43,12 @@ target_link_libraries(rpt2D_wrapper
onnxruntime onnxruntime
) )
set_target_properties(rpt2D_wrapper PROPERTIES set_target_properties(rpt2d_wrapper PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE
INSTALL_RPATH "/onnxruntime/build/Linux/Release" INSTALL_RPATH "/onnxruntime/build/Linux/Release"
) )
install(TARGETS rpt2D_wrapper install(TARGETS rpt2d_wrapper
DESTINATION lib/${PROJECT_NAME}) DESTINATION lib/${PROJECT_NAME})
if(BUILD_TESTING) if(BUILD_TESTING)

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?> <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3"> <package format="3">
<name>rpt2D_wrapper_cpp</name> <name>rpt2d_wrapper_cpp</name>
<version>0.0.0</version> <version>0.0.0</version>
<description>TODO: Package description</description> <description>TODO: Package description</description>
<maintainer email="root@todo.todo">root</maintainer> <maintainer email="root@todo.todo">root</maintainer>

View File

@ -222,7 +222,7 @@ int main(int argc, char **argv)
{ {
rclcpp::init(argc, argv); rclcpp::init(argc, argv);
auto node = std::make_shared<Rpt2DWrapperNode>("rpt2D_wrapper"); auto node = std::make_shared<Rpt2DWrapperNode>("rpt2d_wrapper");
rclcpp::spin(node); rclcpp::spin(node);
rclcpp::shutdown(); rclcpp::shutdown();