diff --git a/localization/yabloc/imgproc/graph_segment/CMakeLists.txt b/localization/yabloc/imgproc/graph_segment/CMakeLists.txt deleted file mode 100644 index e31b6d13ed2b2..0000000000000 --- a/localization/yabloc/imgproc/graph_segment/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(graph_segment) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # add_compile_options(-Wall -Wextra -Wpedantic -Werror) - add_compile_options(-Wall -Wextra -Wpedantic) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# Eigen3 -find_package(Eigen3 REQUIRED) - -# OpenCV -find_package(OpenCV REQUIRED) - -# =================================================== -# Executable -set(TARGET graph_segment_node) -ament_auto_add_executable(${TARGET} src/graph_segment_node.cpp src/graph_segment_core src/similar_area_searcher.cpp) -target_include_directories(${TARGET} PUBLIC include) -target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS}) -target_link_libraries(${TARGET} ${OpenCV_LIBS}) - -# =================================================== -ament_auto_package(INSTALL_TO_SHARE config) \ No newline at end of file diff --git a/localization/yabloc/imgproc/graph_segment/package.xml b/localization/yabloc/imgproc/graph_segment/package.xml deleted file mode 100644 index cc0de841996e1..0000000000000 --- a/localization/yabloc/imgproc/graph_segment/package.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - graph_segment - 0.0.0 - graph based segmentation - Kento Yabuuchi - Apache License 2.0 - - ament_cmake - - rclcpp - std_msgs - sensor_msgs - cv_bridge - yabloc_common - - ament_lint_auto - ament_lint_common - - - ament_cmake - - - - diff --git a/localization/yabloc/imgproc/lsd/CMakeLists.txt b/localization/yabloc/imgproc/lsd/CMakeLists.txt deleted file mode 100644 index c5944f6e5b3e0..0000000000000 --- a/localization/yabloc/imgproc/lsd/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(lsd) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # add_compile_options(-Wall -Wextra -Wpedantic -Werror) - add_compile_options(-Wall -Wextra -Wpedantic) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# Eigen3 -find_package(Eigen3 REQUIRED) - -# OpenCV -find_package(OpenCV REQUIRED) - -# =================================================== -# Executable -set(TARGET lsd_node) -ament_auto_add_executable(${TARGET} src/lsd_node.cpp src/lsd_core.cpp) -target_include_directories(${TARGET} PUBLIC include) -target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS}) -target_link_libraries(${TARGET} ${OpenCV_LIBS}) - -# =================================================== -ament_auto_package() \ No newline at end of file diff --git a/localization/yabloc/imgproc/lsd/package.xml b/localization/yabloc/imgproc/lsd/package.xml deleted file mode 100644 index 951894704536b..0000000000000 --- a/localization/yabloc/imgproc/lsd/package.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - lsd - 0.0.0 - line segment detection - Kento Yabuuchi - Apache License 2.0 - - ament_cmake - - rclcpp - tf2 - tf2_ros - std_msgs - sensor_msgs - nav_msgs - visualization_msgs - cv_bridge - pcl_conversions - - yabloc_common - - ament_lint_auto - ament_lint_common - - - ament_cmake - - - - diff --git a/localization/yabloc/imgproc/segment_filter/CMakeLists.txt b/localization/yabloc/imgproc/segment_filter/CMakeLists.txt deleted file mode 100644 index c6e87479291b8..0000000000000 --- a/localization/yabloc/imgproc/segment_filter/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(segment_filter) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # add_compile_options(-Wall -Wextra -Wpedantic -Werror) - add_compile_options(-Wall -Wextra -Wpedantic) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# Eigen3 -find_package(Eigen3 REQUIRED) - -# OpenCV -find_package(OpenCV REQUIRED) - -# PCL -find_package(PCL REQUIRED COMPONENTS common) - -# =================================================== -# Executable -set(TARGET segment_filter_node) -ament_auto_add_executable(${TARGET} - src/segment_filter_node.cpp - src/segment_filter_core.cpp) -target_include_directories(${TARGET} PUBLIC include ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) -target_link_libraries(${TARGET} ${PCL_LIBRARIES} ${OpenCV_LIBS}) - -# =================================================== -ament_auto_package(INSTALL_TO_SHARE config) \ No newline at end of file diff --git a/localization/yabloc/imgproc/undistort/CMakeLists.txt b/localization/yabloc/imgproc/undistort/CMakeLists.txt deleted file mode 100644 index cc0e985c346c0..0000000000000 --- a/localization/yabloc/imgproc/undistort/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(undistort) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # add_compile_options(-Wall -Wextra -Wpedantic -Werror) - add_compile_options(-Wall -Wextra -Wpedantic) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# OpenCV -find_package(OpenCV REQUIRED) - -# =================================================== -# Executable -set(TARGET undistort_node) -ament_auto_add_executable(${TARGET} src/undistort_node.cpp) -target_link_libraries(${TARGET} ${OpenCV_LIBS}) - -# =================================================== -ament_auto_package(INSTALL_TO_SHARE launch config) \ No newline at end of file diff --git a/localization/yabloc/imgproc/undistort/launch/undistort.launch.xml b/localization/yabloc/imgproc/undistort/launch/undistort.launch.xml deleted file mode 100644 index ce2ed66ae9f39..0000000000000 --- a/localization/yabloc/imgproc/undistort/launch/undistort.launch.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/localization/yabloc/imgproc/undistort/package.xml b/localization/yabloc/imgproc/undistort/package.xml deleted file mode 100644 index 28c1e73994e92..0000000000000 --- a/localization/yabloc/imgproc/undistort/package.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - undistort - 0.0.0 - undistort and resize - Kento Yabuuchi - Apache License 2.0 - - ament_cmake - - rclcpp - - std_msgs - sensor_msgs - nav_msgs - visualization_msgs - cv_bridge - pcl_conversions - - yabloc_common - - ament_lint_auto - ament_lint_common - - - ament_cmake - - - - diff --git a/localization/yabloc/validation/lanelet2_overlay_monitor/CMakeLists.txt b/localization/yabloc/validation/lanelet2_overlay_monitor/CMakeLists.txt deleted file mode 100644 index 1e56a9370df59..0000000000000 --- a/localization/yabloc/validation/lanelet2_overlay_monitor/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(lanelet2_overlay_monitor) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wextra -Wpedantic -Werror) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# Eigen3 -find_package(Eigen3 REQUIRED) - -# PCL -find_package(PCL REQUIRED COMPONENTS common) - -# Sophus -find_package(Sophus REQUIRED) - -# =================================================== -# Executable -set(TARGET lanelet2_overlay_monitor_node) -ament_auto_add_executable(${TARGET} src/lanelet2_overlay_monitor_core.cpp src/lanelet2_overlay_monitor_node.cpp) -target_include_directories(${TARGET} PUBLIC include) -target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) -target_link_libraries(${TARGET} Sophus::Sophus ${PCL_LIBRARIES}) - -# =================================================== -ament_auto_package() diff --git a/localization/yabloc/validation/lanelet2_overlay_monitor/package.xml b/localization/yabloc/validation/lanelet2_overlay_monitor/package.xml deleted file mode 100644 index 27c8ba7e51488..0000000000000 --- a/localization/yabloc/validation/lanelet2_overlay_monitor/package.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - lanelet2_overlay_monitor - 0.0.0 - overlay lanelet2 onto camera image - Kento Yabuuchi - Apache License 2.0 - - ament_cmake - - rclcpp - std_msgs - sensor_msgs - nav_msgs - visualization_msgs - ublox_msgs - - yabloc_common - - ament_lint_auto - ament_lint_common - - - ament_cmake - - \ No newline at end of file diff --git a/localization/yabloc/validation/line_segments_overlay_monitor/CMakeLists.txt b/localization/yabloc/validation/line_segments_overlay_monitor/CMakeLists.txt deleted file mode 100644 index e5bf0f587006e..0000000000000 --- a/localization/yabloc/validation/line_segments_overlay_monitor/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(line_segments_overlay_monitor) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wextra -Wpedantic -Werror) -endif() - -# =================================================== -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -# =================================================== -# Eigen3 -find_package(Eigen3 REQUIRED) - -# PCL -find_package(PCL REQUIRED COMPONENTS common) - -# Sophus -find_package(Sophus REQUIRED) - -# =================================================== -# Executable -set(TARGET line_segments_overlay_monitor_node) -ament_auto_add_executable(${TARGET} src/line_segments_overlay_monitor_core.cpp src/line_segments_overlay_monitor_node.cpp) -target_include_directories(${TARGET} PUBLIC include) -target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) -target_link_libraries(${TARGET} Sophus::Sophus ${PCL_LIBRARIES}) - -# =================================================== -ament_auto_package() diff --git a/localization/yabloc/validation/line_segments_overlay_monitor/package.xml b/localization/yabloc/validation/line_segments_overlay_monitor/package.xml deleted file mode 100644 index 4003587c67b68..0000000000000 --- a/localization/yabloc/validation/line_segments_overlay_monitor/package.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - line_segments_overlay_monitor - 0.0.0 - overlay detected line segments onto camera image - Kento Yabuuchi - Apache License 2.0 - - ament_cmake - - rclcpp - std_msgs - sensor_msgs - nav_msgs - visualization_msgs - ublox_msgs - - yabloc_common - - ament_lint_auto - ament_lint_common - - - ament_cmake - - \ No newline at end of file diff --git a/localization/yabloc/yabloc_imgproc/CMakeLists.txt b/localization/yabloc/yabloc_imgproc/CMakeLists.txt new file mode 100644 index 0000000000000..ccc676d76b9c5 --- /dev/null +++ b/localization/yabloc/yabloc_imgproc/CMakeLists.txt @@ -0,0 +1,84 @@ +cmake_minimum_required(VERSION 3.5) +project(yabloc_imgproc) + +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +endif() + +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # add_compile_options(-Wall -Wextra -Wpedantic -Werror) + add_compile_options(-Wall -Wextra -Wpedantic) +endif() + +# =================================================== +find_package(ament_cmake_auto REQUIRED) +ament_auto_find_build_dependencies() + +# =================================================== +# Eigen3 +find_package(Eigen3 REQUIRED) + +# OpenCV +find_package(OpenCV REQUIRED) + +# PCL +find_package(PCL REQUIRED COMPONENTS common) + +# Sophus +find_package(Sophus REQUIRED) + +# =================================================== +# Executable +# line segment detection +set(TARGET lsd_node) +ament_auto_add_executable(${TARGET} + src/lsd/lsd_node.cpp + src/lsd/lsd_core.cpp) +target_include_directories(${TARGET} PUBLIC include) +target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS}) +target_link_libraries(${TARGET} ${OpenCV_LIBS}) + +# graph based segmentation +set(TARGET graph_segment_node) +ament_auto_add_executable(${TARGET} + src/graph_segment/graph_segment_node.cpp + src/graph_segment/graph_segment_core + src/graph_segment/similar_area_searcher.cpp) +target_include_directories(${TARGET} PUBLIC include) +target_include_directories(${TARGET} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS}) +target_link_libraries(${TARGET} ${OpenCV_LIBS}) + +# segment filter +set(TARGET segment_filter_node) +ament_auto_add_executable(${TARGET} + src/segment_filter/segment_filter_node.cpp + src/segment_filter/segment_filter_core.cpp) +target_include_directories(${TARGET} PUBLIC include ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) +target_link_libraries(${TARGET} ${PCL_LIBRARIES} ${OpenCV_LIBS}) + +# undistort +set(TARGET undistort_node) +ament_auto_add_executable(${TARGET} + src/undistort/undistort_node.cpp) +target_link_libraries(${TARGET} ${OpenCV_LIBS}) + +# line_segments_overlay +set(TARGET line_segments_overlay_node) +ament_auto_add_executable(${TARGET} + src/line_segments_overlay/line_segments_overlay_core.cpp + src/line_segments_overlay/line_segments_overlay_node.cpp) +target_include_directories(${TARGET} PUBLIC include ${EIGEN_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) +target_link_libraries(${TARGET} Sophus::Sophus ${PCL_LIBRARIES}) + +# lanelet2_overlay +set(TARGET lanelet2_overlay_node) +ament_auto_add_executable(${TARGET} + src/lanelet2_overlay/lanelet2_overlay_core.cpp + src/lanelet2_overlay/lanelet2_overlay_node.cpp) +target_include_directories(${TARGET} PUBLIC include ${EIGEN_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) +target_link_libraries(${TARGET} Sophus::Sophus ${PCL_LIBRARIES}) + +# =================================================== +ament_auto_package(INSTALL_TO_SHARE config) \ No newline at end of file diff --git a/localization/yabloc/imgproc/graph_segment/config/graph_segment.param.yaml b/localization/yabloc/yabloc_imgproc/config/graph_segment.param.yaml similarity index 100% rename from localization/yabloc/imgproc/graph_segment/config/graph_segment.param.yaml rename to localization/yabloc/yabloc_imgproc/config/graph_segment.param.yaml diff --git a/localization/yabloc/imgproc/segment_filter/config/segment_filter.param.yaml b/localization/yabloc/yabloc_imgproc/config/segment_filter.param.yaml similarity index 100% rename from localization/yabloc/imgproc/segment_filter/config/segment_filter.param.yaml rename to localization/yabloc/yabloc_imgproc/config/segment_filter.param.yaml diff --git a/localization/yabloc/imgproc/undistort/config/undistort.param.yaml b/localization/yabloc/yabloc_imgproc/config/undistort.param.yaml similarity index 100% rename from localization/yabloc/imgproc/undistort/config/undistort.param.yaml rename to localization/yabloc/yabloc_imgproc/config/undistort.param.yaml diff --git a/localization/yabloc/imgproc/graph_segment/include/graph_segment/graph_segment.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/graph_segment.hpp similarity index 96% rename from localization/yabloc/imgproc/graph_segment/include/graph_segment/graph_segment.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/graph_segment.hpp index 9485c00881253..0b31105c992fe 100644 --- a/localization/yabloc/imgproc/graph_segment/include/graph_segment/graph_segment.hpp +++ b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/graph_segment.hpp @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "graph_segment/similar_area_searcher.hpp" +#include "yabloc_imgproc/graph_segment/similar_area_searcher.hpp" #include #include diff --git a/localization/yabloc/imgproc/graph_segment/include/graph_segment/histogram.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/histogram.hpp similarity index 100% rename from localization/yabloc/imgproc/graph_segment/include/graph_segment/histogram.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/histogram.hpp diff --git a/localization/yabloc/imgproc/graph_segment/include/graph_segment/similar_area_searcher.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/similar_area_searcher.hpp similarity index 100% rename from localization/yabloc/imgproc/graph_segment/include/graph_segment/similar_area_searcher.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/graph_segment/similar_area_searcher.hpp diff --git a/localization/yabloc/validation/lanelet2_overlay_monitor/include/lanelet2_overlay_monitor/lanelet2_overlay_monitor.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/lanelet2_overlay/lanelet2_overlay.hpp similarity index 100% rename from localization/yabloc/validation/lanelet2_overlay_monitor/include/lanelet2_overlay_monitor/lanelet2_overlay_monitor.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/lanelet2_overlay/lanelet2_overlay.hpp diff --git a/localization/yabloc/validation/line_segments_overlay_monitor/include/line_segments_overlay_monitor/line_segments_overlay_monitor.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/line_segments_overlay/line_segments_overlay.hpp similarity index 100% rename from localization/yabloc/validation/line_segments_overlay_monitor/include/line_segments_overlay_monitor/line_segments_overlay_monitor.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/line_segments_overlay/line_segments_overlay.hpp diff --git a/localization/yabloc/imgproc/lsd/include/lsd/lsd.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/lsd/lsd.hpp similarity index 100% rename from localization/yabloc/imgproc/lsd/include/lsd/lsd.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/lsd/lsd.hpp diff --git a/localization/yabloc/imgproc/segment_filter/include/segment_filter/segment_filter.hpp b/localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/segment_filter/segment_filter.hpp similarity index 100% rename from localization/yabloc/imgproc/segment_filter/include/segment_filter/segment_filter.hpp rename to localization/yabloc/yabloc_imgproc/include/yabloc_imgproc/segment_filter/segment_filter.hpp diff --git a/localization/yabloc/imgproc/segment_filter/package.xml b/localization/yabloc/yabloc_imgproc/package.xml similarity index 88% rename from localization/yabloc/imgproc/segment_filter/package.xml rename to localization/yabloc/yabloc_imgproc/package.xml index 528f350261bcf..7c8a4df97dca8 100644 --- a/localization/yabloc/imgproc/segment_filter/package.xml +++ b/localization/yabloc/yabloc_imgproc/package.xml @@ -1,9 +1,9 @@ - segment_filter + yabloc_imgproc 0.0.0 - line segmentation filter + image processing package Kento Yabuuchi Apache License 2.0 @@ -18,6 +18,7 @@ visualization_msgs cv_bridge pcl_conversions + sophus yabloc_common diff --git a/localization/yabloc/imgproc/graph_segment/src/graph_segment_core.cpp b/localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_core.cpp similarity index 97% rename from localization/yabloc/imgproc/graph_segment/src/graph_segment_core.cpp rename to localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_core.cpp index a9f4ff85ecaa4..db1b08a500e01 100644 --- a/localization/yabloc/imgproc/graph_segment/src/graph_segment_core.cpp +++ b/localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_core.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "graph_segment/graph_segment.hpp" -#include "graph_segment/histogram.hpp" +#include "yabloc_imgproc/graph_segment/graph_segment.hpp" +#include "yabloc_imgproc/graph_segment/histogram.hpp" #include #include diff --git a/localization/yabloc/imgproc/graph_segment/src/graph_segment_node.cpp b/localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_node.cpp similarity index 92% rename from localization/yabloc/imgproc/graph_segment/src/graph_segment_node.cpp rename to localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_node.cpp index a954cd91d3030..4eb5aa222cd54 100644 --- a/localization/yabloc/imgproc/graph_segment/src/graph_segment_node.cpp +++ b/localization/yabloc/yabloc_imgproc/src/graph_segment/graph_segment_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "graph_segment/graph_segment.hpp" +#include "yabloc_imgproc/graph_segment/graph_segment.hpp" int main(int argc, char * argv[]) { diff --git a/localization/yabloc/imgproc/graph_segment/src/similar_area_searcher.cpp b/localization/yabloc/yabloc_imgproc/src/graph_segment/similar_area_searcher.cpp similarity index 96% rename from localization/yabloc/imgproc/graph_segment/src/similar_area_searcher.cpp rename to localization/yabloc/yabloc_imgproc/src/graph_segment/similar_area_searcher.cpp index 81a3dac88f177..d02e3236be9c2 100644 --- a/localization/yabloc/imgproc/graph_segment/src/similar_area_searcher.cpp +++ b/localization/yabloc/yabloc_imgproc/src/graph_segment/similar_area_searcher.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "graph_segment/similar_area_searcher.hpp" +#include "yabloc_imgproc/graph_segment/similar_area_searcher.hpp" -#include "graph_segment/histogram.hpp" +#include "yabloc_imgproc/graph_segment/histogram.hpp" #include diff --git a/localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_core.cpp b/localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_core.cpp similarity index 99% rename from localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_core.cpp rename to localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_core.cpp index f4ab98b961d33..62ae60ebc61da 100644 --- a/localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_core.cpp +++ b/localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lanelet2_overlay_monitor/lanelet2_overlay_monitor.hpp" +#include "yabloc_imgproc/lanelet2_overlay/lanelet2_overlay.hpp" #include #include diff --git a/localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_node.cpp b/localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_node.cpp similarity index 92% rename from localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_node.cpp rename to localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_node.cpp index 1d42bef690eab..3acf6dd8ecfbe 100644 --- a/localization/yabloc/validation/lanelet2_overlay_monitor/src/lanelet2_overlay_monitor_node.cpp +++ b/localization/yabloc/yabloc_imgproc/src/lanelet2_overlay/lanelet2_overlay_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lanelet2_overlay_monitor/lanelet2_overlay_monitor.hpp" +#include "yabloc_imgproc/lanelet2_overlay/lanelet2_overlay.hpp" int main(int argc, char * argv[]) { diff --git a/localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_core.cpp b/localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_core.cpp similarity index 97% rename from localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_core.cpp rename to localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_core.cpp index 905ff15a32ab9..bb1c03933f2af 100644 --- a/localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_core.cpp +++ b/localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "line_segments_overlay_monitor/line_segments_overlay_monitor.hpp" +#include "yabloc_imgproc/line_segments_overlay/line_segments_overlay.hpp" #include #include diff --git a/localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_node.cpp b/localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_node.cpp similarity index 91% rename from localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_node.cpp rename to localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_node.cpp index 91844f8fe2b3d..4332ee48d6bad 100644 --- a/localization/yabloc/validation/line_segments_overlay_monitor/src/line_segments_overlay_monitor_node.cpp +++ b/localization/yabloc/yabloc_imgproc/src/line_segments_overlay/line_segments_overlay_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "line_segments_overlay_monitor/line_segments_overlay_monitor.hpp" +#include "yabloc_imgproc/line_segments_overlay/line_segments_overlay.hpp" int main(int argc, char * argv[]) { diff --git a/localization/yabloc/imgproc/lsd/src/lsd_core.cpp b/localization/yabloc/yabloc_imgproc/src/lsd/lsd_core.cpp similarity index 95% rename from localization/yabloc/imgproc/lsd/src/lsd_core.cpp rename to localization/yabloc/yabloc_imgproc/src/lsd/lsd_core.cpp index b1ae01b948820..bc0b25c2f4156 100644 --- a/localization/yabloc/imgproc/lsd/src/lsd_core.cpp +++ b/localization/yabloc/yabloc_imgproc/src/lsd/lsd_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lsd/lsd.hpp" +#include "yabloc_imgproc/lsd/lsd.hpp" #include #include @@ -35,7 +35,8 @@ LineSegmentDetector::LineSegmentDetector() : Node("line_detector") pub_image_with_line_segments_ = create_publisher("image_with_line_segments", 10); pub_cloud_ = create_publisher("line_segments_cloud", 10); - line_segment_detector_ = cv::createLineSegmentDetector(cv::LSD_REFINE_STD, 0.8, 0.6, 2.0, 22.5, 0, 0.7, 1024); + line_segment_detector_ = + cv::createLineSegmentDetector(cv::LSD_REFINE_STD, 0.8, 0.6, 2.0, 22.5, 0, 0.7, 1024); } void LineSegmentDetector::on_image(const sensor_msgs::msg::Image & msg) diff --git a/localization/yabloc/imgproc/lsd/src/lsd_node.cpp b/localization/yabloc/yabloc_imgproc/src/lsd/lsd_node.cpp similarity index 95% rename from localization/yabloc/imgproc/lsd/src/lsd_node.cpp rename to localization/yabloc/yabloc_imgproc/src/lsd/lsd_node.cpp index 0198d0734c6b5..0fdd7ebece7d8 100644 --- a/localization/yabloc/imgproc/lsd/src/lsd_node.cpp +++ b/localization/yabloc/yabloc_imgproc/src/lsd/lsd_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lsd/lsd.hpp" +#include "yabloc_imgproc/lsd/lsd.hpp" int main(int argc, char * argv[]) { diff --git a/localization/yabloc/imgproc/segment_filter/src/segment_filter_core.cpp b/localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_core.cpp similarity index 99% rename from localization/yabloc/imgproc/segment_filter/src/segment_filter_core.cpp rename to localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_core.cpp index 3c16cae94a99f..610cdd5de0b06 100644 --- a/localization/yabloc/imgproc/segment_filter/src/segment_filter_core.cpp +++ b/localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_core.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "segment_filter/segment_filter.hpp" +#include "yabloc_imgproc/segment_filter/segment_filter.hpp" #include #include diff --git a/localization/yabloc/imgproc/segment_filter/src/segment_filter_node.cpp b/localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_node.cpp similarity index 92% rename from localization/yabloc/imgproc/segment_filter/src/segment_filter_node.cpp rename to localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_node.cpp index 1088dc32983ec..6593c4548ea00 100644 --- a/localization/yabloc/imgproc/segment_filter/src/segment_filter_node.cpp +++ b/localization/yabloc/yabloc_imgproc/src/segment_filter/segment_filter_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "segment_filter/segment_filter.hpp" +#include "yabloc_imgproc/segment_filter/segment_filter.hpp" int main(int argc, char * argv[]) { diff --git a/localization/yabloc/imgproc/undistort/src/undistort_node.cpp b/localization/yabloc/yabloc_imgproc/src/undistort/undistort_node.cpp similarity index 100% rename from localization/yabloc/imgproc/undistort/src/undistort_node.cpp rename to localization/yabloc/yabloc_imgproc/src/undistort/undistort_node.cpp diff --git a/localization/yabloc/yabloc_launch/launch/impl/imgproc.launch.xml b/localization/yabloc/yabloc_launch/launch/impl/imgproc.launch.xml index 3f8852ab4ecb6..56e34543df475 100644 --- a/localization/yabloc/yabloc_launch/launch/impl/imgproc.launch.xml +++ b/localization/yabloc/yabloc_launch/launch/impl/imgproc.launch.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/localization/yabloc/yabloc_launch/launch/impl/overlay.launch.xml b/localization/yabloc/yabloc_launch/launch/impl/overlay.launch.xml index 7ca473efeadaa..6088bc5785e1f 100644 --- a/localization/yabloc/yabloc_launch/launch/impl/overlay.launch.xml +++ b/localization/yabloc/yabloc_launch/launch/impl/overlay.launch.xml @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/localization/yabloc/yabloc_launch/launch/yabloc.launch.xml b/localization/yabloc/yabloc_launch/launch/yabloc.launch.xml index f5f668e6f44a1..9e1b9bd680c3d 100644 --- a/localization/yabloc/yabloc_launch/launch/yabloc.launch.xml +++ b/localization/yabloc/yabloc_launch/launch/yabloc.launch.xml @@ -23,9 +23,9 @@ - - - + + + diff --git a/localization/yabloc/yabloc_launch/launch/yabloc_multi_camera.launch.xml b/localization/yabloc/yabloc_launch/launch/yabloc_multi_camera.launch.xml index ab667e7f8e635..6e1d77720dbb0 100644 --- a/localization/yabloc/yabloc_launch/launch/yabloc_multi_camera.launch.xml +++ b/localization/yabloc/yabloc_launch/launch/yabloc_multi_camera.launch.xml @@ -31,9 +31,9 @@ - - - + + +