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

Rename 2d Nav Goal to 2d Goal Pose + move_base_simple to goal_pose #455

Merged
merged 3 commits into from
Sep 4, 2019
Merged

Rename 2d Nav Goal to 2d Goal Pose + move_base_simple to goal_pose #455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d3e4c
rename nav pose tool to goal pose tool
SteveMacenski Aug 27, 2019
696cc43
rename topic for goal pose tool to goal_pose from move_base_simple/goal
SteveMacenski Aug 27, 2019
9eecbbe
updating header gaurds for pose tool
SteveMacenski Sep 3, 2019
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For some displays, the [documentation is updated](docs/FEATURES.md).
| Fluid Pressure | Focus Camera | XY Orbit | Help |
| Grid | Measure | First Person | Selections |
| Grid Cells | Select | Third Person Follower | Tool Properties |
| Illuminance | 2D Nav Goal | Top Down Orthographic | Views |
| Illuminance | 2D Goal Pose | Top Down Orthographic | Views |
| Image | Publish Point |
| Laser Scan | Initial Pose |
| Map | Interact |
Expand Down
4 changes: 2 additions & 2 deletions rviz/doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ hold down the Alt key.

The f key will focus the camera on the current selection.

2D Nav Goal
2D Goal Pose
...........

* Keyboard shortcut: g

This tool lets you set a goal sent on the "/move_base_simple/goal" ROS
This tool lets you set a goal sent on the "/goal_pose" ROS
topic. Click on a location on the ground plane and drag to select the
orientation. The output topic can be changed in the "Tool Properties" panel.

Expand Down
2 changes: 1 addition & 1 deletion rviz/src/test/rviz_logo.rviz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ Visualization Manager:
- Class: rviz/SetInitialPose
Topic: initialpose
- Class: rviz/SetGoal
Topic: /move_base_simple/goal
Topic: /goal_pose
Views:
Current:
Class: rviz/Orbit
Expand Down
2 changes: 1 addition & 1 deletion rviz/src/test/test_in.vcg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ Transforms.Show\ Names=1
Transforms.Update\ Interval=1
Visualization\ Markers.Enabled=1
Visualization\ Markers.Marker\ Topic=visualization_marker
Tool\ 2D\ Nav\ GoalTopic=move_base_simple/goal
Tool\ 2D\ Goal\ PoseTopic=goal_pose
Tool\ 2D\ Pose\ EstimateTopic=initialpose
Camera\ Type=rviz::OrbitViewController
Camera\ Config=0.641005 0.225801 37.6566 -8.59894 -8.94399 -2.83087
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/default.rviz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Panels:
- Class: rviz_common/Tool Properties
Expanded:
# - /2D Pose Estimate1
- /2D Nav Goal1
- /2D Goal Pose1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely clear if this is necessary, but defensively removed anything "Nav Goal" related

- /Publish Point1
Name: Tool Properties
Splitter Ratio: 0.588679
Expand Down Expand Up @@ -63,7 +63,7 @@ Visualization Manager:
- Class: rviz_default_plugins/SetInitialPose
Topic: /initialpose
- Class: rviz_default_plugins/SetGoal
Topic: /move_base_simple/goal
Topic: /goal_pose
- Class: rviz_default_plugins/PublishPoint
Single click: true
Topic: /clicked_point
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/help/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h3>Switching between tools</h3>
</tr>
<tr class="even">
<td class="key">G</td>
<td>Switch to the 2D Nav Goal tool.</td>
<td>Switch to the 2D Goal Pose tool.</td>
</tr>
<tr class="even">
<td class="key">P</td>
Expand Down
4 changes: 2 additions & 2 deletions rviz_default_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ set(rviz_default_plugins_headers_to_moc
include/rviz_default_plugins/robot/robot_link.hpp
include/rviz_default_plugins/robot/robot_element_base_class.hpp
include/rviz_default_plugins/tools/measure/measure_tool.hpp
include/rviz_default_plugins/tools/nav_goal/goal_tool.hpp
include/rviz_default_plugins/tools/goal_pose/goal_tool.hpp
include/rviz_default_plugins/tools/interaction/interaction_tool.hpp
include/rviz_default_plugins/tools/pose/pose_tool.hpp
include/rviz_default_plugins/tools/pose_estimate/initial_pose_tool.hpp
Expand Down Expand Up @@ -193,7 +193,7 @@ set(rviz_default_plugins_source_files
src/rviz_default_plugins/tools/measure/measure_tool.cpp
src/rviz_default_plugins/tools/focus/focus_tool.cpp
src/rviz_default_plugins/tools/move/move_tool.cpp
src/rviz_default_plugins/tools/nav_goal/goal_tool.cpp
src/rviz_default_plugins/tools/goal_pose/goal_tool.cpp
src/rviz_default_plugins/tools/pose/pose_tool.cpp
src/rviz_default_plugins/tools/pose_estimate/initial_pose_tool.cpp
src/rviz_default_plugins/tools/point/point_tool.cpp
Expand Down
0 ...ault_plugins/tools/nav_goal/goal_tool.hpp → ...ult_plugins/tools/goal_pose/goal_tool.hpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ault_plugins/tools/nav_goal/goal_tool.cpp → ...ult_plugins/tools/goal_pose/goal_tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "rviz_default_plugins/tools/nav_goal/goal_tool.hpp"
#include "rviz_default_plugins/tools/goal_pose/goal_tool.hpp"

#include <string>

Expand All @@ -49,7 +49,7 @@ GoalTool::GoalTool()
shortcut_key_ = 'g';

topic_property_ = new rviz_common::properties::StringProperty("Topic", "goal",
"The topic on which to publish navigation goals.",
"The topic on which to publish goals.",
getPropertyContainer(), SLOT(updateTopic()), this);
}

Expand All @@ -58,7 +58,7 @@ GoalTool::~GoalTool() = default;
void GoalTool::onInitialize()
{
PoseTool::onInitialize();
setName("2D Nav Goal");
setName("2D Goal Pose");
updateTopic();
}

Expand Down