Add help again (#300)

* Comment in help of all ported tools

* Comment in some lines in default config again

rviz_common/default.rviz

@@ -8,13 +8,12 @@ Panels:
         - /Status1
       Splitter Ratio: 0.5
     Tree Height: 464
-  # TODO(wjwwood): restore these panels when ported
   - Class: rviz_common/Selection
     Name: Selection
   - Class: rviz_common/Tool Properties
     Expanded:
   #     - /2D Pose Estimate1
-  #     - /2D Nav Goal1
+      - /2D Nav Goal1
       - /Publish Point1
     Name: Tool Properties
     Splitter Ratio: 0.588679
@@ -23,6 +22,7 @@ Panels:
       - /Current View1
     Name: Views
     Splitter Ratio: 0.5
+  # TODO(wjwwood): restore these panels when ported
   # - Class: rviz/Time
   #   Name: Time
   #   SyncMode: 0
@@ -59,12 +59,12 @@ Visualization Manager:
     #   Hide Inactive Objects: true
     - Class: rviz_default_plugins/MoveCamera
     - Class: rviz_default_plugins/Select
-    # - Class: rviz/FocusCamera
+    - Class: rviz_default_plugins/FocusCamera
     - Class: rviz_default_plugins/Measure
     # - Class: rviz/SetInitialPose
     #   Topic: /initialpose
-    # - Class: rviz/SetGoal
-    #   Topic: /move_base_simple/goal
+    - Class: rviz_default_plugins/SetGoal
+      Topic: /move_base_simple/goal
     - Class: rviz_default_plugins/PublishPoint
       Single click: true
       Topic: /clicked_point

rviz_common/help/help.html

@@ -34,10 +34,10 @@ <h3>Switching between tools</h3>
     <td class="key">S</td>
     <td>Switch to the Select tool.</td>
   </tr>
-  <!--<tr class="even">-->
-    <!--<td class="key">G</td>-->
-    <!--<td>Switch to the 2D Nav Goal tool.</td>-->
-  <!--</tr>-->
+  <tr class="odd">
+    <td class="key">G</td>
+    <td>Switch to the 2D Nav Goal tool.</td>
+  </tr>
   <!--<tr class="odd">-->
     <!--<td class="key">P</td>-->
     <!--<td>Switch to the 2D Pose Estimate tool.</td>-->
@@ -138,81 +138,81 @@ <h3>Orbit view controller</h3>
 </table>
 </p>
 
-<!--<h3>XYOrbit view controller</h3>-->
-<!--<p>-->
-  <!--<em>-->
-    <!--Similar to the Orbit view controller, but the focal point is kept-->
-    <!--on the Z=0 (ground) plane.-->
-  <!--</em>-->
-<!--<table border="0" cellspacing="0" cellpadding="3">-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Left</td>-->
-    <!--<td>Drag to rotate around the focal point.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>-->
-    <!--<td>Drag to move the focal point in the ground plane.</td>-->
-  <!--</tr>-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Scroll Wheel</td>-->
-    <!--<td>Roll up or down to zoom towards or away from the focal point.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td class="key">Right</td>-->
-    <!--<td>Drag up or down to zoom towards or away from the focal point.</td>-->
-  <!--</tr>-->
-<!--</table>-->
-<!--</p>-->
+<h3>XYOrbit view controller</h3>
+<p>
+  <em>
+    Similar to the Orbit view controller, but the focal point is kept
+    on the Z=0 (ground) plane.
+  </em>
+<table border="0" cellspacing="0" cellpadding="3">
+  <tr class="odd">
+    <td class="key">Left</td>
+    <td>Drag to rotate around the focal point.</td>
+  </tr>
+  <tr class="even">
+    <td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>
+    <td>Drag to move the focal point in the ground plane.</td>
+  </tr>
+  <tr class="odd">
+    <td class="key">Scroll Wheel</td>
+    <td>Roll up or down to zoom towards or away from the focal point.</td>
+  </tr>
+  <tr class="even">
+    <td class="key">Right</td>
+    <td>Drag up or down to zoom towards or away from the focal point.</td>
+  </tr>
+</table>
+</p>
 
-<!--<h3>FPS view controller</h3>-->
-<!--<p>-->
-  <!--<em>-->
-    <!--Inspired by first-person shooter games.  Drag to point your head.-->
-  <!--</em>-->
-<!--<table border="0" cellspacing="0" cellpadding="3">-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Left</td>-->
-    <!--<td>Dragging rotates the viewpoint in the direction of the drag.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>-->
-    <!--<td>Drag to strafe (translate) left/right and up/down.</td>-->
-  <!--</tr>-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Scroll Wheel</td>-->
-    <!--<td>Roll up or down to move the viewpoint forwards or back.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td class="key">Right</td>-->
-    <!--<td>Drag up or down to move the viewport forwards or back.</td>-->
-  <!--</tr>-->
-<!--</table>-->
-<!--</p>-->
+<h3>FPS view controller</h3>
+<p>
+  <em>
+    Inspired by first-person shooter games.  Drag to point your head.
+  </em>
+<table border="0" cellspacing="0" cellpadding="3">
+  <tr class="odd">
+    <td class="key">Left</td>
+    <td>Dragging rotates the viewpoint in the direction of the drag.</td>
+  </tr>
+  <tr class="even">
+    <td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>
+    <td>Drag to strafe (translate) left/right and up/down.</td>
+  </tr>
+  <tr class="odd">
+    <td class="key">Scroll Wheel</td>
+    <td>Roll up or down to move the viewpoint forwards or back.</td>
+  </tr>
+  <tr class="even">
+    <td class="key">Right</td>
+    <td>Drag up or down to move the viewport forwards or back.</td>
+  </tr>
+</table>
+</p>
 
-<!--<h3>TopDownOrtho view controller</h3>-->
-<!--<p>-->
-  <!--<em>-->
-    <!--Top-down orthographic view.-->
-  <!--</em>-->
-<!--<table border="0" cellspacing="0" cellpadding="3">-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Left</td>-->
-    <!--<td>Dragging left/right rotates the view.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>-->
-    <!--<td>Drag to move the viewpoint in the XY plane.</td>-->
-  <!--</tr>-->
-  <!--<tr class="odd">-->
-    <!--<td class="key">Scroll Wheel</td>-->
-    <!--<td>Roll up or down to zoom in or out.</td>-->
-  <!--</tr>-->
-  <!--<tr class="even">-->
-    <!--<td class="key">Right</td>-->
-    <!--<td>Drag up or down to zoom in or out.</td>-->
-  <!--</tr>-->
-<!--</table>-->
-<!--</p>-->
+<h3>TopDownOrtho view controller</h3>
+<p>
+  <em>
+    Top-down orthographic view.
+  </em>
+<table border="0" cellspacing="0" cellpadding="3">
+  <tr class="odd">
+    <td class="key">Left</td>
+    <td>Dragging left/right rotates the view.</td>
+  </tr>
+  <tr class="even">
+    <td><div class="key">Middle</div> or<div class="key">Shift-Left</div></td>
+    <td>Drag to move the viewpoint in the XY plane.</td>
+  </tr>
+  <tr class="odd">
+    <td class="key">Scroll Wheel</td>
+    <td>Roll up or down to zoom in or out.</td>
+  </tr>
+  <tr class="even">
+    <td class="key">Right</td>
+    <td>Drag up or down to zoom in or out.</td>
+  </tr>
+</table>
+</p>
 
 </body>
 </html>