Skip to content

Enhance color initialization with hex support #1980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akivab wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Enhance color initialization with hex support #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd2d80e
Enhance color initialization with hex support
akivab Jan 25, 2026
d26a202
format
akivab Jan 25, 2026
91a69c2
add tests for examples given by OCP
akivab Jan 28, 2026
ca3dc69
add comments for test
akivab Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cadquery/occ_impl/assembly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ def __init__(self, *args, **kwargs):
self.wrapped = Quantity_ColorRGBA()
elif len(args) == 1:
self.wrapped = Quantity_ColorRGBA()
exists = Quantity_ColorRGBA.ColorFromName_s(args[0], self.wrapped)
exists = Quantity_ColorRGBA.ColorFromName_s(
args[0], self.wrapped
) or Quantity_ColorRGBA.ColorFromHex_s(args[0], self.wrapped)
if not exists:
raise ValueError(f"Unknown color name: {args[0]}")
elif len(args) == 3:
Expand Down
30 changes: 30 additions & 0 deletions tests/test_assembly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,36 @@ def test_color():
assert c4.wrapped.GetRGB().Green() == pytest.approx(0.2)
assert c4.wrapped.Alpha() == 0.5

# test for hex string for short sRGB color
c5 = cq.Color("#FF0")
assert c5.wrapped.GetRGB().Red() == 1
assert c5.wrapped.GetRGB().Green() == 1
assert c5.wrapped.GetRGB().Blue() == 0
with pytest.raises(AttributeError):
c5.wrapped.GetRGB().Alpha()

# test for hex string for short sRGBA color
c6 = cq.Color("#FF0F")
assert c6.wrapped.GetRGB().Red() == 1
assert c6.wrapped.GetRGB().Green() == 1
assert c6.wrapped.GetRGB().Blue() == 0
assert c6.wrapped.Alpha() == 1.0

# test for hex string for RGB color
c7 = cq.Color("#FFFF00")
assert c7.wrapped.GetRGB().Red() == 1
assert c7.wrapped.GetRGB().Green() == 1
assert c7.wrapped.GetRGB().Blue() == 0
with pytest.raises(AttributeError):
c7.wrapped.GetRGB().Alpha()

# test for hex string for RGBA color
c8 = cq.Color("#FFFF00FF")
assert c8.wrapped.GetRGB().Red() == 1
assert c8.wrapped.GetRGB().Green() == 1
assert c8.wrapped.GetRGB().Blue() == 0
assert c8.wrapped.Alpha() == 1.0

with pytest.raises(ValueError):
cq.Color("?????")

Expand Down