From 4fd0fe80f0336fdcecee442e7e1d573b088eb3a3 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Wed, 3 Mar 2021 18:38:41 +0800
Subject: [PATCH] UI: rename frontview to driver_view (#20228)

old-commit-hash: 8db3eea6c5e25516445bb8345fe13f0a2b7e6348
---
 selfdrive/ui/android/ui.cc |  4 ++--
 selfdrive/ui/paint.cc      |  4 ++--
 selfdrive/ui/qt/home.cc    |  2 +-
 selfdrive/ui/ui.cc         | 10 +++++-----
 selfdrive/ui/ui.hpp        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/selfdrive/ui/android/ui.cc b/selfdrive/ui/android/ui.cc
index e954efd441..c2fc74a358 100644
--- a/selfdrive/ui/android/ui.cc
+++ b/selfdrive/ui/android/ui.cc
@@ -64,7 +64,7 @@ static void handle_display_state(UIState *s, bool user_input) {
 static void handle_vision_touch(UIState *s, int touch_x, int touch_y) {
   if (s->started && (touch_x >= s->viz_rect.x - bdr_s)
       && (s->active_app != cereal::UiLayoutState::App::SETTINGS)) {
-    if (!s->scene.frontview) {
+    if (!s->scene.driver_view) {
       s->sidebar_collapsed = !s->sidebar_collapsed;
     } else {
       Params().write_db_value("IsDriverViewEnabled", "0", 1);
@@ -172,7 +172,7 @@ int main(int argc, char* argv[]) {
 
     ui_draw(s);
     double u2 = millis_since_boot();
-    if (!s->scene.frontview && (u2-u1 > 66)) {
+    if (!s->scene.driver_view && (u2-u1 > 66)) {
       // warn on sub 15fps
       LOGW("slow frame(%llu) time: %.2f", (s->sm)->frame, u2-u1);
     }
diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc
index 74cd688160..a23fd444ef 100644
--- a/selfdrive/ui/paint.cc
+++ b/selfdrive/ui/paint.cc
@@ -140,7 +140,7 @@ static void ui_draw_line(UIState *s, const line_vertices_data &vd, NVGcolor *col
 
 static void draw_frame(UIState *s) {
   mat4 *out_mat;
-  if (s->scene.frontview) {
+  if (s->scene.driver_view) {
     glBindVertexArray(s->frame_vao[1]);
     out_mat = &s->front_frame_mat;
   } else {
@@ -377,7 +377,7 @@ static void ui_draw_vision_frame(UIState *s) {
 
 static void ui_draw_vision(UIState *s) {
   const UIScene *scene = &s->scene;
-  if (!scene->frontview) {
+  if (!scene->driver_view) {
     // Draw augmented elements
     if (scene->world_objects_visible) {
       ui_draw_world(s);
diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc
index b755a69666..c44b5a5aab 100644
--- a/selfdrive/ui/qt/home.cc
+++ b/selfdrive/ui/qt/home.cc
@@ -160,7 +160,7 @@ void HomeWindow::setVisibility(bool offroad) {
 
 void HomeWindow::mousePressEvent(QMouseEvent* e) {
   UIState* ui_state = &glWindow->ui_state;
-  if (GLWindow::ui_state.started && GLWindow::ui_state.scene.frontview) {
+  if (GLWindow::ui_state.started && GLWindow::ui_state.scene.driver_view) {
     Params().write_db_value("IsDriverViewEnabled", "0", 1);
     return;
   }
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
index b60146dff0..6c262f3dc6 100644
--- a/selfdrive/ui/ui.cc
+++ b/selfdrive/ui/ui.cc
@@ -188,11 +188,11 @@ static void update_sockets(UIState *s) {
   }
   if (sm.updated("driverMonitoringState")) {
     scene.dmonitoring_state = sm["driverMonitoringState"].getDriverMonitoringState();
-    if(!scene.frontview && !s->ignition) {
-      read_param(&scene.frontview, "IsDriverViewEnabled");
+    if(!scene.driver_view && !s->ignition) {
+      read_param(&scene.driver_view, "IsDriverViewEnabled");
     }
   } else if ((sm.frame - sm.rcv_frame("driverMonitoringState")) > UI_FREQ/2) {
-    scene.frontview = false;
+    scene.driver_view = false;
   }
   if (sm.updated("sensorEvents")) {
     for (auto sensor : sm["sensorEvents"].getSensorEvents()) {
@@ -205,7 +205,7 @@ static void update_sockets(UIState *s) {
       }
     }
   }
-  s->started = scene.deviceState.getStarted() || scene.frontview;
+  s->started = scene.deviceState.getStarted() || scene.driver_view;
 }
 
 static void update_alert(UIState *s) {
@@ -305,7 +305,7 @@ static void update_status(UIState *s) {
       s->active_app = cereal::UiLayoutState::App::NONE;
       s->sidebar_collapsed = true;
       s->scene.alert_size = cereal::ControlsState::AlertSize::NONE;
-      s->vipc_client = s->scene.frontview ? s->vipc_client_front : s->vipc_client_rear;
+      s->vipc_client = s->scene.driver_view ? s->vipc_client_front : s->vipc_client_rear;
     } else {
       s->status = STATUS_OFFROAD;
       s->active_app = cereal::UiLayoutState::App::HOME;
diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.hpp
index 0050b55b27..935d2758a0 100644
--- a/selfdrive/ui/ui.hpp
+++ b/selfdrive/ui/ui.hpp
@@ -100,7 +100,7 @@ typedef struct UIScene {
   bool world_objects_visible;
 
   bool is_rhd;
-  bool frontview;
+  bool driver_view;
 
   std::string alert_text1;
   std::string alert_text2;