Revert "ui/driverview: inherit from CameraWidget" (#29718)

Revert "ui/driverview: inherit from CameraWidget (#29661)"

This reverts commit 6c73a924fa.

selfdrive/ui/qt/offroad/driverview.cc

@@ -3,33 +3,62 @@
 #include <algorithm>
 #include <QPainter>
 
+#include "selfdrive/ui/qt/qt_window.h"
 #include "selfdrive/ui/qt/util.h"
 
 const int FACE_IMG_SIZE = 130;
 
-DriverViewWindow::DriverViewWindow(QWidget* parent) : CameraWidget("camerad", VISION_STREAM_DRIVER, true, parent) {
+DriverViewWindow::DriverViewWindow(QWidget* parent) : QWidget(parent) {
+  setAttribute(Qt::WA_OpaquePaintEvent);
+  layout = new QStackedLayout(this);
+  layout->setStackingMode(QStackedLayout::StackAll);
+
+  cameraView = new CameraWidget("camerad", VISION_STREAM_DRIVER, true, this);
+  layout->addWidget(cameraView);
+
+  scene = new DriverViewScene(this);
+  connect(cameraView, &CameraWidget::vipcThreadFrameReceived, scene, &DriverViewScene::frameUpdated);
+  layout->addWidget(scene);
+  layout->setCurrentWidget(scene);
+
+  QObject::connect(device(), &Device::interactiveTimeout, this, &DriverViewWindow::closeView);
+}
+
+void DriverViewWindow::closeView() {
+  if (isVisible()) {
+    cameraView->stopVipcThread();
+    emit done();
+  }
+}
+
+void DriverViewWindow::mouseReleaseEvent(QMouseEvent* e) {
+  closeView();
+}
+
+DriverViewScene::DriverViewScene(QWidget* parent) : QWidget(parent) {
   face_img = loadPixmap("../assets/img_driver_face_static.png", {FACE_IMG_SIZE, FACE_IMG_SIZE});
-  QObject::connect(device(), &Device::interactiveTimeout, this, &DriverViewWindow::done);
-  QObject::connect(this, &CameraWidget::clicked, this, &DriverViewWindow::done);
 }
 
-void DriverViewWindow::showEvent(QShowEvent* event) {
+void DriverViewScene::showEvent(QShowEvent* event) {
+  frame_updated = false;
   params.putBool("IsDriverViewEnabled", true);
   device()->resetInteractiveTimeout(60);
-  CameraWidget::showEvent(event);
 }
 
-void DriverViewWindow::hideEvent(QHideEvent* event) {
+void DriverViewScene::hideEvent(QHideEvent* event) {
   params.putBool("IsDriverViewEnabled", false);
-  stopVipcThread();
 }
 
-void DriverViewWindow::paintGL() {
+void DriverViewScene::frameUpdated() {
-  CameraWidget::paintGL();
+  frame_updated = true;
+  update();
+}
 
+void DriverViewScene::paintEvent(QPaintEvent* event) {
   QPainter p(this);
+
   // startup msg
-  if (frames.empty()) {
+  if (!frame_updated) {
     p.setPen(Qt::white);
     p.setRenderHint(QPainter::TextAntialiasing);
     p.setFont(InterFont(100, QFont::Bold));
@@ -41,7 +70,7 @@ void DriverViewWindow::paintGL() {
   cereal::DriverStateV2::Reader driver_state = sm["driverStateV2"].getDriverStateV2();
   cereal::DriverStateV2::DriverData::Reader driver_data;
 
-  bool is_rhd = driver_state.getWheelOnRightProb() > 0.5;
+  is_rhd = driver_state.getWheelOnRightProb() > 0.5;
   driver_data = is_rhd ? driver_state.getRightDriverData() : driver_state.getLeftDriverData();
 
   bool face_detected = driver_data.getFaceProb() > 0.7;

selfdrive/ui/qt/offroad/driverview.h

@@ -1,21 +1,44 @@
 #pragma once
 
+#include <QStackedLayout>
+
 #include "selfdrive/ui/qt/widgets/cameraview.h"
 
-class DriverViewWindow : public CameraWidget {
+class DriverViewScene : public QWidget {
   Q_OBJECT
 
 public:
-  explicit DriverViewWindow(QWidget *parent);
+  explicit DriverViewScene(QWidget *parent);
 
-signals:
+public slots:
-  void done();
+  void frameUpdated();
 
 protected:
   void showEvent(QShowEvent *event) override;
   void hideEvent(QHideEvent *event) override;
-  void paintGL() override;
+  void paintEvent(QPaintEvent *event) override;
 
+private:
   Params params;
   QPixmap face_img;
+  bool is_rhd = false;
+  bool frame_updated = false;
+};
+
+class DriverViewWindow : public QWidget {
+  Q_OBJECT
+
+public:
+  explicit DriverViewWindow(QWidget *parent);
+
+signals:
+  void done();
+
+protected:
+  void mouseReleaseEvent(QMouseEvent* e) override;
+  void closeView();
+
+  CameraWidget *cameraView;
+  DriverViewScene *scene;
+  QStackedLayout *layout;
 };

selfdrive/ui/translations/main_de.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>Kamera startet</translation>

selfdrive/ui/translations/main_fr.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>démarrage de la caméra</translation>

selfdrive/ui/translations/main_ja.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>ｶﾒﾗを起動しています</translation>

selfdrive/ui/translations/main_ko.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>카메라 시작중</translation>

selfdrive/ui/translations/main_pt-BR.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>câmera iniciando</translation>

selfdrive/ui/translations/main_th.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>กำลังเปิดกล้อง</translation>

selfdrive/ui/translations/main_tr.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>kamera başlatılıyor</translation>

selfdrive/ui/translations/main_zh-CHS.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>正在启动相机</translation>

selfdrive/ui/translations/main_zh-CHT.ts

@@ -302,7 +302,7 @@
     </message>
 </context>
 <context>
-    <name>DriverViewWindow</name>
+    <name>DriverViewScene</name>
     <message>
         <source>camera starting</source>
         <translation>開啟相機中</translation>