Merge branch 'master' into agalbachicar/#332_topic_interface_ign_gui_3

maliput · Apr 23, 2021 · f381eed · f381eed
2 parents 19098ce + 00bf2e9
commit f381eed
Show file tree

Hide file tree

Showing 13 changed files with 1,043 additions and 47 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,29 +74,29 @@ jobs:
         token: ${{ secrets.MALIPUT_TOKEN }}
     - uses: actions/checkout@v2
       with:
-        repository: ToyotaResearchInstitute/dsim-repos-index
+        repository: ToyotaResearchInstitute/maliput_infrastructure
         fetch-depth: 0
-        path: dsim-repos-index
+        path: maliput_infrastructure
         token: ${{ secrets.MALIPUT_TOKEN }}
     - name: check if dependencies have a matching branch
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src
       run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
-    # install drake_vendor prereqs using dsim-repos-index/tools/prereqs.lib
+    # install drake_vendor prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install drake_vendor prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t drake .
-    # install delphyne prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t drake .
+    # install delphyne prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/delphyne
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
-    # install delphyne_gui prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
+    # install delphyne_gui prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne_gui prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
     # clone public dependencies
     - name: vcs import
       shell: bash

diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -92,29 +92,29 @@ jobs:
         token: ${{ secrets.MALIPUT_TOKEN }}
     - uses: actions/checkout@v2
       with:
-        repository: ToyotaResearchInstitute/dsim-repos-index
+        repository: ToyotaResearchInstitute/maliput_infrastructure
         fetch-depth: 0
-        path: dsim-repos-index
+        path: maliput_infrastructure
         token: ${{ secrets.MALIPUT_TOKEN }}
     - name: check if dependencies have a matching branch
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src
       run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
-    # install drake_vendor prereqs using dsim-repos-index/tools/prereqs.lib
+    # install drake_vendor prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install drake_vendor prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t drake .
-    # install delphyne prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t drake .
+    # install delphyne prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/delphyne
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
-    # install delphyne_gui prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
+    # install delphyne_gui prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne_gui prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
     - name: clang 8 install
       shell: bash
       run: ${{ env.ROS_WS }}/src/${PACKAGE_NAME}/.github/clang_suite_installation.sh

diff --git a/.github/workflows/scan_build.yml b/.github/workflows/scan_build.yml
@@ -79,29 +79,29 @@ jobs:
         token: ${{ secrets.MALIPUT_TOKEN }}
     - uses: actions/checkout@v2
       with:
-        repository: ToyotaResearchInstitute/dsim-repos-index
+        repository: ToyotaResearchInstitute/maliput_infrastructure
         fetch-depth: 0
-        path: dsim-repos-index
+        path: maliput_infrastructure
         token: ${{ secrets.MALIPUT_TOKEN }}
     - name: check if dependencies have a matching branch
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src
       run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
-    # install drake_vendor prereqs using dsim-repos-index/tools/prereqs.lib
+    # install drake_vendor prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install drake_vendor prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t drake .
-    # install delphyne prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t drake .
+    # install delphyne prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/delphyne
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
-    # install delphyne_gui prereqs using dsim-repos-index/tools/prereqs.lib
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
+    # install delphyne_gui prereqs using maliput_infrastructure/tools/prereqs.lib
     - name: install delphyne_gui prereqs
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-      run: ${GITHUB_WORKSPACE}/dsim-repos-index/tools/prereqs-install -t ignition .
+      run: ${GITHUB_WORKSPACE}/maliput_infrastructure/tools/prereqs-install -t ignition .
     - name: clang 8 install
       shell: bash
       run: ${{ env.ROS_WS }}/src/${PACKAGE_NAME}/.github/clang_suite_installation.sh

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This is the repository for Delphyne GUI, a front-end visualizer for `delphyne`.
 
 ## Build
 
-1. Setup a development workspace as described [here](https://github.com/ToyotaResearchInstitute/dsim-repos-index/tree/master/README.md).
+1. Setup a development workspace as described [here](https://github.com/ToyotaResearchInstitute/maliput-documentation/blob/main/docs/installation_quickstart.rst).
 
 2. Bring up your development workspace:
 

diff --git a/delphyne_gui/tools/maliput_viewer2.sh b/delphyne_gui/tools/maliput_viewer2.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/layout_maliput_viewer.config \
+  --layout=${DELPHYNE_GUI_RESOURCE_ROOT}/layouts/layout2_maliput_viewer.config \
   "$@"
diff --git a/delphyne_gui/visualizer/CMakeLists.txt b/delphyne_gui/visualizer/CMakeLists.txt
@@ -7,30 +7,34 @@ include_directories(
 )
 
 # ----------------------------------------
-# maliput_mesh library.
-add_library(maliput_mesh
+# maliput_viewer_model library.
+add_library(maliput_viewer_model
+  maliput_viewer_model.cc
   maliput_mesh_converter.cc
 )
-add_library(delphyne_gui::maliput_mesh ALIAS maliput_mesh)
-set_target_properties(maliput_mesh
+add_library(delphyne_gui::maliput_viewer_model ALIAS maliput_viewer_model)
+set_target_properties(maliput_viewer_model
   PROPERTIES
-    OUTPUT_NAME delphyne_gui_maliput_mesh
+    OUTPUT_NAME delphyne_gui_maliput_viewer_model
 )
 
-ament_target_dependencies(maliput_mesh
+ament_target_dependencies(maliput_viewer_model
   "maliput"
+  "maliput_multilane"
 )
 
-target_link_libraries(maliput_mesh
+target_link_libraries(maliput_viewer_model
   ${drake_LIBRARIES}
-  ignition-common3::ignition-common3
   delphyne::public_headers
+  delphyne::roads_utilities
+  ignition-common3::ignition-common3
+  ignition-rendering3::ignition-rendering3
   maliput::api
   maliput::utilities
 )
 
 install(
-  TARGETS maliput_mesh
+  TARGETS maliput_viewer_model
   EXPORT ${PROJECT_NAME}-targets
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
@@ -59,6 +63,43 @@ install(
   ARCHIVE DESTINATION lib
 )
 
+#-------------------------------------------------------------------------------
+# MaliputViewerPlugin (ign-gui 3)
+QT5_WRAP_CPP(MaliputViewerPlugin_headers_MOC maliput_viewer_plugin.hh)
+QT5_ADD_RESOURCES(MaliputViewerPlugin_RCC maliput_viewer_plugin.qrc)
+
+add_library(MaliputViewerPlugin
+  ${CMAKE_CURRENT_SOURCE_DIR}/maliput_viewer_plugin.cc
+  ${MaliputViewerPlugin_headers_MOC}
+  ${MaliputViewerPlugin_RCC}
+)
+add_library(delphyne_gui::MaliputViewerPlugin ALIAS MaliputViewerPlugin)
+set_target_properties(MaliputViewerPlugin
+  PROPERTIES
+    OUTPUT_NAME MaliputViewerPlugin
+)
+
+target_link_libraries(MaliputViewerPlugin
+    delphyne_gui::global_attributes
+    delphyne_gui::maliput_viewer_model
+    ignition-gui3::ignition-gui3
+    ignition-common3::ignition-common3
+    ignition-transport8::ignition-transport8
+    ignition-rendering3::ignition-rendering3
+    ${Qt5Core_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ignition-plugin1::register
+)
+
+install(
+  TARGETS MaliputViewerPlugin
+  EXPORT ${PROJECT_NAME}-targets
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+#-------------------------------------------------------------------------------
 # MaliputViewerWidget GUI plugin.
 QT5_WRAP_CPP(MaliputViewerWidget_MOC maliput_viewer_widget.hh)
 QT5_WRAP_CPP(LayerSelectionWidget_MOC layer_selection_widget.hh)
@@ -70,7 +111,6 @@ add_library(maliput_viewer_widget
   ${CMAKE_CURRENT_SOURCE_DIR}/maliput_viewer_widget.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/render_maliput_widget.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/rules_visualizer_widget.cc
-  maliput_viewer_model.cc
   orbit_view_control.cc
   render_maliput_widget.cc
   arrow_mesh.cc
@@ -87,25 +127,16 @@ set_target_properties(maliput_viewer_widget
     OUTPUT_NAME delphyne_gui_maliput_viewer_widget
 )
 
-ament_target_dependencies(maliput_viewer_widget
-  "maliput"
-  "maliput_multilane"
-)
-
 target_link_libraries(maliput_viewer_widget
   ${drake_LIBRARIES}
-  global_attributes
+  delphyne_gui::global_attributes
+  delphyne_gui::maliput_viewer_model
   ignition-common3::ignition-common3
   ignition-gui0::ignition-gui0
   ignition-msgs5::ignition-msgs5
   ignition-rendering3::ignition-rendering3
-  maliput_mesh
   ${Qt5Core_LIBRARIES}
   ${Qt5Widgets_LIBRARIES}
-  delphyne::roads_utilities
-  maliput::api
-  maliput_multilane::maliput_multilane
-  maliput::utilities
 )
 
 install(
@@ -383,6 +414,7 @@ install(
     layout_maliput_viewer.config
     layout_for_playback.config
     layout2_for_playback.config
+    layout2_maliput_viewer.config
     layout2_with_teleop.config
   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/delphyne/layouts