Commit156a0f6

authored

Merge pull request#20503 from meeseeksmachine/auto-backport-of-pr-20488-on-v3.4.x

Backport PR#20488 on branch v3.4.x (FIX: Include 0 when checking lognorm vmin)

2 parentsdf9fa06 +dcb3708 commit156a0f6Copy full SHA for 156a0f6

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

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1213,23 +1213,24 @@ def test_imshow_quantitynd():`
`1213`	`1213`	`fig.canvas.draw()`
`1214`	`1214`
`1215`	`1215`
	`1216`	`+@pytest.mark.parametrize('x', [-1,1])`
`1216`	`1217`	`@check_figures_equal(extensions=['png'])`
`1217`		`-deftest_huge_range_log(fig_test,fig_ref):`
`1218`		`-data=np.full((5,5),-1,dtype=np.float64)`
	`1218`	`+deftest_huge_range_log(fig_test,fig_ref,x):`
	`1219`	`+# parametrize over bad lognorm -1 values and large range 1 -> 1e20`
	`1220`	`+data=np.full((5,5),x,dtype=np.float64)`
`1219`	`1221`	`data[0:2, :]=1E20`
`1220`	`1222`
`1221`	`1223`	`ax=fig_test.subplots()`
`1222`		`-im=ax.imshow(data,norm=colors.LogNorm(vmin=100,vmax=data.max()),`
`1223`		`-interpolation='nearest',cmap='viridis')`
	`1224`	`+ax.imshow(data,norm=colors.LogNorm(vmin=1,vmax=data.max()),`
	`1225`	`+interpolation='nearest',cmap='viridis')`
`1224`	`1226`
`1225`		`-data=np.full((5,5),-1,dtype=np.float64)`
	`1227`	`+data=np.full((5,5),x,dtype=np.float64)`
`1226`	`1228`	`data[0:2, :]=1000`
`1227`	`1229`
`1228`		`-cmap=copy(plt.get_cmap('viridis'))`
`1229`		`-cmap.set_under('w')`
`1230`	`1230`	`ax=fig_ref.subplots()`
`1231`		`-im=ax.imshow(data,norm=colors.Normalize(vmin=100,vmax=data.max()),`
`1232`		`-interpolation='nearest',cmap=cmap)`
	`1231`	`+cmap=plt.get_cmap('viridis').with_extremes(under='w')`
	`1232`	`+ax.imshow(data,norm=colors.Normalize(vmin=1,vmax=data.max()),`
	`1233`	`+interpolation='nearest',cmap=cmap)`
`1233`	`1234`
`1234`	`1235`
`1235`	`1236`	`@check_figures_equal()`

Comments

(0)