8000 Correctly skip colors for nan points given to scatter by dstansby · Pull Request #7570 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Correctly skip colors for nan points given to scatter #7570

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 6 commits into from
Dec 11, 2016
Merged

Correctly skip colors for nan points given to scatter #7570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b201e6
Mask correct color array before scattering
dstansby Dec 4, 2016
cc5cbe5
Add a scatter masked colors test
dstansby Dec 4, 2016
d6c47af
Put back mask deletion for 'c'
dstansby Dec 5, 2016
ab11d0d
Also mask edgecolors
dstansby Dec 6, 2016
7cabe13
Finally, mask linewidths
dstansby Dec 6, 2016
e5469f5
Fix scatter color masking test
dstansby Dec 9, 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
Finally, mask linewidths
  • Loading branch information
@dstansby
dstansby committed Dec 6, 2016
commit 7cabe139ddeeed6dc6904a8f2ebac84c5d03f9d4
9 changes: 5 additions & 4 deletions lib/matplotlib/axes/_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3995,10 +3995,11 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
else:
colors = None # use cmap, norm after collection is created

# s, c, colors, or edgecolors will be unchanged unless they are the
# same length as x:
maskargs = x, y, s, c, colors, edgecolors
x, y, s, c, colors, edgecolors = cbook.delete_masked_points(*maskargs)
# Anything in maskargs will be unchanged unless it is the same length
# as x:
maskargs = x, y, s, c, colors, edgecolors, linewidths
x, y, s, c, colors, edgecolors, linewidths =\
cbook.delete_masked_points(*maskargs)

scales = s # Renamed for readability below.

Expand Down
3 changes: 3 additions & 0 deletions lib/matplotlib/tests/test_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4848,9 +4848,12 @@ def test_scatter_color_masking():
x = np.array([1, 2, 3])
y = np.array([1, np.nan, 3])
colors = np.array(['k', 'w', 'k'])
linewidths = np.array([1, 2, 3])
s = plt.scatter(x, y, color=colors)

facecolors = s.get_facecolors()
linecolors = s.get_edgecolors()
linewidths = s.get_linewidths()
assert_array_equal(facecolors[1], np.array([0, 0, 0, 1]))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably unnecessary, but what about a test that verifies it's the right facecolor for the right value? Just to ensure no weird shifting.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to get the scatter points out from s? All I can see that might do it is s.get_paths(), but that seems to give arrays that are definitely not what I'm looking for...

Copy link
Member
@story645 story645 Dec 5, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, unfortunately haven't found a direct way though there might be one. :( As much as I'm loath to suggest an image test, that seems to be the trick. Though the way to test the error you're seeing below is to use the s.get_edgecolors(), so maybe that'd be good enough?

assert_array_equal(linecolors[1], np.array([0, 0, 0, 1]))
assert linewidths[1] == 3
Copy link
Member
@story645 story645 Dec 6, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also maybe assert facecolors[0], name edgecolors = s.get_edgecolors(),

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm missing something here - should I just rename facecolors to edgecolors?

0