3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

NEW:support transparent color display

Browse source 
Change-Id: I49e0e4c507121af7dad912a3a549348e7ade8eec
This commit is contained in:
tao wang 2023-05-16 20:53:08 +08:00 • committed by Lane.Wei
parent 57873e6e59
commit 9f8397b187
14 changed files with 317 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/images/transparent_ams_item.svg Normal file
View file

@ -0,0 +1,21 @@
<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="48" height="48" transform="matrix(1 0 0 -1 0 48)" fill="#FEFFFE"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 0 8)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 0 24)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 0 40)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 8 0)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 8 16)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 8 32)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 16 8)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 16 24)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 16 40)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 24 0)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 24 16)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 24 32)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 32 8)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 32 24)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 32 40)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 40 0)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 40 16)" fill="#D9D9D9"/>
<rect width="8" height="8" transform="matrix(0 1 1 0 40 32)" fill="#D9D9D9"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

125
resources/images/transparent_ams_lib.svg Normal file
View file

@ -0,0 +1,125 @@
<svg width="50" height="68" viewBox="0 0 50 68" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_23_15)">
<mask id="mask0_23_15" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="50" height="68">
<path d="M50 0H0V68H50V0Z" fill="white"/>
</mask>
<g mask="url(#mask0_23_15)">
<path d="M50 68H0V0H50V68Z" fill="#FEFFFE"/>
<path d="M0 8V4H3.84615V8H0Z" fill="#D9D9D9"/>
<path d="M23.0769 8V4H26.9231V8H23.0769Z" fill="#D9D9D9"/>
<path d="M0 40V36H3.84615V40H0Z" fill="#D9D9D9"/>
<path d="M23.0769 40V36H26.9231V40H23.0769Z" fill="#D9D9D9"/>
<path d="M0 16V12H3.84615V16H0Z" fill="#D9D9D9"/>
<path d="M23.0769 16V12H26.9231V16H23.0769Z" fill="#D9D9D9"/>
<path d="M0 48V44H3.84615V48H0Z" fill="#D9D9D9"/>
<path d="M23.0769 48V44H26.9231V48H23.0769Z" fill="#D9D9D9"/>
<path d="M0 24V20H3.84615V24H0Z" fill="#D9D9D9"/>
<path d="M23.0769 24V20H26.9231V24H23.0769Z" fill="#D9D9D9"/>
<path d="M0 56V52H3.84615V56H0Z" fill="#D9D9D9"/>
<path d="M23.0769 56V52H26.9231V56H23.0769Z" fill="#D9D9D9"/>
<path d="M3.84616 28V24H7.69231V28H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 28V24H30.7692V28H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 60V56H7.69231V60H3.84616Z" fill="#D9D9D9"/>
<path d="M3.84616 68V64H7.69231V68H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 60V56H30.7692V60H26.9231Z" fill="#D9D9D9"/>
<path d="M26.9231 68V64H30.7692V68H26.9231Z" fill="#D9D9D9"/>
<path d="M0 32V28H3.84615V32H0Z" fill="#D9D9D9"/>
<path d="M23.0769 32V28H26.9231V32H23.0769Z" fill="#D9D9D9"/>
<path d="M0 64V60H3.84615V64H0Z" fill="#D9D9D9"/>
<path d="M23.0769 64V60H26.9231V64H23.0769Z" fill="#D9D9D9"/>
<path d="M3.84616 4V0H7.69231V4H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 4V0H30.7692V4H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 36V32H7.69231V36H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 36V32H30.7692V36H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 12V8H7.69231V12H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 12V8H30.7692V12H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 44V40H7.69231V44H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 44V40H30.7692V44H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 20V16H7.69231V20H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 20V16H30.7692V20H26.9231Z" fill="#D9D9D9"/>
<path d="M3.84616 52V48H7.69231V52H3.84616Z" fill="#D9D9D9"/>
<path d="M26.9231 52V48H30.7692V52H26.9231Z" fill="#D9D9D9"/>
<path d="M7.69231 8V4H11.5385V8H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 8V4H34.6154V8H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 40V36H11.5385V40H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 40V36H34.6154V40H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 16V12H11.5385V16H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 16V12H34.6154V16H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 48V44H11.5385V48H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 48V44H34.6154V48H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 24V20H11.5385V24H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 24V20H34.6154V24H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 56V52H11.5385V56H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 56V52H34.6154V56H30.7692Z" fill="#D9D9D9"/>
<path d="M11.5385 28V24H15.3846V28H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 28V24H38.4615V28H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 60V56H15.3846V60H11.5385Z" fill="#D9D9D9"/>
<path d="M11.5385 68V64H15.3846V68H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 60V56H38.4615V60H34.6154Z" fill="#D9D9D9"/>
<path d="M34.6154 68V64H38.4615V68H34.6154Z" fill="#D9D9D9"/>
<path d="M7.69231 32V28H11.5385V32H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 32V28H34.6154V32H30.7692Z" fill="#D9D9D9"/>
<path d="M7.69231 64V60H11.5385V64H7.69231Z" fill="#D9D9D9"/>
<path d="M30.7692 64V60H34.6154V64H30.7692Z" fill="#D9D9D9"/>
<path d="M11.5385 4V0H15.3846V4H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 4V0H38.4615V4H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 36V32H15.3846V36H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 36V32H38.4615V36H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 12V8H15.3846V12H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 12V8H38.4615V12H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 44V40H15.3846V44H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 44V40H38.4615V44H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 20V16H15.3846V20H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 20V16H38.4615V20H34.6154Z" fill="#D9D9D9"/>
<path d="M11.5385 52V48H15.3846V52H11.5385Z" fill="#D9D9D9"/>
<path d="M34.6154 52V48H38.4615V52H34.6154Z" fill="#D9D9D9"/>
<path d="M15.3846 8V4H19.2308V8H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 8V4H42.3077V8H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 40V36H19.2308V40H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 40V36H42.3077V40H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 16V12H19.2308V16H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 16V12H42.3077V16H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 48V44H19.2308V48H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 48V44H42.3077V48H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 24V20H19.2308V24H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 24V20H42.3077V24H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 56V52H19.2308V56H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 56V52H42.3077V56H38.4615Z" fill="#D9D9D9"/>
<path d="M19.2308 28V24H23.0769V28H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 28V24H46.1538V28H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 32V28H50V32H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 60V56H23.0769V60H19.2308Z" fill="#D9D9D9"/>
<path d="M19.2308 68V64H23.0769V68H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 60V56H46.1538V60H42.3077Z" fill="#D9D9D9"/>
<path d="M42.3077 68V64H46.1538V68H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 64V60H50V64H46.1538Z" fill="#D9D9D9"/>
<path d="M15.3846 32V28H19.2308V32H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 32V28H42.3077V32H38.4615Z" fill="#D9D9D9"/>
<path d="M15.3846 64V60H19.2308V64H15.3846Z" fill="#D9D9D9"/>
<path d="M38.4615 64V60H42.3077V64H38.4615Z" fill="#D9D9D9"/>
<path d="M19.2308 4V0H23.0769V4H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 4V0H46.1538V4H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 8V4H50V8H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 36V32H23.0769V36H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 36V32H46.1538V36H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 40V36H50V40H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 12V8H23.0769V12H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 12V8H46.1538V12H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 16V12H50V16H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 44V40H23.0769V44H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 44V40H46.1538V44H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 48V44H50V48H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 20V16H23.0769V20H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 20V16H46.1538V20H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 24V20H50V24H46.1538Z" fill="#D9D9D9"/>
<path d="M19.2308 52V48H23.0769V52H19.2308Z" fill="#D9D9D9"/>
<path d="M42.3077 52V48H46.1538V52H42.3077Z" fill="#D9D9D9"/>
<path d="M46.1538 56V52H50V56H46.1538Z" fill="#D9D9D9"/>
</g>
</g>
<defs>
<clipPath id="clip0_23_15">
<rect width="50" height="68" fill="white"/>
</clipPath>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 7 KiB

4
resources/images/transparent_color_picker.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25 12.5C25 5.59644 19.4036 0 12.5 0V0C5.59644 0 0 5.59644 0 12.5V12.5C0 19.4036 5.59644 25 12.5 25V25C19.4036 25 25 19.4036 25 12.5V12.5Z" fill="#FEFFFE"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.250045 15C0.0860757 14.1922 0 13.3562 0 12.5C0 11.6438 0.0860756 10.8078 0.250045 10H5V15H0.250045ZM5 22.5009C4.05303 21.7896 3.21038 20.947 2.49908 20H5V22.5009ZM15 24.75C14.1922 24.9139 13.3562 25 12.5 25C11.6438 25 10.8078 24.9139 10 24.75V20H15V24.75ZM22.5009 20C21.7896 20.947 20.947 21.7896 20 22.5009V20H22.5009ZM25 12.5C25 13.3562 24.9139 14.1922 24.75 15H20V10H24.75C24.9139 10.8078 25 11.6438 25 12.5ZM20 2.49908C20.947 3.21038 21.7896 4.05303 22.5009 5H20V2.49908ZM10 0.250045C10.8078 0.0860756 11.6438 0 12.5 0C13.3562 0 14.1922 0.0860757 15 0.250045V5H10V0.250045ZM5 2.49908C4.05303 3.21038 3.21038 4.05303 2.49908 5H5V10H10V15H5V20H10V15H15V20H20V15H15V10H20V5H15V10H10V5H5V2.49908Z" fill="#D9D9D9"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

76
resources/images/transparent_mapping_item.svg Normal file
View file

@ -0,0 +1,76 @@
<svg width="45" height="44" viewBox="0 0 45 44" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_10957_38888)">
<path d="M45 44H0V0H45V44Z" fill="#FEFFFE"/>
<path d="M0 8V4H4V8H0Z" fill="#D9D9D9"/>
<path d="M24 8V4H28V8H24Z" fill="#D9D9D9"/>
<path d="M0 40V36H4V40H0Z" fill="#D9D9D9"/>
<path d="M24 40V36H28V40H24Z" fill="#D9D9D9"/>
<path d="M0 16V12H4V16H0Z" fill="#D9D9D9"/>
<path d="M24 16V12H28V16H24Z" fill="#D9D9D9"/>
<path d="M0 24V20H4V24H0Z" fill="#D9D9D9"/>
<path d="M24 24V20H28V24H24Z" fill="#D9D9D9"/>
<path d="M4 28V24H8V28H4Z" fill="#D9D9D9"/>
<path d="M28 28V24H32V28H28Z" fill="#D9D9D9"/>
<path d="M0 32V28H4V32H0Z" fill="#D9D9D9"/>
<path d="M24 32V28H28V32H24Z" fill="#D9D9D9"/>
<path d="M4 4V0H8V4H4Z" fill="#D9D9D9"/>
<path d="M28 4V0H32V4H28Z" fill="#D9D9D9"/>
<path d="M4 36V32H8V36H4Z" fill="#D9D9D9"/>
<path d="M4 44V40H8V44H4Z" fill="#D9D9D9"/>
<path d="M28 36V32H32V36H28Z" fill="#D9D9D9"/>
<path d="M28 44V40H32V44H28Z" fill="#D9D9D9"/>
<path d="M4 12V8H8V12H4Z" fill="#D9D9D9"/>
<path d="M28 12V8H32V12H28Z" fill="#D9D9D9"/>
<path d="M4 20V16H8V20H4Z" fill="#D9D9D9"/>
<path d="M28 20V16H32V20H28Z" fill="#D9D9D9"/>
<path d="M8 8V4H12V8H8Z" fill="#D9D9D9"/>
<path d="M32 8V4H36V8H32Z" fill="#D9D9D9"/>
<path d="M40 8V4H44V8H40Z" fill="#D9D9D9"/>
<path d="M8 40V36H12V40H8Z" fill="#D9D9D9"/>
<path d="M32 40V36H36V40H32Z" fill="#D9D9D9"/>
<path d="M40 40V36H44V40H40Z" fill="#D9D9D9"/>
<path d="M8 16V12H12V16H8Z" fill="#D9D9D9"/>
<path d="M32 16V12H36V16H32Z" fill="#D9D9D9"/>
<path d="M40 16V12H44V16H40Z" fill="#D9D9D9"/>
<path d="M8 24V20H12V24H8Z" fill="#D9D9D9"/>
<path d="M32 24V20H36V24H32Z" fill="#D9D9D9"/>
<path d="M40 24V20H44V24H40Z" fill="#D9D9D9"/>
<path d="M12 28V24H16V28H12Z" fill="#D9D9D9"/>
<path d="M36 28V24H40V28H36Z" fill="#D9D9D9"/>
<path d="M44 28V24H48V28H44Z" fill="#D9D9D9"/>
<path d="M8 32V28H12V32H8Z" fill="#D9D9D9"/>
<path d="M32 32V28H36V32H32Z" fill="#D9D9D9"/>
<path d="M40 32V28H44V32H40Z" fill="#D9D9D9"/>
<path d="M12 4V0H16V4H12Z" fill="#D9D9D9"/>
<path d="M36 4V0H40V4H36Z" fill="#D9D9D9"/>
<path d="M44 4V0H48V4H44Z" fill="#D9D9D9"/>
<path d="M12 36V32H16V36H12Z" fill="#D9D9D9"/>
<path d="M12 44V40H16V44H12Z" fill="#D9D9D9"/>
<path d="M36 36V32H40V36H36Z" fill="#D9D9D9"/>
<path d="M44 36V32H48V36H44Z" fill="#D9D9D9"/>
<path d="M36 44V40H40V44H36Z" fill="#D9D9D9"/>
<path d="M44 44V40H48V44H44Z" fill="#D9D9D9"/>
<path d="M12 12V8H16V12H12Z" fill="#D9D9D9"/>
<path d="M36 12V8H40V12H36Z" fill="#D9D9D9"/>
<path d="M44 12V8H48V12H44Z" fill="#D9D9D9"/>
<path d="M12 20V16H16V20H12Z" fill="#D9D9D9"/>
<path d="M36 20V16H40V20H36Z" fill="#D9D9D9"/>
<path d="M44 20V16H48V20H44Z" fill="#D9D9D9"/>
<path d="M16 8V4H20V8H16Z" fill="#D9D9D9"/>
<path d="M16 40V36H20V40H16Z" fill="#D9D9D9"/>
<path d="M16 16V12H20V16H16Z" fill="#D9D9D9"/>
<path d="M16 24V20H20V24H16Z" fill="#D9D9D9"/>
<path d="M20 28V24H24V28H20Z" fill="#D9D9D9"/>
<path d="M16 32V28H20V32H16Z" fill="#D9D9D9"/>
<path d="M20 4V0H24V4H20Z" fill="#D9D9D9"/>
<path d="M20 36V32H24V36H20Z" fill="#D9D9D9"/>
<path d="M20 44V40H24V44H20Z" fill="#D9D9D9"/>
<path d="M20 12V8H24V12H20Z" fill="#D9D9D9"/>
<path d="M20 20V16H24V20H20Z" fill="#D9D9D9"/>
</g>
<defs>
<clipPath id="clip0_10957_38888">
<rect width="45" height="44" fill="white"/>
</clipPath>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

11
resources/images/transparent_material_item.svg Normal file
View file

@ -0,0 +1,11 @@
<svg width="62" height="32" viewBox="0 0 62 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_10955_38884)">
<path d="M0 0H62V32H0V0Z" fill="#FEFFFE"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V4H3V8H0V12H3V16H0V20H3V24H0V28H3V32H7V28H11V32H15V28H19V32H23V28H27V32H31V28H35V32H39V28H43V32H47V28H51V32H55V28H59V32H62V28H59V24H62V20H59V16H62V12H59V8H62V4H59V0H55V4H51V0H47V4H43V0H39V4H35V0H31V4H27V0H23V4H19V0H15V4H11V0H7V4H3V0H0ZM7 8V4H11V8H7ZM7 12V8H3V12H7ZM11 12V8H15V12H11ZM11 16V12H7V16H3V20H7V24H3V28H7V24H11V28H15V24H19V28H23V24H27V28H31V24H35V28H39V24H43V28H47V24H51V28H55V24H59V20H55V16H59V12H55V8H59V4H55V8H51V4H47V8H43V4H39V8H35V4H31V8H27V4H23V8H19V4H15V8H19V12H15V16H11ZM11 20V24H15V20H19V24H23V20H27V24H31V20H35V24H39V20H43V24H47V20H51V24H55V20H51V16H55V12H51V8H47V12H43V8H39V12H35V8H31V12H27V8H23V12H19V16H15V20H11ZM23 16V12H27V16H23ZM31 16V12H35V16H31ZM39 16V12H43V16H39ZM47 16V20H43V16H47ZM39 16V20H35V16H39ZM31 16V20H27V16H31ZM23 16V20H19V16H23ZM47 16H51V12H47V16ZM11 20H7V16H11V20Z" fill="#D9D9D9"/>
</g>
<defs>
<clipPath id="clip0_10955_38884">
<rect width="62" height="32" rx="5" fill="white"/>
</clipPath>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

21
src/slic3r/GUI/AMSMaterialsSetting.cpp
View file

@ -644,7 +644,7 @@ void AMSMaterialsSetting::set_colors(std::vector<wxColour> colors)
void AMSMaterialsSetting::on_picker_color(wxCommandEvent& event) void AMSMaterialsSetting::on_picker_color(wxCommandEvent& event)
{ {
unsigned int color_num = event.GetInt(); unsigned int color_num = event.GetInt();
set_color(wxColour(color_num>>16&0xFF, color_num>>8&0xFF, color_num&0xFF)); set_color(wxColour(color_num>>24&0xFF, color_num>>16&0xFF, color_num>>8&0xFF, color_num&0xFF));
} }
void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event) void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event)
@ -929,7 +929,9 @@ ColorPicker::ColorPicker(wxWindow* parent, wxWindowID id, const wxPoint& pos /*=
SetMaxSize(wxSize(FromDIP(25), FromDIP(25))); SetMaxSize(wxSize(FromDIP(25), FromDIP(25)));
Bind(wxEVT_PAINT, &ColorPicker::paintEvent, this); Bind(wxEVT_PAINT, &ColorPicker::paintEvent, this);
m_bitmap_border = create_scaled_bitmap("color_picker_border", nullptr, 25); m_bitmap_border = create_scaled_bitmap("color_picker_border", nullptr, 25);
m_bitmap_transparent = create_scaled_bitmap("transparent_color_picker", nullptr, 25);
} }
ColorPicker::~ColorPicker(){} ColorPicker::~ColorPicker(){}
@ -982,13 +984,19 @@ void ColorPicker::render(wxDC& dc)
void ColorPicker::doRender(wxDC& dc) void ColorPicker::doRender(wxDC& dc)
{ {
wxSize size = GetSize(); wxSize size = GetSize();
auto alpha = m_colour.Alpha();
auto radius = m_show_full?size.x / 2:size.x / 2 - FromDIP(1); auto radius = m_show_full?size.x / 2:size.x / 2 - FromDIP(1);
if (m_selected) radius -= FromDIP(1); if (m_selected) radius -= FromDIP(1);
if (alpha == 0) {
dc.DrawBitmap(m_bitmap_transparent, 0, 0);
}
else {
dc.SetPen(wxPen(m_colour)); dc.SetPen(wxPen(m_colour));
dc.SetBrush(wxBrush(m_colour)); dc.SetBrush(wxBrush(m_colour));
dc.DrawCircle(size.x / 2, size.x / 2, radius); dc.DrawCircle(size.x / 2, size.x / 2, radius);
}
if (m_selected) { if (m_selected) {
dc.SetPen(wxPen(m_colour)); dc.SetPen(wxPen(m_colour));
@ -1001,6 +1009,11 @@ void ColorPicker::doRender(wxDC& dc)
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawCircle(size.x / 2, size.x / 2, radius); dc.DrawCircle(size.x / 2, size.x / 2, radius);
//transparent
if (alpha == 0) {
dc.DrawBitmap(m_bitmap_transparent, 0, 0);
}
if (m_cols.size() > 1) { if (m_cols.size() > 1) {
int left = FromDIP(0); int left = FromDIP(0);
float total_width = size.x; float total_width = size.x;
@ -1096,7 +1109,7 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent)
set_def_colour(cp->m_colour); set_def_colour(cp->m_colour);
wxCommandEvent evt(EVT_SELECTED_COLOR); wxCommandEvent evt(EVT_SELECTED_COLOR);
unsigned long g_col = ((cp->m_colour.Red() & 0xff) << 16) + ((cp->m_colour.Green() & 0xff) << 8) + (cp->m_colour.Blue() & 0xff); unsigned long g_col = ((cp->m_colour.Red() & 0xff) << 24) + ((cp->m_colour.Green() & 0xff) << 16) + ((cp->m_colour.Blue() & 0xff) << 8) + (cp->m_colour.Alpha() & 0xff);
evt.SetInt(g_col); evt.SetInt(g_col);
wxPostEvent(GetParent(), evt); wxPostEvent(GetParent(), evt);
}); });
@ -1183,7 +1196,7 @@ void ColorPickerPopup::on_custom_clr_picker(wxMouseEvent& event)
m_custom_cp->SetBackgroundColor(picker_color); m_custom_cp->SetBackgroundColor(picker_color);
set_def_colour(picker_color); set_def_colour(picker_color);
wxCommandEvent evt(EVT_SELECTED_COLOR); wxCommandEvent evt(EVT_SELECTED_COLOR);
unsigned long g_col = ((picker_color.Red() & 0xff) << 16) + ((picker_color.Green() & 0xff) << 8) + (picker_color.Blue() & 0xff); unsigned long g_col = ((picker_color.Red() & 0xff) << 24) + ((picker_color.Green() & 0xff) << 16) + ((picker_color.Blue() & 0xff) << 8) + (picker_color.Alpha() & 0xff);
evt.SetInt(g_col); evt.SetInt(g_col);
wxPostEvent(GetParent(), evt); wxPostEvent(GetParent(), evt);
} }
@ -1218,7 +1231,7 @@ void ColorPickerPopup::set_ams_colours(std::vector<wxColour> ams)
set_def_colour(cp->m_colour); set_def_colour(cp->m_colour);
wxCommandEvent evt(EVT_SELECTED_COLOR); wxCommandEvent evt(EVT_SELECTED_COLOR);
unsigned long g_col = ((cp->m_colour.Red() & 0xff) << 16) + ((cp->m_colour.Green() & 0xff) << 8) + (cp->m_colour.Blue() & 0xff); unsigned long g_col = ((cp->m_colour.Red() & 0xff) << 24) + ((cp->m_colour.Green() & 0xff) << 16) + ((cp->m_colour.Blue() & 0xff) << 8) + (cp->m_colour.Alpha() & 0xff);
evt.SetInt(g_col); evt.SetInt(g_col);
wxPostEvent(GetParent(), evt); wxPostEvent(GetParent(), evt);
}); });

2
src/slic3r/GUI/AMSMaterialsSetting.hpp
View file

@ -32,6 +32,8 @@ class ColorPicker : public wxWindow
{ {
public: public:
wxBitmap m_bitmap_border; wxBitmap m_bitmap_border;
wxBitmap m_bitmap_transparent;
wxColour m_colour; wxColour m_colour;
std::vector<wxColour> m_cols; std::vector<wxColour> m_cols;
bool m_selected{false}; bool m_selected{false};

35
src/slic3r/GUI/AmsMappingPopup.cpp
View file

@ -30,7 +30,7 @@ wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent);
{ {
m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down", FromDIP(12)); m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down", FromDIP(12));
m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", FromDIP(12)); m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", FromDIP(12));
m_transparent_mitem = ScalableBitmap(this, "transparent_material_item", FromDIP(32));
m_material_coloul = mcolour; m_material_coloul = mcolour;
m_material_name = mname; m_material_name = mname;
@ -121,6 +121,7 @@ void MaterialItem::render(wxDC &dc)
dc.SetFont(::Label::Body_13); dc.SetFont(::Label::Body_13);
auto material_name_colour = m_material_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30); auto material_name_colour = m_material_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30);
if (m_material_coloul.Alpha() == 0) {material_name_colour = wxColour(0x26, 0x2E, 0x30);}
dc.SetTextForeground(material_name_colour); dc.SetTextForeground(material_name_colour);
if (dc.GetTextExtent(m_material_name).x > GetSize().x - 10) { if (dc.GetTextExtent(m_material_name).x > GetSize().x - 10) {
@ -134,6 +135,9 @@ void MaterialItem::render(wxDC &dc)
// mapping num // mapping num
dc.SetFont(::Label::Body_10); dc.SetFont(::Label::Body_10);
dc.SetTextForeground(m_ams_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30)); dc.SetTextForeground(m_ams_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30));
if (m_ams_coloul.Alpha() == 0) {
dc.SetTextForeground(wxColour(0x26, 0x2E, 0x30));
}
wxString mapping_txt = wxEmptyString; wxString mapping_txt = wxEmptyString;
if (m_ams_name.empty()) { if (m_ams_name.empty()) {
@ -148,6 +152,10 @@ void MaterialItem::render(wxDC &dc)
void MaterialItem::doRender(wxDC &dc) void MaterialItem::doRender(wxDC &dc)
{ {
if (m_material_coloul.Alpha() == 0) {
dc.DrawBitmap(m_transparent_mitem.bmp(), FromDIP(1), FromDIP(1));
}
//top //top
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(m_material_coloul)); dc.SetBrush(wxBrush(m_material_coloul));
@ -181,7 +189,7 @@ void MaterialItem::doRender(wxDC &dc)
dc.DrawRoundedRectangle(1, 1, MATERIAL_ITEM_SIZE.x - 1, MATERIAL_ITEM_SIZE.y - 1, 5); dc.DrawRoundedRectangle(1, 1, MATERIAL_ITEM_SIZE.x - 1, MATERIAL_ITEM_SIZE.y - 1, 5);
} }
#else #else
if (m_material_coloul == *wxWHITE || m_ams_coloul == *wxWHITE) { if (m_material_coloul == *wxWHITE || m_ams_coloul == *wxWHITE || m_ams_coloul.Alpha() == 0) {
dc.SetPen(wxColour(0xAC, 0xAC, 0xAC)); dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5); dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5);
@ -194,7 +202,6 @@ void MaterialItem::doRender(wxDC &dc)
} }
#endif #endif
//arrow //arrow
if ( (m_ams_coloul.Red() > 160 && m_ams_coloul.Green() > 160 && m_ams_coloul.Blue() > 160) && if ( (m_ams_coloul.Red() > 160 && m_ams_coloul.Green() > 160 && m_ams_coloul.Blue() > 160) &&
(m_ams_coloul.Red() < 180 && m_ams_coloul.Green() < 180 && m_ams_coloul.Blue() < 180)) { (m_ams_coloul.Red() < 180 && m_ams_coloul.Green() < 180 && m_ams_coloul.Blue() < 180)) {
dc.DrawBitmap(m_arraw_bitmap_white.bmp(), GetSize().x - m_arraw_bitmap_white.GetBmpSize().x - FromDIP(7), GetSize().y - m_arraw_bitmap_white.GetBmpSize().y); dc.DrawBitmap(m_arraw_bitmap_white.bmp(), GetSize().x - m_arraw_bitmap_white.GetBmpSize().x - FromDIP(7), GetSize().y - m_arraw_bitmap_white.GetBmpSize().y);
@ -535,6 +542,8 @@ void AmsMapingPopup::paintEvent(wxPaintEvent &evt)
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetDoubleBuffered(true); SetDoubleBuffered(true);
#endif //__WINDOWS__ #endif //__WINDOWS__
m_transparent_mapping_item = ScalableBitmap(this, "transparent_mapping_item", FromDIP(44));
SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
Bind(wxEVT_PAINT, &MappingItem::paintEvent, this); Bind(wxEVT_PAINT, &MappingItem::paintEvent, this);
} }
@ -550,7 +559,7 @@ void MappingItem::send_event(int fliament_id)
wxCommandEvent event(EVT_SET_FINISH_MAPPING); wxCommandEvent event(EVT_SET_FINISH_MAPPING);
event.SetInt(m_tray_data.id); event.SetInt(m_tray_data.id);
wxString param = wxString::Format("%d|%d|%d|%s|%d", m_coloul.Red(), m_coloul.Green(), m_coloul.Blue(), number, fliament_id); wxString param = wxString::Format("%d|%d|%d|%d|%s|%d", m_coloul.Red(), m_coloul.Green(), m_coloul.Blue(), m_coloul.Alpha(), number, fliament_id);
event.SetString(param); event.SetString(param);
event.SetEventObject(this->GetParent()->GetParent()); event.SetEventObject(this->GetParent()->GetParent());
wxPostEvent(this->GetParent()->GetParent()->GetParent(), event); wxPostEvent(this->GetParent()->GetParent()->GetParent(), event);
@ -594,7 +603,7 @@ void MappingItem::render(wxDC &dc)
auto txt_colour = m_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30); auto txt_colour = m_coloul.GetLuminance() < 0.5 ? *wxWHITE : wxColour(0x26, 0x2E, 0x30);
txt_colour = m_unmatch ? wxColour(0xCE, 0xCE, 0xCE) : txt_colour; txt_colour = m_unmatch ? wxColour(0xCE, 0xCE, 0xCE) : txt_colour;
if (m_coloul.Alpha() == 0) txt_colour = wxColour(0x26, 0x2E, 0x30);
dc.SetTextForeground(txt_colour); dc.SetTextForeground(txt_colour);
/*if (dc.GetTextExtent(m_name).x > GetSize().x - 10) { /*if (dc.GetTextExtent(m_name).x > GetSize().x - 10) {
@ -628,16 +637,14 @@ void MappingItem::doRender(wxDC &dc)
{ {
dc.SetPen(m_coloul); dc.SetPen(m_coloul);
dc.SetBrush(wxBrush(m_coloul)); dc.SetBrush(wxBrush(m_coloul));
dc.DrawRectangle(0, (GetSize().y - MAPPING_ITEM_REAL_SIZE.y) / 2, MAPPING_ITEM_REAL_SIZE.x, MAPPING_ITEM_REAL_SIZE.y);
// if (m_coloul == *wxWHITE) { if (m_coloul.Alpha() == 0) {
// dc.SetPen(wxPen(wxColour(0xAC, 0xAC, 0xAC), 1)); dc.DrawBitmap( m_transparent_mapping_item.bmp(), 0, (GetSize().y - MAPPING_ITEM_REAL_SIZE.y) / 2);
//#ifdef __APPLE__ }
// dc.DrawRectangle(1, 1, GetSize().x - 1, GetSize().y - 1); else {
//#else dc.DrawRectangle(0, (GetSize().y - MAPPING_ITEM_REAL_SIZE.y) / 2, MAPPING_ITEM_REAL_SIZE.x, MAPPING_ITEM_REAL_SIZE.y);
// dc.DrawRectangle(0, 0, tray_size.x, tray_size.y); }
//#endif // __APPLE__
// }
wxColour side_colour = wxColour(0xE4E4E4); wxColour side_colour = wxColour(0xE4E4E4);

2
src/slic3r/GUI/AmsMappingPopup.hpp
View file

@ -75,6 +75,7 @@ public:
ScalableBitmap m_arraw_bitmap_gray; ScalableBitmap m_arraw_bitmap_gray;
ScalableBitmap m_arraw_bitmap_white; ScalableBitmap m_arraw_bitmap_white;
ScalableBitmap m_transparent_mitem;
bool m_selected {false}; bool m_selected {false};
bool m_warning{false}; bool m_warning{false};
@ -106,6 +107,7 @@ public:
wxColour m_coloul; wxColour m_coloul;
wxString m_name; wxString m_name;
TrayData m_tray_data; TrayData m_tray_data;
ScalableBitmap m_transparent_mapping_item;
bool m_unmatch{false}; bool m_unmatch{false};
void msw_rescale(); void msw_rescale();

1
src/slic3r/GUI/BitmapCache.cpp
View file

@ -449,6 +449,7 @@ bool BitmapCache::parse_color(const std::string& scolor, unsigned char* rgb_out)
return false; return false;
rgb_out[i] = (unsigned char)(digit1 * 16 + digit2); rgb_out[i] = (unsigned char)(digit1 * 16 + digit2);
} }
return true; return true;
} }

8
src/slic3r/GUI/DeviceManager.hpp
View file

@ -173,19 +173,19 @@ public:
static wxColour decode_color(const std::string &color) static wxColour decode_color(const std::string &color)
{ {
std::array<int, 3> ret = {0, 0, 0}; std::array<int, 4> ret = {0, 0, 0, 0};
const char * c = color.data(); const char * c = color.data();
if (color.size() == 8) { if (color.size() == 8) {
for (size_t j = 0; j < 3; ++j) { for (size_t j = 0; j < 4; ++j) {
int digit1 = hex_digit_to_int(*c++); int digit1 = hex_digit_to_int(*c++);
int digit2 = hex_digit_to_int(*c++); int digit2 = hex_digit_to_int(*c++);
if (digit1 == -1 || digit2 == -1) break; if (digit1 == -1 || digit2 == -1) break;
ret[j] = float(digit1 * 16 + digit2); ret[j] = float(digit1 * 16 + digit2);
} }
} else { } else {
return wxColour(255, 255, 255); return wxColour(255, 255, 255, 255);
} }
return wxColour(ret[0], ret[1], ret[2]); return wxColour(ret[0], ret[1], ret[2], ret[3]);
} }
std::string id; std::string id;

28
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1899,11 +1899,7 @@ bool SelectMachineDialog::get_ams_mapping_result(std::string &mapping_array_str,
mapping_item["filamentId"] = it->filament_id; mapping_item["filamentId"] = it->filament_id;
} }
//convert #RRGGBB to RRGGBBAA //convert #RRGGBB to RRGGBBAA
if (m_filaments[k].color.size() > 6) {
mapping_item["sourceColor"] = m_filaments[k].color.substr(1, 6) + "FF";
} else {
mapping_item["sourceColor"] = m_filaments[k].color; mapping_item["sourceColor"] = m_filaments[k].color;
}
mapping_item["targetColor"] = m_ams_mapping_result[k].color; mapping_item["targetColor"] = m_ams_mapping_result[k].color;
} }
} }
@ -2445,7 +2441,7 @@ void SelectMachineDialog::on_send_print()
json mapping_info_json = json::array(); json mapping_info_json = json::array();
json item; json item;
if (m_filaments.size() > 0) { if (m_filaments.size() > 0) {
item["sourceColor"] = m_filaments[0].color.substr(1, 6) + "FF"; item["sourceColor"] = m_filaments[0].color.substr(1, 8);
item["filamentType"] = m_filaments[0].type; item["filamentType"] = m_filaments[0].type;
mapping_info_json.push_back(item); mapping_info_json.push_back(item);
ams_mapping_info = mapping_info_json.dump(); ams_mapping_info = mapping_info_json.dump();
@ -2604,12 +2600,12 @@ void SelectMachineDialog::on_set_finish_mapping(wxCommandEvent &evt)
BOOST_LOG_TRIVIAL(info) << "The ams mapping selection result: data is " << selection_data; BOOST_LOG_TRIVIAL(info) << "The ams mapping selection result: data is " << selection_data;
if (selection_data_arr.size() == 5) { if (selection_data_arr.size() == 6) {
for (auto i = 0; i < m_ams_mapping_result.size(); i++) { for (auto i = 0; i < m_ams_mapping_result.size(); i++) {
if (m_ams_mapping_result[i].id == wxAtoi(selection_data_arr[4])) { if (m_ams_mapping_result[i].id == wxAtoi(selection_data_arr[5])) {
m_ams_mapping_result[i].tray_id = evt.GetInt(); m_ams_mapping_result[i].tray_id = evt.GetInt();
auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2])); auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2]), wxAtoi(selection_data_arr[3]));
auto color = wxString::Format("%sFF", ams_colour.GetAsString(wxC2S_HTML_SYNTAX).substr(1, ams_colour.GetAsString(wxC2S_HTML_SYNTAX).size()-1)); wxString color = wxString::Format("#%02X%02X%02X%02X", ams_colour.Red(), ams_colour.Green(), ams_colour.Blue(), ams_colour.Alpha());
m_ams_mapping_result[i].color = color.ToStdString(); m_ams_mapping_result[i].color = color.ToStdString();
} }
BOOST_LOG_TRIVIAL(trace) << "The ams mapping result: id is " << m_ams_mapping_result[i].id << "tray_id is " << m_ams_mapping_result[i].tray_id; BOOST_LOG_TRIVIAL(trace) << "The ams mapping result: id is " << m_ams_mapping_result[i].id << "tray_id is " << m_ams_mapping_result[i].tray_id;
@ -2620,8 +2616,8 @@ void SelectMachineDialog::on_set_finish_mapping(wxCommandEvent &evt)
Material* item = iter->second; Material* item = iter->second;
MaterialItem *m = item->item; MaterialItem *m = item->item;
if (item->id == m_current_filament_id) { if (item->id == m_current_filament_id) {
auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2])); auto ams_colour = wxColour(wxAtoi(selection_data_arr[0]), wxAtoi(selection_data_arr[1]), wxAtoi(selection_data_arr[2]), wxAtoi(selection_data_arr[3]));
m->set_ams_info(ams_colour, selection_data_arr[3]); m->set_ams_info(ams_colour, selection_data_arr[4]);
} }
iter++; iter++;
} }
@ -3443,11 +3439,11 @@ void SelectMachineDialog::set_default_normal()
for (auto i = 0; i < extruders.size(); i++) { for (auto i = 0; i < extruders.size(); i++) {
auto extruder = extruders[i] - 1; auto extruder = extruders[i] - 1;
auto colour = wxGetApp().preset_bundle->project_config.opt_string("filament_colour", (unsigned int)extruder); auto colour = wxGetApp().preset_bundle->project_config.opt_string("filament_colour", (unsigned int) extruder);
unsigned char rgb[3]; unsigned char rgb[4];
bmcache.parse_color(colour, rgb); bmcache.parse_color4(colour, rgb);
auto colour_rgb = wxColour((int)rgb[0], (int)rgb[1], (int)rgb[2]); auto colour_rgb = wxColour((int) rgb[0], (int) rgb[1], (int) rgb[2], (int) rgb[3]);
if (extruder >= materials.size() || extruder < 0 || extruder >= display_materials.size()) if (extruder >= materials.size() || extruder < 0 || extruder >= display_materials.size())
continue; continue;
@ -3507,7 +3503,7 @@ void SelectMachineDialog::set_default_normal()
info.id = extruder; info.id = extruder;
info.type = materials[extruder]; info.type = materials[extruder];
info.brand = brands[extruder]; info.brand = brands[extruder];
info.color = colour_rgb.GetAsString(wxC2S_HTML_SYNTAX).ToStdString(); info.color = wxString::Format("#%02X%02X%02X%02X", colour_rgb.Red(), colour_rgb.Green(), colour_rgb.Blue(), colour_rgb.Alpha()).ToStdString();
m_filaments.push_back(info); m_filaments.push_back(info);
} }
} }

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

@ -633,6 +633,7 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14); m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14);
m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14); m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14);
m_bitmap_readonly_light = ScalableBitmap(this, "ams_readonly_light", 14); m_bitmap_readonly_light = ScalableBitmap(this, "ams_readonly_light", 14);
m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", FromDIP(68));
m_sizer_body->Add(0, 0, 1, wxEXPAND, 0); m_sizer_body->Add(0, 0, 1, wxEXPAND, 0);
m_sizer_body->Add(m_sizer_edit, 0, wxALIGN_CENTER, 0); m_sizer_body->Add(m_sizer_edit, 0, wxALIGN_CENTER, 0);
@ -723,9 +724,9 @@ void AMSLib::render(wxDC &dc)
temp_text_colour = AMS_CONTROL_GRAY800; temp_text_colour = AMS_CONTROL_GRAY800;
} }
//if (!wxWindow::IsEnabled()) { if (tmp_lib_colour.Alpha() == 0) {
//temp_text_colour = AMS_CONTROL_DISABLE_TEXT_COLOUR; temp_text_colour = AMS_CONTROL_GRAY800;
//} }
dc.SetFont(::Label::Body_13); dc.SetFont(::Label::Body_13);
dc.SetTextForeground(temp_text_colour); dc.SetTextForeground(temp_text_colour);
@ -829,9 +830,10 @@ void AMSLib::doRender(wxDC &dc)
temp_bitmap_brand = m_bitmap_readonly; temp_bitmap_brand = m_bitmap_readonly;
} }
//if (!wxWindow::IsEnabled()) { if (tmp_lib_colour.Alpha() == 0) {
//tmp_lib_colour = AMS_CONTROL_DISABLE_COLOUR; temp_bitmap_third = m_bitmap_editable;
//} temp_bitmap_brand = m_bitmap_readonly;
}
// selected // selected
if (m_selected) { if (m_selected) {
@ -888,6 +890,12 @@ void AMSLib::doRender(wxDC &dc)
if (curr_height >= FromDIP(6)) { if (curr_height >= FromDIP(6)) {
//transparent
auto alpha = m_info.material_colour.Alpha();
if (alpha == 0) {
dc.DrawBitmap(m_bitmap_transparent.bmp(),FromDIP(4), FromDIP(4));
}
//gradient //gradient
if (m_info.material_cols.size() > 1) { if (m_info.material_cols.size() > 1) {
int left = FromDIP(4); int left = FromDIP(4);

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

@ -307,6 +307,8 @@ protected:
ScalableBitmap m_bitmap_editable_light; ScalableBitmap m_bitmap_editable_light;
ScalableBitmap m_bitmap_readonly; ScalableBitmap m_bitmap_readonly;
ScalableBitmap m_bitmap_readonly_light; ScalableBitmap m_bitmap_readonly_light;
ScalableBitmap m_bitmap_transparent;
bool m_unable_selected = {false}; bool m_unable_selected = {false};
bool m_enable = {false}; bool m_enable = {false};
bool m_selected = {false}; bool m_selected = {false};