Skip to content

Commit

Permalink
Migrate GridCellsDisplay (#286)
Browse files Browse the repository at this point in the history
* Move grid_cells_display

* Make it compile and fix linters

* Add tests

* Add visual test

* Fix uncrustify and cpplint

* Add methods to PointCloud to clear vector of points

* Use the new clearAndRemoveAllPoints() method istead of just clear()

* Fix failing test

* Add asserts for position and orientation

* Fix Windows warning

* Refactor GridCellDisplay and tests

* Move grid_cells_display.hpp to include folder

* Harmonize failed transform error message

* Add visibility Control
  • Loading branch information
botteroa-si authored and wjwwood committed Jun 14, 2018
1 parent f89711b commit 2ffa05f
Show file tree
Hide file tree
Showing 15 changed files with 690 additions and 303 deletions.
256 changes: 0 additions & 256 deletions rviz/src/rviz/default_plugin/grid_cells_display.cpp

This file was deleted.

27 changes: 27 additions & 0 deletions rviz_default_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ find_package(visualization_msgs REQUIRED)
set(rviz_default_plugins_headers_to_moc
include/rviz_default_plugins/displays/camera/camera_display.hpp
include/rviz_default_plugins/displays/grid/grid_display.hpp
include/rviz_default_plugins/displays/grid_cells/grid_cells_display.hpp
include/rviz_default_plugins/displays/image/image_display.hpp
include/rviz_default_plugins/displays/laser_scan/laser_scan_display.hpp
include/rviz_default_plugins/displays/marker/marker_display.hpp
Expand Down Expand Up @@ -89,6 +90,7 @@ set(rviz_default_plugins_headers_to_moc
set(rviz_default_plugins_source_files
src/rviz_default_plugins/displays/camera/camera_display.cpp
src/rviz_default_plugins/displays/grid/grid_display.cpp
src/rviz_default_plugins/displays/grid_cells/grid_cells_display.cpp
src/rviz_default_plugins/displays/image/image_display.cpp
src/rviz_default_plugins/displays/image/ros_image_texture.cpp
src/rviz_default_plugins/displays/laser_scan/laser_scan_display.cpp
Expand Down Expand Up @@ -266,6 +268,18 @@ if(BUILD_TESTING)
rviz_common::rviz_common
)

ament_add_gmock(grid_cells_display_test
test/rviz_default_plugins/displays/grid_cells/grid_cells_display_test.cpp
test/rviz_default_plugins/displays/display_test_fixture.cpp
test/rviz_default_plugins/scene_graph_introspection.cpp
APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
if(TARGET grid_cells_display_test)
target_include_directories(grid_cells_display_test PUBLIC
${TEST_INCLUDE_DIRS})
target_link_libraries(grid_cells_display_test
${TEST_LINK_LIBRARIES})
endif()

ament_add_gmock(point_cloud2_display_test
test/rviz_default_plugins/pointcloud_messages.hpp
test/rviz_default_plugins/pointcloud_messages.cpp
Expand Down Expand Up @@ -512,6 +526,19 @@ if(EnableVisualTests STREQUAL "True")
rviz_visual_testing_framework::rviz_visual_testing_framework)
endif()

ament_add_gtest(grid_cells_display_visual_test
test/rviz_default_plugins/displays/grid_cells/grid_cells_display_visual_test.cpp
test/rviz_default_plugins/page_objects/grid_cells_display_page_object.cpp
TIMEOUT 180)
if(TARGET grid_cells_display_visual_test)
target_include_directories(grid_cells_display_visual_test PUBLIC
${TEST_INCLUDE_DIRS}
${rviz_visual_testing_framework_INCLUDE_DIRS})
target_link_libraries(grid_cells_display_visual_test
${TEST_LINK_LIBRARIES}
rviz_visual_testing_framework::rviz_visual_testing_framework)
endif()

ament_add_gtest(image_display_visual_test
test/rviz_default_plugins/displays/image/image_display_visual_test.cpp
test/rviz_default_plugins/page_objects/image_display_page_object.cpp
Expand Down
Loading

0 comments on commit 2ffa05f

Please sign in to comment.