Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit89923a6

Browse files
committed
MNT : remove non-boilerplatedraw_if_interactive
There is still one `draw_if_interactive` left in the `rcdefaults`call as the current scheme does not track when rcparams change.
1 parentb2fbae7 commit89923a6

File tree

1 file changed

+13
-64
lines changed

1 file changed

+13
-64
lines changed

‎lib/matplotlib/pyplot.py

Lines changed: 13 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,7 @@ def sci(im):
349349
# (getp is simply imported)
350350
@docstring.copy(_setp)
351351
defsetp(*args,**kwargs):
352-
ret=_setp(*args,**kwargs)
353-
draw_if_interactive()
354-
returnret
352+
return_setp(*args,**kwargs)
355353

356354

357355
defxkcd(scale=1,length=100,randomness=2):
@@ -544,7 +542,6 @@ def make_active(event):
544542
_pylab_helpers.Gcf.set_active(figManager)
545543
figManager.canvas.figure.number=num
546544

547-
draw_if_interactive()
548545
returnfigManager.canvas.figure
549546

550547

@@ -642,7 +639,6 @@ def clf():
642639
Clear the current figure.
643640
"""
644641
gcf().clf()
645-
draw_if_interactive()
646642

647643

648644
defdraw():
@@ -707,27 +703,20 @@ def waitforbuttonpress(*args, **kwargs):
707703

708704
@docstring.copy_dedent(Figure.text)
709705
deffigtext(*args,**kwargs):
710-
711-
ret=gcf().text(*args,**kwargs)
712-
draw_if_interactive()
713-
returnret
706+
returngcf().text(*args,**kwargs)
714707

715708

716709
@docstring.copy_dedent(Figure.suptitle)
717710
defsuptitle(*args,**kwargs):
718-
ret=gcf().suptitle(*args,**kwargs)
719-
draw_if_interactive()
720-
returnret
711+
returngcf().suptitle(*args,**kwargs)
721712

722713

723714
@docstring.Appender("Addition kwargs: hold = [True|False] overrides default hold state","\n")
724715
@docstring.copy_dedent(Figure.figimage)
725716
deffigimage(*args,**kwargs):
726717
# allow callers to override the hold state by passing hold=True|False
727-
ret=gcf().figimage(*args,**kwargs)
728-
draw_if_interactive()
729718
#sci(ret) # JDH figimage should not set current image -- it is not mappable, etc
730-
returnret
719+
returngcf().figimage(*args,**kwargs)
731720

732721

733722
deffiglegend(handles,labels,loc,**kwargs):
@@ -758,9 +747,7 @@ def figlegend(handles, labels, loc, **kwargs):
758747
:func:`~matplotlib.pyplot.legend`
759748
760749
"""
761-
l=gcf().legend(handles,labels,loc,**kwargs)
762-
draw_if_interactive()
763-
returnl
750+
returngcf().legend(handles,labels,loc,**kwargs)
764751

765752

766753
## Figure and Axes hybrid ##
@@ -869,7 +856,6 @@ def axes(*args, **kwargs):
869856
else:
870857
rect=arg
871858
a=gcf().add_axes(rect,**kwargs)
872-
draw_if_interactive()
873859
returna
874860

875861

@@ -885,7 +871,6 @@ def delaxes(*args):
885871
else:
886872
ax=args[0]
887873
ret=gcf().delaxes(ax)
888-
draw_if_interactive()
889874
returnret
890875

891876

@@ -922,11 +907,11 @@ def gca(**kwargs):
922907
--------
923908
matplotlib.figure.Figure.gca : The figure's gca method.
924909
"""
925-
ax=gcf().gca(**kwargs)
926-
returnax
910+
returngcf().gca(**kwargs)
927911

928912
# More ways of creating axes:
929913

914+
930915
defsubplot(*args,**kwargs):
931916
"""
932917
Return a subplot axes positioned by the given grid definition.
@@ -1025,7 +1010,6 @@ def subplot(*args, **kwargs):
10251010
byebye.append(other)
10261011
foraxinbyebye:delaxes(ax)
10271012

1028-
draw_if_interactive()
10291013
returna
10301014

10311015

@@ -1277,7 +1261,6 @@ def subplot2grid(shape, loc, rowspan=1, colspan=1, **kwargs):
12771261
byebye.append(other)
12781262
foraxinbyebye:delaxes(ax)
12791263

1280-
draw_if_interactive()
12811264
returna
12821265

12831266

@@ -1296,7 +1279,6 @@ def twinx(ax=None):
12961279
ifaxisNone:
12971280
ax=gca()
12981281
ax1=ax.twinx()
1299-
draw_if_interactive()
13001282
returnax1
13011283

13021284

@@ -1310,7 +1292,6 @@ def twiny(ax=None):
13101292
ifaxisNone:
13111293
ax=gca()
13121294
ax1=ax.twiny()
1313-
draw_if_interactive()
13141295
returnax1
13151296

13161297

@@ -1336,7 +1317,6 @@ def subplots_adjust(*args, **kwargs):
13361317
"""
13371318
fig=gcf()
13381319
fig.subplots_adjust(*args,**kwargs)
1339-
draw_if_interactive()
13401320

13411321

13421322
defsubplot_tool(targetfig=None):
@@ -1383,7 +1363,6 @@ def tight_layout(pad=1.08, h_pad=None, w_pad=None, rect=None):
13831363

13841364
fig=gcf()
13851365
fig.tight_layout(pad=pad,h_pad=h_pad,w_pad=w_pad,rect=rect)
1386-
draw_if_interactive()
13871366

13881367

13891368
defbox(on=None):
@@ -1398,7 +1377,6 @@ def box(on=None):
13981377
ifonisNone:
13991378
on=notax.get_frame_on()
14001379
ax.set_frame_on(on)
1401-
draw_if_interactive()
14021380

14031381

14041382
deftitle(s,*args,**kwargs):
@@ -1443,9 +1421,7 @@ def title(s, *args, **kwargs):
14431421
properties.
14441422
14451423
"""
1446-
l=gca().set_title(s,*args,**kwargs)
1447-
draw_if_interactive()
1448-
returnl
1424+
returngca().set_title(s,*args,**kwargs)
14491425

14501426
## Axis ##
14511427

@@ -1510,10 +1486,7 @@ def axis(*v, **kwargs):
15101486
:func:`xlim`, :func:`ylim`
15111487
For setting the x- and y-limits individually.
15121488
"""
1513-
ax=gca()
1514-
v=ax.axis(*v,**kwargs)
1515-
draw_if_interactive()
1516-
returnv
1489+
returngca().axis(*v,**kwargs)
15171490

15181491

15191492
defxlabel(s,*args,**kwargs):
@@ -1533,9 +1506,7 @@ def xlabel(s, *args, **kwargs):
15331506
:func:`~matplotlib.pyplot.text`
15341507
For information on how override and the optional args work
15351508
"""
1536-
l=gca().set_xlabel(s,*args,**kwargs)
1537-
draw_if_interactive()
1538-
returnl
1509+
returngca().set_xlabel(s,*args,**kwargs)
15391510

15401511

15411512
defylabel(s,*args,**kwargs):
@@ -1556,9 +1527,7 @@ def ylabel(s, *args, **kwargs):
15561527
For information on how override and the optional args
15571528
work.
15581529
"""
1559-
l=gca().set_ylabel(s,*args,**kwargs)
1560-
draw_if_interactive()
1561-
returnl
1530+
returngca().set_ylabel(s,*args,**kwargs)
15621531

15631532

15641533
defxlim(*args,**kwargs):
@@ -1586,7 +1555,6 @@ def xlim(*args, **kwargs):
15861555
ifnotargsandnotkwargs:
15871556
returnax.get_xlim()
15881557
ret=ax.set_xlim(*args,**kwargs)
1589-
draw_if_interactive()
15901558
returnret
15911559

15921560

@@ -1614,7 +1582,6 @@ def ylim(*args, **kwargs):
16141582
ifnotargsandnotkwargs:
16151583
returnax.get_ylim()
16161584
ret=ax.set_ylim(*args,**kwargs)
1617-
draw_if_interactive()
16181585
returnret
16191586

16201587

@@ -1633,9 +1600,7 @@ def xscale(*args, **kwargs):
16331600
16341601
%(scale_docs)s
16351602
"""
1636-
ax=gca()
1637-
ax.set_xscale(*args,**kwargs)
1638-
draw_if_interactive()
1603+
gca().set_xscale(*args,**kwargs)
16391604

16401605

16411606
@docstring.dedent_interpd
@@ -1653,9 +1618,7 @@ def yscale(*args, **kwargs):
16531618
16541619
%(scale_docs)s
16551620
"""
1656-
ax=gca()
1657-
ax.set_yscale(*args,**kwargs)
1658-
draw_if_interactive()
1621+
gca().set_yscale(*args,**kwargs)
16591622

16601623

16611624
defxticks(*args,**kwargs):
@@ -1695,7 +1658,6 @@ def xticks(*args, **kwargs):
16951658
forlinlabels:
16961659
l.update(kwargs)
16971660

1698-
draw_if_interactive()
16991661
returnlocs,silent_list('Text xticklabel',labels)
17001662

17011663

@@ -1736,7 +1698,6 @@ def yticks(*args, **kwargs):
17361698
forlinlabels:
17371699
l.update(kwargs)
17381700

1739-
draw_if_interactive()
17401701

17411702
return (locs,
17421703
silent_list('Text yticklabel',labels)
@@ -1751,15 +1712,13 @@ def minorticks_on():
17511712
minorticks_off() if drawing speed is a problem.
17521713
"""
17531714
gca().minorticks_on()
1754-
draw_if_interactive()
17551715

17561716

17571717
defminorticks_off():
17581718
"""
17591719
Remove minor ticks from the current plot.
17601720
"""
17611721
gca().minorticks_off()
1762-
draw_if_interactive()
17631722

17641723

17651724
defrgrids(*args,**kwargs):
@@ -1802,7 +1761,6 @@ def rgrids(*args, **kwargs):
18021761
else:
18031762
lines,labels=ax.set_rgrids(*args,**kwargs)
18041763

1805-
draw_if_interactive()
18061764
return (silent_list('Line2D rgridline',lines),
18071765
silent_list('Text rgridlabel',labels) )
18081766

@@ -1863,7 +1821,6 @@ def thetagrids(*args, **kwargs):
18631821
else:
18641822
lines,labels=ax.set_thetagrids(*args,**kwargs)
18651823

1866-
draw_if_interactive()
18671824
return (silent_list('Line2D thetagridline',lines),
18681825
silent_list('Text thetagridlabel',labels)
18691826
)
@@ -2254,7 +2211,6 @@ def colorbar(mappable=None, cax=None, ax=None, **kw):
22542211
ax=gca()
22552212

22562213
ret=gcf().colorbar(mappable,cax=cax,ax=ax,**kw)
2257-
draw_if_interactive()
22582214
returnret
22592215
colorbar.__doc__=matplotlib.colorbar.colorbar_doc
22602216

@@ -2282,7 +2238,6 @@ def clim(vmin=None, vmax=None):
22822238
raiseRuntimeError('You must first define an image, e.g., with imshow')
22832239

22842240
im.set_clim(vmin,vmax)
2285-
draw_if_interactive()
22862241

22872242

22882243
defset_cmap(cmap):
@@ -2304,7 +2259,6 @@ def set_cmap(cmap):
23042259
ifimisnotNone:
23052260
im.set_cmap(cmap)
23062261

2307-
draw_if_interactive()
23082262

23092263

23102264
@docstring.copy_dedent(_imread)
@@ -2355,7 +2309,6 @@ def matshow(A, fignum=None, **kw):
23552309
im=ax.matshow(A,**kw)
23562310
sci(im)
23572311

2358-
draw_if_interactive()
23592312
returnim
23602313

23612314

@@ -2373,7 +2326,6 @@ def polar(*args, **kwargs):
23732326
"""
23742327
ax=gca(polar=True)
23752328
ret=ax.plot(*args,**kwargs)
2376-
draw_if_interactive()
23772329
returnret
23782330

23792331

@@ -2495,8 +2447,6 @@ def getname_val(identifier):
24952447
ifxname=='date':
24962448
fig.autofmt_xdate()
24972449

2498-
draw_if_interactive()
2499-
25002450

25012451
def_autogen_docstring(base):
25022452
"""Autogenerated wrappers will get their docstring from a base function
@@ -2517,7 +2467,6 @@ def spy(Z, precision=0, marker=None, markersize=None, aspect='equal', hold=None,
25172467
ax.hold(hold)
25182468
try:
25192469
ret=ax.spy(Z,precision,marker,markersize,aspect,**kwargs)
2520-
draw_if_interactive()
25212470
finally:
25222471
ax.hold(washold)
25232472
ifisinstance(ret,cm.ScalarMappable):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp