From dbbb20a0ef89d1378c4faafeed7625550067a10d Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Tue, 12 Sep 2023 12:15:59 -0400 Subject: [PATCH] ui: Rename `mapVisible` to `splitPanelVisible` (#250) --- selfdrive/ui/qt/onroad.cc | 12 ++++++------ selfdrive/ui/qt/onroad.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 9dd7401ebd37a5..4191bff88c3bcb 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -477,7 +477,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) { car_state.getCruiseState().getAvailable(); gacTr = s.scene.gac_tr; - mapVisible = s.scene.map_visible; + splitPanelVisible = s.scene.map_visible; // ############################## DEV UI START ############################## lead_d_rel = radar_state.getLeadOne().getDRel(); @@ -794,7 +794,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { if (!reversing) { // ####### 1 ROW ####### QRect bar_rect1(rect().left(), rect().bottom() - 60, rect().width(), 61); - if (devUiEnabled && !mapVisible && devUiInfo == 1) { + if (devUiEnabled && !splitPanelVisible && devUiInfo == 1) { p.setPen(Qt::NoPen); p.setBrush(QColor(0, 0, 0, 100)); p.drawRect(bar_rect1); @@ -808,7 +808,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { } int rn_btn = 0; - rn_btn = devUiEnabled && !mapVisible && devUiInfo == 1 ? 30 : 0; + rn_btn = devUiEnabled && !splitPanelVisible && devUiInfo == 1 ? 30 : 0; uiState()->scene.rn_offset = rn_btn; if (gac) { @@ -816,7 +816,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { } // Stand Still Timer - if (standStillTimer && standStill && !mapVisible) { + if (standStillTimer && standStill && !splitPanelVisible) { drawStandstillTimer(p, rect().right() - 650, 30 + 160 + 250); } @@ -1849,10 +1849,10 @@ void AnnotatedCameraWidget::paintEvent(QPaintEvent *event) { blinker_frame++; int state = blinkerPulse(blinker_frame); if (left_blinker) { - drawLeftTurnSignal(painter, rect().center().x() - 300, mapVisible ? 210 : 90, state); + drawLeftTurnSignal(painter, rect().center().x() - 300, splitPanelVisible ? 210 : 90, state); } if (right_blinker) { - drawRightTurnSignal(painter, rect().center().x() + 180, mapVisible ? 210 : 90, state); + drawRightTurnSignal(painter, rect().center().x() + 180, splitPanelVisible ? 210 : 90, state); } } else { blinker_frame = 0; diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h index 8bfca2c062b76a..b06b72ada33db8 100644 --- a/selfdrive/ui/qt/onroad.h +++ b/selfdrive/ui/qt/onroad.h @@ -175,7 +175,7 @@ class AnnotatedCameraWidget : public CameraWidget { bool gac; int gacTr; - bool mapVisible; + bool splitPanelVisible; // ############################## DEV UI START ############################## bool lead_status;