training guide fixups (#21485)

* training images

* wide training guide

* fixup some images

* cleanup

* one more

* release files

release/files_tici

@@ -1,5 +1,8 @@
 installer/continue_openpilot.sh
 
+selfdrive/assets/navigation/*
+selfdrive/assets/training_wide/*
+
 selfdrive/camerad/cameras/camera_qcom2.cc
 selfdrive/camerad/cameras/camera_qcom2.h
 selfdrive/camerad/cameras/real_debayer.cl

selfdrive/assets/compress-images.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "compressing training guide images"
+optipng -o7 -strip all training/* training_wide/*

selfdrive/ui/qt/offroad/onboarding.cc

@@ -10,28 +10,23 @@
 #include "selfdrive/ui/qt/widgets/input.h"
 
 void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
-  QPoint touch = QPoint(e->x(), e->y()) - imageCorner;
+  if (boundingRect[currentIndex].contains(e->x(), e->y())) {
-
-  // Check for restart
-  if (currentIndex == (boundingBox.size() - 1) && 200 <= touch.x() && touch.x() <= 920 &&
-      760 <= touch.y() && touch.y() <= 960) {
-    currentIndex = 0;
-  } else if (boundingBox[currentIndex][0] <= touch.x() && touch.x() <= boundingBox[currentIndex][1] &&
-             boundingBox[currentIndex][2] <= touch.y() && touch.y() <= boundingBox[currentIndex][3]) {
     currentIndex += 1;
+  } else if (currentIndex == (boundingRect.size() - 2) && boundingRect.last().contains(e->x(), e->y())) {
+    currentIndex = 0;
   }
 
-  if (currentIndex >= boundingBox.size()) {
+  if (currentIndex >= (boundingRect.size() - 1)) {
     emit completedTraining();
   } else {
-    image.load("../assets/training/step" + QString::number(currentIndex) + ".png");
+    image.load(IMG_PATH + "step" + QString::number(currentIndex) + ".png");
     update();
   }
 }
 
 void TrainingGuide::showEvent(QShowEvent *event) {
   currentIndex = 0;
-  image.load("../assets/training/step0.png");
+  image.load(IMG_PATH + "step0.png");
 }
 
 void TrainingGuide::paintEvent(QPaintEvent *event) {
@@ -44,7 +39,6 @@ void TrainingGuide::paintEvent(QPaintEvent *event) {
   QRect rect(image.rect());
   rect.moveCenter(bg.center());
   painter.drawImage(rect.topLeft(), image);
-  imageCorner = rect.topLeft();
 }
 
 void TermsPage::showEvent(QShowEvent *event) {

selfdrive/ui/qt/offroad/onboarding.h

@@ -7,6 +7,7 @@
 #include <QWidget>
 
 #include "selfdrive/common/params.h"
+#include "selfdrive/ui/qt/qt_window.h"
 
 class TrainingGuide : public QFrame {
   Q_OBJECT
@@ -20,32 +21,58 @@ private:
   void mouseReleaseEvent(QMouseEvent* e) override;
 
   QImage image;
-  QPoint imageCorner;
   int currentIndex = 0;
 
-  // Bounding boxes for the a given training guide step
+  // Bounding boxes for each training guide step
-  // (minx, maxx, miny, maxy)
+  const QRect continueBtnStandard = {1610, 0, 310, 1080};
-  QVector<QVector<int>> boundingBox {
+  QVector<QRect> boundingRectStandard {
-    {650, 1375, 700, 900},
+    QRect(650, 710, 720, 190),
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1240, 1750, 480, 1080},
+    QRect(1470, 515, 235, 565),
-    {1570, 1780, 620, 750},
+    QRect(1580, 630, 215, 130),
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1630, 1740, 620, 780},
+    QRect(1580, 630, 215, 130),
-    {1200, 1920, 0, 1080},
+    QRect(1210, 0, 485, 590),
-    {1455, 1850, 400, 660},
+    QRect(1460, 400, 375, 210),
-    {1460, 1800, 195, 520},
+    QRect(1460, 210, 300, 310),
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1350, 1920, 65, 1080},
+    QRect(1375, 80, 545, 1000),
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1570, 1900, 130, 1000},
+    QRect(1610, 130, 280, 800),
-    {1350, 1770, 500, 700},
+    QRect(1385, 485, 400, 270),
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1600, 1920, 0, 1080},
+    continueBtnStandard,
-    {1000, 1800, 760, 954},
+    QRect(1036, 769, 718, 189),
+    QRect(201, 769, 718, 189),
   };
 
+  const QRect continueBtnWide = {1850, 0, 310, 1080};
+  QVector<QRect> boundingRectWide {
+    QRect(654, 721, 718, 189),
+    continueBtnWide,
+    continueBtnWide,
+    QRect(1589, 530, 345, 555),
+    QRect(1660, 630, 195, 125),
+    continueBtnWide,
+    QRect(1820, 630, 180, 155),
+    QRect(1360, 0, 460, 620),
+    QRect(1570, 400, 375, 215),
+    QRect(1610, 210, 295, 310),
+    continueBtnWide,
+    QRect(1555, 90, 610, 990),
+    continueBtnWide,
+    QRect(1600, 140, 280, 790),
+    QRect(1385, 490, 750, 270),
+    continueBtnWide,
+    continueBtnWide,
+    QRect(1138, 755, 718, 189),
+    QRect(303, 755, 718, 189),
+  };
+
+  const QString IMG_PATH = vwp_w == 2160 ? "../assets/training_wide/" : "../assets/training/";
+  const QVector<QRect> boundingRect = vwp_w == 2160 ? boundingRectWide : boundingRectStandard;
+
 signals:
   void completedTraining();
 };