Commitc5fb275

committed

Fix ngrids support in axes_grid.Grid().

Thiis also restores axes_row and axes_column to their behavior prior to88e0d84(which is the commit that broke ngrids support).

1 parent42472ef commitc5fb275Copy full SHA for c5fb275

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,9 @@ def __init__(self, fig,`
`144`	`144`	`axes_array[row,col]=axes_class(`
`145`	`145`	`fig,rect,sharex=sharex,sharey=sharey)`
`146`	`146`	`self.axes_all=axes_array.ravel(`
`147`		`-order="C"ifself._direction=="row"else"F").tolist()`
`148`		`-self.axes_column=axes_array.T.tolist()`
`149`		`-self.axes_row=axes_array.tolist()`
	`147`	`+order="C"ifself._direction=="row"else"F").tolist()[:ngrids]`
	`148`	`+self.axes_row=[[axforaxinrowifax]forrowinaxes_array]`
	`149`	`+self.axes_column=[[axforaxincolifax]forcolinaxes_array.T]`
`150`	`150`	`self.axes_llc=self.axes_column[0][-1]`
`151`	`151`
`152`	`152`	`self._init_locators()`
`@@ -256,7 +256,10 @@ def set_label_mode(self, mode):`
`256`	`256`	`return`
`257`	`257`	`foriinrange(self._nrows):`
`258`	`258`	`forjinrange(self._ncols):`
`259`		`-ax=self.axes_row[i][j]`
	`259`	`+try:`
	`260`	`+ax=self.axes_row[i][j]`
	`261`	`+exceptIndexError:`
	`262`	`+continue`
`260`	`263`	`ifisinstance(ax.axis,MethodType):`
`261`	`264`	`bottom_axis=SimpleAxisArtist(ax.xaxis,1,ax.spines["bottom"])`
`262`	`265`	`left_axis=SimpleAxisArtist(ax.yaxis,1,ax.spines["left"])`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -792,3 +792,9 @@ def test_anchored_locator_base_call():`
`792`	`792`	`deftest_grid_with_axes_class_not_overriding_axis():`
`793`	`793`	`Grid(plt.figure(),111, (2,2),axes_class=mpl.axes.Axes)`
`794`	`794`	`RGBAxes(plt.figure(),111,axes_class=mpl.axes.Axes)`
	`795`	`+`
	`796`	`+`
	`797`	`+deftest_grid_ngrids():`
	`798`	`+fig=plt.figure()`
	`799`	`+grid=Grid(fig,111, (3,3),ngrids=5)`
	`800`	`+assertlen(fig.axes)==grid.ngrids==5`

Comments

(0)