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: add autoware_remaining_distance_time_calculator and overlay #6855

Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
606a961
feat(remaining_dist_eta): add initial implementation for testing rema…
ahmeddesokyebrahim Apr 18, 2024
235039d
feat(remaining_dist_eta): add initial implementation for ETA
ahmeddesokyebrahim Apr 19, 2024
e0a9843
feat(remaining_dist_eta): change eta values to uint8
ahmeddesokyebrahim Apr 19, 2024
96c8ea7
feat(remaining_dist_eta): add publisher and using the remaining dista…
Apr 19, 2024
36ef21a
feat(remaining_dist_eta): removing functions usage from mission plann…
Apr 19, 2024
2755265
style(pre-commit): autofix
pre-commit-ci[bot] Apr 19, 2024
7d3247c
feat(remaining_dist_eta): improving and cleaning remaining dist and e…
Apr 22, 2024
a012502
style(pre-commit): autofix
pre-commit-ci[bot] Apr 22, 2024
2d57d45
feat(remaining_dist_eta): change in remaining dist and time calculati…
Apr 23, 2024
8598fea
feat(remaining_dist_eta): add visualization overlay for mission detai…
Apr 23, 2024
2876776
feat(remaining_dist_eta): update visualization and behavior path plan…
Apr 23, 2024
8dd46aa
feat(remaining_dist_eta): cleaning up
Apr 23, 2024
52ca290
style(pre-commit): autofix
pre-commit-ci[bot] Apr 23, 2024
73a3428
feat(remaining_dist_eta): change dependency from autoware_planning_ms…
Apr 24, 2024
62df403
style(pre-commit): autofix
pre-commit-ci[bot] Apr 24, 2024
10e5f81
feat(remaining_dist_eta): reverting back to route_handler and lanelet…
Apr 25, 2024
a7408be
style(pre-commit): autofix
pre-commit-ci[bot] Apr 25, 2024
2c1bc34
feat(remaining_dist_eta): fix review comment to have the remaining di…
Apr 25, 2024
662f409
style(pre-commit): autofix
pre-commit-ci[bot] Apr 25, 2024
d39f1b4
feat(remaining_dist_eta): add remaining time back to the visualizatio…
Apr 29, 2024
1776e43
style(pre-commit): autofix
pre-commit-ci[bot] Apr 29, 2024
bcf9dbb
added goal distance/time icons
Apr 30, 2024
20e076b
Refactor remaining_distance_time_display.hpp to add goal distance/tim…
Apr 30, 2024
f17f11b
Refactor to use icons and use km/m depending on distance
Apr 30, 2024
82471ad
update widget size
Apr 30, 2024
1ddb209
feat(remaining_dist_eta): add slight changes to icons and values/text…
Apr 30, 2024
7f29beb
feat(remaining_dist_eta): update readme file
Apr 30, 2024
64d1114
style(pre-commit): autofix
pre-commit-ci[bot] Apr 30, 2024
4e60c16
feat(remaining_dist_eta): [wip] fix review comments - separate the im…
ahmeddesokyebrahim May 7, 2024
3401f91
feat(remaining_dist_eta): remove functionalities from behavior path p…
ahmeddesokyebrahim May 7, 2024
64ce68a
feat(remaining_dist_eta): remove some other change in behavior path p…
ahmeddesokyebrahim May 7, 2024
76389ec
feat(remaining_dist_eta): removing unused files in remaining dist and…
ahmeddesokyebrahim May 7, 2024
020c8dc
feat(remaining_dist_eta): header file cleaning up
ahmeddesokyebrahim May 7, 2024
84b3c0e
feat(remaining_dist_eta): node cpp file cleaning up
ahmeddesokyebrahim May 7, 2024
ae74169
feat(remaining_dist_eta): package.xml clean up
ahmeddesokyebrahim May 7, 2024
33ff5dc
feat(remaining_dist_eta): package.xml cleaning up
ahmeddesokyebrahim May 7, 2024
87e48d2
feat(remaining_dist_eta): package.xml cleaning up
ahmeddesokyebrahim May 7, 2024
5e332ba
feat(remaining_dist_eta): add comments
ahmeddesokyebrahim May 7, 2024
686f808
style(pre-commit): autofix
pre-commit-ci[bot] May 7, 2024
614c82c
feat(remaining_dist_eta): remove unneeded changes
ahmeddesokyebrahim May 7, 2024
4a25f9b
feat(remaining_dist_eta): update visualization to calculate remaining…
May 7, 2024
9662b2a
feat(remaining_dist_eta): fix review comments
May 7, 2024
a9e3433
style(pre-commit): autofix
pre-commit-ci[bot] May 7, 2024
5b91356
feat(remaining_dist_eta): add content to package readme file
May 7, 2024
ab6c316
style(pre-commit): autofix
pre-commit-ci[bot] May 7, 2024
bd722f5
feat(remaining_dist_eta): removing info log lines - minor update in r…
May 7, 2024
322f751
style(pre-commit): autofix
pre-commit-ci[bot] May 7, 2024
5d5955c
Merge branch 'main' into 4593-feat-remaining-distance-eta
xmfcx May 10, 2024
9fcda4d
update the readme
May 10, 2024
694886b
refactor all
May 10, 2024
d43a1c3
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
24db0c0
remove unused dep
May 10, 2024
4925f03
reformat cmakelists
May 10, 2024
be4ba57
update the namespace, remove unused code
May 10, 2024
137cae4
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
59cebe7
remove unused headers
May 10, 2024
7920153
update the images
May 10, 2024
30fc9f4
icon sources
May 10, 2024
8a4c8e9
simplify readme
May 10, 2024
8ebe0ae
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
dfd410b
remove unused fonts
May 10, 2024
6c35ab9
fix the messy display code
May 10, 2024
fa79682
fix anchoring, update readme
May 10, 2024
38ae94f
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
a4c28dd
remove unused panel and dependency
May 10, 2024
42611d6
clean up more
May 10, 2024
5e98a6f
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
7b1901e
use max vel instead
May 10, 2024
3b2957f
rm comment
May 10, 2024
2d80db8
style(pre-commit): autofix
pre-commit-ci[bot] May 10, 2024
b4770f8
proportionally extend the rect to the right
May 11, 2024
56b432f
fix typo
May 11, 2024
68a8be7
feat(remaining_dist_eta): add checks for calculating remaining distance
May 13, 2024
ee08bc2
feat(remaining_dist_eta): handle cases when routing graph is not able…
May 13, 2024
8e8954b
feat(remaining_dist_eta): update readme
May 13, 2024
650eb80
style(pre-commit): autofix
pre-commit-ci[bot] May 13, 2024
8a9b86b
feat(remaining_dist_eta): add check for velocity limit preventing uni…
May 13, 2024
cadd17c
feat(remaining_dist_eta): fix type
May 13, 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
Prev Previous commit
Next Next commit
style(pre-commit): autofix
  • Loading branch information
pre-commit-ci[bot] committed May 10, 2024
commit 5e98a6f3f51af3bcb9fc652f3c5920468f6d2f65
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@

#include <QFontDatabase>
#include <QPainter>
#include <memory>
#include <rclcpp/rclcpp.hpp>
#include <rviz_common/properties/ros_topic_property.hpp>
#include <rviz_rendering/render_system.hpp>
@@ -54,7 +53,8 @@
static int count = 0;
std::stringstream ss;
ss << "MissionDetailsDisplay" << count++;
overlay_ = std::make_shared<autoware::mission_details_overlay_rviz_plugin::OverlayObject>(ss.str());
overlay_ =
std::make_shared<autoware::mission_details_overlay_rviz_plugin::OverlayObject>(ss.str());
overlay_->show();
update_size();

@@ -69,19 +69,19 @@
remaining_distance_time_topic_property_->initialize(rviz_ros_node);
}

void MissionDetailsDisplay::setupRosSubscriptions()
{
// Don't create a node, just use the one from the parent class
auto rviz_node_ = context_->getRosNodeAbstraction().lock()->get_raw_node();

remaining_distance_time_sub_ =
rviz_node_->create_subscription<autoware_internal_msgs::msg::MissionRemainingDistanceTime>(
remaining_distance_time_topic_property_->getTopicStd(),
rclcpp::QoS(rclcpp::KeepLast(10)).durability_volatile().reliable(),
[this](const autoware_internal_msgs::msg::MissionRemainingDistanceTime::SharedPtr msg) {
cb_remaining_distance_time(msg);
});
}

Check warning on line 84 in common/autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/src/mission_details_display.cpp

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

❌ New issue: Code Duplication

The module contains 2 functions with similar structure: MissionDetailsDisplay::setupRosSubscriptions,MissionDetailsDisplay::topic_updated_remaining_distance_time. Avoid duplicated, aka copy-pasted, code inside the module. More duplication lowers the code health.

MissionDetailsDisplay::~MissionDetailsDisplay()
{
@@ -160,8 +160,7 @@
painter.end();
}

void MissionDetailsDisplay::draw_rounded_rect(
QPainter & painter, const QRectF & backgroundRect)
void MissionDetailsDisplay::draw_rounded_rect(QPainter & painter, const QRectF & backgroundRect)
{
painter.setRenderHint(QPainter::Antialiasing, true);
QColor colorFromHSV;
Loading