NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commitfa8ef97

committed

Prefer add_subplot(foo=bar) to subplots(subplot_kw={"foo": bar}).

When creating a single subplot I think the former is more readable.(Note that before mpl3.1 one had to write `add_subplot(111, foo=bar)`where the tradeoff was less clear.)

1 parent4b50ce6 commitfa8ef97Copy full SHA for fa8ef97

File tree

11 files changed

+31

-31

lines changed

examples
- frontpage
  - 3D.py
- mplot3d
  - custom_shaded_3d_surface.py
  - wire3d_zero_stride.py
- pie_and_polar_charts
  - nested_pie.py
  - pie_and_donut_labels.py
- shapes_and_collections
  - ellipse_demo.py
- text_labels_and_annotations
  - annotation_demo.py
- widgets
  - lasso_selector_demo_sgskip.py
lib
- matplotlib/tests
  - test_axes.py
  - test_quiver.py
- mpl_toolkits/tests
  - test_mplot3d.py

11 files changed

+31

-31

lines changed

`‎examples/frontpage/3D.py‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`region=np.s_[5:50,5:50]`
`24`	`24`	`x,y,z=x[region],y[region],z[region]`
`25`	`25`
`26`		`-fig,ax=plt.subplots(subplot_kw=dict(projection='3d'))`
	`26`	`+fig=plt.figure()`
	`27`	`+ax=fig.add_subplot(projection='3d')`
`27`	`28`
`28`	`29`	`ls=LightSource(270,45)`
`29`	`30`	`# To use a custom hillshading mode, override the built-in shading and pass`

`‎examples/mplot3d/custom_shaded_3d_surface.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`x,y,z=x[region],y[region],z[region]`
`26`	`26`
`27`	`27`	`# Set up plot`
`28`		`-fig,ax=plt.subplots(subplot_kw=dict(projection='3d'))`
	`28`	`+ax=plt.figure().add_subplot(projection='3d')`
`29`	`29`
`30`	`30`	`ls=LightSource(270,45)`
`31`	`31`	`# To use a custom hillshading mode, override the built-in shading and pass`

`‎examples/mplot3d/wire3d_zero_stride.py‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`importmatplotlib.pyplotasplt`
`12`	`12`
`13`	`13`
`14`		`-fig, [ax1,ax2]=plt.subplots(2,1,figsize=(8,12),subplot_kw={'projection':'3d'})`
	`14`	`+fig, (ax1,ax2)=plt.subplots(`
	`15`	`+2,1,figsize=(8,12),subplot_kw={'projection':'3d'})`
`15`	`16`
`16`	`17`	`# Get the test data`
`17`	`18`	`X,Y,Z=axes3d.get_test_data(0.05)`

`‎examples/pie_and_polar_charts/nested_pie.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`# a circle. The cumulative sum of the values are used as the edges`
`53`	`53`	`# of the bars.`
`54`	`54`
`55`		`-fig,ax=plt.subplots(subplot_kw=dict(polar=True))`
	`55`	`+ax=plt.figure().add_subplot(polar=True)`
`56`	`56`
`57`	`57`	`size=0.3`
`58`	`58`	`vals=np.array([[60.,32.], [37.,40.], [29.,10.]])`

`‎examples/pie_and_polar_charts/pie_and_donut_labels.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`importnumpyasnp`
`34`	`34`	`importmatplotlib.pyplotasplt`
`35`	`35`
`36`		`-fig,ax=plt.subplots(figsize=(6,3),subplot_kw=dict(aspect="equal"))`
	`36`	`+ax=plt.figure(figsize=(6,3)).add_subplot(aspect="equal")`
`37`	`37`
`38`	`38`	`recipe= ["375 g flour",`
`39`	`39`	`"75 g sugar",`
`@@ -88,7 +88,7 @@ def func(pct, allvals):`
`88`	`88`	`# determined parameters.`
`89`	`89`
`90`	`90`
`91`		`-fig,ax=plt.subplots(figsize=(6,3),subplot_kw=dict(aspect="equal"))`
	`91`	`+ax=plt.figure(figsize=(6,3)).add_subplot(aspect="equal")`
`92`	`92`
`93`	`93`	`recipe= ["225 g flour",`
`94`	`94`	`"90 g sugar",`

`‎examples/shapes_and_collections/ellipse_demo.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`angle=np.random.rand()*360)`
`19`	`19`	`foriinrange(NUM)]`
`20`	`20`
`21`		`-fig,ax=plt.subplots(subplot_kw={'aspect':'equal'})`
	`21`	`+ax=plt.figure().add_subplot(aspect='equal')`
`22`	`22`	`foreinells:`
`23`	`23`	`ax.add_artist(e)`
`24`	`24`	`e.set_clip_box(ax.bbox)`

`‎examples/text_labels_and_annotations/annotation_demo.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`# The text in the example is placed in the fractional figure coordinate system.`
`110`	`110`	`# Text keyword args like horizontal and vertical alignment are respected.`
`111`	`111`
`112`		`-fig,ax=plt.subplots(subplot_kw=dict(projection='polar'),figsize=(3,3))`
	`112`	`+ax=plt.figure(figsize=(3,3)).add_subplot(projection='polar')`
`113`	`113`	`r=np.arange(0,1,0.001)`
`114`	`114`	`theta=22np.pi*r`
`115`	`115`	`line,=ax.plot(theta,r)`
`@@ -131,7 +131,7 @@`
`131`	`131`
`132`	`132`	`el=Ellipse((0,0),10,20,facecolor='r',alpha=0.5)`
`133`	`133`
`134`		`-fig,ax=plt.subplots(subplot_kw=dict(aspect='equal'))`
	`134`	`+ax=plt.figure().add_subplot(aspect='equal')`
`135`	`135`	`ax.add_artist(el)`
`136`	`136`	`el.set_clip_box(ax.bbox)`
`137`	`137`	`ax.annotate('the top',`

`‎examples/widgets/lasso_selector_demo_sgskip.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ def disconnect(self):`
`82`	`82`
`83`	`83`	`data=np.random.rand(100,2)`
`84`	`84`
`85`		`-subplot_kw=dict(xlim=(0,1),ylim=(0,1),autoscale_on=False)`
`86`		`-fig,ax=plt.subplots(subplot_kw=subplot_kw)`
	`85`	`+fig=plt.figure()`
	`86`	`+ax=fig.add_subplot(xlim=(0,1),ylim=(0,1),autoscale_on=False)`
`87`	`87`
`88`	`88`	`pts=ax.scatter(data[:,0],data[:,1],s=80)`
`89`	`89`	`selector=SelectFromCollection(ax,pts)`

`‎lib/matplotlib/tests/test_axes.py‎`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -769,21 +769,21 @@ def test_polar_theta_limits():`
`769`	`769`
`770`	`770`	`@check_figures_equal(extensions=["png"])`
`771`	`771`	`deftest_polar_rlim(fig_test,fig_ref):`
`772`		`-ax=fig_test.subplots(subplot_kw={'polar':True})`
	`772`	`+ax=fig_test.add_subplot(polar=True)`
`773`	`773`	`ax.set_rlim(top=10)`
`774`	`774`	`ax.set_rlim(bottom=.5)`
`775`	`775`
`776`		`-ax=fig_ref.subplots(subplot_kw={'polar':True})`
	`776`	`+ax=fig_ref.add_subplot(polar=True)`
`777`	`777`	`ax.set_rmax(10.)`
`778`	`778`	`ax.set_rmin(.5)`
`779`	`779`
`780`	`780`
`781`	`781`	`@check_figures_equal(extensions=["png"])`
`782`	`782`	`deftest_polar_rlim_bottom(fig_test,fig_ref):`
`783`		`-ax=fig_test.subplots(subplot_kw={'polar':True})`
	`783`	`+ax=fig_test.add_subplot(polar=True)`
`784`	`784`	`ax.set_rlim(bottom=[.5,10])`
`785`	`785`
`786`		`-ax=fig_ref.subplots(subplot_kw={'polar':True})`
	`786`	`+ax=fig_ref.add_subplot(polar=True)`
`787`	`787`	`ax.set_rmax(10.)`
`788`	`788`	`ax.set_rmin(.5)`
`789`	`789`
`@@ -6275,7 +6275,8 @@ def test_minor_accountedfor():`
`6275`	`6275`
`6276`	`6276`
`6277`	`6277`	`deftest_get_tightbbox_polar():`
`6278`		`-fig,ax=plt.subplots(subplot_kw={'projection':'polar'})`
	`6278`	`+fig=plt.figure()`
	`6279`	`+ax=fig.add_subplot(projection='polar')`
`6279`	`6280`	`fig.canvas.draw()`
`6280`	`6281`	`bb=ax.get_tightbbox(fig.canvas.get_renderer())`
`6281`	`6282`	`assert_allclose(bb.extents,`

`‎lib/matplotlib/tests/test_quiver.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ def test_angles_and_scale():`
`199`	`199`	`@image_comparison(['quiver_xy.png'],remove_text=True)`
`200`	`200`	`deftest_quiver_xy():`
`201`	`201`	`# simple arrow pointing from SW to NE`
`202`		`-fig,ax=plt.subplots(subplot_kw=dict(aspect='equal'))`
	`202`	`+ax=plt.figure().add_subplot(aspect='equal')`
`203`	`203`	`ax.quiver(0,0,1,1,angles='xy',scale_units='xy',scale=1)`
`204`	`204`	`ax.set_xlim(0,1.1)`
`205`	`205`	`ax.set_ylim(0,1.1)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfa8ef97

File tree

11 files changed

11 files changed

`‎examples/frontpage/3D.py‎`

`‎examples/mplot3d/custom_shaded_3d_surface.py‎`

`‎examples/mplot3d/wire3d_zero_stride.py‎`

`‎examples/pie_and_polar_charts/nested_pie.py‎`

`‎examples/pie_and_polar_charts/pie_and_donut_labels.py‎`

`‎examples/shapes_and_collections/ellipse_demo.py‎`

`‎examples/text_labels_and_annotations/annotation_demo.py‎`

`‎examples/widgets/lasso_selector_demo_sgskip.py‎`

`‎lib/matplotlib/tests/test_axes.py‎`

`‎lib/matplotlib/tests/test_quiver.py‎`

0 commit comments