Commit98506d0

authored

Merge pull request#27964 from AnsonTran/fix-logscale-axis

BUG: Fix NonUniformImage with nonlinear scale

2 parentsa218d5c +919a6cb commit98506d0Copy full SHA for 98506d0

File tree

+28

-3

lines changed

+28

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1085,12 +1085,16 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):`
`1085`	`1085`	`B[:, :,0:3]=A`
`1086`	`1086`	`B[:, :,3]=255`
`1087`	`1087`	`A=B`
`1088`		`-vl=self.axes.viewLim`
`1089`	`1088`	`l,b,r,t=self.axes.bbox.extents`
`1090`	`1089`	`width=int(((round(r)+0.5)- (round(l)-0.5))*magnification)`
`1091`	`1090`	`height=int(((round(t)+0.5)- (round(b)-0.5))*magnification)`
`1092`		`-x_pix=np.linspace(vl.x0,vl.x1,width)`
`1093`		`-y_pix=np.linspace(vl.y0,vl.y1,height)`
	`1091`	`+`
	`1092`	`+invertedTransform=self.axes.transData.inverted()`
	`1093`	`+x_pix=invertedTransform.transform(`
	`1094`	`+ [(x,b)forxinnp.linspace(l,r,width)])[:,0]`
	`1095`	`+y_pix=invertedTransform.transform(`
	`1096`	`+ [(l,y)foryinnp.linspace(b,t,height)])[:,1]`
	`1097`	`+`
`1094`	`1098`	`ifself._interpolation=="nearest":`
`1095`	`1099`	`x_mid= (self._Ax[:-1]+self._Ax[1:])/2`
`1096`	`1100`	`y_mid= (self._Ay[:-1]+self._Ay[1:])/2`

792 Bytes

10 KB

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1414,6 +1414,27 @@ def test_nonuniform_and_pcolor():`
`1414`	`1414`	`ax.set(xlim=(0,10))`
`1415`	`1415`
`1416`	`1416`
	`1417`	`+@image_comparison(["nonuniform_logscale.png"],style="mpl20")`
	`1418`	`+deftest_nonuniform_logscale():`
	`1419`	`+_,axs=plt.subplots(ncols=3,nrows=1)`
	`1420`	`+`
	`1421`	`+foriinrange(3):`
	`1422`	`+ax=axs[i]`
	`1423`	`+im=NonUniformImage(ax)`
	`1424`	`+im.set_data(np.arange(1,4)2,np.arange(1,4)2,`
	`1425`	`+np.arange(9).reshape((3,3)))`
	`1426`	`+ax.set_xlim(1,16)`
	`1427`	`+ax.set_ylim(1,16)`
	`1428`	`+ax.set_box_aspect(1)`
	`1429`	`+ifi==1:`
	`1430`	`+ax.set_xscale("log",base=2)`
	`1431`	`+ax.set_yscale("log",base=2)`
	`1432`	`+ifi==2:`
	`1433`	`+ax.set_xscale("log",base=4)`
	`1434`	`+ax.set_yscale("log",base=4)`
	`1435`	`+ax.add_image(im)`
	`1436`	`+`
	`1437`	`+`
`1417`	`1438`	`@image_comparison(`
`1418`	`1439`	`['rgba_antialias.png'],style='mpl20',remove_text=True,`
`1419`	`1440`	`tol=0ifplatform.machine()=='x86_64'else0.007)`

Comments

(0)