Purges code from old visualizer references.

delphyne_gui/CMakeLists.txt

@@ -130,6 +130,6 @@ ament_environment_hooks(setup.sh.in)
 
 #################################################
 # Installs maliput_viewer2.sh as a shortcut to run the visualizer.
-install (PROGRAMS tools/maliput_viewer2.sh DESTINATION bin)
+install (PROGRAMS tools/maliput_viewer.sh DESTINATION bin)
 
 ament_package()

delphyne_gui/python/scripts/CMakeLists.txt

@@ -5,7 +5,6 @@
 install(
   PROGRAMS
     delphyne_replay
-    delphyne_replay2
   DESTINATION
     bin
 )

delphyne_gui/python/toolkit/CMakeLists.txt

@@ -6,7 +6,6 @@ install(
   FILES
     __init__.py
     replay.py
-    replay2.py
   DESTINATION
     ${PYTHON_INSTALL_DIR}/delphyne_gui/toolkit
 )

delphyne_gui/python/toolkit/replay.py

@@ -4,7 +4,19 @@
 #
 
 """
-The replay tool.
+Replays a simulation out of a log file previously obtained.
+The layout used for the window is `layout_for_playback` which
+posses a playback plugin for rewinding, pausing and stepping forward the
+simulation.
+
+-- How to use:
+1 - To use this application a log file is needed.
+    (e.g.: `delphyne_demos` package allows you to get a log file when running its demos)
+    "delphyne_gazoo -l -f <path/to/somewhere/my_awesome_log_file.log>"
+
+2 - Execute the application using the log as argument:
+    "delphyne_replay <path/to/somewhere/my_awesome_log_file.log>"
+
 """
 
 ##############################################################################
@@ -133,11 +145,8 @@ def main():
             if not args.bare:
                 delphyne_gui.utilities.launch_visualizer(
                     launch_manager, bundle_path=bundle_path,
-                    ign_visualizer="visualizer0",
-                    # Injects PlaybackWidget below RenderWidget
-                    # if the former is not present in the layout.
-                    plugin_injection="RenderWidget/delphyne_gui_playback_widget",
-                    plugin_name="PlaybackWidget"
+                    ign_visualizer="visualizer",
+                    layout_filename="layout_for_playback.config",
                 )
                 launch_manager.wait(float("Inf"))
         except RuntimeError as error_msg:

delphyne_gui/tools/maliput_viewer2.sh → delphyne_gui/tools/maliput_viewer.sh

@@ -32,5 +32,5 @@
 # CLI arguments will be forwarded to `visualizer`.
 # It is assumed that the environment is already configured.
 visualizer \
-  --layout=${DELPHYNE_GUI_RESOURCE_ROOT}/layouts/layout2_maliput_viewer.config \
+  --layout=${DELPHYNE_GUI_RESOURCE_ROOT}/layouts/layout_maliput_viewer.config \
   "$@"

delphyne_gui/visualizer/CMakeLists.txt

@@ -27,7 +27,7 @@ install(
 
 # Visualizer
 add_executable(visualizer
-  visualizer2.cc
+  visualizer.cc
 )
 
 target_link_libraries(visualizer
@@ -48,9 +48,9 @@ install(
 # Install .config files.
 install(
   FILES
-    layout2_for_playback.config
-    layout2_maliput_viewer.config
-    layout2_with_teleop.config
+    layout_for_playback.config
+    layout_maliput_viewer.config
+    layout_with_teleop.config
   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/delphyne/layouts
 )

delphyne_gui/visualizer/layout2_for_playback.config → delphyne_gui/visualizer/layout_for_playback.config

@@ -69,16 +69,8 @@
   </stylesheet>
   <menus>
     <file/>
-    <plugins from_paths="0">
-      <show>Plot</show>
-      <show>Requester</show>
-      <show>Responder</show>
-      <show>TimePanel</show>
-      <show>TopicInterface</show>
-      <show>TopicsStats</show>
-      <show>TopicViewer</show>
-    </plugins>
   </menus>
+  <dialog_on_exit>true</dialog_on_exit>
 </window>
 <plugin filename="Scene3D">
   <ignition-gui>
@@ -118,10 +110,9 @@
   <topic>/world_stats</topic>
 </plugin>
 
-<plugin filename="TopicInterface" read_only="true">
+<plugin filename="TopicInterfacePlugin" read_only="true">
   <title>Scene tree</title>
   <topic>/scene</topic>
-  <message_type>ignition.msgs.Scene</message_type>
   <hide>ambient</hide>
   <hide>background</hide>
   <hide>fog</hide>
@@ -158,7 +149,6 @@
   <hide>model::link::id</hide>
   <hide>model::link::inertial</hide>
   <hide>model::link::kinematic</hide>
-  <hide>model::link::name</hide>
   <hide>model::link::projector</hide>
   <hide>model::link::self_collide</hide>
   <hide>model::link::sensor</hide>

delphyne_gui/visualizer/layout2_maliput_viewer.config → delphyne_gui/visualizer/layout_maliput_viewer.config

@@ -69,12 +69,8 @@
   </stylesheet>
   <menus>
     <file/>
-    <plugins from_paths="0">
-      MaliputViewerPlugin
-      OriginDisplay
-      Scene3D
-    </plugins>
   </menus>
+  <dialog_on_exit>true</dialog_on_exit>
 </window>
 
 <plugin filename="Scene3D">

delphyne_gui/visualizer/layout2_with_teleop.config → delphyne_gui/visualizer/layout_with_teleop.config

@@ -69,17 +69,8 @@
   </stylesheet>
   <menus>
     <file/>
-    <plugins from_paths="0">
-      <show>Plot</show>
-      <show>Requester</show>
-      <show>Responder</show>
-      <show>delphyne_gui_teleop_widget</show>
-      <show>TimePanel</show>
-      <show>TopicInterface</show>
-      <show>TopicsStats</show>
-      <show>TopicViewer</show>
-    </plugins>
   </menus>
+  <dialog_on_exit>true</dialog_on_exit>
 </window>
 <plugin filename="Scene3D">
   <ignition-gui>
@@ -135,61 +126,6 @@
   <topic>/world_stats</topic>
 </plugin>
 
-<plugin filename="TopicInterface" read_only="true">
-  <title>Scene tree</title>
-  <topic>/scene</topic>
-  <message_type>ignition.msgs.Scene</message_type>
-  <hide>ambient</hide>
-  <hide>background</hide>
-  <hide>fog</hide>
-  <hide>grid</hide>
-  <hide>header</hide>
-  <hide>joint</hide>
-  <hide>light</hide>
-  <hide>model::deleted</hide>
-  <hide>model::header</hide>
-  <hide>model::id</hide>
-  <hide>model::is_static</hide>
-  <hide>model::joint</hide>
-  <hide>model::joint::bounce</hide>
-  <hide>model::joint::cfm</hide>
-  <hide>model::joint::child_id</hide>
-  <hide>model::joint::fudge_factor</hide>
-  <hide>model::joint::gearbox</hide>
-  <hide>model::joint::header</hide>
-  <hide>model::joint::id</hide>
-  <hide>model::joint::limit_cfm</hide>
-  <hide>model::joint::limit_erp</hide>
-  <hide>model::joint::parent_id</hide>
-  <hide>model::joint::screw</hide>
-  <hide>model::joint::sensor</hide>
-  <hide>model::joint::suspension_cfm</hide>
-  <hide>model::joint::suspension_erp</hide>
-  <hide>model::link::battery</hide>
-  <hide>model::link::canonical</hide>
-  <hide>model::link::collision</hide>
-  <hide>model::link::density</hide>
-  <hide>model::link::enabled</hide>
-  <hide>model::link::gravity</hide>
-  <hide>model::link::header</hide>
-  <hide>model::link::id</hide>
-  <hide>model::link::inertial</hide>
-  <hide>model::link::kinematic</hide>
-  <hide>model::link::name</hide>
-  <hide>model::link::projector</hide>
-  <hide>model::link::self_collide</hide>
-  <hide>model::link::sensor</hide>
-  <hide>model::link::visual</hide>
-  <hide>model::model</hide>
-  <hide>model::scale</hide>
-  <hide>model::self_collide</hide>
-  <hide>model::visual</hide>
-  <hide>name</hide>
-  <hide>origin_visual</hide>
-  <hide>shadows</hide>
-  <hide>sky</hide>
-</plugin>
-
 <plugin filename="TopicsStats"/>
 
 <plugin filename="TopicViewer">

delphyne_gui/visualizer/visualizer2.cc → delphyne_gui/visualizer/visualizer.cc

@@ -22,7 +22,7 @@ namespace {
 
 /// Constants.
 constexpr char kVersionStr[] = "Visualizer 0.2.0";
-constexpr char kDefaultLayout[] = "layout2_with_teleop.config";
+constexpr char kDefaultLayout[] = "layout_with_teleop.config";
 
 /////////////////////////////////////////////////
 /// \brief Get the path of the default configuration file for Delphyne.