NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commite8ac9f1

committed

Revert "Merge pull request#17543 from timhoffm/unfilled-markers"

This reverts commit16ae71f, reversingchanges made to7a6c5d3.

1 parent5354b70 commite8ac9f1Copy full SHA for e8ac9f1

File tree

4 files changed

-25

lines changed

lib/matplotlib
- axes
  - _axes.py
- markers.py
- tests
  - test_axes.py
  - test_marker.py

4 files changed

-25

lines changed

`‎lib/matplotlib/axes/_axes.py‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4392,9 +4392,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4392`	`4392`	`- 'none': No patch boundary will be drawn.`
`4393`	`4393`	`- A color or sequence of colors.`
`4394`	`4394`
`4395`		`- For non-filled markers, edgecolors is ignored. Instead, the color`
`4396`		`- is determined like with 'face', i.e. from c, colors, or`
`4397`		`- facecolors.`
	`4395`	`+ For non-filled markers, the edgecolors kwarg is ignored and`
	`4396`	`+ forced to 'face' internally.`
`4398`	`4397`
`4399`	`4398`	`plotnonfinite : bool, default: False`
`4400`	`4399`	`Set to plot points with nonfinite c, in conjunction with`
`@@ -4476,6 +4475,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4476`	`4475`	`path=marker_obj.get_path().transformed(`
`4477`	`4476`	`marker_obj.get_transform())`
`4478`	`4477`	`ifnotmarker_obj.is_filled():`
	`4478`	`+edgecolors='face'`
`4479`	`4479`	`iflinewidthsisNone:`
`4480`	`4480`	`linewidths=rcParams['lines.linewidth']`
`4481`	`4481`	`elifnp.iterable(linewidths):`
`@@ -4487,8 +4487,8 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4487`	`4487`
`4488`	`4488`	`collection=mcoll.PathCollection(`
`4489`	`4489`	`(path,),scales,`
`4490`		`-facecolors=colorsifmarker_obj.is_filled()else'none',`
`4491`		`-edgecolors=edgecolorsifmarker_obj.is_filled()elsecolors,`
	`4490`	`+facecolors=colors,`
	`4491`	`+edgecolors=edgecolors,`
`4492`	`4492`	`linewidths=linewidths,`
`4493`	`4493`	`offsets=offsets,`
`4494`	`4494`	`transOffset=kwargs.pop('transform',self.transData),`

`‎lib/matplotlib/markers.py‎`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -237,10 +237,7 @@ def _recache(self):`
`237`	`237`	`self._snap_threshold=None`
`238`	`238`	`self._joinstyle='round'`
`239`	`239`	`self._capstyle='butt'`
`240`		`-# Initial guess: Assume the marker is filled unless the fillstyle is`
`241`		`-# set to 'none'. The marker function will override this for unfilled`
`242`		`-# markers.`
`243`		`-self._filled=self._fillstyle!='none'`
	`240`	`+self._filled=True`
`244`	`241`	`self._marker_function()`
`245`	`242`
`246`	`243`	`def__bool__(self):`

`‎lib/matplotlib/tests/test_axes.py‎`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1855,16 +1855,6 @@ def test_scatter_color(self):`
`1855`	`1855`	`withpytest.raises(ValueError):`
`1856`	`1856`	`plt.scatter([1,2,3], [1,2,3],color=[1,2,3])`
`1857`	`1857`
`1858`		`-deftest_scatter_unfilled(self):`
`1859`		`-coll=plt.scatter([0,1,2], [1,3,2],c=['0.1','0.3','0.5'],`
`1860`		`-marker=mmarkers.MarkerStyle('o',fillstyle='none'),`
`1861`		`-linewidths=[1.1,1.2,1.3])`
`1862`		`-assertcoll.get_facecolors().shape== (0,4)# no facecolors`
`1863`		`-assert_array_equal(coll.get_edgecolors(), [[0.1,0.1,0.1,1],`
`1864`		`- [0.3,0.3,0.3,1],`
`1865`		`- [0.5,0.5,0.5,1]])`
`1866`		`-assert_array_equal(coll.get_linewidths(), [1.1,1.2,1.3])`
`1867`		`-`
`1868`	`1858`	`deftest_scatter_size_arg_size(self):`
`1869`	`1859`	`x=np.arange(4)`
`1870`	`1860`	`withpytest.raises(ValueError):`

`‎lib/matplotlib/tests/test_marker.py‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,6 @@`
`7`	`7`	`importpytest`
`8`	`8`
`9`	`9`
`10`		`-deftest_marker_fillstyle():`
`11`		`-marker_style=markers.MarkerStyle(marker='o',fillstyle='none')`
`12`		`-assertmarker_style.get_fillstyle()=='none'`
`13`		`-assertnotmarker_style.is_filled()`
`14`		`-`
`15`		`-`
`16`	`10`	`deftest_markers_valid():`
`17`	`11`	`marker_style=markers.MarkerStyle()`
`18`	`12`	`mrk_array=np.array([[-0.5,0],`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commite8ac9f1

File tree

4 files changed

4 files changed

`‎lib/matplotlib/axes/_axes.py‎`

`‎lib/matplotlib/markers.py‎`

`‎lib/matplotlib/tests/test_axes.py‎`

`‎lib/matplotlib/tests/test_marker.py‎`

0 commit comments