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

Deprecates ign_gui0-based visualizer. #423

Merged
merged 1 commit into from
Aug 4, 2021
Merged

Deprecates ign_gui0-based visualizer. #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions .github/dependencies.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ repositories:
type: git
url: https://github.com/ToyotaResearchInstitute/ament_cmake_doxygen
version: main
ign-gui0:
type: git
url: https://github.com/scpeters/ign-gui
version: gui0_citadel
pybind11:
type: git
url: https://github.com/RobotLocomotion/pybind11.git
Expand Down
5 changes: 1 addition & 4 deletions delphyne_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ find_package(ament_cmake REQUIRED)
find_package(ignition-common3 REQUIRED)
find_package(ignition-math6 REQUIRED)
find_package(ignition-msgs5 REQUIRED)
find_package(ignition-gui0 0.1 REQUIRED)
find_package(ignition-gui3 REQUIRED)
find_package(ignition-rendering3 REQUIRED)
find_package(ignition-transport8 REQUIRED)
Expand Down Expand Up @@ -110,9 +109,7 @@ add_subdirectory(python)
ament_environment_hooks(setup.sh.in)

#################################################
# Installs maliput_viewer0.sh and maliput_viewer2.sh as a shortcut to run both
# visualizers.
install (PROGRAMS tools/maliput_viewer0.sh DESTINATION bin)
# Installs maliput_viewer2.sh as a shortcut to run the visualizer.
install (PROGRAMS tools/maliput_viewer2.sh DESTINATION bin)

ament_package()
2 changes: 0 additions & 2 deletions delphyne_gui/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<build_depend>ignition-msgs5</build_depend>
<build_depend>ignition-transport8</build_depend>
<build_depend>ignition-rendering3</build_depend>
<build_depend>ignition-gui0</build_depend>
<build_depend>ignition-gui3</build_depend>
<build_depend>delphyne</build_depend>

Expand All @@ -28,7 +27,6 @@
<build_export_depend>ignition-msgs5</build_export_depend>
<build_export_depend>ignition-transport8</build_export_depend>
<build_export_depend>ignition-rendering3</build_export_depend>
<build_export_depend>ignition-gui0</build_export_depend>
<build_export_depend>ignition-gui3</build_export_depend>
<build_export_depend>delphyne</build_export_depend>

Expand Down
36 changes: 0 additions & 36 deletions delphyne_gui/tools/maliput_viewer0.sh
View file
Open in desktop

This file was deleted.

175 changes: 1 addition & 174 deletions delphyne_gui/visualizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,176 +25,7 @@ install(
ARCHIVE DESTINATION lib
)

#-------------------------------------------------------------------------------
# MaliputViewerWidget GUI plugin.
QT5_WRAP_CPP(MaliputViewerWidget_MOC maliput_viewer_widget.hh)
QT5_WRAP_CPP(LayerSelectionWidget_MOC layer_selection_widget.hh)
QT5_WRAP_CPP(RenderMaliputWidget_MOC render_maliput_widget.hh)
QT5_WRAP_CPP(RulesVisualizerWidget_MOC rules_visualizer_widget.hh)

add_library(maliput_viewer_widget
${CMAKE_CURRENT_SOURCE_DIR}/layer_selection_widget.cc
${CMAKE_CURRENT_SOURCE_DIR}/maliput_viewer_widget.cc
${CMAKE_CURRENT_SOURCE_DIR}/render_maliput_widget.cc
${CMAKE_CURRENT_SOURCE_DIR}/rules_visualizer_widget.cc
orbit_view_control.cc
render_maliput_widget.cc
${MaliputViewerWidget_MOC}
${LayerSelectionWidget_MOC}
${RenderMaliputWidget_MOC}
${RulesVisualizerWidget_MOC}
)
add_library(delphyne_gui::maliput_viewer_widget ALIAS maliput_viewer_widget)
set_target_properties(maliput_viewer_widget
PROPERTIES
OUTPUT_NAME delphyne_gui_maliput_viewer_widget
)

target_link_libraries(maliput_viewer_widget
${drake_LIBRARIES}
delphyne_gui::arrow_mesh
delphyne_gui::global_attributes
delphyne_gui::maliput_viewer_model
delphyne_gui::selector
delphyne_gui::traffic_light_manager
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-rendering3::ignition-rendering3
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
)

install(
TARGETS maliput_viewer_widget
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

# RenderWidget GUI plugin.
QT5_WRAP_CPP(RenderWidget_MOC render_widget.hh)

add_library(render_widget
${CMAKE_CURRENT_SOURCE_DIR}/render_widget.cc
orbit_view_control.cc
${RenderWidget_MOC}
)
add_library(delphyne_gui::render_widget ALIAS render_widget)
set_target_properties(render_widget
PROPERTIES
OUTPUT_NAME delphyne_gui_render_widget
)

target_link_libraries(render_widget
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-rendering3::ignition-rendering3
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
delphyne::utility
)

install(
TARGETS render_widget
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

# TeleopWidget GUI plugin.
QT5_WRAP_CPP(TeleopWidget_MOC teleop_widget.hh)

add_library(teleop_widget
${CMAKE_CURRENT_SOURCE_DIR}/teleop_widget.cc
${TeleopWidget_MOC}
)
add_library(delphyne_gui::teleop_widget ALIAS teleop_widget)
set_target_properties(teleop_widget
PROPERTIES
OUTPUT_NAME delphyne_gui_teleop_widget
)

target_link_libraries(teleop_widget
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
)

install(
TARGETS teleop_widget
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

# PlaybackWidget GUI plugin.
QT5_WRAP_CPP(PlaybackWidget_MOC playback_widget.hh)
QT5_ADD_RESOURCES(PlaybackWidget_resources_RCC playback.qrc)

add_library(playback_widget
${CMAKE_CURRENT_SOURCE_DIR}/playback_widget.cc
${PlaybackWidget_MOC}
${PlaybackWidget_resources_RCC}
)
add_library(delphyne_gui::playback_widget ALIAS playback_widget)
set_target_properties(playback_widget
PROPERTIES
OUTPUT_NAME delphyne_gui_playback_widget
)

target_link_libraries(playback_widget
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
delphyne::public_headers
)

install(
TARGETS playback_widget
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

#-------------------------------------------------------------------------------

# Visualizer with ign-gui0
add_executable(visualizer0
visualizer0.cc
)

target_link_libraries(visualizer0
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::utility
global_attributes
)

install(
TARGETS visualizer0
EXPORT ${PROJECT_NAME}-targets
DESTINATION bin
)

# Visualizer with ign-gui3
# Visualizer
add_executable(visualizer
visualizer2.cc
)
Expand All @@ -217,10 +48,6 @@ install(
# Install .config files.
install(
FILES
layout_with_render_only.config
layout_with_teleop.config
layout_maliput_viewer.config
layout_for_playback.config
layout2_for_playback.config
layout2_maliput_viewer.config
layout2_with_teleop.config
Expand Down
62 changes: 0 additions & 62 deletions delphyne_gui/visualizer/display_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,6 @@ include_directories(
${CMAKE_SOURCE_DIR}
)

# Origin display plugin.
QT5_WRAP_CPP(OriginDisplay0_MOC origin_display0.hh)

add_library(origin_display0
${CMAKE_CURRENT_SOURCE_DIR}/origin_display0.cc
${OriginDisplay0_MOC}
)
add_library(delphyne_gui::origin_display0 ALIAS origin_display0)
set_target_properties(origin_display0
PROPERTIES
OUTPUT_NAME delphyne_gui_origin_display0
)

target_link_libraries(origin_display0
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
)

install(
TARGETS origin_display0
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

# Agent Info display plugin.
QT5_WRAP_CPP(AgentInfoDisplay0_MOC agent_info_display0.hh)

add_library(agent_info_display0
${CMAKE_CURRENT_SOURCE_DIR}/agent_info_display0.cc
${AgentInfoDisplay0_MOC}
)
add_library(delphyne_gui::agent_info_display0 ALIAS agent_info_display0)
set_target_properties(agent_info_display0
PROPERTIES
OUTPUT_NAME delphyne_gui_agent_info_display0
)

target_link_libraries(agent_info_display0
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
)

install(
TARGETS agent_info_display0
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

#-------------------------------------------------------------------------------
# AgentInfo display (ign-gui 3)
QT5_WRAP_CPP(AgentInfoDisplay_MOC agent_info_display.hh)
Expand Down
Loading