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-04 15:58:34 -05:00
parent b017bec24b
commit c98d082477
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,6 @@ void OnroadWindow::updateState(const UIState &s) {
return; return;
} }
Alert alert = Alert::get(*(s.sm), s.scene.started_frame); Alert alert = Alert::get(*(s.sm), s.scene.started_frame);
alerts->updateAlert(alert); alerts->updateAlert(alert);
@@ -115,6 +114,7 @@ void OnroadWindow::updateState(const UIState &s) {
if (bg != bgColor) { if (bg != bgColor) {
bg = bgColor; bg = bgColor;
CameraWidget->updateLaneEdgeColor(bg);
update(); update();
} }
} }
@@ -636,20 +636,16 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
map_settings_btn->setVisible(!hideBottomIcons && compass && !scene.hide_map_icon); map_settings_btn->setVisible(!hideBottomIcons && compass && !scene.hide_map_icon);
main_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignTop); main_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignTop);
} }
QColor bgColor = bg_colors[s.status];
if (paramsMemory.getInt("no_lat_lane_change") == 1) {
bgColor = bg_colors[STATUS_DISENGAGED];
}
if (bg != bgColor) {
bg = bgColor;
update();
}
updateFrogPilotWidgets(); updateFrogPilotWidgets();
} }
void AnnotatedCameraWidget::updateLaneEdgeColor(QColor &bgColor) {
if (bg != bgColor) {
bg = bgColor;
}
}
void AnnotatedCameraWidget::drawHud(QPainter &p) { void AnnotatedCameraWidget::drawHud(QPainter &p) {
p.save(); p.save();

1
selfdrive/ui/qt/onroad.h
View File

@@ -168,6 +168,7 @@ class AnnotatedCameraWidget : public CameraWidget {
public: public:
explicit AnnotatedCameraWidget(VisionStreamType type, QWidget* parent = 0); explicit AnnotatedCameraWidget(VisionStreamType type, QWidget* parent = 0);
void updateState(const UIState &s); void updateState(const UIState &s);
void updateLaneEdgeColor(QColor &bgColor);
MapSettingsButton *map_settings_btn; MapSettingsButton *map_settings_btn;
MapSettingsButton *map_settings_btn_bottom; MapSettingsButton *map_settings_btn_bottom;