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.

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

feat: new rviz ui - speed/gear/turnsignal/steering #5957

Merged
merged 52 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c761006
feat: :sparkles: new rviz ui - speed/gear/turnsignal/steering
KhalilSelyan Dec 25, 2023
11eea88
style(pre-commit): autofix
pre-commit-ci[bot] Dec 25, 2023
391072a
docs: :memo: Add README
KhalilSelyan Dec 25, 2023
0c00509
refactor: rename folder rviz_2d_overlay_plugins to awf_2d_overlay_veh…
KhalilSelyan Dec 25, 2023
f977573
feat: add files to awf_2d_overlay_vehicle folder, with addition of T…
KhalilSelyan Dec 25, 2023
a6bac39
style(pre-commit): autofix
pre-commit-ci[bot] Dec 25, 2023
ef693fa
Add dependencies for perception messages
KhalilSelyan Dec 27, 2023
4cc9c64
refactor: setup specific colors + commented subscription
KhalilSelyan Dec 27, 2023
5c78b4d
style(pre-commit): autofix
pre-commit-ci[bot] Dec 27, 2023
0e468ac
Remove unnecessary package dependency
KhalilSelyan Dec 27, 2023
169fcba
Update signal_display.cpp and signal_display.h to reflect traffic dis…
KhalilSelyan Dec 27, 2023
4dc632d
bug: reporting bug regarding trafficlight message format vs. Qt reser…
KhalilSelyan Dec 27, 2023
6dd6cc6
revert: to last building with no Qt errors regarding signals word
KhalilSelyan Dec 27, 2023
0cfda74
fix RosTopicProperty crash and restrict the node variable
Dec 29, 2023
6ae9f86
eliminate non-reqıired Qt dependency
Dec 29, 2023
81b8963
Remove rosidl_generator_traits dependency from package.xml
Dec 29, 2023
802fb3f
File renames to follow snake_case and .hpp instead of .h
KhalilSelyan Jan 11, 2024
551db74
Fixing Segfault by correct usage of topicProperty with QSlots
KhalilSelyan Jan 11, 2024
b6d65e3
style(pre-commit): autofix
pre-commit-ci[bot] Jan 11, 2024
22b5e3e
tmp
brkay54 Jan 12, 2024
ba1337e
style(pre-commit): autofix
pre-commit-ci[bot] Jan 12, 2024
aa8d228
Add autoware_msgs_adapter for awf_2d_overlay_vehicle (traffic light t…
KhalilSelyan Jan 15, 2024
473ea4e
Add gray color constant to display classes to avoid re-creating the Q…
KhalilSelyan Jan 15, 2024
144c20d
Update traffic light display and data handling with new message type …
KhalilSelyan Jan 15, 2024
9ab9633
re-integrate traffic light subscriptions with new message type and to…
KhalilSelyan Jan 15, 2024
36f73fe
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 15, 2024
1b4bba6
style(pre-commit): autofix
pre-commit-ci[bot] Jan 15, 2024
729e0b3
fix json-schema-check error
KhalilSelyan Jan 15, 2024
7af3519
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 15, 2024
ffbf7e0
fix typo when resolving conflicts with main
KhalilSelyan Jan 15, 2024
ceff842
revert+fix: message converter no longer needed with `add_definitions(…
KhalilSelyan Jan 16, 2024
359e4d6
docs(font): add LICENSE file for QuickSand
KhalilSelyan Jan 16, 2024
d831014
style(pre-commit): autofix
pre-commit-ci[bot] Jan 16, 2024
5fc5d66
Merge branch 'main' into feat/modernize-rviz-ui
isamu-takagi Jan 17, 2024
58d6049
refactor: remove the delete calls as QT takes care of them automatically
KhalilSelyan Jan 17, 2024
574a004
feat: add testing `ament_lint_auto/autoware_lint_common`
KhalilSelyan Jan 17, 2024
b70ea03
feat: add linting when build
KhalilSelyan Jan 17, 2024
5a0d601
refactor: removed doxyfile as unnecessary
KhalilSelyan Jan 22, 2024
6375ddf
refactor: fix partial spelling issues
KhalilSelyan Jan 22, 2024
c392ff9
refactor: remove qresource to fix partial spell check issue
KhalilSelyan Jan 22, 2024
0cdbd70
refactor: more fixes for the spell check partial
KhalilSelyan Jan 22, 2024
4ddde15
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 22, 2024
c70b792
fix: cmake_lint corrections
KhalilSelyan Jan 23, 2024
9561034
fix: small bugfix missing parenthesis
KhalilSelyan Jan 23, 2024
bc3962d
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 23, 2024
1b7bf47
docs: add autoware contributors copyright
KhalilSelyan Jan 23, 2024
699dad6
docs: add autoware contributors copyright to overlay files
KhalilSelyan Jan 25, 2024
78bfa1f
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 25, 2024
7cc3a2c
update license for awf_2d_overlay_vehicle-extras.cmake
xmfcx Jan 25, 2024
9d591e6
Update common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/awf_2d_o…
xmfcx Jan 26, 2024
7679be9
style(pre-commit): autofix
pre-commit-ci[bot] Jan 26, 2024
927d930
Merge branch 'main' into feat/modernize-rviz-ui
KhalilSelyan Jan 27, 2024
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
125 changes: 125 additions & 0 deletions common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
cmake_minimum_required(VERSION 3.8)
project(awf_2d_overlay_vehicle)

# find dependencies
find_package(ament_cmake_auto REQUIRED)
find_package(ament_cmake REQUIRED)
find_package(autoware_auto_vehicle_msgs REQUIRED)
find_package(tier4_planning_msgs REQUIRED)
find_package(autoware_perception_msgs REQUIRED)
ament_auto_find_build_dependencies()
# if your cmake has this line it should probably find autoware_auto_vehicle_msgs package if not you should add to ament_target_dependencies()

find_package(rviz_2d_overlay_msgs REQUIRED)

find_package(rviz_common REQUIRED)
find_package(rviz_rendering REQUIRED)
find_package(rviz_ogre_vendor REQUIRED)
find_package(std_msgs REQUIRED)

set(
headers_to_moc
include/overlay_text_display.hpp
include/signal_display.h
include/SteeringWheelDisplay.h
include/GearDisplay.h
include/SpeedDisplay.h
include/TurnSignalsDisplay.h
include/TrafficDisplay.h
include/SpeedLimitDisplay.h
)

qt5_add_resources(RESOURCES_RCC resources.qrc)


foreach (header "${headers_to_moc}")
qt5_wrap_cpp(display_moc_files "${header}")
endforeach ()

set(
display_source_files
src/overlay_text_display.cpp
src/overlay_utils.cpp
src/signal_display.cpp
src/SteeringWheelDisplay.cpp
src/GearDisplay.cpp
src/SpeedDisplay.cpp
src/TurnSignalsDisplay.cpp
src/TrafficDisplay.cpp
src/SpeedLimitDisplay.cpp
${RESOURCES_RCC} # Add this line

)

add_library(
${PROJECT_NAME} SHARED
${display_moc_files}
${display_source_files}
)

set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)

target_include_directories(
${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
${Qt5Widgets_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
)

target_link_libraries(
${PROJECT_NAME} PUBLIC
rviz_ogre_vendor::OgreMain
rviz_ogre_vendor::OgreOverlay
)

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(${PROJECT_NAME} PRIVATE "${PROJECT_NAME}_BUILDING_LIBRARY")

# prevent pluginlib from using boost
target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")

pluginlib_export_plugin_description_file(rviz_common plugins_description.xml)

ament_target_dependencies(
${PROJECT_NAME}
PUBLIC
rviz_common
rviz_rendering
rviz_2d_overlay_msgs
autoware_auto_vehicle_msgs
tier4_planning_msgs
autoware_perception_msgs
)

ament_export_include_directories(include)
ament_export_targets(${PROJECT_NAME} HAS_LIBRARY_TARGET)
ament_export_dependencies(
rviz_common
rviz_ogre_vendor
)

install(
TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
INCLUDES DESTINATION include
)

install(
DIRECTORY include/
DESTINATION include
)

install(
TARGETS
DESTINATION lib/${PROJECT_NAME}
)

ament_package(
CONFIG_EXTRAS "awf_2d_overlay_vehicle-extras.cmake"
)
Loading