rename to dialog

Author: deanlee

selfdrive/ui/layouts/settings/device.py

@@ -1,6 +1,6 @@
 from openpilot.system.ui.lib.application import Widget
 from openpilot.system.ui.lib.list_view import ListView, text_item, button_item
-from openpilot.selfdrive.ui.onroad.driver_camera_view import DriverCameraView
+from openpilot.selfdrive.ui.onroad.driver_camera_dialog import DriverCameraDialog
 from openpilot.common.params import Params
 from openpilot.system.hardware import TICI
 from openpilot.system.ui.lib.application import gui_app
@@ -40,14 +40,14 @@ def __init__(self):
     items.append(button_item("Change Language", "CHANGE", callback=self._on_change_language))
 
     self._list_widget = ListView(items)
-    self._driver_camera = DriverCameraView()
+    self._driver_camera: DriverCameraDialog | None = None
 
   def _render(self, rect):
     self._list_widget.render(rect)
 
   def _on_driver_camera(self):
     if not self._driver_camera:
-      self._driver_camera = DriverCameraView()
+      self._driver_camera = DriverCameraDialog()
 
     gui_app.set_modal_overlay(self._driver_camera, callback=lambda result: setattr(self, '_driver_camera', None))
 

selfdrive/ui/onroad/driver_camera_view.py renamed to selfdrive/ui/onroad/driver_camera_dialog.py

@@ -8,7 +8,7 @@
 from openpilot.system.ui.lib.label import gui_label
 
 
-class DriverCameraView(CameraView):
+class DriverCameraDialog(CameraView):
   def __init__(self):
     super().__init__("camerad", VisionStreamType.VISION_STREAM_DRIVER)
     self.driver_state_renderer = DriverStateRenderer()
@@ -30,7 +30,7 @@ def _render(self, rect):
       return -1
 
     self._draw_face_detection(rect)
-    self.driver_state_renderer.draw(rect)
+    self.driver_state_renderer.render(rect)
 
     return -1
 
@@ -89,7 +89,7 @@ def _calc_frame_matrix(self, rect: rl.Rectangle) -> np.ndarray:
 if __name__ == "__main__":
   gui_app.init_window("Driver Camera View")
 
-  driver_camera_view = DriverCameraView()
+  driver_camera_view = DriverCameraDialog()
   try:
     for _ in gui_app.render():
       ui_state.update()