From 28755745c5c87138a2184a12bd94c474a1382ee8 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 28 Jul 2021 00:07:59 -0700 Subject: [PATCH] add DM opt in to onboarding (#21756) old-commit-hash: cae10844c7a9f9db0a7d4d4fcb86d7fa722b85fd --- selfdrive/assets/training/step10.png | 4 ++-- selfdrive/assets/training/step11.png | 4 ++-- selfdrive/assets/training/step12.png | 4 ++-- selfdrive/assets/training/step13.png | 4 ++-- selfdrive/assets/training/step14.png | 4 ++-- selfdrive/assets/training/step15.png | 4 ++-- selfdrive/assets/training/step16.png | 4 ++-- selfdrive/assets/training/step17.png | 4 ++-- selfdrive/assets/training/step18.png | 3 +++ selfdrive/assets/training/step9.png | 4 ++-- selfdrive/assets/training_wide/step10.png | 4 ++-- selfdrive/assets/training_wide/step11.png | 4 ++-- selfdrive/assets/training_wide/step12.png | 4 ++-- selfdrive/assets/training_wide/step13.png | 4 ++-- selfdrive/assets/training_wide/step14.png | 4 ++-- selfdrive/assets/training_wide/step15.png | 4 ++-- selfdrive/assets/training_wide/step16.png | 4 ++-- selfdrive/assets/training_wide/step17.png | 4 ++-- selfdrive/assets/training_wide/step18.png | 3 +++ selfdrive/assets/training_wide/step9.png | 4 ++-- selfdrive/ui/qt/offroad/onboarding.cc | 5 +++++ selfdrive/ui/qt/offroad/onboarding.h | 2 ++ 22 files changed, 49 insertions(+), 36 deletions(-) create mode 100644 selfdrive/assets/training/step18.png create mode 100644 selfdrive/assets/training_wide/step18.png diff --git a/selfdrive/assets/training/step10.png b/selfdrive/assets/training/step10.png index 1f1a23d80..e27c04ff6 100644 --- a/selfdrive/assets/training/step10.png +++ b/selfdrive/assets/training/step10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e395cdf4d84e6d68ffe1df24f3a2ea1fd0529c71d4ab7a3f3bb5983f1d3a872 -size 50736 +oid sha256:6b889dd001fe04003606ef9c0cd16ad56fd7062b1885288204d2e1360adbbc46 +size 704674 diff --git a/selfdrive/assets/training/step11.png b/selfdrive/assets/training/step11.png index 6777e5c80..1f1a23d80 100644 --- a/selfdrive/assets/training/step11.png +++ b/selfdrive/assets/training/step11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81905c334375199d61b7a1c8498b5bb9d4619c22acfe57c00e634a3323d784f6 -size 761111 +oid sha256:2e395cdf4d84e6d68ffe1df24f3a2ea1fd0529c71d4ab7a3f3bb5983f1d3a872 +size 50736 diff --git a/selfdrive/assets/training/step12.png b/selfdrive/assets/training/step12.png index da16540b9..6777e5c80 100644 --- a/selfdrive/assets/training/step12.png +++ b/selfdrive/assets/training/step12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8cc8a2496cfdcbdf3806499dc99058106f72a511a5428ebb808653be175651d -size 33754 +oid sha256:81905c334375199d61b7a1c8498b5bb9d4619c22acfe57c00e634a3323d784f6 +size 761111 diff --git a/selfdrive/assets/training/step13.png b/selfdrive/assets/training/step13.png index b55283350..da16540b9 100644 --- a/selfdrive/assets/training/step13.png +++ b/selfdrive/assets/training/step13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bb21e03badacd4a7942c47a90428a99fd01199c2f2ebbea0ceb91313917f8ba -size 1169756 +oid sha256:f8cc8a2496cfdcbdf3806499dc99058106f72a511a5428ebb808653be175651d +size 33754 diff --git a/selfdrive/assets/training/step14.png b/selfdrive/assets/training/step14.png index e15c4ac0a..b55283350 100644 --- a/selfdrive/assets/training/step14.png +++ b/selfdrive/assets/training/step14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a99026e3f00db962351b4923776566729ee97068c10d656c82f035d069e797a -size 724928 +oid sha256:7bb21e03badacd4a7942c47a90428a99fd01199c2f2ebbea0ceb91313917f8ba +size 1169756 diff --git a/selfdrive/assets/training/step15.png b/selfdrive/assets/training/step15.png index a2f51f2bd..e15c4ac0a 100644 --- a/selfdrive/assets/training/step15.png +++ b/selfdrive/assets/training/step15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9b0f046461381618d7b57f36f89b65ce35a366601fb89fd9d3b0f8528ec9a63 -size 33214 +oid sha256:4a99026e3f00db962351b4923776566729ee97068c10d656c82f035d069e797a +size 724928 diff --git a/selfdrive/assets/training/step16.png b/selfdrive/assets/training/step16.png index 4a39b228e..a2f51f2bd 100644 --- a/selfdrive/assets/training/step16.png +++ b/selfdrive/assets/training/step16.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f8f5b0736866f6f2a8fde41c3bce683cca17bafb823dc466d76adf9df25fd66 -size 40950 +oid sha256:b9b0f046461381618d7b57f36f89b65ce35a366601fb89fd9d3b0f8528ec9a63 +size 33214 diff --git a/selfdrive/assets/training/step17.png b/selfdrive/assets/training/step17.png index 0519f70d9..4a39b228e 100644 --- a/selfdrive/assets/training/step17.png +++ b/selfdrive/assets/training/step17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba56bcc00af21885c5dd32973d789cbe4ac58dce5eeb3bd7356b7554d8f60ab0 -size 1969282 +oid sha256:2f8f5b0736866f6f2a8fde41c3bce683cca17bafb823dc466d76adf9df25fd66 +size 40950 diff --git a/selfdrive/assets/training/step18.png b/selfdrive/assets/training/step18.png new file mode 100644 index 000000000..0519f70d9 --- /dev/null +++ b/selfdrive/assets/training/step18.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba56bcc00af21885c5dd32973d789cbe4ac58dce5eeb3bd7356b7554d8f60ab0 +size 1969282 diff --git a/selfdrive/assets/training/step9.png b/selfdrive/assets/training/step9.png index e27c04ff6..80a30a366 100644 --- a/selfdrive/assets/training/step9.png +++ b/selfdrive/assets/training/step9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b889dd001fe04003606ef9c0cd16ad56fd7062b1885288204d2e1360adbbc46 -size 704674 +oid sha256:2b3ffb07f2118875adc5d320d527c75867d68e7792e4a6411a31fc63832f6dd4 +size 840990 diff --git a/selfdrive/assets/training_wide/step10.png b/selfdrive/assets/training_wide/step10.png index 309f85c94..3a63f220c 100644 --- a/selfdrive/assets/training_wide/step10.png +++ b/selfdrive/assets/training_wide/step10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae2aba1c6e617cca0d393cbd6d29134b6de7c211415791d840093286593b9b7 -size 52148 +oid sha256:398a99cabef868cfe4195e2606e517999d4558222cf80f6ff8cd3d74117ff979 +size 918857 diff --git a/selfdrive/assets/training_wide/step11.png b/selfdrive/assets/training_wide/step11.png index e689c8b87..309f85c94 100644 --- a/selfdrive/assets/training_wide/step11.png +++ b/selfdrive/assets/training_wide/step11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8dddd191f854dabbc3193973b0353e6b5dbd1377fa57d4069ff23a9f05f4e0 -size 810584 +oid sha256:aae2aba1c6e617cca0d393cbd6d29134b6de7c211415791d840093286593b9b7 +size 52148 diff --git a/selfdrive/assets/training_wide/step12.png b/selfdrive/assets/training_wide/step12.png index a289bb765..e689c8b87 100644 --- a/selfdrive/assets/training_wide/step12.png +++ b/selfdrive/assets/training_wide/step12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e42831ca4d403f08f607f5df9b53dbb073a1dcda7ac8695a66b9c950dc629c -size 34857 +oid sha256:7c8dddd191f854dabbc3193973b0353e6b5dbd1377fa57d4069ff23a9f05f4e0 +size 810584 diff --git a/selfdrive/assets/training_wide/step13.png b/selfdrive/assets/training_wide/step13.png index 10d0acc13..a289bb765 100644 --- a/selfdrive/assets/training_wide/step13.png +++ b/selfdrive/assets/training_wide/step13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f1b7e23a4e3c50178a865c540ca18b38a748a07c5d8ff659ce75f205a8295f4 -size 1676468 +oid sha256:49e42831ca4d403f08f607f5df9b53dbb073a1dcda7ac8695a66b9c950dc629c +size 34857 diff --git a/selfdrive/assets/training_wide/step14.png b/selfdrive/assets/training_wide/step14.png index 4c737014b..10d0acc13 100644 --- a/selfdrive/assets/training_wide/step14.png +++ b/selfdrive/assets/training_wide/step14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1236bd00a86dbfa46566ab5ec81b791bcc42256e0b28d7d5870e84bd34c61ed9 -size 971539 +oid sha256:9f1b7e23a4e3c50178a865c540ca18b38a748a07c5d8ff659ce75f205a8295f4 +size 1676468 diff --git a/selfdrive/assets/training_wide/step15.png b/selfdrive/assets/training_wide/step15.png index 38b794eef..4c737014b 100644 --- a/selfdrive/assets/training_wide/step15.png +++ b/selfdrive/assets/training_wide/step15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad47cac4554a82c373f28fc860c1c791742986df54b76c29a57f0e73ddb1832d -size 34410 +oid sha256:1236bd00a86dbfa46566ab5ec81b791bcc42256e0b28d7d5870e84bd34c61ed9 +size 971539 diff --git a/selfdrive/assets/training_wide/step16.png b/selfdrive/assets/training_wide/step16.png index c046dd33a..38b794eef 100644 --- a/selfdrive/assets/training_wide/step16.png +++ b/selfdrive/assets/training_wide/step16.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d940357c66adaabeb9aced38ac1314be3f3fdb6e13ebe22446c912b757cbc903 -size 42178 +oid sha256:ad47cac4554a82c373f28fc860c1c791742986df54b76c29a57f0e73ddb1832d +size 34410 diff --git a/selfdrive/assets/training_wide/step17.png b/selfdrive/assets/training_wide/step17.png index ea0bb1e88..c046dd33a 100644 --- a/selfdrive/assets/training_wide/step17.png +++ b/selfdrive/assets/training_wide/step17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74565cd799bbc57a06a3288cc04e4af2ff64d254fe9ac6b5ff40fcd7121e0ec4 -size 2219788 +oid sha256:d940357c66adaabeb9aced38ac1314be3f3fdb6e13ebe22446c912b757cbc903 +size 42178 diff --git a/selfdrive/assets/training_wide/step18.png b/selfdrive/assets/training_wide/step18.png new file mode 100644 index 000000000..ea0bb1e88 --- /dev/null +++ b/selfdrive/assets/training_wide/step18.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74565cd799bbc57a06a3288cc04e4af2ff64d254fe9ac6b5ff40fcd7121e0ec4 +size 2219788 diff --git a/selfdrive/assets/training_wide/step9.png b/selfdrive/assets/training_wide/step9.png index 3a63f220c..8dabe8d61 100644 --- a/selfdrive/assets/training_wide/step9.png +++ b/selfdrive/assets/training_wide/step9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:398a99cabef868cfe4195e2606e517999d4558222cf80f6ff8cd3d74117ff979 -size 918857 +oid sha256:8a3e1249f4dcf9b345b4b9a9e078efc78f506210581b69e9bbb380d6f98d7bf7 +size 872514 diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc index 6e7d57452..82b93ab55 100644 --- a/selfdrive/ui/qt/offroad/onboarding.cc +++ b/selfdrive/ui/qt/offroad/onboarding.cc @@ -7,11 +7,16 @@ #include #include "selfdrive/common/util.h" +#include "selfdrive/common/params.h" #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/widgets/input.h" void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { if (boundingRect[currentIndex].contains(e->x(), e->y())) { + if (currentIndex == 9) { + const QRect yes = QRect(692, 842, 492, 148); + Params().putBool("RecordFront", yes.contains(e->x(), e->y())); + } currentIndex += 1; } else if (currentIndex == (boundingRect.size() - 2) && boundingRect.last().contains(e->x(), e->y())) { currentIndex = 0; diff --git a/selfdrive/ui/qt/offroad/onboarding.h b/selfdrive/ui/qt/offroad/onboarding.h index fe479d84a..21db36125 100644 --- a/selfdrive/ui/qt/offroad/onboarding.h +++ b/selfdrive/ui/qt/offroad/onboarding.h @@ -35,6 +35,7 @@ private: 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), continueBtnStandard, QRect(1375, 80, 545, 1000), @@ -58,6 +59,7 @@ private: 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), continueBtnWide, QRect(1555, 90, 610, 990),