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

Commit33c243a

Browse files
committed
Don't import rcParams but rather use mpl.rcParams (part 2)
1 parentd9ae387 commit33c243a

13 files changed

+168
-159
lines changed

‎lib/matplotlib/artist.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
importnumpyasnp
1010

11-
importmatplotlib
12-
from .importcbook,docstring,rcParams
11+
importmatplotlibasmpl
12+
from .importcbook,docstring
1313
from .pathimportPath
1414
from .transformsimport (Bbox,IdentityTransform,Transform,TransformedBbox,
1515
TransformedPatchPath,TransformedPath)
@@ -99,8 +99,8 @@ def __init__(self):
9999
self._url=None
100100
self._gid=None
101101
self._snap=None
102-
self._sketch=rcParams['path.sketch']
103-
self._path_effects=rcParams['path.effects']
102+
self._sketch=mpl.rcParams['path.sketch']
103+
self._path_effects=mpl.rcParams['path.effects']
104104
self._sticky_edges=_XYPair([], [])
105105
self._in_layout=True
106106

@@ -588,7 +588,7 @@ def get_snap(self):
588588
589589
See `.set_snap` for details.
590590
"""
591-
ifrcParams['path.snap']:
591+
ifmpl.rcParams['path.snap']:
592592
returnself._snap
593593
else:
594594
returnFalse
@@ -1602,7 +1602,7 @@ def kwdoc(artist):
16021602
"""
16031603
ai=ArtistInspector(artist)
16041604
return ('\n'.join(ai.pprint_setters_rest(leadingspace=4))
1605-
ifmatplotlib.rcParams['docstring.hardcopy']else
1605+
ifmpl.rcParams['docstring.hardcopy']else
16061606
'Properties:\n'+'\n'.join(ai.pprint_setters(leadingspace=4)))
16071607

16081608

‎lib/matplotlib/axis.py

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
importnumpyasnp
99

10-
frommatplotlibimportrcParams
10+
importmatplotlibasmpl
1111
importmatplotlib.artistasmartist
1212
importmatplotlib.cbookascbook
1313
importmatplotlib.linesasmlines
@@ -84,11 +84,12 @@ def __init__(self, axes, loc, label=None,
8484
martist.Artist.__init__(self)
8585

8686
ifgridOnisNone:
87-
ifmajorand (rcParams['axes.grid.which']in ('both','major')):
88-
gridOn=rcParams['axes.grid']
89-
elif (notmajor)and (rcParams['axes.grid.which']
87+
ifmajorand (mpl.rcParams['axes.grid.which']
88+
in ('both','major')):
89+
gridOn=mpl.rcParams['axes.grid']
90+
elif (notmajor)and (mpl.rcParams['axes.grid.which']
9091
in ('both','minor')):
91-
gridOn=rcParams['axes.grid']
92+
gridOn=mpl.rcParams['axes.grid']
9293
else:
9394
gridOn=False
9495

@@ -102,25 +103,25 @@ def __init__(self, axes, loc, label=None,
102103
major_minor="major"ifmajorelse"minor"
103104

104105
ifsizeisNone:
105-
size=rcParams[f"{name}.{major_minor}.size"]
106+
size=mpl.rcParams[f"{name}.{major_minor}.size"]
106107
self._size=size
107108

108109
ifwidthisNone:
109-
width=rcParams[f"{name}.{major_minor}.width"]
110+
width=mpl.rcParams[f"{name}.{major_minor}.width"]
110111
self._width=width
111112

112113
ifcolorisNone:
113-
color=rcParams[f"{name}.color"]
114+
color=mpl.rcParams[f"{name}.color"]
114115

115116
ifpadisNone:
116-
pad=rcParams[f"{name}.{major_minor}.pad"]
117+
pad=mpl.rcParams[f"{name}.{major_minor}.pad"]
117118
self._base_pad=pad
118119

119120
iflabelcolorisNone:
120-
labelcolor=rcParams[f"{name}.color"]
121+
labelcolor=mpl.rcParams[f"{name}.color"]
121122

122123
iflabelsizeisNone:
123-
labelsize=rcParams[f"{name}.labelsize"]
124+
labelsize=mpl.rcParams[f"{name}.labelsize"]
124125

125126
self._set_labelrotation(labelrotation)
126127

@@ -132,13 +133,13 @@ def __init__(self, axes, loc, label=None,
132133
self._zorder=zorder
133134

134135
ifgrid_colorisNone:
135-
grid_color=rcParams["grid.color"]
136+
grid_color=mpl.rcParams["grid.color"]
136137
ifgrid_linestyleisNone:
137-
grid_linestyle=rcParams["grid.linestyle"]
138+
grid_linestyle=mpl.rcParams["grid.linestyle"]
138139
ifgrid_linewidthisNone:
139-
grid_linewidth=rcParams["grid.linewidth"]
140+
grid_linewidth=mpl.rcParams["grid.linewidth"]
140141
ifgrid_alphaisNone:
141-
grid_alpha=rcParams["grid.alpha"]
142+
grid_alpha=mpl.rcParams["grid.alpha"]
142143
grid_kw= {k[5:]:vfork,vinkw.items()}
143144

144145
self.apply_tickdir(tickdir)
@@ -453,7 +454,7 @@ def _get_text2_transform(self):
453454

454455
defapply_tickdir(self,tickdir):
455456
iftickdirisNone:
456-
tickdir=rcParams['%s.direction'%self.__name__.lower()]
457+
tickdir=mpl.rcParams['%s.direction'%self.__name__.lower()]
457458
self._tickdir=tickdir
458459

459460
ifself._tickdir=='in':
@@ -524,7 +525,7 @@ def _get_text2_transform(self):
524525

525526
defapply_tickdir(self,tickdir):
526527
iftickdirisNone:
527-
tickdir=rcParams['%s.direction'%self.__name__.lower()]
528+
tickdir=mpl.rcParams['%s.direction'%self.__name__.lower()]
528529
self._tickdir=tickdir
529530

530531
ifself._tickdir=='in':
@@ -689,15 +690,15 @@ def __init__(self, axes, pickradius=15):
689690

690691
self.label=mtext.Text(
691692
np.nan,np.nan,
692-
fontsize=rcParams['axes.labelsize'],
693-
fontweight=rcParams['axes.labelweight'],
694-
color=rcParams['axes.labelcolor'],
693+
fontsize=mpl.rcParams['axes.labelsize'],
694+
fontweight=mpl.rcParams['axes.labelweight'],
695+
color=mpl.rcParams['axes.labelcolor'],
695696
)
696697
self._set_artist_props(self.label)
697698
self.offsetText=mtext.Text(np.nan,np.nan)
698699
self._set_artist_props(self.offsetText)
699700

700-
self.labelpad=rcParams['axes.labelpad']
701+
self.labelpad=mpl.rcParams['axes.labelpad']
701702

702703
self.pickradius=pickradius
703704

@@ -778,10 +779,12 @@ def cla(self):
778779
self.callbacks=cbook.CallbackRegistry()
779780

780781
# whether the grids are on
781-
self._gridOnMajor= (rcParams['axes.grid']and
782-
rcParams['axes.grid.which']in ('both','major'))
783-
self._gridOnMinor= (rcParams['axes.grid']and
784-
rcParams['axes.grid.which']in ('both','minor'))
782+
self._gridOnMajor= (
783+
mpl.rcParams['axes.grid']and
784+
mpl.rcParams['axes.grid.which']in ('both','major'))
785+
self._gridOnMinor= (
786+
mpl.rcParams['axes.grid']and
787+
mpl.rcParams['axes.grid.which']in ('both','minor'))
785788

786789
self.reset_ticks()
787790

@@ -1842,8 +1845,8 @@ def __init__(self, *args, **kwargs):
18421845
verticalalignment='top',horizontalalignment='right',
18431846
transform=mtransforms.blended_transform_factory(
18441847
self.axes.transAxes,mtransforms.IdentityTransform()),
1845-
fontsize=rcParams['xtick.labelsize'],
1846-
color=rcParams['xtick.color'],
1848+
fontsize=mpl.rcParams['xtick.labelsize'],
1849+
color=mpl.rcParams['xtick.color'],
18471850
)
18481851
self.offset_text_position='bottom'
18491852

@@ -2135,8 +2138,8 @@ def __init__(self, *args, **kwargs):
21352138
verticalalignment='baseline',horizontalalignment='left',
21362139
transform=mtransforms.blended_transform_factory(
21372140
self.axes.transAxes,mtransforms.IdentityTransform()),
2138-
fontsize=rcParams['ytick.labelsize'],
2139-
color=rcParams['ytick.color'],
2141+
fontsize=mpl.rcParams['ytick.labelsize'],
2142+
color=mpl.rcParams['ytick.color'],
21402143
)
21412144
self.offset_text_position='left'
21422145

‎lib/matplotlib/backend_tools.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
importnumpyasnp
2222

23-
frommatplotlibimportrcParams
23+
importmatplotlibasmpl
2424
frommatplotlib._pylab_helpersimportGcf
2525
importmatplotlib.cbookascbook
2626

@@ -394,7 +394,7 @@ class ToolQuit(ToolBase):
394394
"""Tool to call the figure manager destroy method"""
395395

396396
description='Quit the figure'
397-
default_keymap=rcParams['keymap.quit']
397+
default_keymap=mpl.rcParams['keymap.quit']
398398

399399
deftrigger(self,sender,event,data=None):
400400
Gcf.destroy_fig(self.figure)
@@ -404,7 +404,7 @@ class ToolQuitAll(ToolBase):
404404
"""Tool to call the figure manager destroy method"""
405405

406406
description='Quit all figures'
407-
default_keymap=rcParams['keymap.quit_all']
407+
default_keymap=mpl.rcParams['keymap.quit_all']
408408

409409
deftrigger(self,sender,event,data=None):
410410
Gcf.destroy_all()
@@ -414,7 +414,7 @@ class ToolEnableAllNavigation(ToolBase):
414414
"""Tool to enable all axes for toolmanager interaction"""
415415

416416
description='Enable all axes toolmanager'
417-
default_keymap=rcParams['keymap.all_axes']
417+
default_keymap=mpl.rcParams['keymap.all_axes']
418418

419419
deftrigger(self,sender,event,data=None):
420420
ifevent.inaxesisNone:
@@ -482,7 +482,7 @@ class ToolGrid(_ToolGridBase):
482482
"""Tool to toggle the major grids of the figure"""
483483

484484
description='Toggle major grids'
485-
default_keymap=rcParams['keymap.grid']
485+
default_keymap=mpl.rcParams['keymap.grid']
486486

487487
def_get_next_grid_states(self,ax):
488488
ifNoneinmap(self._get_uniform_grid_state,
@@ -503,7 +503,7 @@ class ToolMinorGrid(_ToolGridBase):
503503
"""Tool to toggle the major and minor grids of the figure"""
504504

505505
description='Toggle major and minor grids'
506-
default_keymap=rcParams['keymap.grid_minor']
506+
default_keymap=mpl.rcParams['keymap.grid_minor']
507507

508508
def_get_next_grid_states(self,ax):
509509
ifNoneinmap(self._get_uniform_grid_state,
@@ -523,7 +523,7 @@ class ToolFullScreen(ToolToggleBase):
523523
"""Tool to toggle full screen"""
524524

525525
description='Toggle fullscreen mode'
526-
default_keymap=rcParams['keymap.fullscreen']
526+
default_keymap=mpl.rcParams['keymap.fullscreen']
527527

528528
defenable(self,event):
529529
self.figure.canvas.manager.full_screen_toggle()
@@ -553,7 +553,7 @@ class ToolYScale(AxisScaleBase):
553553
"""Tool to toggle between linear and logarithmic scales on the Y axis"""
554554

555555
description='Toggle scale Y axis'
556-
default_keymap=rcParams['keymap.yscale']
556+
default_keymap=mpl.rcParams['keymap.yscale']
557557

558558
defset_scale(self,ax,scale):
559559
ax.set_yscale(scale)
@@ -563,7 +563,7 @@ class ToolXScale(AxisScaleBase):
563563
"""Tool to toggle between linear and logarithmic scales on the X axis"""
564564

565565
description='Toggle scale X axis'
566-
default_keymap=rcParams['keymap.xscale']
566+
default_keymap=mpl.rcParams['keymap.xscale']
567567

568568
defset_scale(self,ax,scale):
569569
ax.set_xscale(scale)
@@ -738,7 +738,7 @@ class ToolHome(ViewsPositionsBase):
738738

739739
description='Reset original view'
740740
image='home'
741-
default_keymap=rcParams['keymap.home']
741+
default_keymap=mpl.rcParams['keymap.home']
742742
_on_trigger='home'
743743

744744

@@ -747,7 +747,7 @@ class ToolBack(ViewsPositionsBase):
747747

748748
description='Back to previous view'
749749
image='back'
750-
default_keymap=rcParams['keymap.back']
750+
default_keymap=mpl.rcParams['keymap.back']
751751
_on_trigger='back'
752752

753753

@@ -756,7 +756,7 @@ class ToolForward(ViewsPositionsBase):
756756

757757
description='Forward to next view'
758758
image='forward'
759-
default_keymap=rcParams['keymap.forward']
759+
default_keymap=mpl.rcParams['keymap.forward']
760760
_on_trigger='forward'
761761

762762

@@ -772,7 +772,7 @@ class SaveFigureBase(ToolBase):
772772

773773
description='Save the figure'
774774
image='filesave'
775-
default_keymap=rcParams['keymap.save']
775+
default_keymap=mpl.rcParams['keymap.save']
776776

777777

778778
classZoomPanBase(ToolToggleBase):
@@ -844,7 +844,7 @@ class ToolZoom(ZoomPanBase):
844844

845845
description='Zoom to rectangle'
846846
image='zoom_to_rect'
847-
default_keymap=rcParams['keymap.zoom']
847+
default_keymap=mpl.rcParams['keymap.zoom']
848848
cursor=cursors.SELECT_REGION
849849
radio_group='default'
850850

@@ -968,7 +968,7 @@ def _release(self, event):
968968
classToolPan(ZoomPanBase):
969969
"""Pan axes with left mouse, zoom with right"""
970970

971-
default_keymap=rcParams['keymap.pan']
971+
default_keymap=mpl.rcParams['keymap.pan']
972972
description='Pan axes with left mouse, zoom with right'
973973
image='move'
974974
cursor=cursors.MOVE
@@ -1033,7 +1033,7 @@ def _mouse_move(self, event):
10331033

10341034
classToolHelpBase(ToolBase):
10351035
description='Print tool list, shortcuts and description'
1036-
default_keymap=rcParams['keymap.help']
1036+
default_keymap=mpl.rcParams['keymap.help']
10371037
image='help.png'
10381038

10391039
@staticmethod
@@ -1073,7 +1073,7 @@ class ToolCopyToClipboardBase(ToolBase):
10731073
"""Tool to copy the figure to the clipboard"""
10741074

10751075
description='Copy the canvas figure to clipboard'
1076-
default_keymap=rcParams['keymap.copy']
1076+
default_keymap=mpl.rcParams['keymap.copy']
10771077

10781078
deftrigger(self,*args,**kwargs):
10791079
message="Copy tool is not available"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp