NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commitca4ddac

committed

Don't reshape offsets into the correct shape.

(Instead let invalid entries error.)

1 parenta4bd3ce commitca4ddacCopy full SHA for ca4ddac

File tree

3 files changed

-16

lines changed

lib/matplotlib
- axes
  - _axes.py
- collections.py
- tests
  - test_collections.py

3 files changed

-16

lines changed

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4023,7 +4023,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4023`	`4023`	`edgecolors='face'`
`4024`	`4024`	`linewidths=rcParams['lines.linewidth']`
`4025`	`4025`
`4026`		`-offsets=np.dstack((x,y))`
	`4026`	`+offsets=np.column_stack([x,y])`
`4027`	`4027`
`4028`	`4028`	`collection=mcoll.PathCollection(`
`4029`	`4029`	`(path,),scales,`

`‎lib/matplotlib/collections.py`

Lines changed: 6 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ def __init__(self,`
`145`	`145`	`self._uniform_offsets=None`
`146`	`146`	`self._offsets=np.array([[0,0]],float)`
`147`	`147`	`ifoffsetsisnotNone:`
`148`		`-offsets=np.asanyarray(offsets).reshape((-1,2))`
	`148`	`+offsets=np.asanyarray(offsets,float)`
`149`	`149`	`iftransOffsetisnotNone:`
`150`	`150`	`self._offsets=offsets`
`151`	`151`	`self._transOffset=transOffset`
`@@ -210,7 +210,6 @@ def get_datalim(self, transData):`
`210`	`210`	`offsets=transOffset.transform_non_affine(offsets)`
`211`	`211`	`transOffset=transOffset.get_affine()`
`212`	`212`
`213`		`-offsets=np.asanyarray(offsets,float).reshape((-1,2))`
`214`	`213`	`ifisinstance(offsets,np.ma.MaskedArray):`
`215`	`214`	`offsets=offsets.filled(np.nan)`
`216`	`215`	`# get_path_collection_extents handles nan but not masked arrays`
`@@ -244,14 +243,12 @@ def _prepare_points(self):`
`244`	`243`	`xs,ys=vertices[:,0],vertices[:,1]`
`245`	`244`	`xs=self.convert_xunits(xs)`
`246`	`245`	`ys=self.convert_yunits(ys)`
`247`		`-paths.append(mpath.Path(list(zip(xs,ys)),path.codes))`
	`246`	`+paths.append(mpath.Path(np.column_stack([xs,ys]),path.codes))`
`248`	`247`
`249`	`248`	`ifoffsets.size>0:`
`250`	`249`	`xs=self.convert_xunits(offsets[:,0])`
`251`	`250`	`ys=self.convert_yunits(offsets[:,1])`
`252`		`-offsets=list(zip(xs,ys))`
`253`		`-`
`254`		`-offsets=np.asanyarray(offsets,float).reshape((-1,2))`
	`251`	`+offsets=np.column_stack([xs,ys])`
`255`	`252`
`256`	`253`	`ifnottransform.is_affine:`
`257`	`254`	`paths= [transform.transform_path_non_affine(path)`
`@@ -431,7 +428,7 @@ def set_offsets(self, offsets):`
`431`	`428`
`432`	`429`	`ACCEPTS: float or sequence of floats`
`433`	`430`	`"""`
`434`		`-offsets=np.asanyarray(offsets,float).reshape((-1,2))`
	`431`	`+offsets=np.asanyarray(offsets,float)`
`435`	`432`	`#This decision is based on how they are initialized above`
`436`	`433`	`ifself._uniform_offsetsisNone:`
`437`	`434`	`self._offsets=offsets`
`@@ -1881,17 +1878,12 @@ def draw(self, renderer):`
`1881`	`1878`	`iflen(self._offsets):`
`1882`	`1879`	`xs=self.convert_xunits(self._offsets[:,0])`
`1883`	`1880`	`ys=self.convert_yunits(self._offsets[:,1])`
`1884`		`-offsets=list(zip(xs,ys))`
`1885`		`-`
`1886`		`-offsets=np.asarray(offsets,float).reshape((-1,2))`
	`1881`	`+offsets=np.column_stack([xs,ys])`
`1887`	`1882`
`1888`	`1883`	`self.update_scalarmappable()`
`1889`	`1884`
`1890`	`1885`	`ifnottransform.is_affine:`
`1891`		`-coordinates=self._coordinates.reshape(`
`1892`		`- (self._coordinates.shape[0]*`
`1893`		`-self._coordinates.shape[1],`
`1894`		`-2))`
	`1886`	`+coordinates=self._coordinates.reshape((-1,2))`
`1895`	`1887`	`coordinates=transform.transform(coordinates)`
`1896`	`1888`	`coordinates=coordinates.reshape(self._coordinates.shape)`
`1897`	`1889`	`transform=transforms.IdentityTransform()`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ def test_regularpolycollection_rotate():`
`538`	`538`	`forxy,alphainzip(xy_points,rotations):`
`539`	`539`	`col=mcollections.RegularPolyCollection(`
`540`	`540`	`4,sizes=(100,),rotation=alpha,`
`541`		`-offsets=xy,transOffset=ax.transData)`
	`541`	`+offsets=[xy],transOffset=ax.transData)`
`542`	`542`	`ax.add_collection(col,autolim=True)`
`543`	`543`	`ax.autoscale_view()`
`544`	`544`

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!

Commitca4ddac

File tree

3 files changed

3 files changed

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

`‎lib/matplotlib/collections.py`

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

0 commit comments