8000 Modified scatter method to correctly recognize RGB/A values by vecuenca · Pull Request #6087 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Modified scatter method to correctly recognize RGB/A values #6087

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

Closed
wants to merge 16 commits into from
Closed

Modified scatter method to correctly recognize RGB/A values #6087

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8299732
Correct link to favicon by using build in sphix support
jenshnielsen Feb 22, 2016
f6f9996
Merge pull request #6074 from dylan-evans/master
tacaswell Feb 29, 2016
7c4faf6
Merge pull request #6050 from jenshnielsen/fixfavicon
mdboom Feb 29, 2016
dcf8f6e
Modified scatter method to correctly recognize RGB/A values
vecuenca Mar 1, 2016
2f416b2
Added images and links for seaborn, holoviews, and ggplot
jbednar Mar 3, 2016
76bf550
Merge pull request #6106 from jbednar/v1.5.1-doc
tacaswell Mar 3, 2016
b4c3091
Merge pull request #6079 from paulkirow/master
tacaswell Mar 4, 2016
1302606
Merge pull request #6099 from mdboom/masked-image
tacaswell Mar 4, 2016
b89ddd3
Merge remote-tracking branch 'matplotlib/v1.5.1-doc' into v1.5.x
tacaswell Mar 4, 2016
732efa3
merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
tacaswell Mar 4, 2016
ebfbc4a
Merge pull request #6073 from crazyo/master
tacaswell Mar 6, 2016
869cc9d
Merge pull request #6110 from nansonzheng/1235-fix-proposal
tacaswell Mar 7, 2016
f726dbe
TST: pull test image from master branch
tacaswell Mar 7, 2016
57fa73f
Merge pull request #6127 from tacaswell/TST_fix_failing_svg
tacaswell Mar 7, 2016
4bfa43b
Merge remote-tracking branch 'upstream/v2.x' into v2.x
vecuenca Mar 11, 2016
69ebbb9
Checking ndim instead of shape in the scatter method
vecuenca Mar 11, 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
Modified scatter method to correctly recognize RGB/A values
  • Loading branch information
@vecuenca
vecuenca committed Mar 1, 2016
commit dcf8f6e91e8c0c5403aa436824666fac56fb50c1
2 changes: 1 addition & 1 deletion lib/matplotlib/axes/_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3861,7 +3861,7 @@ def scatter(self, x, y, s=20, c=None, marker='o', cmap=None, norm=None,
# favor of mapping, not rgb or rgba.
try:
c_array = np.asanyarray(c, dtype=float)
if c_array.size == x.size:
if c_array.size == x.size and c_array.shape[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.

Is there anyway we can get a numpy-scaler in here as a valid input? If so probably want to be a bit more paranoid and add and carray.ndims

Copy link
Member

Choose a reason for hiding this comment

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

and would the check on c_array.ndim == 1 be a better check?

c = np.ma.ravel(c_array)
else:
# Wrong size; it must not be intended for mapping.
Expand Down
0