ui: Feature Status cleanup (#270)

This commit is contained in:
Jason Wen
2023-09-14 13:54:33 -04:00
committed by GitHub
parent e8a6afa656
commit 020cd7b1f8
2 changed files with 9 additions and 4 deletions
+5 -2
View File
@@ -605,6 +605,9 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
curveSign = lp.getTurnSign();
}
longitudinalPersonality = s.scene.longitudinal_personality;
dynamicLaneProfile = s.scene.dynamic_lane_profile;
static int reverse_delay = 0;
bool reverse_allowed = false;
if (int(car_state.getGearShifter()) != 4) {
@@ -1465,11 +1468,11 @@ void AnnotatedCameraWidget::drawFeatureStatusText(QPainter &p, int x, int y) {
p.setFont(InterFont(32, QFont::Bold));
p.setPen(whiteColor());
status_text.sprintf("GAC: %s\n", QString::number(uiState()->scene.longitudinal_personality).toStdString().c_str());
status_text.sprintf("GAP: %s\n", QString::number(longitudinalPersonality).toStdString().c_str());
p.drawText(x, y, status_text);
y += text_height;
status_text.sprintf("DLP: %s\n", QString::number(uiState()->scene.dynamic_lane_profile).toStdString().c_str());
status_text.sprintf("DLP: %s\n", QString::number(dynamicLaneProfile).toStdString().c_str());
p.drawText(x, y, status_text);
y += text_height;
+4 -2
View File
@@ -213,6 +213,10 @@ private:
int blinker_frame;
int blinker_state = 0;
cereal::LongitudinalPlan::SpeedLimitControlState slcState;
int longitudinalPersonality;
int dynamicLaneProfile;
protected:
void paintGL() override;
void initializeGL() override;
@@ -231,8 +235,6 @@ protected:
FirstOrderFilter fps_filter;
void rocketFuel(QPainter &p);
cereal::LongitudinalPlan::SpeedLimitControlState slcState;
// neokii
#ifdef ENABLE_DASHCAM
private: