3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX:change the humidity level icons

Browse source 
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
This commit is contained in:
tao wang 2022-12-09 16:20:22 +08:00 • committed by Lane.Wei
parent 94dd1af6c6
commit 52e431170c
7 changed files with 51 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/images/ams_humidity_0.svg
View file

@ -1,11 +1,11 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.08751 10.1311L9.30206 10.5827L9.58751 10.4471V10.1311H9.08751ZM12.3733 10.1311H11.8733V10.4471L12.1588 10.5827L12.3733 10.1311ZM9.58751 2.64291C9.58751 2.0117 10.0992 1.5 10.7304 1.5V0.5C9.54692 0.5 8.58751 1.45941 8.58751 2.64291H9.58751ZM9.58751 10.1311V2.64291H8.58751V10.1311H9.58751ZM7.39697 13.5956C7.39697 12.2666 8.17469 11.1182 9.30206 10.5827L8.87297 9.67943C7.41008 10.3744 6.39697 11.8662 6.39697 13.5956H7.39697ZM10.7304 16.929C8.88941 16.929 7.39697 15.4366 7.39697 13.5956H6.39697C6.39697 15.9889 8.33712 17.929 10.7304 17.929V16.929ZM14.0639 13.5956C14.0639 15.4366 12.5714 16.929 10.7304 16.929V17.929C13.1237 17.929 15.0639 15.9889 15.0639 13.5956H14.0639ZM12.1588 10.5827C13.2861 11.1182 14.0639 12.2666 14.0639 13.5956H15.0639C15.0639 11.8662 14.0508 10.3744 12.5879 9.67943L12.1588 10.5827ZM11.8733 2.6429V10.1311H12.8733V2.6429H11.8733ZM10.7304 1.5C11.3616 1.5 11.8733 2.0117 11.8733 2.6429H12.8733C12.8733 1.45941 11.9139 0.5 10.7304 0.5V1.5Z" fill="#898989"/> <path d="M9.08898 10.1857L9.30352 10.6374L9.58898 10.5018V10.1857H9.08898ZM12.3748 10.1857H11.8748V10.5018L12.1602 10.6374L12.3748 10.1857ZM9.58898 2.69759C9.58898 2.06638 10.1007 1.55469 10.7319 1.55469V0.554688C9.54839 0.554688 8.58898 1.5141 8.58898 2.69759H9.58898ZM9.58898 10.1857V2.69759H8.58898V10.1857H9.58898ZM7.39844 13.6503C7.39844 12.3213 8.17616 11.1729 9.30352 10.6374L8.87443 9.73412C7.41154 10.4291 6.39844 11.9209 6.39844 13.6503H7.39844ZM10.7319 16.9837C8.89087 16.9837 7.39844 15.4913 7.39844 13.6503H6.39844C6.39844 16.0436 8.33859 17.9837 10.7319 17.9837V16.9837ZM14.0653 13.6503C14.0653 15.4913 12.5729 16.9837 10.7319 16.9837V17.9837C13.1252 17.9837 15.0653 16.0436 15.0653 13.6503H14.0653ZM12.1602 10.6374C13.2876 11.1729 14.0653 12.3213 14.0653 13.6503H15.0653C15.0653 11.9209 14.0522 10.4291 12.5893 9.73412L12.1602 10.6374ZM11.8748 2.69759V10.1857H12.8748V2.69759H11.8748ZM10.7319 1.55469C11.3631 1.55469 11.8748 2.06638 11.8748 2.69759H12.8748C12.8748 1.5141 11.9154 0.554688 10.7319 0.554688V1.55469Z" fill="#898989"/>
<path d="M1 9.03081C1 7.79861 2.76767 3.86325 3.28007 3.86328C3.79246 3.86331 5.48331 7.97448 5.48331 9.03081C5.48331 10.0871 4.81114 11.549 3.28007 11.549C1.74899 11.549 1 10.263 1 9.03081Z" stroke="#898989"/> <path d="M1 9.0855C1 7.8533 2.76767 3.91794 3.28007 3.91797C3.79246 3.918 5.48331 8.02917 5.48331 9.0855C5.48331 10.1418 4.81114 11.6037 3.28007 11.6037C1.74899 11.6037 1 10.3177 1 9.0855Z" stroke="#898989"/>
<path d="M2.46231 8.4037C2.3916 8.79641 2.43422 9.68152 3.17033 10.0803" stroke="#898989" stroke-linecap="round"/> <path d="M2.46231 8.4579C2.3916 8.85061 2.43422 9.73572 3.17033 10.1345" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2763 11.4742C12.2211 11.7174 12.9192 12.5751 12.9192 13.5958C12.9192 14.8056 11.9384 15.7863 10.7286 15.7863C9.51882 15.7863 8.53809 14.8056 8.53809 13.5958C8.53809 12.5751 9.2362 11.7174 10.181 11.4742L10.181 3.1907C10.181 2.88825 10.4262 2.64307 10.7286 2.64307C11.0311 2.64307 11.2763 2.88825 11.2763 3.1907L11.2763 11.4742Z" fill="#00AE42"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11.2772 11.5284C12.222 11.7716 12.9201 12.6293 12.9201 13.65C12.9201 14.8598 11.9394 15.8405 10.7296 15.8405C9.5198 15.8405 8.53906 14.8598 8.53906 13.65C8.53906 12.6293 9.23717 11.7716 10.182 11.5284L10.182 3.2449C10.182 2.94245 10.4272 2.69727 10.7296 2.69727C11.0321 2.69727 11.2772 2.94245 11.2772 3.2449L11.2772 11.5284Z" fill="#FF6F00"/>
<path d="M19.1211 15.7861H16.4358" stroke="#898989" stroke-linecap="round"/> <path d="M19.1211 15.8398H16.4358" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1211 12.5005H16.8833" stroke="#898989" stroke-linecap="round"/> <path d="M19.1211 12.5547H16.8833" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 9.21436L15.9882 9.21436" stroke="#898989" stroke-linecap="round"/> <path d="M19.1211 9.26953L15.9882 9.26953" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 5.92871L15.9882 5.92871" stroke="#898989" stroke-linecap="round"/> <path d="M19.1211 5.98242L15.9882 5.98242" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 2.64307H15.9882" stroke="#898989" stroke-linecap="round"/> <path d="M19.1211 2.69727H15.9882" stroke="#C2C2C2" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

18
resources/images/ams_humidity_1.svg
View file

@ -1,12 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.75548 10.1311L8.97003 10.5827L9.25548 10.4471V10.1311H8.75548ZM12.0413 10.1311H11.5413V10.4471L11.8267 10.5827L12.0413 10.1311ZM9.25548 2.64291C9.25548 2.0117 9.76718 1.5 10.3984 1.5V0.5C9.21489 0.5 8.25548 1.45941 8.25548 2.64291H9.25548ZM9.25548 10.1311V2.64291H8.25548V10.1311H9.25548ZM7.06494 13.5956C7.06494 12.2666 7.84266 11.1182 8.97003 10.5827L8.54093 9.67943C7.07804 10.3744 6.06494 11.8662 6.06494 13.5956H7.06494ZM10.3984 16.929C8.55737 16.929 7.06494 15.4366 7.06494 13.5956H6.06494C6.06494 15.9889 8.00509 17.929 10.3984 17.929V16.929ZM13.7318 13.5956C13.7318 15.4366 12.2394 16.929 10.3984 16.929V17.929C12.7917 17.929 14.7318 15.9889 14.7318 13.5956H13.7318ZM11.8267 10.5827C12.9541 11.1182 13.7318 12.2666 13.7318 13.5956H14.7318C14.7318 11.8662 13.7187 10.3744 12.2558 9.67943L11.8267 10.5827ZM11.5413 2.6429V10.1311H12.5413V2.6429H11.5413ZM10.3984 1.5C11.0296 1.5 11.5413 2.0117 11.5413 2.6429H12.5413C12.5413 1.45941 11.5819 0.5 10.3984 0.5V1.5Z" fill="#898989"/> <path d="M8.75695 10.1311L8.97149 10.5827L9.25695 10.4471V10.1311H8.75695ZM12.0428 10.1311H11.5428V10.4471L11.8282 10.5827L12.0428 10.1311ZM9.25695 2.64291C9.25695 2.0117 9.76864 1.5 10.3999 1.5V0.5C9.21636 0.5 8.25695 1.45941 8.25695 2.64291H9.25695ZM9.25695 10.1311V2.64291H8.25695V10.1311H9.25695ZM7.06641 13.5956C7.06641 12.2666 7.84413 11.1182 8.97149 10.5827L8.5424 9.67943C7.07951 10.3744 6.06641 11.8662 6.06641 13.5956H7.06641ZM10.3999 16.929C8.55884 16.929 7.06641 15.4366 7.06641 13.5956H6.06641C6.06641 15.9889 8.00656 17.929 10.3999 17.929V16.929ZM13.7333 13.5956C13.7333 15.4366 12.2409 16.929 10.3999 16.929V17.929C12.7931 17.929 14.7333 15.9889 14.7333 13.5956H13.7333ZM11.8282 10.5827C12.9556 11.1182 13.7333 12.2666 13.7333 13.5956H14.7333C14.7333 11.8662 13.7202 10.3744 12.2573 9.67943L11.8282 10.5827ZM11.5428 2.6429V10.1311H12.5428V2.6429H11.5428ZM10.3999 1.5C11.0311 1.5 11.5428 2.0117 11.5428 2.6429H12.5428C12.5428 1.45941 11.5833 0.5 10.3999 0.5V1.5Z" fill="#898989"/>
<path d="M0.667969 9.03081C0.667969 7.79861 2.43564 3.86325 2.94804 3.86328C3.46043 3.86331 5.15128 7.97448 5.15128 9.03081C5.15128 10.0871 4.47911 11.549 2.94804 11.549C1.41696 11.549 0.667969 10.263 0.667969 9.03081Z" stroke="#898989"/> <path d="M0.667969 9.03081C0.667969 7.79861 2.43564 3.86325 2.94804 3.86328C3.46043 3.86331 5.15128 7.97448 5.15128 9.03081C5.15128 10.0871 4.47911 11.549 2.94804 11.549C1.41696 11.549 0.667969 10.263 0.667969 9.03081Z" stroke="#898989"/>
<path d="M2.13028 8.4037C2.05957 8.79641 2.10218 9.68152 2.8383 10.0803" stroke="#898989" stroke-linecap="round"/> <path d="M2.13028 8.40322C2.05957 8.79592 2.10218 9.68104 2.8383 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9437 11.4742C11.8885 11.7174 12.5866 12.5751 12.5866 13.5958C12.5866 14.8056 11.6059 15.7863 10.3961 15.7863C9.1863 15.7863 8.20557 14.8056 8.20557 13.5958C8.20557 12.5751 8.90368 11.7174 9.84847 11.4742L9.84847 3.1907C9.84847 2.88825 10.0937 2.64307 10.3961 2.64307C10.6986 2.64307 10.9437 2.88825 10.9437 3.1907L10.9437 11.4742Z" fill="#C2C2C2"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M10.9452 11.4737C11.89 11.7169 12.5881 12.5746 12.5881 13.5953C12.5881 14.8051 11.6074 15.7858 10.3976 15.7858C9.18777 15.7858 8.20703 14.8051 8.20703 13.5953C8.20703 12.5746 8.90514 11.7169 9.84994 11.4737L9.84994 3.19021C9.84994 2.88776 10.0951 2.64258 10.3976 2.64258C10.7 2.64258 10.9452 2.88776 10.9452 3.19021L10.9452 11.4737Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9437 11.4743C11.8885 11.7174 12.5866 12.5751 12.5866 13.5958C12.5866 14.8056 11.6059 15.7863 10.3961 15.7863C9.1863 15.7863 8.20557 14.8056 8.20557 13.5958C8.20557 12.5751 8.90368 11.7174 9.84847 11.4743L9.84847 6.11599C9.84847 5.81354 10.0937 5.56836 10.3961 5.56836C10.6986 5.56836 10.9437 5.81354 10.9437 6.11599L10.9437 11.4743Z" fill="#00AE42"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M10.9452 11.4743C11.89 11.7174 12.5881 12.5751 12.5881 13.5958C12.5881 14.8056 11.6074 15.7863 10.3976 15.7863C9.18777 15.7863 8.20703 14.8056 8.20703 13.5958C8.20703 12.5751 8.90514 11.7174 9.84994 11.4743L9.84994 6.11599C9.84994 5.81354 10.0951 5.56836 10.3976 5.56836C10.7 5.56836 10.9452 5.81354 10.9452 6.11599L10.9452 11.4743Z" fill="#FF6F00"/>
<path d="M18.7876 15.7861H16.1023" stroke="#898989" stroke-linecap="round"/> <path d="M18.7891 15.7852H16.1038" stroke="#898989" stroke-linecap="round"/>
<path d="M18.7876 12.5005H16.5498" stroke="#898989" stroke-linecap="round"/> <path d="M18.7891 12.5H16.5513" stroke="#898989" stroke-linecap="round"/>
<path d="M18.7876 9.21436L15.6547 9.21436" stroke="#898989" stroke-linecap="round"/> <path d="M18.7891 9.21484L15.6562 9.21484" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.7876 5.92871L15.6547 5.92871" stroke="#898989" stroke-linecap="round"/> <path d="M18.7891 5.92773L15.6562 5.92773" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.7876 2.64307H15.6547" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M18.7891 2.64258H15.6562" stroke="#C2C2C2" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

18
resources/images/ams_humidity_2.svg
View file

@ -1,12 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.42345 10.1311L9.638 10.5827L9.92345 10.4471V10.1311H9.42345ZM12.7093 10.1311H12.2093V10.4471L12.4947 10.5827L12.7093 10.1311ZM9.92345 2.64291C9.92345 2.0117 10.4351 1.5 11.0664 1.5V0.5C9.88286 0.5 8.92345 1.45941 8.92345 2.64291H9.92345ZM9.92345 10.1311V2.64291H8.92345V10.1311H9.92345ZM7.73291 13.5956C7.73291 12.2666 8.51063 11.1182 9.638 10.5827L9.2089 9.67943C7.74601 10.3744 6.73291 11.8662 6.73291 13.5956H7.73291ZM11.0664 16.929C9.22534 16.929 7.73291 15.4366 7.73291 13.5956H6.73291C6.73291 15.9889 8.67306 17.929 11.0664 17.929V16.929ZM14.3998 13.5956C14.3998 15.4366 12.9074 16.929 11.0664 16.929V17.929C13.4596 17.929 15.3998 15.9889 15.3998 13.5956H14.3998ZM12.4947 10.5827C13.6221 11.1182 14.3998 12.2666 14.3998 13.5956H15.3998C15.3998 11.8662 14.3867 10.3744 12.9238 9.67943L12.4947 10.5827ZM12.2093 2.6429V10.1311H13.2093V2.6429H12.2093ZM11.0664 1.5C11.6976 1.5 12.2093 2.0117 12.2093 2.6429H13.2093C13.2093 1.45941 12.2498 0.5 11.0664 0.5V1.5Z" fill="#898989"/> <path d="M9.42491 10.1311L9.63946 10.5827L9.92491 10.4471V10.1311H9.42491ZM12.7107 10.1311H12.2107V10.4471L12.4962 10.5827L12.7107 10.1311ZM9.92491 2.64291C9.92491 2.0117 10.4366 1.5 11.0678 1.5V0.5C9.88432 0.5 8.92491 1.45941 8.92491 2.64291H9.92491ZM9.92491 10.1311V2.64291H8.92491V10.1311H9.92491ZM7.73438 13.5956C7.73438 12.2666 8.5121 11.1182 9.63946 10.5827L9.21037 9.67943C7.74748 10.3744 6.73438 11.8662 6.73438 13.5956H7.73438ZM11.0678 16.929C9.22681 16.929 7.73438 15.4366 7.73438 13.5956H6.73438C6.73438 15.9889 8.67452 17.929 11.0678 17.929V16.929ZM14.4013 13.5956C14.4013 15.4366 12.9088 16.929 11.0678 16.929V17.929C13.4611 17.929 15.4013 15.9889 15.4013 13.5956H14.4013ZM12.4962 10.5827C13.6235 11.1182 14.4013 12.2666 14.4013 13.5956H15.4013C15.4013 11.8662 14.3882 10.3744 12.9253 9.67943L12.4962 10.5827ZM12.2107 2.6429V10.1311H13.2107V2.6429H12.2107ZM11.0678 1.5C11.699 1.5 12.2107 2.0117 12.2107 2.6429H13.2107C13.2107 1.45941 12.2513 0.5 11.0678 0.5V1.5Z" fill="#898989"/>
<path d="M1.33594 9.03081C1.33594 7.79861 3.10361 3.86325 3.616 3.86328C4.1284 3.86331 5.81925 7.97448 5.81925 9.03081C5.81925 10.0871 5.14708 11.549 3.616 11.549C2.08493 11.549 1.33594 10.263 1.33594 9.03081Z" stroke="#898989"/> <path d="M1.33594 9.03081C1.33594 7.79861 3.10361 3.86325 3.616 3.86328C4.1284 3.86331 5.81925 7.97448 5.81925 9.03081C5.81925 10.0871 5.14708 11.549 3.616 11.549C2.08493 11.549 1.33594 10.263 1.33594 9.03081Z" stroke="#898989"/>
<path d="M2.79824 8.4037C2.72754 8.79641 2.77015 9.68152 3.50627 10.0803" stroke="#898989" stroke-linecap="round"/> <path d="M2.79824 8.40322C2.72754 8.79592 2.77015 9.68104 3.50627 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6161 11.4742C12.5609 11.7174 13.259 12.5751 13.259 13.5958C13.259 14.8056 12.2783 15.7863 11.0685 15.7863C9.85867 15.7863 8.87793 14.8056 8.87793 13.5958C8.87793 12.5751 9.57604 11.7174 10.5208 11.4742L10.5208 3.1907C10.5208 2.88825 10.766 2.64307 11.0685 2.64307C11.3709 2.64307 11.6161 2.88825 11.6161 3.1907L11.6161 11.4742Z" fill="#C2C2C2"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11.6171 11.4737C12.5619 11.7169 13.26 12.5746 13.26 13.5953C13.26 14.8051 12.2792 15.7858 11.0694 15.7858C9.85964 15.7858 8.87891 14.8051 8.87891 13.5953C8.87891 12.5746 9.57702 11.7169 10.5218 11.4737L10.5218 3.19021C10.5218 2.88776 10.767 2.64258 11.0694 2.64258C11.3719 2.64258 11.6171 2.88776 11.6171 3.19021L11.6171 11.4737Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5208 11.4738L10.5208 9.31668C10.5208 9.01423 10.766 8.76904 11.0685 8.76904C11.3709 8.76904 11.6161 9.01423 11.6161 9.31668L11.6161 11.4738C12.5609 11.717 13.259 12.5747 13.259 13.5954C13.259 14.8052 12.2783 15.7859 11.0685 15.7859C9.85867 15.7859 8.87793 14.8052 8.87793 13.5954C8.87793 12.5747 9.57604 11.717 10.5208 11.4738Z" fill="#00AE42"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M10.5218 11.4743L10.5218 9.31717C10.5218 9.01472 10.767 8.76953 11.0694 8.76953C11.3719 8.76953 11.6171 9.01472 11.6171 9.31717L11.6171 11.4743C12.5619 11.7175 13.26 12.5752 13.26 13.5959C13.26 14.8057 12.2792 15.7864 11.0694 15.7864C9.85964 15.7864 8.87891 14.8057 8.87891 13.5959C8.87891 12.5751 9.57702 11.7175 10.5218 11.4743Z" fill="#00AE42"/>
<path d="M19.4609 15.7861H16.7756" stroke="#898989" stroke-linecap="round"/> <path d="M19.4609 15.7852H16.7756" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 12.5005H17.2232" stroke="#898989" stroke-linecap="round"/> <path d="M19.4609 12.5H17.2232" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 9.21436L16.3281 9.21436" stroke="#898989" stroke-linecap="round"/> <path d="M19.4609 9.21484L16.3281 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 5.92871L16.3281 5.92871" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.4609 5.92773L16.3281 5.92773" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.4609 2.64307H16.3281" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.4609 2.64258H16.3281" stroke="#C2C2C2" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

18
resources/images/ams_humidity_3.svg
View file

@ -1,12 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.06407 10.1311L9.27862 10.5827L9.56407 10.4471V10.1311H9.06407ZM12.3499 10.1311H11.8499V10.4471L12.1353 10.5827L12.3499 10.1311ZM9.56407 2.64291C9.56407 2.0117 10.0758 1.5 10.707 1.5V0.5C9.52348 0.5 8.56407 1.45941 8.56407 2.64291H9.56407ZM9.56407 10.1311V2.64291H8.56407V10.1311H9.56407ZM7.37354 13.5956C7.37354 12.2666 8.15126 11.1182 9.27862 10.5827L8.84953 9.67943C7.38664 10.3744 6.37354 11.8662 6.37354 13.5956H7.37354ZM10.707 16.929C8.86597 16.929 7.37354 15.4366 7.37354 13.5956H6.37354C6.37354 15.9889 8.31368 17.929 10.707 17.929V16.929ZM14.0404 13.5956C14.0404 15.4366 12.548 16.929 10.707 16.929V17.929C13.1003 17.929 15.0404 15.9889 15.0404 13.5956H14.0404ZM12.1353 10.5827C13.2627 11.1182 14.0404 12.2666 14.0404 13.5956H15.0404C15.0404 11.8662 14.0273 10.3744 12.5644 9.67943L12.1353 10.5827ZM11.8499 2.64291V10.1311H12.8499V2.64291H11.8499ZM10.707 1.5C11.3382 1.5 11.8499 2.0117 11.8499 2.64291H12.8499C12.8499 1.45941 11.8905 0.5 10.707 0.5V1.5Z" fill="#898989"/> <path d="M9.06554 10.1311L9.28009 10.5827L9.56554 10.4471V10.1311H9.06554ZM12.3513 10.1311H11.8513V10.4471L12.1368 10.5827L12.3513 10.1311ZM9.56554 2.64291C9.56554 2.0117 10.0772 1.5 10.7084 1.5V0.5C9.52495 0.5 8.56554 1.45941 8.56554 2.64291H9.56554ZM9.56554 10.1311V2.64291H8.56554V10.1311H9.56554ZM7.375 13.5956C7.375 12.2666 8.15272 11.1182 9.28009 10.5827L8.85099 9.67943C7.3881 10.3744 6.375 11.8662 6.375 13.5956H7.375ZM10.7084 16.929C8.86743 16.929 7.375 15.4366 7.375 13.5956H6.375C6.375 15.9889 8.31515 17.929 10.7084 17.929V16.929ZM14.0419 13.5956C14.0419 15.4366 12.5495 16.929 10.7084 16.929V17.929C13.1017 17.929 15.0419 15.9889 15.0419 13.5956H14.0419ZM12.1368 10.5827C13.2642 11.1182 14.0419 12.2666 14.0419 13.5956H15.0419C15.0419 11.8662 14.0288 10.3744 12.5659 9.67943L12.1368 10.5827ZM11.8513 2.64291V10.1311H12.8513V2.64291H11.8513ZM10.7084 1.5C11.3397 1.5 11.8513 2.0117 11.8513 2.64291H12.8513C12.8513 1.45941 11.8919 0.5 10.7084 0.5V1.5Z" fill="#898989"/>
<path d="M0.976562 9.03081C0.976562 7.79861 2.74423 3.86325 3.25663 3.86328C3.76903 3.86331 5.45988 7.97448 5.45988 9.03081C5.45988 10.0871 4.78771 11.549 3.25663 11.549C1.72555 11.549 0.976562 10.263 0.976562 9.03081Z" stroke="#898989"/> <path d="M0.976562 9.03081C0.976562 7.79861 2.74423 3.86325 3.25663 3.86328C3.76903 3.86331 5.45988 7.97448 5.45988 9.03081C5.45988 10.0871 4.78771 11.549 3.25663 11.549C1.72555 11.549 0.976562 10.263 0.976562 9.03081Z" stroke="#898989"/>
<path d="M2.43887 8.4037C2.36816 8.79641 2.41078 9.68152 3.14689 10.0803" stroke="#898989" stroke-linecap="round"/> <path d="M2.43887 8.40322C2.36816 8.79592 2.41078 9.68104 3.14689 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2528 11.4742C12.1976 11.7174 12.8957 12.5751 12.8957 13.5958C12.8957 14.8056 11.915 15.7863 10.7052 15.7863C9.49539 15.7863 8.51465 14.8056 8.51465 13.5958C8.51465 12.5751 9.21276 11.7174 10.1576 11.4742L10.1576 3.1907C10.1576 2.88825 10.4027 2.64307 10.7052 2.64307C11.0076 2.64307 11.2528 2.88825 11.2528 3.1907L11.2528 11.4742Z" fill="#C2C2C2"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11.2538 11.4737C12.1986 11.7169 12.8967 12.5746 12.8967 13.5953C12.8967 14.8051 11.916 15.7858 10.7062 15.7858C9.49636 15.7858 8.51562 14.8051 8.51562 13.5953C8.51562 12.5746 9.21373 11.7169 10.1585 11.4737L10.1585 3.19021C10.1585 2.88776 10.4037 2.64258 10.7062 2.64258C11.0086 2.64258 11.2538 2.88776 11.2538 3.19021L11.2538 11.4737Z" fill="#C2C2C2"/>
<path d="M12.8957 13.5958C12.8957 14.8056 11.915 15.7864 10.7052 15.7864C9.49539 15.7864 8.51465 14.8056 8.51465 13.5958C8.51465 12.386 9.49539 11.4053 10.7052 11.4053C11.915 11.4053 12.8957 12.386 12.8957 13.5958Z" fill="#FF6F00"/> <path d="M12.8967 13.5948C12.8967 14.8046 11.916 15.7854 10.7062 15.7854C9.49636 15.7854 8.51562 14.8046 8.51562 13.5948C8.51562 12.385 9.49636 11.4043 10.7062 11.4043C11.916 11.4043 12.8967 12.385 12.8967 13.5948Z" fill="#00AE42"/>
<path d="M19.1001 15.7861H16.4148" stroke="#898989" stroke-linecap="round"/> <path d="M19.1016 15.7852H16.4163" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1001 12.5005H16.8623" stroke="#898989" stroke-linecap="round"/> <path d="M19.1016 12.5H16.8638" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1001 9.21436L15.9672 9.21436" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.1016 9.21484L15.9687 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1001 5.92871L15.9672 5.92871" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.1016 5.92773L15.9687 5.92773" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1001 2.64307H15.9672" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.1016 2.64258H15.9687" stroke="#C2C2C2" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

18
resources/images/ams_humidity_4.svg
View file

@ -1,12 +1,12 @@
<svg width="21" height="18" viewBox="0 0 21 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="21" height="18" viewBox="0 0 21 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.48155 10.1311L9.6961 10.5827L9.98155 10.4471V10.1311H9.48155ZM12.7674 10.1311H12.2674V10.4471L12.5528 10.5827L12.7674 10.1311ZM9.98155 2.64291C9.98155 2.0117 10.4933 1.5 11.1245 1.5V0.5C9.94097 0.5 8.98155 1.45941 8.98155 2.64291H9.98155ZM9.98155 10.1311V2.64291H8.98155V10.1311H9.98155ZM7.79102 13.5956C7.79102 12.2666 8.56874 11.1182 9.6961 10.5827L9.26701 9.67943C7.80412 10.3744 6.79102 11.8662 6.79102 13.5956H7.79102ZM11.1245 16.929C9.28345 16.929 7.79102 15.4366 7.79102 13.5956H6.79102C6.79102 15.9889 8.73116 17.929 11.1245 17.929V16.929ZM14.4579 13.5956C14.4579 15.4366 12.9655 16.929 11.1245 16.929V17.929C13.5178 17.929 15.4579 15.9889 15.4579 13.5956H14.4579ZM12.5528 10.5827C13.6802 11.1182 14.4579 12.2666 14.4579 13.5956H15.4579C15.4579 11.8662 14.4448 10.3744 12.9819 9.67943L12.5528 10.5827ZM12.2674 2.6429V10.1311H13.2674V2.6429H12.2674ZM11.1245 1.5C11.7557 1.5 12.2674 2.0117 12.2674 2.6429H13.2674C13.2674 1.45941 12.308 0.5 11.1245 0.5V1.5Z" fill="#898989"/> <path d="M9.48351 10.1311L9.69805 10.5827L9.98351 10.4471V10.1311H9.48351ZM12.7693 10.1311H12.2693V10.4471L12.5548 10.5827L12.7693 10.1311ZM9.98351 2.64291C9.98351 2.0117 10.4952 1.5 11.1264 1.5V0.5C9.94292 0.5 8.98351 1.45941 8.98351 2.64291H9.98351ZM9.98351 10.1311V2.64291H8.98351V10.1311H9.98351ZM7.79297 13.5956C7.79297 12.2666 8.57069 11.1182 9.69805 10.5827L9.26896 9.67943C7.80607 10.3744 6.79297 11.8662 6.79297 13.5956H7.79297ZM11.1264 16.929C9.2854 16.929 7.79297 15.4366 7.79297 13.5956H6.79297C6.79297 15.9889 8.73312 17.929 11.1264 17.929V16.929ZM14.4599 13.5956C14.4599 15.4366 12.9674 16.929 11.1264 16.929V17.929C13.5197 17.929 15.4599 15.9889 15.4599 13.5956H14.4599ZM12.5548 10.5827C13.6821 11.1182 14.4599 12.2666 14.4599 13.5956H15.4599C15.4599 11.8662 14.4468 10.3744 12.9839 9.67943L12.5548 10.5827ZM12.2693 2.6429V10.1311H13.2693V2.6429H12.2693ZM11.1264 1.5C11.7576 1.5 12.2693 2.0117 12.2693 2.6429H13.2693C13.2693 1.45941 12.3099 0.5 11.1264 0.5V1.5Z" fill="#898989"/>
<path d="M1.39453 9.03081C1.39453 7.79861 3.1622 3.86325 3.6746 3.86328C4.18699 3.86331 5.87785 7.97448 5.87785 9.03081C5.87785 10.0871 5.20568 11.549 3.6746 11.549C2.14352 11.549 1.39453 10.263 1.39453 9.03081Z" stroke="#898989"/> <path d="M1.39453 9.03081C1.39453 7.79861 3.1622 3.86325 3.6746 3.86328C4.18699 3.86331 5.87785 7.97448 5.87785 9.03081C5.87785 10.0871 5.20568 11.549 3.6746 11.549C2.14352 11.549 1.39453 10.263 1.39453 9.03081Z" stroke="#898989"/>
<path d="M2.85684 8.4037C2.78613 8.79641 2.82875 9.68152 3.56486 10.0803" stroke="#898989" stroke-linecap="round"/> <path d="M2.85684 8.40322C2.78613 8.79592 2.82875 9.68104 3.56486 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6708 11.4742C12.6156 11.7174 13.3137 12.5751 13.3137 13.5958C13.3137 14.8056 12.333 15.7863 11.1232 15.7863C9.91336 15.7863 8.93262 14.8056 8.93262 13.5958C8.93262 12.5751 9.63073 11.7174 10.5755 11.4742L10.5755 3.1907C10.5755 2.88825 10.8207 2.64307 11.1232 2.64307C11.4256 2.64307 11.6708 2.88825 11.6708 3.1907L11.6708 11.4742Z" fill="#C2C2C2"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11.6718 11.4737C12.6166 11.7169 13.3147 12.5746 13.3147 13.5953C13.3147 14.8051 12.3339 15.7858 11.1241 15.7858C9.91433 15.7858 8.93359 14.8051 8.93359 13.5953C8.93359 12.5746 9.6317 11.7169 10.5765 11.4737L10.5765 3.19021C10.5765 2.88776 10.8217 2.64258 11.1241 2.64258C11.4266 2.64258 11.6718 2.88776 11.6718 3.19021L11.6718 11.4737Z" fill="#C2C2C2"/>
<path d="M13.3137 13.5955C13.3137 14.8053 12.333 15.7861 11.1232 15.7861C9.91335 15.7861 8.93262 14.8053 8.93262 13.5955C8.93262 13.1672 9.58139 13.869 10.7912 13.869C12.001 13.869 13.3137 12.3857 13.3137 13.5955Z" fill="#FF6F00"/> <path d="M13.3147 13.596C13.3147 14.8058 12.3339 15.7866 11.1241 15.7866C9.91433 15.7866 8.93359 14.8058 8.93359 13.596C8.93359 13.1677 9.58237 13.8695 10.7922 13.8695C12.002 13.8695 13.3147 12.3862 13.3147 13.596Z" fill="#00AE42"/>
<path d="M19.5156 15.7861H16.8303" stroke="#898989" stroke-linecap="round"/> <path d="M19.5156 15.7871H16.8303" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 12.5005H17.2779" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.5156 12.5H17.2779" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 9.21436L16.3828 9.21436" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.5156 9.21484L16.3828 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 5.92871L16.3828 5.92871" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.5156 5.92969L16.3828 5.92969" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 2.64307H16.3828" stroke="#C2C2C2" stroke-linecap="round"/> <path d="M19.5156 2.64258H16.3828" stroke="#898989" stroke-linecap="round"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

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

@ -913,22 +913,22 @@ void AMSRoad::doRender(wxDC &dc)
if (m_canindex == 3) { if (m_canindex == 3) {
if (m_amsinfo.ams_humidity == 5) { if (m_amsinfo.ams_humidity == 5) {
dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(size.x - ams_humidity_4.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_4.GetBmpSize().y - FromDIP(8)));
} }
else if (m_amsinfo.ams_humidity == 4) { else if (m_amsinfo.ams_humidity == 4) {
dc.DrawBitmap(ams_humidity_1.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_3.bmp(), wxPoint(size.x - ams_humidity_3.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_3.GetBmpSize().y - FromDIP(8)));
} }
else if (m_amsinfo.ams_humidity == 3) { else if (m_amsinfo.ams_humidity == 3) {
dc.DrawBitmap(ams_humidity_2.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_2.bmp(), wxPoint(size.x - ams_humidity_2.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_2.GetBmpSize().y - FromDIP(8)));
} }
else if (m_amsinfo.ams_humidity == 2) { else if (m_amsinfo.ams_humidity == 2) {
dc.DrawBitmap(ams_humidity_3.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_1.bmp(), wxPoint(size.x - ams_humidity_1.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_1.GetBmpSize().y - FromDIP(8)));
} }
else if (m_amsinfo.ams_humidity == 1) { else if (m_amsinfo.ams_humidity == 1) {
dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8)));
} }
else { else {
dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8))); dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(size.x - ams_humidity_4.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_4.GetBmpSize().y - FromDIP(8)));
} }
} }
} }
@ -995,13 +995,6 @@ AMSItem::AMSItem() {}
AMSItem::AMSItem(wxWindow *parent, wxWindowID id, AMSinfo amsinfo, const wxSize cube_size, const wxPoint &pos, const wxSize &size) : AMSItem() AMSItem::AMSItem(wxWindow *parent, wxWindowID id, AMSinfo amsinfo, const wxSize cube_size, const wxPoint &pos, const wxSize &size) : AMSItem()
{ {
ams_humidity_0 = ScalableBitmap(this, "ams_humidity_0", 18);
ams_humidity_1 = ScalableBitmap(this, "ams_humidity_1", 18);
ams_humidity_2 = ScalableBitmap(this, "ams_humidity_2", 18);
ams_humidity_3 = ScalableBitmap(this, "ams_humidity_3", 18);
ams_humidity_4 = ScalableBitmap(this, "ams_humidity_4", 18);
m_amsinfo = amsinfo; m_amsinfo = amsinfo;
m_cube_size = cube_size; m_cube_size = cube_size;
create(parent, id, pos, size); create(parent, id, pos, size);
@ -1145,25 +1138,6 @@ void AMSItem::doRender(wxDC &dc)
dc.SetTextForeground(AMS_CONTROL_GRAY800); dc.SetTextForeground(AMS_CONTROL_GRAY800);
auto tsize = dc.GetTextExtent("00% RH"); auto tsize = dc.GetTextExtent("00% RH");
auto text = wxString::Format("%d%% RH", m_humidity);*/ auto text = wxString::Format("%d%% RH", m_humidity);*/
if (m_amsinfo.ams_humidity == 5) {
dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(left, (size.y - ams_humidity_0.GetBmpSize().y) / 2));
}
else if (m_amsinfo.ams_humidity == 4) {
dc.DrawBitmap(ams_humidity_1.bmp(), wxPoint(left, (size.y - ams_humidity_1.GetBmpSize().y) / 2));
}
else if (m_amsinfo.ams_humidity == 3) {
dc.DrawBitmap(ams_humidity_2.bmp(), wxPoint(left, (size.y - ams_humidity_2.GetBmpSize().y) / 2));
}
else if (m_amsinfo.ams_humidity == 2) {
dc.DrawBitmap(ams_humidity_3.bmp(), wxPoint(left, (size.y - ams_humidity_3.GetBmpSize().y) / 2));
}
else if (m_amsinfo.ams_humidity == 1) {
dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(left, (size.y - ams_humidity_4.GetBmpSize().y) / 2));
}
else {
dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(left, (size.y - ams_humidity_0.GetBmpSize().y) / 2));
}
} }
auto border_colour = AMS_CONTROL_BRAND_COLOUR; auto border_colour = AMS_CONTROL_BRAND_COLOUR;

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

@ -326,11 +326,6 @@ public:
virtual bool Enable(bool enable = true); virtual bool Enable(bool enable = true);
AMSinfo m_amsinfo; AMSinfo m_amsinfo;
ScalableBitmap ams_humidity_0;
ScalableBitmap ams_humidity_1;
ScalableBitmap ams_humidity_2;
ScalableBitmap ams_humidity_3;
ScalableBitmap ams_humidity_4;
protected: protected:
wxSize m_cube_size; wxSize m_cube_size;