Commit33f3526

committed

FIX: Include 0 when checking lognorm vmin

Change vmin check to less than or equal to 0 rather than strictlyless than.

1 parent2a3037f commit33f3526Copy full SHA for 33f3526

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -532,9 +532,9 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,`
`532`	`532`	`# we have re-set the vmin/vmax to account for small errors`
`533`	`533`	`# that may have moved input values in/out of range`
`534`	`534`	`s_vmin,s_vmax=vrange`
`535`		`-ifisinstance(self.norm,mcolors.LogNorm):`
`536`		`-ifs_vmin<0:`
`537`		`-s_vmin=max(s_vmin,np.finfo(scaled_dtype).eps)`
	`535`	`+ifisinstance(self.norm,mcolors.LogNorm)ands_vmin<=0:`
	`536`	`+# Don't give 0 or negative values to LogNorm`
	`537`	`+s_vmin=np.finfo(scaled_dtype).eps`
`538`	`538`	`withcbook._setattr_cm(self.norm,`
`539`	`539`	`vmin=s_vmin,`
`540`	`540`	`vmax=s_vmax,`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1233,23 +1233,24 @@ def test_imshow_quantitynd():`
`1233`	`1233`	`fig.canvas.draw()`
`1234`	`1234`
`1235`	`1235`
	`1236`	`+@pytest.mark.parametrize('x', [-1,1])`
`1236`	`1237`	`@check_figures_equal(extensions=['png'])`
`1237`		`-deftest_huge_range_log(fig_test,fig_ref):`
`1238`		`-data=np.full((5,5),-1,dtype=np.float64)`
	`1238`	`+deftest_huge_range_log(fig_test,fig_ref,x):`
	`1239`	`+# parametrize over bad lognorm -1 values and large range 1 -> 1e20`
	`1240`	`+data=np.full((5,5),x,dtype=np.float64)`
`1239`	`1241`	`data[0:2, :]=1E20`
`1240`	`1242`
`1241`	`1243`	`ax=fig_test.subplots()`
`1242`		`-im=ax.imshow(data,norm=colors.LogNorm(vmin=100,vmax=data.max()),`
`1243`		`-interpolation='nearest',cmap='viridis')`
	`1244`	`+ax.imshow(data,norm=colors.LogNorm(vmin=1,vmax=data.max()),`
	`1245`	`+interpolation='nearest',cmap='viridis')`
`1244`	`1246`
`1245`		`-data=np.full((5,5),-1,dtype=np.float64)`
	`1247`	`+data=np.full((5,5),x,dtype=np.float64)`
`1246`	`1248`	`data[0:2, :]=1000`
`1247`	`1249`
`1248`		`-cmap=copy(plt.get_cmap('viridis'))`
`1249`		`-cmap.set_under('w')`
`1250`	`1250`	`ax=fig_ref.subplots()`
`1251`		`-im=ax.imshow(data,norm=colors.Normalize(vmin=100,vmax=data.max()),`
`1252`		`-interpolation='nearest',cmap=cmap)`
	`1251`	`+cmap=plt.get_cmap('viridis').with_extremes(under='w')`
	`1252`	`+ax.imshow(data,norm=colors.Normalize(vmin=1,vmax=data.max()),`
	`1253`	`+interpolation='nearest',cmap=cmap)`
`1253`	`1254`
`1254`	`1255`
`1255`	`1256`	`@check_figures_equal()`

Comments

(0)