diff --git a/rviz_common/CMakeLists.txt b/rviz_common/CMakeLists.txt index 9e5c5e385..e014953d2 100644 --- a/rviz_common/CMakeLists.txt +++ b/rviz_common/CMakeLists.txt @@ -63,11 +63,10 @@ configure_file(src/rviz_common/env_config.cpp.in ${ENV_CONFIG_CPP} @ONLY) set(rviz_common_headers_to_moc ${ENV_CONFIG_HPP} src/rviz_common/add_display_dialog.hpp - # src/rviz_common/help_panel.hpp + src/rviz_common/help_panel.hpp include/rviz_common/properties/enum_property.hpp include/rviz_common/properties/property_tree_widget.hpp include/rviz_common/properties/splitter_handle.hpp - # src/rviz_common/selection_panel.hpp include/rviz_common/display_group.hpp include/rviz_common/frame_position_tracking_view_controller.hpp include/rviz_common/properties/quaternion_property.hpp @@ -142,7 +141,7 @@ set(rviz_common_source_files src/rviz_common/failed_view_controller.cpp src/rviz_common/frame_manager.cpp src/rviz_common/frame_position_tracking_view_controller.cpp - # src/rviz_common/help_panel.cpp + src/rviz_common/help_panel.cpp src/rviz_common/load_resource.cpp src/rviz_common/loading_dialog.cpp src/rviz_common/logging.cpp @@ -288,6 +287,16 @@ install( DESTINATION "share/${PROJECT_NAME}" ) +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/images" + DESTINATION "share/${PROJECT_NAME}" +) + +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/help" + DESTINATION "share/${PROJECT_NAME}" +) + if(BUILD_TESTING) # TODO(wjwwood): replace this with ament_lint_auto() and/or add the copyright linter back find_package(ament_cmake_cppcheck REQUIRED) diff --git a/rviz_common/default.rviz b/rviz_common/default.rviz index a3574808a..1a80c1229 100644 --- a/rviz_common/default.rviz +++ b/rviz_common/default.rviz @@ -15,7 +15,7 @@ Panels: Expanded: # - /2D Pose Estimate1 # - /2D Nav Goal1 - # - /Publish Point1 + - /Publish Point1 Name: Tool Properties Splitter Ratio: 0.588679 - Class: rviz_common/Views @@ -60,14 +60,14 @@ Visualization Manager: - Class: rviz_default_plugins/MoveCamera - Class: rviz_default_plugins/Select # - Class: rviz/FocusCamera - # - Class: rviz/Measure + - Class: rviz_default_plugins/Measure # - Class: rviz/SetInitialPose # Topic: /initialpose # - Class: rviz/SetGoal # Topic: /move_base_simple/goal - # - Class: rviz/PublishPoint - # Single click: true - # Topic: /clicked_point + - Class: rviz_default_plugins/PublishPoint + Single click: true + Topic: /clicked_point Value: true Views: Current: diff --git a/rviz/help/help.html b/rviz_common/help/help.html similarity index 50% rename from rviz/help/help.html rename to rviz_common/help/help.html index 73cf9f0f3..6034bd24b 100644 --- a/rviz/help/help.html +++ b/rviz_common/help/help.html @@ -20,28 +20,28 @@
-These controls work in all modes. +These controls work in all modes, except for tools capturing all keys (Select tool).
M | Switch to the Move-Camera tool. |
I | -Switch to the Interact tool. | -
S | Switch to the Select tool. |
G | -Switch to the 2D Nav Goal tool. | -
P | -Switch to the 2D Pose Estimate tool. | -
Ctrl-A | +Ctrl-N | Add a display |
- - Similar to the Orbit view controller, but the focal point is kept - on the Z=0 (ground) plane. - -
Left | -Drag to rotate around the focal point. | -
Middle orShift-Left |
- Drag to move the focal point in the ground plane. | -
Scroll Wheel | -Roll up or down to zoom towards or away from the focal point. | -
Right | -Drag up or down to zoom towards or away from the focal point. | -
- - Inspired by first-person shooter games. Drag to point your head. - -
Left | -Dragging rotates the viewpoint in the direction of the drag. | -
Middle orShift-Left |
- Drag to strafe (translate) left/right and up/down. | -
Scroll Wheel | -Roll up or down to move the viewpoint forwards or back. | -
Right | -Drag up or down to move the viewport forwards or back. | -
- - Top-down orthographic view. - -
Left | -Dragging left/right rotates the view. | -
Middle orShift-Left |
- Drag to move the viewpoint in the XY plane. | -
Scroll Wheel | -Roll up or down to zoom in or out. | -
Right | -Drag up or down to zoom in or out. | -