Commit2e7b3c6

committed

[ENH] Vectorized Wedgeprops argument to pie

1 parent5093150 commit2e7b3c6Copy full SHA for 2e7b3c6

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+importcollections`
`1`	`2`	`importfunctools`
`2`	`3`	`importitertools`
`3`	`4`	`importlogging`
`@@ -3226,7 +3227,14 @@ def get_next_color():`
`3226`	`3227`	`slices= []`
`3227`	`3228`	`autotexts= []`
`3228`	`3229`
`3229`		`-forfrac,label,explinzip(x,labels,explode):`
	`3230`	`+ifisinstance(wedgeprops,collections.abc.Sequence):`
	`3231`	`+iflen(wedgeprops)!=len(x):`
	`3232`	`+raiseValueError(f'wedgeprops length={len(wedgeprops)}'`
	`3233`	`+f' and input length={len(x)} are not equal')`
	`3234`	`+else:`
	`3235`	`+wedgeprops=itertools.repeat(wedgeprops)`
	`3236`	`+`
	`3237`	`+forfrac,label,expl,wpropsinzip(x,labels,explode,wedgeprops):`
`3230`	`3238`	`x,y=center`
`3231`	`3239`	`theta2= (theta1+frac)ifcounterclockelse (theta1-frac)`
`3232`	`3240`	`thetam=2np.pi0.5* (theta1+theta2)`
`@@ -3238,7 +3246,7 @@ def get_next_color():`
`3238`	`3246`	`facecolor=get_next_color(),`
`3239`	`3247`	`clip_on=False,`
`3240`	`3248`	`label=label)`
`3241`		`-w.set(**wedgeprops)`
	`3249`	`+w.set(**wprops)`
`3242`	`3250`	`slices.append(w)`
`3243`	`3251`	`self.add_patch(w)`
`3244`	`3252`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5740,6 +5740,24 @@ def test_normalize_kwarg_pie():`
`5740`	`5740`	`assertabs(t2[0][-1].theta2-360.)>1e-3`
`5741`	`5741`
`5742`	`5742`
	`5743`	`+deftest_pie_wedgeprops_error():`
	`5744`	`+fig,ax=plt.subplots()`
	`5745`	`+x= [0.3,0.3,0.1]`
	`5746`	`+wedgeprops= [{'a':1}]`
	`5747`	`+withpytest.raises(ValueError,match=r"length=1 .* length=3"):`
	`5748`	`+ax.pie(x,wedgeprops=wedgeprops)`
	`5749`	`+`
	`5750`	`+`
	`5751`	`+@check_figures_equal()`
	`5752`	`+deftest_pie_multi_wedgeprops(fig_test,fig_ref):`
	`5753`	`+x= [0.3,0.3,0.1]`
	`5754`	`+wedgeprops= [{'hatch':'/'}, {'hatch':'+'}, {'hatch':'.'}]`
	`5755`	`+fig_test.subplots().pie(x,wedgeprops=wedgeprops)`
	`5756`	`+wedges,_=fig_ref.subplots().pie(x)`
	`5757`	`+forw,wpinzip(wedges,wedgeprops):`
	`5758`	`+w.set(**wp)`
	`5759`	`+`
	`5760`	`+`
`5743`	`5761`	`@image_comparison(['set_get_ticklabels.png'])`
`5744`	`5762`	`deftest_set_get_ticklabels():`
`5745`	`5763`	`# test issue 2246`

Comments

(0)