brianhansonxyz/clearpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-05-05 05:10:06 -05:00
parent 38fb8ffde0
commit f015a8368b
11 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selfdrive/ui/qt/onroad.cc
View File

@@ -907,8 +907,8 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
if (edgeColor != bg_colors[STATUS_DISENGAGED]) {
QLinearGradient edge_gradient;
edge_gradient.setColorAt(0.0, QColor(edgeColor.red(), edgeColor.green(), edgeColor.blue(), static_cast<int>(255)));
edge_gradient.setColorAt(0.5, QColor(edgeColor.red(), edgeColor.green(), edgeColor.blue(), static_cast<int>(255 * 0.7) ));
edge_gradient.setColorAt(1.0, QColor(edgeColor.red(), edgeColor.green(), edgeColor.blue(), static_cast<int>(255 * 0.5)));
edge_gradient.setColorAt(0.5, QColor(edgeColor.red(), edgeColor.green(), edgeColor.blue(), static_cast<int>(255 * 0.8) ));
edge_gradient.setColorAt(1.0, QColor(edgeColor.red(), edgeColor.green(), edgeColor.blue(), static_cast<int>(255 * 0.7)));
QPainterPath path;
path.addPolygon(scene.track_vertices);

2
selfdrive/ui/qt/ready.cc
View File

@@ -42,7 +42,7 @@ void ReadyWindow::paintEvent(QPaintEvent *event) {
// Calculate the top-left position to center the image in the window.
int x = (this->width() - comma_img.width()) / 2;
int y = (this->height() - comma_img.height()) / 2;
int y = ((this->height() - comma_img.height()) / 20) * 9;
// Draw the pixmap at the calculated position.
painter.drawPixmap(x, y, comma_img);

10
selfdrive/ui/ui.h
View File

@@ -33,18 +33,18 @@ typedef enum UIStatus {
} UIStatus;
// Clearpilot new alpha constants
const float CENTER_LANE_ALPHA = 0.55;
const float CENTER_LANE_ALPHA = 0.75;
const float OTHER_LANE_ALPHA = 0.75;
const int CENTER_LANE_WIDTH = 50;
const int CENTER_LANE_WIDTH = 75;
const int OTHER_LANE_WIDTH = 16;
// Clearpilot custom colors
const QColor bg_colors [] = {
[STATUS_DISENGAGED] = QColor(0x17, 0x33, 0x49, 0xc8),
[STATUS_OVERRIDE] = QColor(64, 85, 245, 0xd1), // When you nudge the steering wheel while engaged
[STATUS_ENGAGED] = QColor(64, 85, 245, 0xd1), // Bright Blue
[STATUS_ALWAYS_ON_LATERAL_ACTIVE] = QColor(162, 221, 235, 0xd1), // Lighter Blue
[STATUS_OVERRIDE] = QColor(94, 112, 255, 0xd1), // When you nudge the steering wheel while engaged
[STATUS_ENGAGED] = QColor(94, 112, 255, 0xd1), // Bright Blue
[STATUS_ALWAYS_ON_LATERAL_ACTIVE] = QColor(143, 204, 235, 0xd1), // Lighter Blue
[STATUS_TRAFFIC_MODE_ACTIVE] = QColor(0xc9, 0x22, 0x31, 0xd1), // ? unused?
[STATUS_EXPERIMENTAL_ACTIVE] = QColor(201, 41, 204, 0xd1), // Magenta
[CENTER_LANE_COLOR] = QColor(150, 150, 150, 0xd1), // Gray