Training guide updates (#24033)

* add new images

* update boxes

* copy updates and fix checkmark spacing

* update wide images and boxes

* tune path and smaller triangle

* tune bounding boxes

* clean up

* same triangle as c3

* revert panda

* optimize images

* Revert "revert panda"

This reverts commit f66aac85a0.

* add comment

* add new step18

* final fixes

* pixel perfect
old-commit-hash: 405ecbced3
taco
Shane Smiskol 3 years ago committed by GitHub
parent 0c9aa1570b
commit d2f8c085c0
  1. 3
      selfdrive/assets/compress-images.sh
  2. 4
      selfdrive/assets/training/step0.png
  3. 4
      selfdrive/assets/training/step1.png
  4. 4
      selfdrive/assets/training/step10.png
  5. 4
      selfdrive/assets/training/step11.png
  6. 4
      selfdrive/assets/training/step12.png
  7. 4
      selfdrive/assets/training/step13.png
  8. 4
      selfdrive/assets/training/step14.png
  9. 4
      selfdrive/assets/training/step15.png
  10. 4
      selfdrive/assets/training/step16.png
  11. 4
      selfdrive/assets/training/step17.png
  12. 4
      selfdrive/assets/training/step18.png
  13. 4
      selfdrive/assets/training/step2.png
  14. 4
      selfdrive/assets/training/step3.png
  15. 4
      selfdrive/assets/training/step4.png
  16. 4
      selfdrive/assets/training/step5.png
  17. 4
      selfdrive/assets/training/step6.png
  18. 4
      selfdrive/assets/training/step7.png
  19. 4
      selfdrive/assets/training/step8.png
  20. 4
      selfdrive/assets/training/step9.png
  21. 4
      selfdrive/assets/training_wide/step0.png
  22. 4
      selfdrive/assets/training_wide/step1.png
  23. 4
      selfdrive/assets/training_wide/step10.png
  24. 4
      selfdrive/assets/training_wide/step11.png
  25. 4
      selfdrive/assets/training_wide/step12.png
  26. 4
      selfdrive/assets/training_wide/step13.png
  27. 4
      selfdrive/assets/training_wide/step14.png
  28. 4
      selfdrive/assets/training_wide/step15.png
  29. 4
      selfdrive/assets/training_wide/step16.png
  30. 4
      selfdrive/assets/training_wide/step17.png
  31. 4
      selfdrive/assets/training_wide/step18.png
  32. 4
      selfdrive/assets/training_wide/step2.png
  33. 4
      selfdrive/assets/training_wide/step3.png
  34. 4
      selfdrive/assets/training_wide/step4.png
  35. 4
      selfdrive/assets/training_wide/step5.png
  36. 4
      selfdrive/assets/training_wide/step6.png
  37. 4
      selfdrive/assets/training_wide/step7.png
  38. 4
      selfdrive/assets/training_wide/step8.png
  39. 4
      selfdrive/assets/training_wide/step9.png
  40. 2
      selfdrive/ui/qt/offroad/onboarding.cc
  41. 56
      selfdrive/ui/qt/offroad/onboarding.h

@ -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/*

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:303ea66d930983468a55000e5a704e19ae9e0ce991d795fbae78ebb505d448ea
size 1619109
oid sha256:4ba69dd2458bb67f30189dc41f6ebb1d77079cf18efc14ab65a7d7329c046832
size 1508871

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7cdd7f50f3bfbc59e21fbb47f73f788870d0f6e23f534b3ea48cd24b4d2cf0a
size 47621
oid sha256:8d5f69386d33431e5ae620cb627eb4b4547103875f40fc4fb58b7f42fde8dc1f
size 40667

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b889dd001fe04003606ef9c0cd16ad56fd7062b1885288204d2e1360adbbc46
size 704674
oid sha256:d6cf7bf4aeb2be0b31a3231c5ed87d5d0f8cf4c46f2e804db69b0bc298d6d009
size 936463

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e395cdf4d84e6d68ffe1df24f3a2ea1fd0529c71d4ab7a3f3bb5983f1d3a872
size 50736
oid sha256:818fdf1be7eea3e2285ba0b3a02b2b4d702d6a16f993ecb03c4453fefe883365
size 43526

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81905c334375199d61b7a1c8498b5bb9d4619c22acfe57c00e634a3323d784f6
size 761111
oid sha256:e940f78e3936d4092db698307526923c4b777d64f656ec909fea4d02ac43c09a
size 969324

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8cc8a2496cfdcbdf3806499dc99058106f72a511a5428ebb808653be175651d
size 33754
oid sha256:6a8f8c4ed9215a4049db3e5bd4a0d24bf8ccf600a56fb65da1b0c4e7b36997be
size 30053

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7bb21e03badacd4a7942c47a90428a99fd01199c2f2ebbea0ceb91313917f8ba
size 1169756
oid sha256:475a2719361e97ef6383520ca19da2c14322c1193ae1a2658965f209ff112901
size 1606262

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a99026e3f00db962351b4923776566729ee97068c10d656c82f035d069e797a
size 724928
oid sha256:5d8de06629394396cb71e4b6c89b35e32f85c5f2fe006facfeeef6375cc0e295
size 940727

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9b0f046461381618d7b57f36f89b65ce35a366601fb89fd9d3b0f8528ec9a63
size 33214
oid sha256:7ecdc63da690af369c924d2c8c53916acaeab63d5ec0590e3954d0b5724c430b
size 29904

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f8f5b0736866f6f2a8fde41c3bce683cca17bafb823dc466d76adf9df25fd66
size 40950
oid sha256:cc430ace2b8880735738b27d1983f1a2670304a75843b1a37228c36388c72528
size 36726

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba56bcc00af21885c5dd32973d789cbe4ac58dce5eeb3bd7356b7554d8f60ab0
size 1969282
oid sha256:b177a701308e2a353d5d16ab3baf5d4ad79d6c23f08dd9d8652ee741af513952
size 1485057

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60c4e5a762281f127732532ccac9adec5abb4a559501f698173d32ee7d30be7b
size 34111
oid sha256:270ea961f50b66d8ab659df9b3d2f59ef2f4b3267c6c76ea00c8ec9c1f15be48
size 30417

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2f9667baf17139aaabf505752d9ffd233600f36efe9753c8c1ad1094f052182
size 737151
oid sha256:8c1c347c4d464b5498386a127b00aab623dffa2bcdf430307e97b7288b991d4e
size 812312

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cbe4a01bbe9d56703db36fefbc0768f79814ad95bf36ce27e2e74eacb5e4167
size 914915
oid sha256:f6e6dbdd66ca6c67a75683dd8512be737d2fb73f14eec4caa38a6d13e2654e57
size 1085837

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b074c39500ea2bdcef5e0f9390e1c8be3956560eba5845776f7d259041057d2
size 39582
oid sha256:9abefa4e4e47b44187918048cc904f41a8cb934de776c16a7e623ca3d05b6661
size 33897

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cbc10374d9cffba4add486324cf4567bb59a5811ecf99f86d0110729b1943e1
size 1055184
oid sha256:33301fa4a27e2a8d724ce3579fbf07c7c908a218518a6fb374f09c3f10433344
size 1102561

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a7f3cb981a8ec9d86f554d658443f375776a2b5b331c5a7ee0e392a27d84c586
size 735469
oid sha256:54fded1cc49351f4e33458cc6f2bac0fc6995524eb52886a87f9fa7c7b38ce13
size 837613

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1574491ee81245a22f8c5344b49c332c570e23e9519cadd58269037cb5df60fb
size 626523
oid sha256:b577e0531165155b86179443025aeea3477649e82ff6076811b17634b0e5515e
size 723606

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b3ffb07f2118875adc5d320d527c75867d68e7792e4a6411a31fc63832f6dd4
size 840990
oid sha256:ae4acbde22c45acd8b7ea6e709a8dc4cb3cf12ee330073051d8c106e71bdfadf
size 891677

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9206bb4e3c528da2189f08194f52950ffdccde809ebed838c45e59dd070ab54
size 1831867
oid sha256:5da731d3b43d7203eda3828c72328e5164f3c5dc14881cee20b474f8a445790c
size 1605451

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8c2cb45f107bf793c0ee7f3e3f2e272d09d955151be4a49c220e80f52174f5e
size 48846
oid sha256:522d7c48937b5551313884051e1018f20d2fca86db31b587222867e86254f08a
size 51774

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:398a99cabef868cfe4195e2606e517999d4558222cf80f6ff8cd3d74117ff979
size 918857
oid sha256:fa3ab22eb5e4f1564f37df24a14b12c34b965cc8539b2df0fb6ae6d5c4ebc857
size 1034167

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aae2aba1c6e617cca0d393cbd6d29134b6de7c211415791d840093286593b9b7
size 52148
oid sha256:bad2dffbc75b502a713ceb718dceb5f3a5a2e34fcffc438ee8acfc6580bbc94f
size 53375

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c8dddd191f854dabbc3193973b0353e6b5dbd1377fa57d4069ff23a9f05f4e0
size 810584
oid sha256:aff8f1b35a29e7353a58ca6349ebe1c0faff162596a134fdd74b126b8c1cdd28
size 1092478

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49e42831ca4d403f08f607f5df9b53dbb073a1dcda7ac8695a66b9c950dc629c
size 34857
oid sha256:d18847d47d963f2536a748ddfde1df4ef3d1dc2638af94974cd6af1539d9c18b
size 37382

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f1b7e23a4e3c50178a865c540ca18b38a748a07c5d8ff659ce75f205a8295f4
size 1676468
oid sha256:be7402c00ea0e67b60394a5858976237af61cccec7068bee0c8ec6aae1385af4
size 1879281

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1236bd00a86dbfa46566ab5ec81b791bcc42256e0b28d7d5870e84bd34c61ed9
size 971539
oid sha256:8c7c981f2601607381a341da47bd044d24a8e301c91c5b7426cbce9570f5bad0
size 1104967

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad47cac4554a82c373f28fc860c1c791742986df54b76c29a57f0e73ddb1832d
size 34410
oid sha256:12780d35798dfab1353bf428927e1c04ca88394675a63c134a0bbbd137201715
size 35997

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d940357c66adaabeb9aced38ac1314be3f3fdb6e13ebe22446c912b757cbc903
size 42178
oid sha256:cfb184957120901b5b803571fa14bd9e7ae98da0b46425e3b75b00a8a69e1246
size 43545

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74565cd799bbc57a06a3288cc04e4af2ff64d254fe9ac6b5ff40fcd7121e0ec4
size 2219788
oid sha256:a29dd3ee7abc5d338db395576e7765ba3d4d56568820f8dfbbe938c62fbee6de
size 1646908

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b291b33beb4a9b9d26ad3b5946dfe49d3ae6f21922151a16026c127a54525b7
size 35149
oid sha256:bdfa7fc67a0d89f5503bb30f1822fa72cbd140c84e14170957531c5166159519
size 36869

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a555f233a71c166df817370af6f8158806b11418bce8ec68ab49f5398eae3166
size 840844
oid sha256:c476251bb58200d008fc0aa172173983d9fb0b71ab860f199d9d431910bf5c61
size 966466

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3bc69b3ed41ca2cd9ab50d52fa041fe310419fd8cffd9e055d8422ef483e1ed
size 1100072
oid sha256:95da2bda3ba1c046620a88b2caf77fd9a2b980b6b746e700d3574f4f1c0d6ce9
size 1287393

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8fe7b67f287f796afb429449501398d1814d9c20806f5fff7cdcfb0eb14a66da
size 40850
oid sha256:886903bfaf0567939125daa0bc7fcaecd08c9f34f4e7c8b137a30986f80e4a6e
size 41823

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10b278e8ad49d9e5acfbac7c56ce728f8578d3df88b295385f7ccd4a8d2b5220
size 1069830
oid sha256:c8dc0b499b0c9dbf7e5e967ea2d55c7ed78f8e56f9055d98662f247de960eda4
size 1231263

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45eab257af3b206914f2f45ff5ca07f326a697c55b0e74a5172948a1afda6152
size 812786
oid sha256:690be96b7a3cacaeb8d11bbab043a3e6dd65710ce197a8c7d35a3124dce590d1
size 936779

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34be7cad438df7dec26e3210f7d09da0ee4295a99956e3c79993f4a51257d1a6
size 755578
oid sha256:89d27d040a04508f755741929158545f4d2780c728021bf02446eb0a2e38aaa6
size 874812

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a3e1249f4dcf9b345b4b9a9e078efc78f506210581b69e9bbb380d6f98d7bf7
size 872514
oid sha256:e48538287fc974e5ec97403ba05145c21035f50bdf28b6e00275a4b428643f09
size 1024935

@ -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;

@ -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<QRect> 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<QRect> 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;

Loading…
Cancel
Save