Skip to content

New color conversion machinery. #6382

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

Merged
merged 11 commits into from
May 14, 2016
Merged

New color conversion machinery. #6382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6f908e
New color conversion machinery.
anntzer May 6, 2016
75b0d13
Update named_colors example.
anntzer May 8, 2016
72f34be
New API for accessing the named colors mapping.
anntzer May 8, 2016
09a0f4c
Faster conversion for RGBA arrays; more tests.
anntzer May 8, 2016
2fe2c26
Return builtin floats, not numpy floats.
anntzer May 8, 2016
5a4432c
Remove use of colorConverter.
anntzer May 8, 2016
bc6ad2a
Base colors are not special.
anntzer May 9, 2016
d9db062
Minor changes to colors.py.
anntzer May 11, 2016
cb3d7c9
Update docs for RGBA support.
anntzer May 11, 2016
d492ba4
Add test for #rrggbbaa roundtrip; add whatsnew.
anntzer May 12, 2016
7c2ec4c
Default to `#rrggbb`, not `#rrggbbaa`.
anntzer May 12, 2016
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
Prev Previous commit
Next Next commit
Faster conversion for RGBA arrays; more tests.
  • Loading branch information
@anntzer
anntzer committed May 14, 2016
commit 09a0f4c44c08166488194fa1776340e3d6e7ac17
16 changes: 16 additions & 0 deletions lib/matplotlib/colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,22 @@ def to_rgba_array(c, alpha=None):
return np.array([to_rgba(c, alpha)], float)
except (ValueError, TypeError):
pass
# Special-case inputs that are already arrays, for performance. (If the
# array has the wrong kind or shape, raise the error during one-at-a-time
# conversion.)
if (isinstance(c, np.ndarray) and c.dtype.kind in "if"
and c.ndim == 2 and c.shape[1] in [3, 4]):
if c.shape[1] == 3:
result = np.column_stack([c, np.zeros(len(c))])
result[:, -1] = alpha if alpha is not None else 1.
elif c.shape[1] == 4:
result = c.copy()
if alpha is not None:
result[:, -1] = alpha
if np.any((result < 0) | (result > 1)):
raise ValueError("RGBA values should be within 0-1 range")
return result
# Convert one at a time.
result = np.empty((len(c), 4), float)
for i, cc in enumerate(c):
result[i] = to_rgba(cc, alpha)
Expand Down
2 changes: 2 additions & 0 deletions lib/matplotlib/tests/test_colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@ def test_conversions():
assert_array_equal(mcolors.to_rgba_array("none"), np.zeros((0, 4)))
# alpha is properly set.
assert_equal(mcolors.to_rgba((1, 1, 1), .5), (1, 1, 1, .5))
# builtin round differs between py2 and py3.
assert_equal(mcolors.to_hex((.7, .7, .7)), "#b2b2b2ff")


if __name__ == '__main__':
Expand Down