Skip to content

Commit 75166f9

Browse files
author
M. Fatih Cırıt
committed
traffic light color overhaul
Signed-off-by: M. Fatih Cırıt <mfc@leodrive.ai>
1 parent 99527ba commit 75166f9

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed
Loading

common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/include/traffic_display.hpp

+5-8
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,11 @@ class TrafficDisplay
4545

4646
private:
4747
QImage traffic_light_image_;
48-
// yellow #CFC353
49-
QColor yellow = QColor(207, 195, 83);
50-
// red #CF5353
51-
QColor red = QColor(207, 83, 83);
52-
// green #53CF5F
53-
QColor green = QColor(83, 207, 95);
54-
// gray #C2C2C2
55-
QColor gray = QColor(194, 194, 194);
48+
49+
const QColor tl_red_;
50+
const QColor tl_yellow_;
51+
const QColor tl_green_;
52+
const QColor tl_gray_;
5653

5754
QImage coloredImage(const QImage & source, const QColor & color);
5855
};

common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/signal_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void SignalDisplay::drawWidget(QImage & hud)
343343

344344
// a 27px space between the two halves of the HUD
345345

346-
QRectF smallerBackgroundRect(340, 0, 190 / 2, hud.height());
346+
QRectF smallerBackgroundRect(340, 0, 190.0 / 2, hud.height());
347347

348348
drawVerticalRoundedRectangle(painter, smallerBackgroundRect);
349349

common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/traffic_display.cpp

+13-10
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ namespace autoware_overlay_rviz_plugin
3535
{
3636

3737
TrafficDisplay::TrafficDisplay()
38+
: tl_red_(QString("#cc3d3d")),
39+
tl_yellow_(QString("#ccb43d")),
40+
tl_green_(QString("#3dcc55")),
41+
tl_gray_(QString("#4f4f4f"))
3842
{
3943
// Load the traffic light image
4044
std::string package_path =
@@ -55,9 +59,8 @@ void TrafficDisplay::drawTrafficLightIndicator(QPainter & painter, const QRectF
5559
painter.setRenderHint(QPainter::Antialiasing, true);
5660
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
5761

58-
// #C2C2C2
59-
painter.setPen(QPen(gray, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
60-
painter.setBrush(QBrush(gray, Qt::SolidPattern));
62+
painter.setBrush(QBrush(tl_gray_, Qt::SolidPattern));
63+
painter.setPen(Qt::NoPen);
6164
// Define the area for the circle (background)
6265
QRectF circleRect = backgroundRect;
6366
circleRect.setWidth(backgroundRect.width() - 30);
@@ -67,33 +70,33 @@ void TrafficDisplay::drawTrafficLightIndicator(QPainter & painter, const QRectF
6770
backgroundRect.top() + circleRect.height() + 30));
6871
painter.drawEllipse(circleRect);
6972

70-
if (current_traffic_.signals.size() > 0) {
73+
if (!current_traffic_.signals.empty()) {
7174
switch (current_traffic_.signals[0].elements[0].color) {
7275
case 1:
73-
painter.setBrush(QBrush(red));
76+
painter.setBrush(QBrush(tl_red_));
7477
painter.drawEllipse(circleRect);
7578
break;
7679
case 2:
77-
painter.setBrush(QBrush(yellow));
80+
painter.setBrush(QBrush(tl_yellow_));
7881
painter.drawEllipse(circleRect);
7982
break;
8083
case 3:
81-
painter.setBrush(QBrush(green));
84+
painter.setBrush(QBrush(tl_green_));
8285
painter.drawEllipse(circleRect);
8386
break;
8487
case 4:
85-
painter.setBrush(QBrush(gray));
88+
painter.setBrush(tl_gray_);
8689
painter.drawEllipse(circleRect);
8790
break;
8891
default:
89-
painter.setBrush(QBrush(gray));
92+
painter.setBrush(tl_gray_);
9093
painter.drawEllipse(circleRect);
9194
break;
9295
}
9396
}
9497

9598
// Scaling factor (e.g., 1.5 for 150% size)
96-
float scaleFactor = 1.25;
99+
float scaleFactor = 1.00;
97100

98101
// Calculate the scaled size
99102
QSize scaledSize = traffic_light_image_.size() * scaleFactor;

0 commit comments

Comments
 (0)