amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX:optimize RDIF animation

Browse source 
Change-Id: I45e45b92efa43f290151e39715ca057da4d862c1
This commit is contained in:
tao wang 2022-07-28 16:24:18 +08:00 committed by Lane.Wei
parent a74fb14613
commit da732ac396
12 changed files with 209 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/images/ams_refresh_normal.svg
View file

@ -1,12 +1,14 @@
<svg width="26" height="26" xmlns="http://www.w3.org/2000/svg" fill="none"> <svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<g> <defs>
<title>background</title> <clipPath id="clip0_0_3">
<rect x="-1" y="-1" width="28" height="28" id="canvas_background" fill="none"/> <rect id="svg_1" fill="white" height="30" width="30"/>
</g> </clipPath>
</defs>
<g> <g>
<title>Layer 1</title> <title>Layer 1</title>
<path d="m23.64505,13.00145c0.1433,0 0.2599,-0.1162 0.2565,-0.2596c-0.0492,-2.06562 -0.6845,-4.07681 -1.8345,-5.79779c-1.198,-1.79301 -2.9008,-3.19049 -4.8931,-4.01572c-1.9923,-0.82523 -4.1846,-1.04115 -6.29955,-0.62045c-2.11499,0.4207 -4.05774,1.45912 -5.58257,2.98395c-1.52483,1.52482 -2.56325,3.46757 -2.98394,5.58257c-0.4207,2.11504 -0.20479,4.30724 0.62044,6.29954c0.82524,1.9923 2.22271,3.6951 4.01572,4.8932c1.72099,1.1499 3.73217,1.7852 5.7978,1.8344c0.1434,0.0034 0.2596,-0.1132 0.2596,-0.2565l0,-1.1656c0,-0.1433 -0.1162,-0.2592 -0.2596,-0.2632c-1.73236,-0.0488 -3.4179,-0.5851 -4.86183,-1.5499c-1.51595,-1.013 -2.6975,-2.4527 -3.39522,-4.1371c-0.69772,-1.6845 -0.88027,-3.538 -0.52458,-5.32617c0.35569,-1.7882 1.23366,-3.43076 2.52288,-4.71998c1.28922,-1.28921 2.93178,-2.16718 4.71995,-2.52287c1.7882,-0.3557 3.6417,-0.17314 5.3262,0.52458c1.6844,0.69772 3.1241,1.87926 4.1371,3.39522c0.9648,1.44393 1.5011,3.12947 1.5499,4.86192c0.004,0.1433 0.1199,0.2595 0.2632,0.2595l1.1656,0z" fill="#ACACAC" id="svg_2"/> <g id="svg_2" clip-path="url(#clip0_0_3)">
<path d="m22.98357,17.51953c-0.1039,0.127 -0.2981,0.127 -0.4019,0l-3.5682,-4.3626c-0.1387,-0.1695 -0.0181,-0.4239 0.2009,-0.4239l7.1364,0c0.219,0 0.3396,0.2544 0.201,0.4239l-3.5682,4.3626z" fill="#ACACAC" id="svg_3"/> <path id="svg_3" stroke="black" d="m31.1538,-1.15385l-32.30765,0l0,32.30765l32.30765,0l0,-32.30765z"/>
<path id="svg_4" fill="#ACACAC" d="m22.2754,10.1387c0.9615,1.439 1.4747,3.1307 1.4747,4.8613l-2.49,0c-0.219,0 -0.3396,0.2544 -0.201,0.4239l3.5682,4.3626c0.1039,0.127 0.2981,0.127 0.4019,0l3.5682,-4.3626c0.1387,-0.1695 0.0181,-0.4239 -0.2009,-0.4239l-2.3965,0c0,-0.5037 -0.0346,-1.0048 -0.1027,-1.5c-0.2263,-1.6434 -0.8223,-3.2212 -1.7511,-4.61127c-1.2087,-1.80894 -2.9267,-3.21884 -4.9367,-4.0514c-2.01,-0.83257 -4.2217,-1.05041 -6.3555,-0.62597c-2.1338,0.42444 -4.0938,1.47209 -5.63217,3.01047c-1.53838,1.53837 -2.58603,3.49837 -3.01047,5.63217c-0.42444,2.1338 -0.2066,4.3455 0.62597,6.3555c0.83256,2.01 2.24246,3.728 4.0514,4.9367c1.39007,0.9288 2.96787,1.5248 4.61127,1.7511c0.4952,0.0681 0.9963,0.1027 1.5,0.1027l0,-0.7499l0,-0.7501l0,-0.7499c-1.7306,0 -3.4223,-0.5132 -4.8613,-1.4747c-1.43892,-0.9615 -2.56043,-2.328 -3.22271,-3.9269c-0.66227,-1.5989 -0.83555,-3.3582 -0.49792,-5.0556c0.33762,-1.6973 1.17098,-3.2564 2.3947,-4.48013c1.22373,-1.22372 2.78283,-2.05708 4.48013,-2.3947c1.6974,-0.33763 3.4567,-0.16435 5.0556,0.49792c1.5989,0.66228 2.9654,1.78379 3.9269,3.22271z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g> </g>
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

22
resources/images/ams_refresh_selected.svg
View file

@ -1,12 +1,14 @@
<svg width="26" height="26" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="null"> <svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<g stroke="null"> <defs>
<title stroke="null">background</title> <clipPath id="clip0_7112_29362">
<rect x="-1" y="-1" width="28" height="28" id="canvas_background" fill="none" stroke="null"/> <rect id="svg_1" fill="white" height="30" width="30"/>
</g> </clipPath>
</defs>
<g stroke="null"> <g>
<title stroke="null">Layer 1</title> <title>Layer 1</title>
<path d="m23.64502,13.00145c0.1434,0 0.2599,-0.1162 0.2565,-0.2596c-0.0492,-2.06562 -0.6845,-4.07681 -1.8344,-5.79779c-1.198,-1.79301 -2.9009,-3.19049 -4.8932,-4.01572c-1.9922,-0.82523 -4.1845,-1.04115 -6.29948,-0.62045c-2.115,0.4207 -4.05775,1.45912 -5.58257,2.98395c-1.52483,1.52482 -2.56325,3.46757 -2.98395,5.58257c-0.4207,2.11504 -0.20478,4.30724 0.62045,6.29954c0.82523,1.9923 2.22271,3.6951 4.01572,4.8932c1.72098,1.1499 3.73217,1.7852 5.79783,1.8344c0.1433,0.0034 0.2596,-0.1132 0.2596,-0.2565l0,-1.1656c0,-0.1433 -0.1163,-0.2592 -0.2596,-0.2632c-1.73239,-0.0488 -3.41794,-0.5851 -4.86186,-1.5499c-1.51596,-1.013 -2.69751,-2.4527 -3.39522,-4.1371c-0.69772,-1.6845 -0.88028,-3.538 -0.52458,-5.32617c0.35569,-1.7882 1.23366,-3.43076 2.52287,-4.71998c1.28922,-1.28921 2.93178,-2.16718 4.71998,-2.52287c1.78821,-0.3557 3.64171,-0.17314 5.32611,0.52458c1.6845,0.69772 3.1242,1.87926 4.1371,3.39522c0.9648,1.44393 1.5012,3.12947 1.55,4.86192c0.004,0.1433 0.1198,0.2595 0.2632,0.2595l1.1655,0z" fill="#6B6B6B" id="svg_2" stroke="null"/> <g id="svg_2" clip-path="url(#clip0_7112_29362)">
<path d="m23.05062,17.59925c-0.1038,0.127 -0.298,0.127 -0.4019,0l-3.5682,-4.3626c-0.1386,-0.1695 -0.018,-0.4239 0.201,-0.4239l7.1364,0c0.219,0 0.3396,0.2544 0.2009,0.4239l-3.5682,4.3626z" fill="#6B6B6B" id="svg_3" stroke="null"/> <path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m22.2754,10.1387c0.9615,1.439 1.4747,3.1307 1.4747,4.8613l-2.49,0c-0.219,0 -0.3396,0.2544 -0.201,0.4239l3.5682,4.3626c0.1039,0.127 0.2981,0.127 0.4019,0l3.5682,-4.3626c0.1387,-0.1695 0.0181,-0.4239 -0.2009,-0.4239l-2.3965,0c0,-0.5037 -0.0346,-1.0048 -0.1027,-1.5c-0.2263,-1.6434 -0.8223,-3.2212 -1.7511,-4.61127c-1.2087,-1.80894 -2.9267,-3.21884 -4.9367,-4.0514c-2.01,-0.83256 -4.2217,-1.0504 -6.3555,-0.62596c-2.1338,0.42443 -4.09379,1.47208 -5.63217,3.01046c-1.53838,1.53838 -2.58603,3.49837 -3.01046,5.63217c-0.42444,2.1338 -0.2066,4.3455 0.62596,6.3555c0.83256,2.01 2.24246,3.728 4.0514,4.9367c1.39007,0.9288 2.96787,1.5248 4.61127,1.7511c0.4952,0.0681 0.9963,0.1027 1.5,0.1027l0,-0.7499l0,-0.7501l0,-0.7499c-1.7306,0 -3.4223,-0.5132 -4.8613,-1.4747c-1.43891,-0.9615 -2.56043,-2.328 -3.2227,-3.9269c-0.66227,-1.5989 -0.83555,-3.3582 -0.49793,-5.0555c0.33762,-1.6974 1.17099,-3.2565 2.3947,-4.48023c1.22373,-1.22371 2.78283,-2.05708 4.48023,-2.3947c1.6973,-0.33762 3.4566,-0.16434 5.0555,0.49793c1.5989,0.66227 2.9654,1.78379 3.9269,3.2227z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g> </g>
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_0.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29362">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29362)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m22.2754,10.1387c0.9615,1.439 1.4747,3.1307 1.4747,4.8613l-2.49,0c-0.219,0 -0.3396,0.2544 -0.201,0.4239l3.5682,4.3626c0.1039,0.127 0.2981,0.127 0.4019,0l3.5682,-4.3626c0.1387,-0.1695 0.0181,-0.4239 -0.2009,-0.4239l-2.3965,0c0,-0.5037 -0.0346,-1.0048 -0.1027,-1.5c-0.2263,-1.6434 -0.8223,-3.2212 -1.7511,-4.61127c-1.2087,-1.80894 -2.9267,-3.21884 -4.9367,-4.0514c-2.01,-0.83256 -4.2217,-1.0504 -6.3555,-0.62596c-2.1338,0.42443 -4.09379,1.47208 -5.63217,3.01046c-1.53838,1.53838 -2.58603,3.49837 -3.01046,5.63217c-0.42444,2.1338 -0.2066,4.3455 0.62596,6.3555c0.83256,2.01 2.24246,3.728 4.0514,4.9367c1.39007,0.9288 2.96787,1.5248 4.61127,1.7511c0.4952,0.0681 0.9963,0.1027 1.5,0.1027l0,-0.7499l0,-0.7501l0,-0.7499c-1.7306,0 -3.4223,-0.5132 -4.8613,-1.4747c-1.43891,-0.9615 -2.56043,-2.328 -3.2227,-3.9269c-0.66227,-1.5989 -0.83555,-3.3582 -0.49793,-5.0555c0.33762,-1.6974 1.17099,-3.2565 2.3947,-4.48023c1.22373,-1.22371 2.78283,-2.05708 4.48023,-2.3947c1.6973,-0.33762 3.4566,-0.16434 5.0555,0.49793c1.5989,0.66227 2.9654,1.78379 3.9269,3.2227z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_1.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29437">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29437)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m22.7973,22.759l1.6843,1.6843c0.1549,0.1549 0.0602,0.42 -0.1577,0.4418l-5.6079,0.5617c-0.1632,0.0164 -0.3005,-0.1209 -0.2842,-0.2841l0.5617,-5.608c0.0219,-0.2178 0.287,-0.3124 0.4419,-0.1576l1.7709,1.771c1.2133,-1.2209 2.0398,-2.7726 2.3756,-4.461c0.3377,-1.6974 0.1644,-3.4567 -0.4979,-5.0556c-0.6623,-1.5989 -1.7838,-2.96544 -3.2227,-3.92691c-1.439,-0.96147 -3.1307,-1.47465 -4.8613,-1.47465c-1.7306,0 -3.4223,0.51318 -4.8613,1.47465c-1.43891,0.96147 -2.56043,2.32801 -3.2227,3.92691c-0.66227,1.5989 -0.83555,3.3582 -0.49793,5.0556c0.33762,1.6973 1.17099,3.2564 2.3947,4.4801l-0.53028,0.5303l-0.53038,0.5304l-0.53028,0.5303c-0.35619,-0.3562 -0.68608,-0.735 -0.98801,-1.1333c-1.0021,-1.3221 -1.69629,-2.8592 -2.02245,-4.4989c-0.42444,-2.1338 -0.2066,-4.3455 0.62596,-6.3555c0.83256,-2.01001 2.24246,-3.72797 4.0514,-4.93667c1.80897,-1.20869 3.93567,-1.85383 6.11127,-1.85383c2.1756,0 4.3023,0.64514 6.1113,1.85383c1.8089,1.2087 3.2188,2.92666 4.0514,4.93667c0.8325,2.01 1.0504,4.2217 0.6259,6.3555c-0.3261,1.6397 -1.0203,3.1768 -2.0224,4.4989c-0.2965,0.3912 -0.62,0.7635 -0.9689,1.1141z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_2.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29465">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29465)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m19.8613,22.2754c-1.439,0.9615 -3.1307,1.4747 -4.8613,1.4747l0,-2.3962c0,-0.219 -0.2544,-0.3396 -0.4239,-0.201l-4.3626,3.5682c-0.127,0.1039 -0.127,0.2981 0,0.4019l4.3626,3.5682c0.1695,0.1387 0.4239,0.0181 0.4239,-0.2009l0,-2.4903c0.5037,0 1.0048,-0.0346 1.5,-0.1027c1.6434,-0.2263 3.2212,-0.8223 4.6113,-1.7511c1.8089,-1.2087 3.2188,-2.9267 4.0514,-4.9367c0.8325,-2.01 1.0504,-4.2217 0.6259,-6.3555c-0.4244,-2.1338 -1.472,-4.09379 -3.0104,-5.63217c-1.5384,-1.53838 -3.4984,-2.58603 -5.6322,-3.01046c-2.1338,-0.42444 -4.3455,-0.2066 -6.3555,0.62596c-2.01001,0.83256 -3.72797,2.24246 -4.93667,4.0514c-0.92883,1.39007 -1.52487,2.96787 -1.75109,4.61127c-0.06815,0.4952 -0.10274,0.9963 -0.10274,1.5l0.74993,0l0.75007,0l0.74993,0c0,-1.7306 0.51319,-3.4223 1.47466,-4.8613c0.96147,-1.43891 2.32801,-2.56043 3.92691,-3.2227c1.5989,-0.66227 3.3582,-0.83555 5.0556,-0.49793c1.6973,0.33762 3.2564,1.17099 4.4801,2.39471c1.2237,1.22372 2.0571,2.78282 2.3947,4.48022c0.3377,1.6973 0.1644,3.4566 -0.4979,5.0555c-0.6623,1.5989 -1.7838,2.9654 -3.2227,3.9269z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_3.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29471">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29471)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m7.26862,22.8248l-1.70224,1.7022c-0.15485,0.1549 -0.42002,0.0603 -0.4418,-0.1577l-0.56172,-5.6079c-0.01641,-0.1632 0.12091,-0.3005 0.28418,-0.2842l5.60796,0.5617c0.2178,0.0219 0.3124,0.2871 0.1576,0.4419l-1.753,1.753c1.2165,1.1983 2.7575,2.0148 4.4333,2.3481c1.6973,0.3377 3.4567,0.1644 5.0555,-0.4979c1.5989,-0.6623 2.9655,-1.7838 3.9269,-3.2227c0.9615,-1.439 1.4747,-3.1307 1.4747,-4.8613c0,-1.7306 -0.5132,-3.4223 -1.4747,-4.8613c-0.9614,-1.43891 -2.328,-2.56043 -3.9269,-3.2227c-1.5988,-0.66227 -3.3582,-0.83555 -5.0555,-0.49793c-1.6974,0.33762 -3.2565,1.17099 -4.4802,2.3947l-0.53029,-0.53028l-0.53037,-0.53038l-0.53029,-0.53028c0.35619,-0.35619 0.73499,-0.68608 1.13331,-0.98801c1.32202,-1.0021 2.85914,-1.69629 4.49884,-2.02245c2.1338,-0.42444 4.3456,-0.2066 6.3555,0.62596c2.01,0.83256 3.728,2.24246 4.9367,4.0514c1.2087,1.80897 1.8538,3.93567 1.8538,6.11127c0,2.1756 -0.6451,4.3023 -1.8538,6.1113c-1.2087,1.8089 -2.9267,3.2188 -4.9367,4.0514c-2.0099,0.8325 -4.2217,1.0504 -6.3555,0.6259c-1.6397,-0.3261 -3.17682,-1.0203 -4.49884,-2.0224c-0.3809,-0.2887 -0.74394,-0.603 -1.08644,-0.9414z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_4.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29432">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29432)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m7.72445,19.8613c-0.96147,-1.439 -1.47465,-3.1307 -1.47465,-4.8613l2.55489,0c0.219,0 0.3396,-0.2544 0.201,-0.4239l-3.5682,-4.3626c-0.1039,-0.127 -0.2981,-0.127 -0.4019,0l-3.5682,4.3626c-0.1387,0.1695 -0.0181,0.4239 0.2009,0.4239l2.33157,0c0,0.5037 0.03459,1.0048 0.10275,1.5c0.22621,1.6434 0.82225,3.2212 1.75109,4.6113c1.20869,1.8089 2.92666,3.2188 4.9366,4.0514c2.01,0.8325 4.2218,1.0504 6.3556,0.6259c2.1337,-0.4244 4.0938,-1.472 5.6321,-3.0104c1.5384,-1.5384 2.5861,-3.4984 3.0105,-5.6322c0.4244,-2.1338 0.2066,-4.3455 -0.626,-6.3555c-0.8325,-2.01001 -2.2424,-3.72797 -4.0514,-4.93667c-1.3901,-0.92883 -2.9678,-1.52487 -4.6112,-1.75109c-0.4952,-0.06815 -0.9963,-0.10274 -1.5,-0.10274l0,0.74993l0,0.75007l0,0.74993c1.7306,0 3.4223,0.51319 4.8612,1.47466c1.439,0.96147 2.5605,2.32801 3.2228,3.92691c0.6622,1.5989 0.8355,3.3582 0.4979,5.0556c-0.3376,1.6973 -1.171,3.2564 -2.3947,4.4801c-1.2237,1.2237 -2.7828,2.0571 -4.4802,2.3947c-1.6973,0.3377 -3.4567,0.1644 -5.0555,-0.4979c-1.5989,-0.6623 -2.96548,-1.7838 -3.92695,-3.2227z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_5.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29427">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29427)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m11.4427,4.81286c0.0164,-0.16327 -0.121,-0.30059 -0.2842,-0.28418l-5.60789,0.56172c-0.21793,0.02178 -0.31254,0.28695 -0.15769,0.4418l1.75906,1.75906c-0.32956,0.33556 -0.63606,0.69067 -0.91816,1.06283c-1.0021,1.32201 -1.69629,2.85911 -2.02245,4.49891c-0.42444,2.1337 -0.2066,4.3455 0.62596,6.3555c0.83256,2.01 2.24246,3.7279 4.0514,4.9366c1.80897,1.2087 3.93567,1.8539 6.11127,1.8539c2.1756,0 4.3023,-0.6452 6.1113,-1.8539c1.8089,-1.2087 3.2188,-2.9266 4.0514,-4.9366c0.8325,-2.01 1.0504,-4.2218 0.6259,-6.3555c-0.3261,-1.6398 -1.0203,-3.1769 -2.0224,-4.49891c-0.3019,-0.39833 -0.6318,-0.77712 -0.988,-1.13331l-0.5303,0.53028l-0.5304,0.53038l-0.5303,0.53028c1.2238,1.22368 2.0571,2.78288 2.3947,4.48018c0.3377,1.6973 0.1644,3.4567 -0.4979,5.0556c-0.6623,1.5988 -1.7838,2.9654 -3.2227,3.9269c-1.439,0.9614 -3.1307,1.4746 -4.8613,1.4746c-1.7306,0 -3.4223,-0.5132 -4.8613,-1.4746c-1.43891,-0.9615 -2.56043,-2.3281 -3.2227,-3.9269c-0.66227,-1.5989 -0.83555,-3.3583 -0.49793,-5.0556c0.33117,-1.6649 1.1393,-3.1968 2.32494,-4.40961l1.69609,1.69611c0.1549,0.1549 0.42,0.0602 0.4419,-0.1576l0.5617,-5.60794z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_6.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29422">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29422)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m19.7865,5.34178c0.127,-0.1039 0.127,-0.2981 0,-0.4019l-4.3626,-3.5682c-0.1695,-0.1387 -0.4239,-0.0181 -0.4239,0.2009l0,2.42777c-0.5037,0 -1.0048,0.03459 -1.5,0.10275c-1.6434,0.22621 -3.2212,0.82225 -4.61127,1.75109c-1.80894,1.20869 -3.21884,2.92666 -4.0514,4.93661c-0.83256,2.01 -1.0504,4.2218 -0.62596,6.3555c0.42443,2.1338 1.47208,4.0938 3.01046,5.6322c1.53838,1.5384 3.49837,2.5861 5.63217,3.0105c2.1338,0.4244 4.3455,0.2066 6.3555,-0.626c2.01,-0.8325 3.728,-2.2424 4.9367,-4.0514c0.9288,-1.3901 1.5248,-2.9679 1.7511,-4.6113c0.0681,-0.4951 0.1027,-0.9962 0.1027,-1.5l-0.7499,0l-0.7501,0l-0.7499,0c0,1.7306 -0.5132,3.4224 -1.4747,4.8613c-0.9615,1.439 -2.328,2.5605 -3.9269,3.2228c-1.5989,0.6622 -3.3582,0.8355 -5.0555,0.4979c-1.6974,-0.3376 -3.2565,-1.171 -4.48022,-2.3947c-1.22372,-1.2237 -2.05709,-2.7828 -2.39471,-4.4802c-0.33762,-1.6973 -0.16434,-3.4567 0.49793,-5.0556c0.66227,-1.5988 1.78379,-2.96539 3.2227,-3.92686c1.439,-0.96147 3.1307,-1.47465 4.8613,-1.47465l0,2.45869c0,0.219 0.2544,0.3396 0.4239,0.201l4.3626,-3.5682z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
resources/images/ams_rfid_7.svg Normal file
View file

@ -0,0 +1,14 @@
<svg width="30" height="30" xmlns="http://www.w3.org/2000/svg" fill="none">
<defs>
<clipPath id="clip0_7112_29417">
<rect id="svg_1" fill="white" height="30" width="30"/>
</clipPath>
</defs>
<g>
<title>Layer 1</title>
<g id="svg_2" clip-path="url(#clip0_7112_29417)">
<path id="svg_3" stroke="black" d="m31.1539,-1.15234l-32.30771,0l0,32.30764l32.30771,0l0,-32.30764z"/>
<path id="svg_4" fill="#6B6B6B" d="m20.8872,8.52665c-1.174,-1.06775 -2.6186,-1.79796 -4.1801,-2.10858c-1.6974,-0.33762 -3.4567,-0.16434 -5.0556,0.49793c-1.5989,0.66227 -2.96544,1.78379 -3.92691,3.2227c-0.96147,1.439 -1.47465,3.1307 -1.47465,4.8613c0,1.7306 0.51318,3.4223 1.47465,4.8613c0.96147,1.4389 2.32801,2.5604 3.92691,3.2227c1.5989,0.6623 3.3582,0.8356 5.0556,0.4979c1.6973,-0.3376 3.2564,-1.1709 4.4801,-2.3947l0.5303,0.5303l0.5304,0.5304l0.5303,0.5303c-0.3562,0.3562 -0.735,0.6861 -1.1333,0.988c-1.3221,1.0021 -2.8592,1.6963 -4.4989,2.0224c-2.1338,0.4245 -4.3455,0.2066 -6.3555,-0.6259c-2.01001,-0.8326 -3.72797,-2.2425 -4.93667,-4.0514c-1.20869,-1.809 -1.85383,-3.9357 -1.85383,-6.1113c0,-2.1756 0.64514,-4.3023 1.85383,-6.11127c1.2087,-1.80894 2.92666,-3.21884 4.93667,-4.0514c2.01,-0.83256 4.2217,-1.0504 6.3555,-0.62596c1.6397,0.32616 3.1768,1.02035 4.4989,2.02245c0.2889,0.21899 0.5675,0.45269 0.8347,0.70047l1.7503,-1.75035c0.1549,-0.15486 0.4201,-0.06025 0.4418,0.15768l0.5618,5.60788c0.0164,0.1632 -0.121,0.3006 -0.2842,0.2842l-5.608,-0.5617c-0.2178,-0.0218 -0.3124,-0.287 -0.1576,-0.4419l1.7035,-1.70345z" clip-rule="evenodd" fill-rule="evenodd"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

88
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -133,13 +133,26 @@ void AMSrefresh::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, con
Bind(wxEVT_LEAVE_WINDOW, &AMSrefresh::OnLeaveWindow, this); Bind(wxEVT_LEAVE_WINDOW, &AMSrefresh::OnLeaveWindow, this);
Bind(wxEVT_LEFT_DOWN, &AMSrefresh::OnClick, this); Bind(wxEVT_LEFT_DOWN, &AMSrefresh::OnClick, this);
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 26); m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 30);
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 26); m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 30);
/* m_animationCtrl = new wxAnimationCtrl(this, wxID_ANY, wxNullAnimation, wxDefaultPosition, AMS_REFRESH_SIZE); m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 30);
auto path = (boost::format("%1%/images/refresh.gif") % resources_dir()).str(); m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 30);
path = encode_path(path.c_str()); m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 30);
if (m_animationCtrl->LoadFile(path)) m_animationCtrl->Hide();*/ m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 30);
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 30);
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 30);
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 30);
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 30);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_0);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_1);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_2);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_3);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_4);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_5);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_6);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_7);
m_playing_timer = new wxTimer(); m_playing_timer = new wxTimer();
m_playing_timer->SetOwner(this); m_playing_timer->SetOwner(this);
@ -147,35 +160,31 @@ void AMSrefresh::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, con
SetSize(AMS_REFRESH_SIZE); SetSize(AMS_REFRESH_SIZE);
SetMinSize(AMS_REFRESH_SIZE); SetMinSize(AMS_REFRESH_SIZE);
SetMaxSize(AMS_REFRESH_SIZE);
} }
void AMSrefresh::on_timer(wxTimerEvent &event) void AMSrefresh::on_timer(wxTimerEvent &event)
{ {
if (m_rotation_angle == 0) { //if (m_rotation_angle >= m_rfid_bitmap_list.size()) {
m_rotation_angle = 360; // m_rotation_angle = 0;
} else { //} else {
m_rotation_angle--; // m_rotation_angle++;
} //}
Refresh(); Refresh();
} }
void AMSrefresh::PlayLoading() void AMSrefresh::PlayLoading()
{ {
if (m_play_loading) return; if (m_play_loading) return;
//this->m_animationCtrl->Show();
//this->m_animationCtrl->Play();
m_play_loading = true; m_play_loading = true;
m_rotation_angle = 360; //m_rotation_angle = 0;
m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER); m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER);
Refresh(); Refresh();
} }
void AMSrefresh::StopLoading() void AMSrefresh::StopLoading()
{ {
if (!m_play_loading) return; if (!m_play_loading) return;
//this->m_animationCtrl->Stop();
//this->m_animationCtrl->Hide();
m_playing_timer->Stop(); m_playing_timer->Stop();
m_play_loading = false; m_play_loading = false;
Refresh(); Refresh();
@ -218,13 +227,19 @@ void AMSrefresh::paintEvent(wxPaintEvent &evt)
if (!m_play_loading) { if (!m_play_loading) {
dc.DrawBitmap(m_selected ? m_bitmap_selected.bmp() : m_bitmap_normal.bmp(), pot); dc.DrawBitmap(m_selected ? m_bitmap_selected.bmp() : m_bitmap_normal.bmp(), pot);
} else { } else {
m_bitmap_rotation = ScalableBitmap(this, "ams_refresh_normal", 26); /* m_bitmap_rotation = ScalableBitmap(this, "ams_refresh_normal", 30);
auto image = m_bitmap_rotation.bmp().ConvertToImage(); auto image = m_bitmap_rotation.bmp().ConvertToImage();
wxPoint offset; wxPoint offset;
auto loading_img = image.Rotate(m_rotation_angle, wxPoint(image.GetWidth() / 2, image.GetHeight() / 2), true, &offset); auto loading_img = image.Rotate(m_rotation_angle, wxPoint(image.GetWidth() / 2, image.GetHeight() / 2), true, &offset);
ScalableBitmap loading_bitmap; ScalableBitmap loading_bitmap;
loading_bitmap.bmp() = wxBitmap(loading_img); loading_bitmap.bmp() = wxBitmap(loading_img);
dc.DrawBitmap(loading_bitmap.bmp(), offset.x , offset.y); dc.DrawBitmap(loading_bitmap.bmp(), offset.x , offset.y);*/
m_rotation_angle++;
if (m_rotation_angle >= m_rfid_bitmap_list.size()) {
m_rotation_angle = 0;
}
if (m_rfid_bitmap_list.size() <= 0)return;
dc.DrawBitmap(m_rfid_bitmap_list[m_rotation_angle].bmp(), pot);
} }
dc.SetPen(wxPen(colour)); dc.SetPen(wxPen(colour));
@ -242,13 +257,32 @@ void AMSrefresh::Update(Caninfo info)
StopLoading(); StopLoading();
} }
void AMSrefresh::msw_rescale() { } void AMSrefresh::msw_rescale() {
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 30);
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 30);
m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 30);
m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 30);
m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 30);
m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 30);
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 30);
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 30);
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 30);
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 30);
m_rfid_bitmap_list.clear();
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_0);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_1);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_2);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_3);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_4);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_5);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_6);
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_7);
}
void AMSrefresh::DoSetSize(int x, int y, int width, int height, int sizeFlags) void AMSrefresh::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{ {
wxWindow::DoSetSize(x, y, width, height, sizeFlags); wxWindow::DoSetSize(x, y, width, height, sizeFlags);
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 26);
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 26);
} }
/************************************************* /*************************************************

21
src/slic3r/GUI/Widgets/AMSControl.hpp
View file

@ -101,7 +101,7 @@ enum FilamentStep {
#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(186)) #define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(186))
#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(186)) #define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(186))
#define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(180)) #define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(180))
#define AMS_REFRESH_SIZE wxSize(FromDIP(26), FromDIP(26)) #define AMS_REFRESH_SIZE wxSize(FromDIP(30), FromDIP(30))
#define AMS_EXTRUDER_SIZE wxSize(FromDIP(66), FromDIP(55)) #define AMS_EXTRUDER_SIZE wxSize(FromDIP(66), FromDIP(55))
#define AMS_EXTRUDER_BITMAP_SIZE wxSize(FromDIP(36), FromDIP(55)) #define AMS_EXTRUDER_BITMAP_SIZE wxSize(FromDIP(36), FromDIP(55))
@ -130,7 +130,7 @@ public:
/************************************************* /*************************************************
Description:AMSrefresh Description:AMSrefresh
**************************************************/ **************************************************/
#define AMS_REFRESH_PLAY_LOADING_TIMER 200 #define AMS_REFRESH_PLAY_LOADING_TIMER 100
class AMSrefresh : public wxWindow class AMSrefresh : public wxWindow
{ {
public: public:
@ -153,16 +153,23 @@ public:
protected: protected:
wxTimer *m_playing_timer= {nullptr}; wxTimer *m_playing_timer= {nullptr};
int m_rotation_angle = {360}; int m_rotation_angle = 0;
wxAnimationCtrl *m_animationCtrl = {nullptr};
bool m_play_loading = {false}; bool m_play_loading = {false};
bool m_selected = {false}; bool m_selected = {false};
ScalableBitmap m_bitmap_rotation;
ScalableBitmap m_bitmap_normal; ScalableBitmap m_bitmap_normal;
ScalableBitmap m_bitmap_selected; ScalableBitmap m_bitmap_selected;
ScalableBitmap m_bitmap_ams_rfid_0;
ScalableBitmap m_bitmap_ams_rfid_1;
ScalableBitmap m_bitmap_ams_rfid_2;
ScalableBitmap m_bitmap_ams_rfid_3;
ScalableBitmap m_bitmap_ams_rfid_4;
ScalableBitmap m_bitmap_ams_rfid_5;
ScalableBitmap m_bitmap_ams_rfid_6;
ScalableBitmap m_bitmap_ams_rfid_7;
std::vector<ScalableBitmap> m_rfid_bitmap_list;
wxString m_text; wxString m_text;
wxBoxSizer * m_size_body; wxBoxSizer * m_size_body;
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);