@@ -35,6 +35,10 @@ namespace autoware_overlay_rviz_plugin
35
35
{
36
36
37
37
TrafficDisplay::TrafficDisplay ()
38
+ : tl_red_(QString(" #cc3d3d" )),
39
+ tl_yellow_ (QString(" #ccb43d" )),
40
+ tl_green_(QString(" #3dcc55" )),
41
+ tl_gray_(QString(" #4f4f4f" ))
38
42
{
39
43
// Load the traffic light image
40
44
std::string package_path =
@@ -55,9 +59,8 @@ void TrafficDisplay::drawTrafficLightIndicator(QPainter & painter, const QRectF
55
59
painter.setRenderHint (QPainter::Antialiasing, true );
56
60
painter.setRenderHint (QPainter::SmoothPixmapTransform, true );
57
61
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);
61
64
// Define the area for the circle (background)
62
65
QRectF circleRect = backgroundRect;
63
66
circleRect.setWidth (backgroundRect.width () - 30 );
@@ -67,33 +70,33 @@ void TrafficDisplay::drawTrafficLightIndicator(QPainter & painter, const QRectF
67
70
backgroundRect.top () + circleRect.height () + 30 ));
68
71
painter.drawEllipse (circleRect);
69
72
70
- if (current_traffic_.signals .size () > 0 ) {
73
+ if (! current_traffic_.signals .empty () ) {
71
74
switch (current_traffic_.signals [0 ].elements [0 ].color ) {
72
75
case 1 :
73
- painter.setBrush (QBrush (red ));
76
+ painter.setBrush (QBrush (tl_red_ ));
74
77
painter.drawEllipse (circleRect);
75
78
break ;
76
79
case 2 :
77
- painter.setBrush (QBrush (yellow ));
80
+ painter.setBrush (QBrush (tl_yellow_ ));
78
81
painter.drawEllipse (circleRect);
79
82
break ;
80
83
case 3 :
81
- painter.setBrush (QBrush (green ));
84
+ painter.setBrush (QBrush (tl_green_ ));
82
85
painter.drawEllipse (circleRect);
83
86
break ;
84
87
case 4 :
85
- painter.setBrush (QBrush (gray) );
88
+ painter.setBrush (tl_gray_ );
86
89
painter.drawEllipse (circleRect);
87
90
break ;
88
91
default :
89
- painter.setBrush (QBrush (gray) );
92
+ painter.setBrush (tl_gray_ );
90
93
painter.drawEllipse (circleRect);
91
94
break ;
92
95
}
93
96
}
94
97
95
98
// Scaling factor (e.g., 1.5 for 150% size)
96
- float scaleFactor = 1.25 ;
99
+ float scaleFactor = 1.00 ;
97
100
98
101
// Calculate the scaled size
99
102
QSize scaledSize = traffic_light_image_.size () * scaleFactor;
0 commit comments