Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate MarkerArrayDisplay #296

Merged
merged 7 commits into from
Jun 15, 2018
Merged

Migrate MarkerArrayDisplay #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da1d128
Migrate MarkerArrayDisplay
greimela-si Jun 12, 2018
d26134b
Fix uncrustify
greimela-si Jun 12, 2018
a2a47ad
Extract common code in marker displays into marker_common
greimela-si Jun 12, 2018
94774d5
Add visual test
botteroa-si Jun 12, 2018
8a787a1
Add visual test for MarkerArray messages in MarkerDisplay
greimela-si Jun 13, 2018
354a211
Implement review comments
greimela-si Jun 13, 2018
7ba84ff
[REMOVE BEFORE MERGE] Fix moved file includes
Martin-Idel-SI Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions rviz/src/rviz/default_plugin/marker_array_display.cpp
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions rviz_common/include/rviz_common/properties/queue_size_property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class RVIZ_COMMON_PUBLIC QueueSizeProperty : public QObject
public:
QueueSizeProperty(_RosTopicDisplay * display, uint32_t default_size);

void setDescription(const QString & description);

private Q_SLOTS:
void updateQueueSize();

Expand Down
5 changes: 5 additions & 0 deletions rviz_common/src/rviz_common/properties/queue_size_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ QueueSizeProperty::QueueSizeProperty(_RosTopicDisplay * display, uint32_t defaul
updateQueueSize();
}

void QueueSizeProperty::setDescription(const QString & description)
{
queue_size_property_->setDescription(description);
}

void QueueSizeProperty::updateQueueSize()
{
display_->updateQoSProfile([this](rmw_qos_profile_t profile) -> rmw_qos_profile_t {
Expand Down
36 changes: 28 additions & 8 deletions rviz_default_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ set(rviz_default_plugins_headers_to_moc
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_common.hpp
include/rviz_default_plugins/displays/marker/marker_display.hpp
include/rviz_default_plugins/displays/marker_array/marker_array_display.hpp
include/rviz_default_plugins/displays/odometry/odometry_display.hpp
include/rviz_default_plugins/displays/path/path_display.hpp
include/rviz_default_plugins/displays/point/point_stamped_display.hpp
Expand Down Expand Up @@ -107,7 +109,9 @@ set(rviz_default_plugins_source_files
src/rviz_default_plugins/displays/marker/markers/shape_marker.cpp
src/rviz_default_plugins/displays/marker/markers/triangle_list_marker.cpp
src/rviz_default_plugins/displays/marker/markers/marker_factory.cpp
src/rviz_default_plugins/displays/marker/marker_common.cpp
src/rviz_default_plugins/displays/marker/marker_display.cpp
src/rviz_default_plugins/displays/marker_array/marker_array_display.cpp
src/rviz_default_plugins/displays/odometry/odometry_display.cpp
src/rviz_default_plugins/displays/path/path_display.cpp
src/rviz_default_plugins/displays/point/point_stamped_display.cpp
Expand Down Expand Up @@ -254,6 +258,7 @@ if(BUILD_TESTING)
${urdf_INCLUDE_DIRS}
${OGRE_INCLUDE_DIRS}
${rclcpp_INCLUDE_DIRS}
${rclcpp_INCLUDE_DIRS}
${nav_msgs_INCLUDE_DIRS}
${sensor_msgs_INCLUDE_DIRS}
${visualization_msgs_INCLUDE_DIRS}
Expand All @@ -272,7 +277,7 @@ if(BUILD_TESTING)
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
test/rviz_default_plugins/scene_graph_introspection_helper.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
Expand Down Expand Up @@ -327,7 +332,7 @@ if(BUILD_TESTING)
ament_add_gmock(point_display_test
test/rviz_default_plugins/displays/point/point_stamped_display_test.cpp
test/rviz_default_plugins/displays/display_test_fixture.cpp
test/rviz_default_plugins/scene_graph_introspection.cpp)
test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
if(TARGET point_display_test)
target_include_directories(point_display_test PUBLIC
${TEST_INCLUDE_DIRS})
Expand Down Expand Up @@ -383,16 +388,16 @@ if(BUILD_TESTING)
${TEST_LINK_LIBRARIES})
endif()

ament_add_gmock(marker_display_test
test/rviz_default_plugins/displays/marker/marker_display_test.cpp
ament_add_gmock(marker_common_test
test/rviz_default_plugins/displays/marker/marker_common_test.cpp
test/rviz_default_plugins/displays/display_test_fixture.cpp
test/rviz_default_plugins/displays/marker/marker_messages.cpp
test/rviz_default_plugins/scene_graph_introspection_helper.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 marker_display_test)
target_include_directories(marker_display_test PUBLIC
if(TARGET marker_common_test)
target_include_directories(marker_common_test PUBLIC
${TEST_INCLUDE_DIRS})
target_link_libraries(marker_display_test
target_link_libraries(marker_common_test
${TEST_LINK_LIBRARIES})
endif()

Expand Down Expand Up @@ -484,7 +489,7 @@ if(BUILD_TESTING)
test/rviz_default_plugins/view_controllers/fps/fps_view_controller_test.cpp
test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
test/rviz_default_plugins/displays/display_test_fixture.cpp
test/rviz_default_plugins/scene_graph_introspection.cpp
test/rviz_default_plugins/scene_graph_introspection_helper.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 fps_view_controller_test)
target_include_directories(fps_view_controller_test PUBLIC
Expand Down Expand Up @@ -554,6 +559,21 @@ if(EnableVisualTests STREQUAL "True")
rviz_visual_testing_framework::rviz_visual_testing_framework)
endif()

ament_add_gtest(marker_array_display_visual_test
test/rviz_default_plugins/displays/marker_array/marker_array_display_visual_test.cpp
test/rviz_default_plugins/page_objects/marker_array_display_page_object.cpp
test/rviz_default_plugins/page_objects/marker_display_page_object.cpp
test/rviz_default_plugins/publishers/marker_array_publisher.hpp
TIMEOUT 180)
if(TARGET marker_array_display_visual_test)
target_include_directories(marker_array_display_visual_test PUBLIC
${TEST_INCLUDE_DIRS}
${rviz_visual_testing_framework_INCLUDE_DIRS})
target_link_libraries(marker_array_display_visual_test
${TEST_LINK_LIBRARIES}
rviz_visual_testing_framework::rviz_visual_testing_framework)
endif()

ament_add_gtest(marker_display_visual_test
test/rviz_default_plugins/displays/marker/marker_display_visual_test.cpp
test/rviz_default_plugins/page_objects/marker_display_page_object.cpp
Expand Down
Loading