Commit83b3fef

authored

Merge pull request#26253 from LemonBoy/inf-surf

Filter out inf values in plot_surface

2 parents427392e +ba7af99 commit83b3fefCopy full SHA for 83b3fef

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1708,18 +1708,18 @@ def plot_surface(self, X, Y, Z, *, norm=None, vmin=None,`
`1708`	`1708`	`iffcolorsisnotNone:`
`1709`	`1709`	`colset.append(fcolors[rs][cs])`
`1710`	`1710`
`1711`		`-# In cases where there areNaNsin the data (possiblyfrom masked`
`1712`		`-# arrays), artifacts can be introduced. Here check whetherNaNs exist`
`1713`		`-# and removethe entries if so`
`1714`		`-ifnotisinstance(polys,np.ndarray)ornp.isnan(polys).any():`
	`1711`	`+# In cases where there arenon-finite valuesin the data (possiblyNaNs from`
	`1712`	`+#maskedarrays), artifacts can be introduced. Here check whethersuch values`
	`1713`	`+#are presentand removethem.`
	`1714`	`+ifnotisinstance(polys,np.ndarray)ornotnp.isfinite(polys).all():`
`1715`	`1715`	`new_polys= []`
`1716`	`1716`	`new_colset= []`
`1717`	`1717`
`1718`	`1718`	`# Depending on fcolors, colset is either an empty list or has as`
`1719`	`1719`	`# many elements as polys. In the former case new_colset results in`
`1720`	`1720`	`# a list with None entries, that is discarded later.`
`1721`	`1721`	`forp,colinitertools.zip_longest(polys,colset):`
`1722`		`-new_poly=np.array(p)[~np.isnan(p).any(axis=1)]`
	`1722`	`+new_poly=np.array(p)[np.isfinite(p).all(axis=1)]`
`1723`	`1723`	`iflen(new_poly):`
`1724`	`1724`	`new_polys.append(new_poly)`
`1725`	`1725`	`new_colset.append(col)`

87.3 KB

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2244,3 +2244,16 @@ def test_scatter_masked_color():`
`2244`	`2244`	`# Assert sizes' equality`
`2245`	`2245`	`assertlen(path3d.get_offsets())==\`
`2246`	`2246`	`len(super(type(path3d),path3d).get_facecolors())`
	`2247`	`+`
	`2248`	`+`
	`2249`	`+@mpl3d_image_comparison(['surface3d_zsort_inf.png'],style='mpl20')`
	`2250`	`+deftest_surface3d_zsort_inf():`
	`2251`	`+fig=plt.figure()`
	`2252`	`+ax=fig.add_subplot(projection='3d')`
	`2253`	`+`
	`2254`	`+x,y=np.mgrid[-2:2:0.1,-2:2:0.1]`
	`2255`	`+z=np.sin(x)2+np.cos(y)2`
	`2256`	`+z[x.shape[0]//2:,x.shape[1]//2:]=np.inf`
	`2257`	`+`
	`2258`	`+ax.plot_surface(x,y,z,cmap='jet')`
	`2259`	`+ax.view_init(elev=45,azim=145)`

Comments

(0)