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

Move some plugins to subfolders #415

Merged
merged 3 commits into from
May 27, 2021
Merged

Move some plugins to subfolders #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d55aa0
Move playback_plugin to folder
scpeters May 25, 2021
3815a8d
Move topics_stats to folder
scpeters May 25, 2021
4d0b790
Move teleop_plugin to a folder
scpeters May 27, 2021
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
120 changes: 3 additions & 117 deletions delphyne_gui/visualizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,123 +337,6 @@ install(
ARCHIVE DESTINATION lib
)

#-------------------------------------------------------------------------------
# Teleop Plugin (ign-gui 3)
QT5_WRAP_CPP(TeleopPlugin_headers_MOC teleop_plugin.h)
QT5_ADD_RESOURCES(TeleopPlugin_RCC teleop_plugin.qrc)

add_library(TeleopPlugin
${CMAKE_CURRENT_SOURCE_DIR}/teleop_plugin.cc
${TeleopPlugin_headers_MOC}
${TeleopPlugin_RCC}
)
add_library(delphyne_gui::TeleopPlugin ALIAS TeleopPlugin)
set_target_properties(TeleopPlugin
PROPERTIES
OUTPUT_NAME TeleopPlugin
)

target_link_libraries(TeleopPlugin
PUBLIC
ignition-gui3::ignition-gui3
ignition-common3::ignition-common3
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
PRIVATE
ignition-plugin1::register
)

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

#-------------------------------------------------------------------------------
# TopicsStats Plugin (ign-gui 3)
QT5_WRAP_CPP(TopicsStats_headers_MOC topics_stats.hh)
QT5_ADD_RESOURCES(TopicsStats_RCC topics_stats.qrc)

add_library(TopicsStats
${CMAKE_CURRENT_SOURCE_DIR}/topics_stats.cc
${TopicsStats_headers_MOC}
${TopicsStats_RCC}
)
add_library(delphyne_gui::TopicsStats ALIAS TopicsStats)
set_target_properties(TopicsStats
PROPERTIES
OUTPUT_NAME TopicsStats
)

target_link_libraries(TopicsStats
PUBLIC
ignition-gui3::ignition-gui3
ignition-common3::ignition-common3
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
PRIVATE
ignition-plugin1::register
)

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

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

# PlaybackWidget (ign-gui 3)
QT5_WRAP_CPP(PlaybackPlugin_MOC playback_plugin.hh)
QT5_ADD_RESOURCES(PlaybackPlugin_resources_RCC PlaybackPlugin.qrc)

add_library(PlaybackPlugin
${CMAKE_CURRENT_SOURCE_DIR}/playback_plugin.cc
${PlaybackPlugin_MOC}
${PlaybackPlugin_resources_RCC}
)
add_library(delphyne_gui::PlaybackPlugin ALIAS PlaybackPlugin)
set_target_properties(PlaybackPlugin
PROPERTIES
OUTPUT_NAME PlaybackPlugin
)

ament_target_dependencies(PlaybackPlugin
"maliput"
)

target_link_libraries(PlaybackPlugin
PUBLIC
ignition-common3::ignition-common3
ignition-gui3::ignition-gui3
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Qml_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
delphyne::public_headers
maliput::common
PRIVATE
ignition-plugin1::register
)

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

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

# Visualizer with ign-gui0
Expand Down Expand Up @@ -531,7 +414,10 @@ install(
)

add_subdirectory(display_plugins)
add_subdirectory(playback_plugin)
add_subdirectory(teleop_plugin)
add_subdirectory(topic_interface_plugin)
add_subdirectory(topics_stats)

if(BUILD_TESTING)
add_subdirectory(test)
Expand Down
49 changes: 49 additions & 0 deletions delphyne_gui/visualizer/playback_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
include_directories(
${Qt5Core_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}
)

#-------------------------------------------------------------------------------
# PlaybackWidget (ign-gui 3)
QT5_WRAP_CPP(PlaybackPlugin_MOC playback_plugin.hh)
QT5_ADD_RESOURCES(PlaybackPlugin_resources_RCC PlaybackPlugin.qrc)

add_library(PlaybackPlugin
${CMAKE_CURRENT_SOURCE_DIR}/playback_plugin.cc
${PlaybackPlugin_MOC}
${PlaybackPlugin_resources_RCC}
)
add_library(delphyne_gui::PlaybackPlugin ALIAS PlaybackPlugin)
set_target_properties(PlaybackPlugin
PROPERTIES
OUTPUT_NAME PlaybackPlugin
)

ament_target_dependencies(PlaybackPlugin
"maliput"
)

target_link_libraries(PlaybackPlugin
PUBLIC
ignition-common3::ignition-common3
ignition-gui3::ignition-gui3
ignition-msgs5::ignition-msgs5
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Qml_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
delphyne::public_headers
maliput::common
PRIVATE
ignition-plugin1::register
)

install(
TARGETS PlaybackPlugin
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
0 delphyne_gui/visualizer/PlaybackPlugin.qml → ...alizer/playback_plugin/PlaybackPlugin.qml
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/PlaybackPlugin.qrc → ...alizer/playback_plugin/PlaybackPlugin.qrc
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/playback_plugin.cc → ...alizer/playback_plugin/playback_plugin.cc
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/playback_plugin.hh → ...alizer/playback_plugin/playback_plugin.hh
View file
Open in desktop
File renamed without changes.
41 changes: 41 additions & 0 deletions delphyne_gui/visualizer/teleop_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
include_directories(
${Qt5Core_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}
)

#-------------------------------------------------------------------------------
# Teleop Plugin (ign-gui 3)
QT5_WRAP_CPP(TeleopPlugin_headers_MOC teleop_plugin.h)
QT5_ADD_RESOURCES(TeleopPlugin_RCC teleop_plugin.qrc)

add_library(TeleopPlugin
${CMAKE_CURRENT_SOURCE_DIR}/teleop_plugin.cc
${TeleopPlugin_headers_MOC}
${TeleopPlugin_RCC}
)
add_library(delphyne_gui::TeleopPlugin ALIAS TeleopPlugin)
set_target_properties(TeleopPlugin
PROPERTIES
OUTPUT_NAME TeleopPlugin
)

target_link_libraries(TeleopPlugin
PUBLIC
ignition-gui3::ignition-gui3
ignition-common3::ignition-common3
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
PRIVATE
ignition-plugin1::register
)

install(
TARGETS TeleopPlugin
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
0 delphyne_gui/visualizer/TeleopPlugin.qml → ...visualizer/teleop_plugin/TeleopPlugin.qml
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/teleop_plugin.cc → ...visualizer/teleop_plugin/teleop_plugin.cc
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/teleop_plugin.h → .../visualizer/teleop_plugin/teleop_plugin.h
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/teleop_plugin.qrc → ...isualizer/teleop_plugin/teleop_plugin.qrc
View file
Open in desktop
File renamed without changes.
41 changes: 41 additions & 0 deletions delphyne_gui/visualizer/topics_stats/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
include_directories(
${Qt5Core_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}
)

#-------------------------------------------------------------------------------
# TopicsStats Plugin (ign-gui 3)
QT5_WRAP_CPP(TopicsStats_headers_MOC topics_stats.hh)
QT5_ADD_RESOURCES(TopicsStats_RCC topics_stats.qrc)

add_library(TopicsStats
${CMAKE_CURRENT_SOURCE_DIR}/topics_stats.cc
${TopicsStats_headers_MOC}
${TopicsStats_RCC}
)
add_library(delphyne_gui::TopicsStats ALIAS TopicsStats)
set_target_properties(TopicsStats
PROPERTIES
OUTPUT_NAME TopicsStats
)

target_link_libraries(TopicsStats
PUBLIC
ignition-gui3::ignition-gui3
ignition-common3::ignition-common3
ignition-transport8::ignition-transport8
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
delphyne::protobuf_messages
PRIVATE
ignition-plugin1::register
)

install(
TARGETS TopicsStats
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
0 delphyne_gui/visualizer/TopicsStats.qml → ...i/visualizer/topics_stats/TopicsStats.qml
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/icons/search.svg → .../visualizer/topics_stats/icons/search.svg
View file
Open in desktop
File renamed without changes
0 delphyne_gui/visualizer/topics_stats.cc → ...i/visualizer/topics_stats/topics_stats.cc
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/topics_stats.hh → ...i/visualizer/topics_stats/topics_stats.hh
View file
Open in desktop
File renamed without changes.
0 delphyne_gui/visualizer/topics_stats.qrc → .../visualizer/topics_stats/topics_stats.qrc
View file
Open in desktop
File renamed without changes.