wip

selfdrive/ui/qt/onroad.h

@@ -38,53 +38,6 @@ private:
   UIScene &scene;
 };
 
-class DistanceButton : public QPushButton {
-public:
-  explicit DistanceButton(QWidget *parent = nullptr);
-
-  void buttonPressed();
-  void buttonReleased();
-  void updateState();
-
-protected:
-  void paintEvent(QPaintEvent *event) override;
-
-private:
-  Params paramsMemory{"/dev/shm/params"};
-
-  UIScene &scene;
-
-  bool trafficModeActive;
-
-  // int personality;
-
-  QElapsedTimer transitionTimer;
-
-  QVector<std::pair<QPixmap, QString>> profile_data;
-  QVector<std::pair<QPixmap, QString>> profile_data_kaofui;
-};
-
-
-class PedalIcons : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit PedalIcons(QWidget *parent = 0);
-  void updateState();
-
-private:
-  void paintEvent(QPaintEvent *event) override;
-
-  QPixmap brake_pedal_img;
-  QPixmap gas_pedal_img;
-
-  UIScene &scene;
-
-  bool accelerating;
-  bool decelerating;
-
-  float acceleration;
-};
 
 // container window for the NVG UI
 class AnnotatedCameraWidget : public CameraWidget {
@@ -97,7 +50,7 @@ public:
 
 private:
   void drawText(QPainter &p, int x, int y, const QString &text, int alpha = 255);
-  void drawSpeedWidget(QPainter &p, int x, int y, const QString &title, const QString &speedLimitStr, QColor colorSpeed);
+  void drawSpeedWidget(QPainter &p, int x, int y, const QString &title, const QString &speedLimitStr, QColor colorSpeed, int width = 172);
 
   QVBoxLayout *main_layout;
   QPixmap dm_img;
@@ -135,8 +88,6 @@ private:
   Params paramsMemory{"/dev/shm/params"};
   UIScene &scene;
 
-  DistanceButton *distance_btn;
-  PedalIcons *pedal_icons;
   ScreenRecorder *recorder_btn;
 
   QHBoxLayout *bottom_layout;
@@ -146,7 +97,6 @@ private:
   bool blindSpotRight;
   bool experimentalMode;
   bool leadInfo;
-  bool onroadDistanceButton;
   bool roadNameUI;
   bool showAlwaysOnLateralStatusBar;
   bool showConditionalExperimentalStatusBar;