diff --git a/selfdrive/assets/compress-images.sh b/selfdrive/assets/compress-images.sh index 607b27c2a..8601b2d61 100755 --- a/selfdrive/assets/compress-images.sh +++ b/selfdrive/assets/compress-images.sh @@ -2,3 +2,6 @@ echo "compressing training guide images" optipng -o7 -strip all training/* training_wide/* + +# This can sometimes provide smaller images +# mogrify -quality 100 -format jpg training_wide/* training/* diff --git a/selfdrive/assets/training/step0.png b/selfdrive/assets/training/step0.png index 8ea90610d..b942703b5 100644 Binary files a/selfdrive/assets/training/step0.png and b/selfdrive/assets/training/step0.png differ diff --git a/selfdrive/assets/training/step1.png b/selfdrive/assets/training/step1.png index 22a629bea..e2c9f9f60 100644 Binary files a/selfdrive/assets/training/step1.png and b/selfdrive/assets/training/step1.png differ diff --git a/selfdrive/assets/training/step10.png b/selfdrive/assets/training/step10.png index 96390aa32..c5ed8fd62 100644 Binary files a/selfdrive/assets/training/step10.png and b/selfdrive/assets/training/step10.png differ diff --git a/selfdrive/assets/training/step11.png b/selfdrive/assets/training/step11.png index 94342a4b5..477659392 100644 Binary files a/selfdrive/assets/training/step11.png and b/selfdrive/assets/training/step11.png differ diff --git a/selfdrive/assets/training/step12.png b/selfdrive/assets/training/step12.png index 8b2b01af2..497170c97 100644 Binary files a/selfdrive/assets/training/step12.png and b/selfdrive/assets/training/step12.png differ diff --git a/selfdrive/assets/training/step13.png b/selfdrive/assets/training/step13.png index 6593b93d7..228d7549d 100644 Binary files a/selfdrive/assets/training/step13.png and b/selfdrive/assets/training/step13.png differ diff --git a/selfdrive/assets/training/step14.png b/selfdrive/assets/training/step14.png index 1cb8fb992..7f8da0552 100644 Binary files a/selfdrive/assets/training/step14.png and b/selfdrive/assets/training/step14.png differ diff --git a/selfdrive/assets/training/step15.png b/selfdrive/assets/training/step15.png index b4c0841b7..9aa861c9f 100644 Binary files a/selfdrive/assets/training/step15.png and b/selfdrive/assets/training/step15.png differ diff --git a/selfdrive/assets/training/step16.png b/selfdrive/assets/training/step16.png index d8518b10b..e0b36b033 100644 Binary files a/selfdrive/assets/training/step16.png and b/selfdrive/assets/training/step16.png differ diff --git a/selfdrive/assets/training/step17.png b/selfdrive/assets/training/step17.png index a9ab91269..c6b33c237 100644 Binary files a/selfdrive/assets/training/step17.png and b/selfdrive/assets/training/step17.png differ diff --git a/selfdrive/assets/training/step18.png b/selfdrive/assets/training/step18.png index a5d8833a3..bd062d4cc 100644 Binary files a/selfdrive/assets/training/step18.png and b/selfdrive/assets/training/step18.png differ diff --git a/selfdrive/assets/training/step2.png b/selfdrive/assets/training/step2.png index 03a45f8de..97c2eb0f4 100644 Binary files a/selfdrive/assets/training/step2.png and b/selfdrive/assets/training/step2.png differ diff --git a/selfdrive/assets/training/step3.png b/selfdrive/assets/training/step3.png index 0712678ac..748972231 100644 Binary files a/selfdrive/assets/training/step3.png and b/selfdrive/assets/training/step3.png differ diff --git a/selfdrive/assets/training/step4.png b/selfdrive/assets/training/step4.png index 60a99310f..8139349ff 100644 Binary files a/selfdrive/assets/training/step4.png and b/selfdrive/assets/training/step4.png differ diff --git a/selfdrive/assets/training/step5.png b/selfdrive/assets/training/step5.png index 54aa049dd..714162ae1 100644 Binary files a/selfdrive/assets/training/step5.png and b/selfdrive/assets/training/step5.png differ diff --git a/selfdrive/assets/training/step6.png b/selfdrive/assets/training/step6.png index 80cbb0a55..356d76a3e 100644 Binary files a/selfdrive/assets/training/step6.png and b/selfdrive/assets/training/step6.png differ diff --git a/selfdrive/assets/training/step7.png b/selfdrive/assets/training/step7.png index e5e403df2..ac09faffe 100644 Binary files a/selfdrive/assets/training/step7.png and b/selfdrive/assets/training/step7.png differ diff --git a/selfdrive/assets/training/step8.png b/selfdrive/assets/training/step8.png index d5193ae33..f081ac6e4 100644 Binary files a/selfdrive/assets/training/step8.png and b/selfdrive/assets/training/step8.png differ diff --git a/selfdrive/assets/training/step9.png b/selfdrive/assets/training/step9.png index 10dadc2ae..540dafe78 100644 Binary files a/selfdrive/assets/training/step9.png and b/selfdrive/assets/training/step9.png differ diff --git a/selfdrive/assets/training_wide/step0.png b/selfdrive/assets/training_wide/step0.png index cff6d4f88..3c2c5c72a 100644 Binary files a/selfdrive/assets/training_wide/step0.png and b/selfdrive/assets/training_wide/step0.png differ diff --git a/selfdrive/assets/training_wide/step1.png b/selfdrive/assets/training_wide/step1.png index e81e2ce80..085789311 100644 Binary files a/selfdrive/assets/training_wide/step1.png and b/selfdrive/assets/training_wide/step1.png differ diff --git a/selfdrive/assets/training_wide/step10.png b/selfdrive/assets/training_wide/step10.png index c595f602a..2941316d1 100644 Binary files a/selfdrive/assets/training_wide/step10.png and b/selfdrive/assets/training_wide/step10.png differ diff --git a/selfdrive/assets/training_wide/step11.png b/selfdrive/assets/training_wide/step11.png index 26680b902..7a7c72e3d 100644 Binary files a/selfdrive/assets/training_wide/step11.png and b/selfdrive/assets/training_wide/step11.png differ diff --git a/selfdrive/assets/training_wide/step12.png b/selfdrive/assets/training_wide/step12.png index c93ea6b25..0d6f64eb8 100644 Binary files a/selfdrive/assets/training_wide/step12.png and b/selfdrive/assets/training_wide/step12.png differ diff --git a/selfdrive/assets/training_wide/step13.png b/selfdrive/assets/training_wide/step13.png index 103b6db97..565e02fa3 100644 Binary files a/selfdrive/assets/training_wide/step13.png and b/selfdrive/assets/training_wide/step13.png differ diff --git a/selfdrive/assets/training_wide/step14.png b/selfdrive/assets/training_wide/step14.png index cf4f35b72..225231cba 100644 Binary files a/selfdrive/assets/training_wide/step14.png and b/selfdrive/assets/training_wide/step14.png differ diff --git a/selfdrive/assets/training_wide/step15.png b/selfdrive/assets/training_wide/step15.png index 29999f0ad..929c759b2 100644 Binary files a/selfdrive/assets/training_wide/step15.png and b/selfdrive/assets/training_wide/step15.png differ diff --git a/selfdrive/assets/training_wide/step16.png b/selfdrive/assets/training_wide/step16.png index 601ff4eb0..161af863a 100644 Binary files a/selfdrive/assets/training_wide/step16.png and b/selfdrive/assets/training_wide/step16.png differ diff --git a/selfdrive/assets/training_wide/step17.png b/selfdrive/assets/training_wide/step17.png index d110451af..1b0cdb6fb 100644 Binary files a/selfdrive/assets/training_wide/step17.png and b/selfdrive/assets/training_wide/step17.png differ diff --git a/selfdrive/assets/training_wide/step18.png b/selfdrive/assets/training_wide/step18.png index c1ce4ec1e..0e3b64bab 100644 Binary files a/selfdrive/assets/training_wide/step18.png and b/selfdrive/assets/training_wide/step18.png differ diff --git a/selfdrive/assets/training_wide/step2.png b/selfdrive/assets/training_wide/step2.png index ac03677ef..55814b8ef 100644 Binary files a/selfdrive/assets/training_wide/step2.png and b/selfdrive/assets/training_wide/step2.png differ diff --git a/selfdrive/assets/training_wide/step3.png b/selfdrive/assets/training_wide/step3.png index 70649b82b..831095b0a 100644 Binary files a/selfdrive/assets/training_wide/step3.png and b/selfdrive/assets/training_wide/step3.png differ diff --git a/selfdrive/assets/training_wide/step4.png b/selfdrive/assets/training_wide/step4.png index 3f393ca79..543303493 100644 Binary files a/selfdrive/assets/training_wide/step4.png and b/selfdrive/assets/training_wide/step4.png differ diff --git a/selfdrive/assets/training_wide/step5.png b/selfdrive/assets/training_wide/step5.png index a26ecbf1e..7191b63a0 100644 Binary files a/selfdrive/assets/training_wide/step5.png and b/selfdrive/assets/training_wide/step5.png differ diff --git a/selfdrive/assets/training_wide/step6.png b/selfdrive/assets/training_wide/step6.png index bb1b11602..8eafd4a19 100644 Binary files a/selfdrive/assets/training_wide/step6.png and b/selfdrive/assets/training_wide/step6.png differ diff --git a/selfdrive/assets/training_wide/step7.png b/selfdrive/assets/training_wide/step7.png index 8a3d93081..502f5f1b2 100644 Binary files a/selfdrive/assets/training_wide/step7.png and b/selfdrive/assets/training_wide/step7.png differ diff --git a/selfdrive/assets/training_wide/step8.png b/selfdrive/assets/training_wide/step8.png index c559d6a6c..c4e866833 100644 Binary files a/selfdrive/assets/training_wide/step8.png and b/selfdrive/assets/training_wide/step8.png differ diff --git a/selfdrive/assets/training_wide/step9.png b/selfdrive/assets/training_wide/step9.png index 19b2d483d..84eae3a06 100644 Binary files a/selfdrive/assets/training_wide/step9.png and b/selfdrive/assets/training_wide/step9.png differ diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc index 458464239..8e7601ca8 100644 --- a/selfdrive/ui/qt/offroad/onboarding.cc +++ b/selfdrive/ui/qt/offroad/onboarding.cc @@ -23,7 +23,7 @@ void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { if (boundingRect[currentIndex].contains(e->x(), e->y())) { if (currentIndex == 9) { - const QRect yes = QRect(692, 842, 492, 148); + const QRect yes = QRect(707, 804, 531, 164); Params().putBool("RecordFront", yes.contains(e->x(), e->y())); } currentIndex += 1; diff --git a/selfdrive/ui/qt/offroad/onboarding.h b/selfdrive/ui/qt/offroad/onboarding.h index 9424c07d1..904aec4ad 100644 --- a/selfdrive/ui/qt/offroad/onboarding.h +++ b/selfdrive/ui/qt/offroad/onboarding.h @@ -25,52 +25,52 @@ private: int currentIndex = 0; // Bounding boxes for each training guide step - const QRect continueBtnStandard = {1610, 0, 310, 1080}; + const QRect continueBtnStandard = {1620, 0, 300, 1080}; QVector boundingRectStandard { - QRect(650, 710, 720, 190), + QRect(112, 804, 619, 166), continueBtnStandard, continueBtnStandard, - QRect(1442, 565, 230, 310), - QRect(1515, 562, 133, 60), + QRect(1476, 565, 253, 308), + QRect(1501, 529, 184, 108), continueBtnStandard, - QRect(1580, 630, 215, 130), - QRect(1210, 0, 485, 590), - QRect(1460, 400, 375, 210), - QRect(166, 842, 1019, 148), - QRect(1460, 210, 300, 310), + QRect(1613, 665, 178, 153), + QRect(1220, 0, 420, 730), + QRect(1335, 499, 440, 147), + QRect(112, 820, 996, 148), + QRect(1412, 199, 316, 333), continueBtnStandard, - QRect(1375, 80, 545, 1000), + QRect(1237, 63, 683, 1017), continueBtnStandard, - QRect(1610, 130, 280, 800), - QRect(1385, 485, 400, 270), + QRect(1455, 110, 313, 860), + QRect(1253, 519, 383, 228), continueBtnStandard, continueBtnStandard, - QRect(1036, 769, 718, 189), - QRect(201, 769, 718, 189), + QRect(630, 804, 626, 164), + QRect(108, 804, 426, 164), }; - const QRect continueBtnWide = {1850, 0, 310, 1080}; + const QRect continueBtnWide = {1840, 0, 320, 1080}; QVector boundingRectWide { - QRect(654, 721, 718, 189), + QRect(112, 804, 618, 164), continueBtnWide, continueBtnWide, - QRect(1690, 570, 165, 300), - QRect(1690, 560, 133, 60), + QRect(1641, 558, 210, 313), + QRect(1662, 528, 184, 108), continueBtnWide, - QRect(1820, 630, 180, 155), - QRect(1360, 0, 460, 620), - QRect(1570, 400, 375, 215), - QRect(167, 842, 1018, 148), - QRect(1610, 210, 295, 310), + QRect(1814, 621, 211, 170), + QRect(1350, 0, 497, 755), + QRect(1553, 516, 406, 112), + QRect(112, 804, 1126, 164), + QRect(1598, 199, 316, 333), continueBtnWide, - QRect(1555, 90, 610, 990), + QRect(1364, 90, 796, 990), continueBtnWide, - QRect(1600, 140, 280, 790), - QRect(1385, 490, 750, 270), + QRect(1593, 114, 318, 853), + QRect(1379, 511, 391, 243), continueBtnWide, continueBtnWide, - QRect(1138, 755, 718, 189), - QRect(303, 755, 718, 189), + QRect(630, 804, 626, 164), + QRect(108, 804, 426, 164), }; QString img_path;