Commit88cd5fd

committed

Fix scatter edgecolor for unfilled points

For unfilled markers, the edgecolor -- if specified -- has precedenceover the facecolor.closeshas2k1/plotnine#100

1 parent49d5ced commit88cd5fdCopy full SHA for 88cd5fd

File tree

+25

-3

lines changed

+25

-3

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+Scatter plot unfilled marker edgecolor`
	`2`	`+--------------------------------------`
	`3`	`+`
	`4`	+For:meth:`~matplotlib.axes.Axes.scatter`, when both the `facecolor`
	`5`	+and `edgecolor` are specified for unfilled marker types, the `edgecolor`
	`6`	+is used. Previously, the points took on the `facecolor`.

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3873,8 +3873,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`3873`	`3873`	`If it is 'none', the patch boundary will not`
`3874`	`3874`	`be drawn.`
`3875`	`3875`
`3876`		- For non-filled markers, the `edgecolors` kwarg
`3877`		`-is ignored and forced to 'face' internally.`
	`3876`	+ For non-filled markers, the `edgecolors` kwarg (if it is not
	`3877`	`+None, 'face' or 'none') dictates the color of the marker.`
`3878`	`3878`
`3879`	`3879`	`Returns`
`3880`	`3880`	`-------`
`@@ -4024,7 +4024,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4024`	`4024`	`path=marker_obj.get_path().transformed(`
`4025`	`4025`	`marker_obj.get_transform())`
`4026`	`4026`	`ifnotmarker_obj.is_filled():`
`4027`		`-edgecolors='face'`
	`4027`	`+ifedgecolorsisNone:`
	`4028`	`+edgecolors='face'`
`4028`	`4029`	`linewidths=rcParams['lines.linewidth']`
`4029`	`4030`
`4030`	`4031`	`offsets=np.column_stack([x,y])`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1733,6 +1733,21 @@ def test_scatter_color():`
`1733`	`1733`	`plt.scatter([1,2,3], [1,2,3],color=[1,2,3])`
`1734`	`1734`
`1735`	`1735`
	`1736`	`+@pytest.mark.parametrize(('facecolor','edgecolor','expected_color'), [`
	`1737`	`+ ('red','cyan','cyan'),`
	`1738`	`+ (None,'cyan','cyan'),`
	`1739`	`+ ('red',None,'red')`
	`1740`	`+])`
	`1741`	`+deftest_scatter_edgecolor(facecolor,edgecolor,expected_color):`
	`1742`	`+fig,ax=plt.subplots()`
	`1743`	`+artist=ax.scatter(x=[1,2,3],y=[1,2,3],s=550,`
	`1744`	`+linewidth=5,marker='2',`
	`1745`	`+facecolor=facecolor,`
	`1746`	`+edgecolor=edgecolor)`
	`1747`	`+result_color=artist.get_edgecolor()[0]`
	`1748`	`+assertmcolors.to_hex(result_color)==mcolors.to_hex(expected_color)`
	`1749`	`+`
	`1750`	`+`
`1736`	`1751`	`deftest_as_mpl_axes_api():`
`1737`	`1752`	`# tests the _as_mpl_axes api`
`1738`	`1753`	`frommatplotlib.projections.polarimportPolarAxes`

Comments

(0)