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

wip

Browse Source
This commit is contained in:
concordia
2024-05-02 21:09:07 -05:00
parent 0f7aa64d3b
commit dc561e3c2d
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,10 +825,10 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
// CLEARPILOT: color channel code rewriten to allow custom colors
// Define base RGB color and alpha
int base_red = 139; // Dark red component
int base_red = 200; // Dark red component
int base_green = 0; // Minimal green component
int base_blue = 0; // Minimal blue component
float base_alpha = 0.6; // 60% opacity
float base_alpha = 0.75; // 60% opacity
QColor baseColor(base_red, base_green, base_blue);
@@ -906,17 +906,15 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
// Paint path edges
QLinearGradient pe(0, height(), 0, 0);
if (alwaysOnLateralActive) {
pe.setColorAt(0.0, QColor::fromHslF(178 / 360., 0.90, 0.38, 1.0));
pe.setColorAt(0.5, QColor::fromHslF(178 / 360., 0.90, 0.38, 0.5));
pe.setColorAt(1.0, QColor::fromHslF(178 / 360., 0.90, 0.38, 0.1));
} else if (conditionalStatus == 1 || conditionalStatus == 3 || conditionalStatus == 5) {
pe.setColorAt(0.0, QColor::fromHslF(58 / 360., 1.00, 0.50, 1.0));
pe.setColorAt(0.5, QColor::fromHslF(58 / 360., 1.00, 0.50, 0.5));
pe.setColorAt(1.0, QColor::fromHslF(58 / 360., 1.00, 0.50, 0.1));
} else if (experimentalMode) {
pe.setColorAt(0.0, QColor::fromHslF(25 / 360., 0.71, 0.50, 1.0));
pe.setColorAt(0.5, QColor::fromHslF(25 / 360., 0.71, 0.50, 0.5));
pe.setColorAt(1.0, QColor::fromHslF(25 / 360., 0.71, 0.50, 0.1));
QColor color = bg_colors[STATUS_ALWAYS_ON_LATERAL_ACTIVE];
pe.setColorAt(0.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255)));
pe.setColorAt(0.5, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.5)));
pe.setColorAt(1.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.1)));
} else if (conditionalStatus == 1 || conditionalStatus == 3 || conditionalStatus == 5 || experimentalMode) {
QColor color = bg_colors[STATUS_EXPERIMENTAL_ACTIVE];
pe.setColorAt(0.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255)));
pe.setColorAt(0.5, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.5)));
pe.setColorAt(1.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.1)));
} else if (trafficModeActive) {
pe.setColorAt(0.0, QColor::fromHslF(355 / 360., 0.71, 0.46, 1.0));
pe.setColorAt(0.5, QColor::fromHslF(355 / 360., 0.71, 0.46, 0.5));
@@ -926,9 +924,10 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
pe.setColorAt(0.5, QColor::fromHslF(205 / 360., 0.85, 0.56, 0.5));
pe.setColorAt(1.0, QColor::fromHslF(205 / 360., 0.85, 0.56, 0.1));
} else {
pe.setColorAt(0.0, QColor(baseColor.red(), baseColor.green(), baseColor.blue(), static_cast<int>(base_alpha * 255)));
pe.setColorAt(0.5, QColor(baseColor.red(), baseColor.green(), baseColor.blue(), static_cast<int>(base_alpha * 255 * 0.5)));
pe.setColorAt(1.0, QColor(baseColor.red(), baseColor.green(), baseColor.blue(), static_cast<int>(base_alpha * 255 * 0.1)));
QColor color = bg_colors[STATUS_ENGAGED];
pe.setColorAt(0.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255)));
pe.setColorAt(0.5, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.5)));
pe.setColorAt(1.0, QColor(color.red(), color.green(), color.blue(), static_cast<int>(base_alpha * 255 * 0.1)));
}
QPainterPath path;