Commitd8629e9

authored

Merge pull request#22844 from QuLogic/auto-backport-of-pr-22313-on-v3.5.x

Backport PR#22313 on branch v3.5.x (Fix colorbar exponents)

2 parents08cb870 +f6c755c commitd8629e9Copy full SHA for d8629e9

File tree

+40

-4

lines changed

+40

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2990,7 +2990,11 @@ def _update_title_position(self, renderer):`
`2990`	`2990`	`orax.xaxis.get_label_position()=='top'):`
`2991`	`2991`	`bb=ax.xaxis.get_tightbbox(renderer)`
`2992`	`2992`	`else:`
`2993`		`-bb=ax.get_window_extent(renderer)`
	`2993`	`+if'outline'inax.spines:`
	`2994`	`+# Special case for colorbars:`
	`2995`	`+bb=ax.spines['outline'].get_window_extent()`
	`2996`	`+else:`
	`2997`	`+bb=ax.get_window_extent(renderer)`
`2994`	`2998`	`ifbbisnotNone:`
`2995`	`2999`	`top=max(top,bb.ymax)`
`2996`	`3000`	`iftop<0:`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2380,8 +2380,13 @@ def _update_offset_text_position(self, bboxes, bboxes2):`
`2380`	`2380`	`Update the offset_text position based on the sequence of bounding`
`2381`	`2381`	`boxes of all the ticklabels`
`2382`	`2382`	`"""`
`2383`		`-x,y=self.offsetText.get_position()`
`2384`		`-top=self.axes.bbox.ymax`
	`2383`	`+x,_=self.offsetText.get_position()`
	`2384`	`+if'outline'inself.axes.spines:`
	`2385`	`+# Special case for colorbars:`
	`2386`	`+bbox=self.axes.spines['outline'].get_window_extent()`
	`2387`	`+else:`
	`2388`	`+bbox=self.axes.bbox`
	`2389`	`+top=bbox.ymax`
`2385`	`2390`	`self.offsetText.set_position(`
`2386`	`2391`	`(x,top+self.OFFSETTEXTPAD*self.figure.dpi/72)`
`2387`	`2392`	`)`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -968,3 +968,30 @@ def test_boundaries():`
`968`	`968`	`fig,ax=plt.subplots(figsize=(2,2))`
`969`	`969`	`pc=ax.pcolormesh(np.random.randn(10,10),cmap='RdBu_r')`
`970`	`970`	`cb=fig.colorbar(pc,ax=ax,boundaries=np.linspace(-3,3,7))`
	`971`	`+`
	`972`	`+`
	`973`	`+deftest_offset_text_loc():`
	`974`	`+plt.style.use('mpl20')`
	`975`	`+fig,ax=plt.subplots()`
	`976`	`+np.random.seed(seed=19680808)`
	`977`	`+pc=ax.pcolormesh(np.random.randn(10,10)*1e6)`
	`978`	`+cb=fig.colorbar(pc,location='right',extend='max')`
	`979`	`+fig.draw_without_rendering()`
	`980`	`+# check that the offsetText is in the proper place above the`
	`981`	`+# colorbar axes. In this case the colorbar axes is the same`
	`982`	`+# height as the parent, so use the parents bbox.`
	`983`	`+assertcb.ax.yaxis.offsetText.get_position()[1]>ax.bbox.y1`
	`984`	`+`
	`985`	`+`
	`986`	`+deftest_title_text_loc():`
	`987`	`+plt.style.use('mpl20')`
	`988`	`+fig,ax=plt.subplots()`
	`989`	`+np.random.seed(seed=19680808)`
	`990`	`+pc=ax.pcolormesh(np.random.randn(10,10))`
	`991`	`+cb=fig.colorbar(pc,location='right',extend='max')`
	`992`	`+cb.ax.set_title('Aardvark')`
	`993`	`+fig.draw_without_rendering()`
	`994`	`+# check that the title is in the proper place above the`
	`995`	`+# colorbar axes, including its extend triangles....`
	`996`	`+assert (cb.ax.title.get_window_extent(fig.canvas.get_renderer()).ymax>`
	`997`	`+cb.ax.spines['outline'].get_window_extent().ymax)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ def my_plotter(ax, data1, data2, param_dict):`
`502`	`502`
`503`	`503`	`pc=axs[1,1].scatter(data1,data2,c=data3,cmap='RdBu_r')`
`504`	`504`	`fig.colorbar(pc,ax=axs[1,1],extend='both')`
`505`		`-axs[1,1].set_title('scatter()');`
	`505`	`+axs[1,1].set_title('scatter()')`
`506`	`506`
`507`	`507`	`##############################################################################`
`508`	`508`	`# Colormaps`

Comments

(0)