Commitaf8b460

committed

Merge pull request#5685 from tacaswell/fix_toolkit_logcolorscale

FIX: do not use removed private methods

2 parentsf9e405e +de53d5c commitaf8b460Copy full SHA for af8b460

File tree

+25

-4

lines changed

+25

-4

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -374,9 +374,8 @@ def __init__(self, ax, cmap=None,`
`374`	`374`	`ifformatisNone:`
`375`	`375`	`ifisinstance(self.norm,colors.LogNorm):`
`376`	`376`	`# change both axis for proper aspect`
`377`		`-self.ax.xaxis.set_scale("log")`
`378`		`-self.ax.yaxis.set_scale("log")`
`379`		`-self.ax._update_transScale()`
	`377`	`+self.ax.set_xscale("log")`
	`378`	`+self.ax.set_yscale("log")`
`380`	`379`	`self.cbar_axis.set_minor_locator(ticker.NullLocator())`
`381`	`380`	`formatter=ticker.LogFormatter()`
`382`	`381`	`else:`

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,13 @@`
`4`	`4`	`frommatplotlib.externalsimportsix`
`5`	`5`
`6`	`6`	`importmatplotlib.pyplotasplt`
`7`		`-frommatplotlib.testing.decoratorsimportimage_comparison`
	`7`	`+frommatplotlib.testing.decoratorsimportimage_comparison,cleanup`
	`8`	`+`
`8`	`9`	`frommpl_toolkits.axes_grid1importmake_axes_locatable`
	`10`	`+frommpl_toolkits.axes_grid1importAxesGrid`
	`11`	`+`
	`12`	`+frommatplotlib.colorsimportLogNorm`
	`13`	`+`
`9`	`14`	`importnumpyasnp`
`10`	`15`
`11`	`16`
`@@ -50,6 +55,23 @@ def test_divider_append_axes():`
`50`	`55`	`axHistleft.yaxis.set_ticklabels(())`
`51`	`56`	`axHistright.yaxis.set_ticklabels(())`
`52`	`57`
	`58`	`+`
	`59`	`+@cleanup`
	`60`	`+deftest_axesgrid_colorbar_log_smoketest():`
	`61`	`+fig=plt.figure()`
	`62`	`+grid=AxesGrid(fig,111,# modified to be only subplot`
	`63`	`+nrows_ncols=(1,1),`
	`64`	`+label_mode="L",`
	`65`	`+cbar_location="top",`
	`66`	`+cbar_mode="single",`
	`67`	`+ )`
	`68`	`+`
	`69`	`+Z=10000*np.random.rand(10,10)`
	`70`	`+im=grid[0].imshow(Z,interpolation="nearest",norm=LogNorm())`
	`71`	`+`
	`72`	`+grid.cbar_axes[0].colorbar(im)`
	`73`	`+`
	`74`	`+`
`53`	`75`	`if__name__=='__main__':`
`54`	`76`	`importnose`
`55`	`77`	`nose.runmodule(argv=['-s','--with-doctest'],exit=False)`

Comments

(0)