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

Commit52fd461

committed

Split attribute sorting into Patch3DCollection.draw.

This moves attribute sorting from `Patch3DCollection.do_3d_projection`into a new `draw` method. Sorted attributes are added only temporarily,so there is no reason to cache the original values anywhere, and thusall overridden setters can be dropped.

1 parent6293052 commit52fd461Copy full SHA for 52fd461

File tree

1 file changed

+21

-24

lines changed

lib/mpl_toolkits/mplot3d
- art3d.py

1 file changed

+21

-24

lines changed

`‎lib/mpl_toolkits/mplot3d/art3d.py`

Lines changed: 21 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -454,16 +454,6 @@ def set_depthshade(self, depthshade):`
`454`	`454`	`self._depthshade=depthshade`
`455`	`455`	`self.stale=True`
`456`	`456`
`457`		`-defset_facecolor(self,c):`
`458`		`-# docstring inherited`
`459`		`-super().set_facecolor(c)`
`460`		`-self._facecolor3d=self.get_facecolor()`
`461`		`-`
`462`		`-defset_edgecolor(self,c):`
`463`		`-# docstring inherited`
`464`		`-super().set_edgecolor(c)`
`465`		`-self._edgecolor3d=self.get_edgecolor()`
`466`		`-`
`467`	`457`	`defset_sort_zpos(self,val):`
`468`	`458`	`"""Set the position to use for z-sorting."""`
`469`	`459`	`self._sort_zpos=val`
`@@ -480,32 +470,39 @@ def set_3d_properties(self, zs, zdir):`
`480`	`470`	`xs= []`
`481`	`471`	`ys= []`
`482`	`472`	`self._offsets3d=juggle_axes(xs,ys,np.atleast_1d(zs),zdir)`
`483`		`-self._facecolor3d=self.get_facecolor()`
`484`		`-self._edgecolor3d=self.get_edgecolor()`
`485`	`473`	`self.stale=True`
`486`	`474`
`487`	`475`	`@cbook._delete_parameter('3.4','renderer')`
`488`	`476`	`defdo_3d_projection(self,renderer=None):`
`489`	`477`	`xs,ys,zs=self._offsets3d`
`490`	`478`	`vxs,vys,vzs,vis=proj3d.proj_transform_clip(xs,ys,zs,`
`491`	`479`	`self.axes.M)`
`492`		`-`
`493`		`-fcs= (_zalpha(self._facecolor3d,vzs)ifself._depthshadeelse`
`494`		`-self._facecolor3d)`
`495`		`-fcs=mcolors.to_rgba_array(fcs,self._alpha)`
`496`		`-super().set_facecolor(fcs)`
`497`		`-`
`498`		`-ecs= (_zalpha(self._edgecolor3d,vzs)ifself._depthshadeelse`
`499`		`-self._edgecolor3d)`
`500`		`-ecs=mcolors.to_rgba_array(ecs,self._alpha)`
`501`		`-super().set_edgecolor(ecs)`
`502`		`-super().set_offsets(np.column_stack([vxs,vys]))`
`503`		`-`
`504`	`480`	`ifvzs.size>0:`
`505`	`481`	`returnmin(vzs)`
`506`	`482`	`else:`
`507`	`483`	`returnnp.nan`
`508`	`484`
	`485`	`+@artist.allow_rasterization`
	`486`	`+defdraw(self,renderer):`
	`487`	`+# docstring inherited`
	`488`	`+xs,ys,zs=self._offsets3d`
	`489`	`+vxs,vys,vzs,vis=proj3d.proj_transform_clip(xs,ys,zs,`
	`490`	`+self.axes.M)`
	`491`	`+`
	`492`	`+fcs=self.get_facecolor()`
	`493`	`+ecs=self.get_edgecolor()`
	`494`	`+ifself._depthshade:`
	`495`	`+fcs=_zalpha(fcs,vzs)`
	`496`	`+ecs=_zalpha(ecs,vzs)`
	`497`	`+fcs=mcolors.to_rgba_array(fcs,self._alpha)`
	`498`	`+ecs=mcolors.to_rgba_array(ecs,self._alpha)`
	`499`	`+`
	`500`	`+offsets=np.column_stack([vxs,vys])`
	`501`	`+`
	`502`	`+withcbook._setattr_cm(self,_edgecolors=ecs,_facecolors=fcs,`
	`503`	`+_offsets=offsets):`
	`504`	`+super().draw(renderer)`
	`505`	`+`
`509`	`506`
`510`	`507`	`classPath3DCollection(PathCollection):`
`511`	`508`	`"""`

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!

Commit52fd461

File tree

1 file changed

1 file changed

`‎lib/mpl_toolkits/mplot3d/art3d.py`

0 commit comments