UI: cleanup old training guide assets (#27973)

* UI: cleanup old training guide assets * rm that old-commit-hash: 38b99b5461
2 years ago · cdbf69f724
parent f1e674f30c
commit cdbf69f724
43 changed files with 42 additions and 102 deletions
--- a/release/files_common
+++ b/release/files_common
@ -411,6 +411,7 @@ selfdrive/assets/images/*
 selfdrive/assets/offroad/*
 selfdrive/assets/sounds/*
 selfdrive/assets/training/*
+selfdrive/assets/navigation/*

 third_party/.gitignore
 third_party/SConscript
--- a/release/files_tici
+++ b/release/files_tici
@ -4,9 +4,6 @@ third_party/mapbox-gl-native-qt/include/*

 system/timezoned.py

-selfdrive/assets/navigation/*
-selfdrive/assets/training_wide/*
-
 system/camerad/cameras/camera_qcom2.cc
 system/camerad/cameras/camera_qcom2.h
 system/camerad/cameras/camera_util.cc
--- a/selfdrive/assets/compress-images.sh
+++ b/selfdrive/assets/compress-images.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 echo "compressing training guide images"
-optipng -o7 -strip all training/* training_wide/*
+optipng -o7 -strip all training/*

 # This can sometimes provide smaller images
-# mogrify -quality 100 -format jpg training_wide/* training/*
+# mogrify -quality 100 -format jpg training/*
--- a/selfdrive/assets/training/step0.png
+++ b/selfdrive/assets/training/step0.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba69dd2458bb67f30189dc41f6ebb1d77079cf18efc14ab65a7d7329c046832
-size 1508871
+oid sha256:5da731d3b43d7203eda3828c72328e5164f3c5dc14881cee20b474f8a445790c
+size 1605451
--- a/selfdrive/assets/training/step1.png
+++ b/selfdrive/assets/training/step1.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d5f69386d33431e5ae620cb627eb4b4547103875f40fc4fb58b7f42fde8dc1f
-size 40667
+oid sha256:522d7c48937b5551313884051e1018f20d2fca86db31b587222867e86254f08a
+size 51774
--- 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:d6cf7bf4aeb2be0b31a3231c5ed87d5d0f8cf4c46f2e804db69b0bc298d6d009
-size 936463
+oid sha256:fa3ab22eb5e4f1564f37df24a14b12c34b965cc8539b2df0fb6ae6d5c4ebc857
+size 1034167
--- 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:818fdf1be7eea3e2285ba0b3a02b2b4d702d6a16f993ecb03c4453fefe883365
-size 43526
+oid sha256:bad2dffbc75b502a713ceb718dceb5f3a5a2e34fcffc438ee8acfc6580bbc94f
+size 53375
--- 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:e940f78e3936d4092db698307526923c4b777d64f656ec909fea4d02ac43c09a
-size 969324
+oid sha256:aff8f1b35a29e7353a58ca6349ebe1c0faff162596a134fdd74b126b8c1cdd28
+size 1092478
--- 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:6a8f8c4ed9215a4049db3e5bd4a0d24bf8ccf600a56fb65da1b0c4e7b36997be
-size 30053
+oid sha256:d18847d47d963f2536a748ddfde1df4ef3d1dc2638af94974cd6af1539d9c18b
+size 37382
--- 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:475a2719361e97ef6383520ca19da2c14322c1193ae1a2658965f209ff112901
-size 1606262
+oid sha256:be7402c00ea0e67b60394a5858976237af61cccec7068bee0c8ec6aae1385af4
+size 1879281
--- 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:5d8de06629394396cb71e4b6c89b35e32f85c5f2fe006facfeeef6375cc0e295
-size 940727
+oid sha256:8c7c981f2601607381a341da47bd044d24a8e301c91c5b7426cbce9570f5bad0
+size 1104967
--- 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:7ecdc63da690af369c924d2c8c53916acaeab63d5ec0590e3954d0b5724c430b
-size 29904
+oid sha256:12780d35798dfab1353bf428927e1c04ca88394675a63c134a0bbbd137201715
+size 35997
--- 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:cc430ace2b8880735738b27d1983f1a2670304a75843b1a37228c36388c72528
-size 36726
+oid sha256:cfb184957120901b5b803571fa14bd9e7ae98da0b46425e3b75b00a8a69e1246
+size 43545
--- a/selfdrive/assets/training/step18.png
+++ b/selfdrive/assets/training/step18.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b177a701308e2a353d5d16ab3baf5d4ad79d6c23f08dd9d8652ee741af513952
-size 1485057
+oid sha256:a29dd3ee7abc5d338db395576e7765ba3d4d56568820f8dfbbe938c62fbee6de
+size 1646908
--- a/selfdrive/assets/training/step2.png
+++ b/selfdrive/assets/training/step2.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:270ea961f50b66d8ab659df9b3d2f59ef2f4b3267c6c76ea00c8ec9c1f15be48
-size 30417
+oid sha256:bdfa7fc67a0d89f5503bb30f1822fa72cbd140c84e14170957531c5166159519
+size 36869
--- a/selfdrive/assets/training/step3.png
+++ b/selfdrive/assets/training/step3.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c1c347c4d464b5498386a127b00aab623dffa2bcdf430307e97b7288b991d4e
-size 812312
+oid sha256:c476251bb58200d008fc0aa172173983d9fb0b71ab860f199d9d431910bf5c61
+size 966466
--- a/selfdrive/assets/training/step4.png
+++ b/selfdrive/assets/training/step4.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6e6dbdd66ca6c67a75683dd8512be737d2fb73f14eec4caa38a6d13e2654e57
-size 1085837
+oid sha256:95da2bda3ba1c046620a88b2caf77fd9a2b980b6b746e700d3574f4f1c0d6ce9
+size 1287393
--- a/selfdrive/assets/training/step5.png
+++ b/selfdrive/assets/training/step5.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9abefa4e4e47b44187918048cc904f41a8cb934de776c16a7e623ca3d05b6661
-size 33897
+oid sha256:886903bfaf0567939125daa0bc7fcaecd08c9f34f4e7c8b137a30986f80e4a6e
+size 41823
--- a/selfdrive/assets/training/step6.png
+++ b/selfdrive/assets/training/step6.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33301fa4a27e2a8d724ce3579fbf07c7c908a218518a6fb374f09c3f10433344
-size 1102561
+oid sha256:c8dc0b499b0c9dbf7e5e967ea2d55c7ed78f8e56f9055d98662f247de960eda4
+size 1231263
--- a/selfdrive/assets/training/step7.png
+++ b/selfdrive/assets/training/step7.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54fded1cc49351f4e33458cc6f2bac0fc6995524eb52886a87f9fa7c7b38ce13
-size 837613
+oid sha256:690be96b7a3cacaeb8d11bbab043a3e6dd65710ce197a8c7d35a3124dce590d1
+size 936779
--- a/selfdrive/assets/training/step8.png
+++ b/selfdrive/assets/training/step8.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b577e0531165155b86179443025aeea3477649e82ff6076811b17634b0e5515e
-size 723606
+oid sha256:89d27d040a04508f755741929158545f4d2780c728021bf02446eb0a2e38aaa6
+size 874812
--- 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:ae4acbde22c45acd8b7ea6e709a8dc4cb3cf12ee330073051d8c106e71bdfadf
-size 891677
+oid sha256:e48538287fc974e5ec97403ba05145c21035f50bdf28b6e00275a4b428643f09
+size 1024935
--- a/selfdrive/assets/training_wide/step0.png
+++ b/selfdrive/assets/training_wide/step0.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5da731d3b43d7203eda3828c72328e5164f3c5dc14881cee20b474f8a445790c
-size 1605451
--- a/selfdrive/assets/training_wide/step1.png
+++ b/selfdrive/assets/training_wide/step1.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:522d7c48937b5551313884051e1018f20d2fca86db31b587222867e86254f08a
-size 51774
--- a/selfdrive/assets/training_wide/step10.png
+++ b/selfdrive/assets/training_wide/step10.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa3ab22eb5e4f1564f37df24a14b12c34b965cc8539b2df0fb6ae6d5c4ebc857
-size 1034167
--- a/selfdrive/assets/training_wide/step11.png
+++ b/selfdrive/assets/training_wide/step11.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bad2dffbc75b502a713ceb718dceb5f3a5a2e34fcffc438ee8acfc6580bbc94f
-size 53375
--- a/selfdrive/assets/training_wide/step12.png
+++ b/selfdrive/assets/training_wide/step12.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aff8f1b35a29e7353a58ca6349ebe1c0faff162596a134fdd74b126b8c1cdd28
-size 1092478
--- a/selfdrive/assets/training_wide/step13.png
+++ b/selfdrive/assets/training_wide/step13.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d18847d47d963f2536a748ddfde1df4ef3d1dc2638af94974cd6af1539d9c18b
-size 37382
--- a/selfdrive/assets/training_wide/step14.png
+++ b/selfdrive/assets/training_wide/step14.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be7402c00ea0e67b60394a5858976237af61cccec7068bee0c8ec6aae1385af4
-size 1879281
--- a/selfdrive/assets/training_wide/step15.png
+++ b/selfdrive/assets/training_wide/step15.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7c981f2601607381a341da47bd044d24a8e301c91c5b7426cbce9570f5bad0
-size 1104967
--- a/selfdrive/assets/training_wide/step16.png
+++ b/selfdrive/assets/training_wide/step16.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12780d35798dfab1353bf428927e1c04ca88394675a63c134a0bbbd137201715
-size 35997
--- a/selfdrive/assets/training_wide/step17.png
+++ b/selfdrive/assets/training_wide/step17.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfb184957120901b5b803571fa14bd9e7ae98da0b46425e3b75b00a8a69e1246
-size 43545
--- a/selfdrive/assets/training_wide/step18.png
+++ b/selfdrive/assets/training_wide/step18.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a29dd3ee7abc5d338db395576e7765ba3d4d56568820f8dfbbe938c62fbee6de
-size 1646908
--- a/selfdrive/assets/training_wide/step2.png
+++ b/selfdrive/assets/training_wide/step2.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdfa7fc67a0d89f5503bb30f1822fa72cbd140c84e14170957531c5166159519
-size 36869
--- a/selfdrive/assets/training_wide/step3.png
+++ b/selfdrive/assets/training_wide/step3.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c476251bb58200d008fc0aa172173983d9fb0b71ab860f199d9d431910bf5c61
-size 966466
--- a/selfdrive/assets/training_wide/step4.png
+++ b/selfdrive/assets/training_wide/step4.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95da2bda3ba1c046620a88b2caf77fd9a2b980b6b746e700d3574f4f1c0d6ce9
-size 1287393
--- a/selfdrive/assets/training_wide/step5.png
+++ b/selfdrive/assets/training_wide/step5.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:886903bfaf0567939125daa0bc7fcaecd08c9f34f4e7c8b137a30986f80e4a6e
-size 41823
--- a/selfdrive/assets/training_wide/step6.png
+++ b/selfdrive/assets/training_wide/step6.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8dc0b499b0c9dbf7e5e967ea2d55c7ed78f8e56f9055d98662f247de960eda4
-size 1231263
--- a/selfdrive/assets/training_wide/step7.png
+++ b/selfdrive/assets/training_wide/step7.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:690be96b7a3cacaeb8d11bbab043a3e6dd65710ce197a8c7d35a3124dce590d1
-size 936779
--- a/selfdrive/assets/training_wide/step8.png
+++ b/selfdrive/assets/training_wide/step8.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89d27d040a04508f755741929158545f4d2780c728021bf02446eb0a2e38aaa6
-size 874812
--- a/selfdrive/assets/training_wide/step9.png
+++ b/selfdrive/assets/training_wide/step9.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e48538287fc974e5ec97403ba05145c21035f50bdf28b6e00275a4b428643f09
-size 1024935
--- a/selfdrive/ui/qt/offroad/onboarding.cc
+++ b/selfdrive/ui/qt/offroad/onboarding.cc
@ -40,7 +40,6 @@ void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
 }

 void TrainingGuide::showEvent(QShowEvent *event) {
-  img_path = width() == WIDE_WIDTH ? "../assets/training_wide/" : "../assets/training/";
  boundingRect = width() == WIDE_WIDTH ? boundingRectWide : boundingRectStandard;

  currentIndex = 0;
--- a/selfdrive/ui/qt/offroad/onboarding.h
+++ b/selfdrive/ui/qt/offroad/onboarding.h
@ -73,7 +73,7 @@ private:
    QRect(108, 804, 426, 164),
  };

-  QString img_path;
+  const QString img_path = "../assets/training/";
  QVector<QRect> boundingRect;
  QElapsedTimer click_timer;