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

Commitd412228

authored

Merge pull request#8772 from anntzer/backends-cleanup

MNT: Backends cleanup - style and docs in backend_bases and backend_agg - style in backend_cairo - dropped unused private attribute in backend_gtk3, backend_gtk3agg, backend_gtk3cairo - unified 'normal' and 'blitting' code paths in backend_qt5agg - import cleanup and MRO tweaks it backend_qt5agg - import tweaks + MRO cleanup in backend_qt4agg

2 parentsc4e6388 +79cfe14 commitd412228Copy full SHA for d412228

File tree

9 files changed

+176

-321

lines changed

lib/matplotlib
- backend_bases.py
- backends

9 files changed

+176

-321

lines changed

`‎lib/matplotlib/backend_bases.py‎`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -694,17 +694,17 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath):`
`694`	`694`
`695`	`695`	`defget_text_width_height_descent(self,s,prop,ismath):`
`696`	`696`	`"""`
`697`		`-get the width andheight, andtheoffset from the bottom to the`
`698`		`-baseline (descent), in display coords of the strings with`
`699`		- :class:`~matplotlib.font_manager.FontProperties` prop
	`697`	`+Get the width,height, anddescent (offset from the bottom`
	`698`	`+to the baseline), in display coords, of the strings with`
	`699`	+ :class:`~matplotlib.font_manager.FontProperties`prop
`700`	`700`	`"""`
`701`	`701`	`ifismath=='TeX':`
`702`	`702`	`# todo: handle props`
`703`	`703`	`size=prop.get_size_in_points()`
`704`	`704`	`texmanager=self._text2path.get_texmanager()`
`705`	`705`	`fontsize=prop.get_size_in_points()`
`706`		`-w,h,d=texmanager.get_text_width_height_descent(s,fontsize,`
`707`		`-renderer=self)`
	`706`	`+w,h,d=texmanager.get_text_width_height_descent(`
	`707`	`+s,fontsize,renderer=self)`
`708`	`708`	`returnw,h,d`
`709`	`709`
`710`	`710`	`dpi=self.points_to_pixels(72)`
`@@ -2151,7 +2151,6 @@ def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,`
`2151`	`2151`	`# the backend to support file-like object, i'm going`
`2152`	`2152`	`# to leave it as it is. However, a better solution`
`2153`	`2153`	`# than stringIO seems to be needed. -JJL`
`2154`		`-#result = getattr(self, method_name)`
`2155`	`2154`	`result=print_method(`
`2156`	`2155`	`io.BytesIO(),`
`2157`	`2156`	`dpi=dpi,`
`@@ -2203,7 +2202,6 @@ def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,`
`2203`	`2202`	`_bbox_inches_restore=None`
`2204`	`2203`
`2205`	`2204`	`try:`
`2206`		`-#result = getattr(self, method_name)(`
`2207`	`2205`	`result=print_method(`
`2208`	`2206`	`filename,`
`2209`	`2207`	`dpi=dpi,`

`‎lib/matplotlib/backends/backend_agg.py‎`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,20 +212,17 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):`
`212`	`212`
`213`	`213`	`defget_text_width_height_descent(self,s,prop,ismath):`
`214`	`214`	`"""`
`215`		`- get the width and height in display coords of the string s`
`216`		`- with FontPropertry prop`
`217`		`-`
`218`		`- # passing rgb is a little hack to make caching in the`
`219`		`- # texmanager more efficient. It is not meant to be used`
`220`		`- # outside the backend`
	`215`	`+ Get the width, height, and descent (offset from the bottom`
	`216`	`+ to the baseline), in display coords, of the string s with`
	`217`	+ :class:`~matplotlib.font_manager.FontProperties` prop
`221`	`218`	`"""`
`222`	`219`	`ifrcParams['text.usetex']:`
`223`	`220`	`# todo: handle props`
`224`	`221`	`size=prop.get_size_in_points()`
`225`	`222`	`texmanager=self.get_texmanager()`
`226`	`223`	`fontsize=prop.get_size_in_points()`
`227`		`-w,h,d=texmanager.get_text_width_height_descent(s,fontsize,`
`228`		`-renderer=self)`
	`224`	`+w,h,d=texmanager.get_text_width_height_descent(`
	`225`	`+s,fontsize,renderer=self)`
`229`	`226`	`returnw,h,d`
`230`	`227`
`231`	`228`	`ifismath:`

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!

Commitd412228

File tree

9 files changed

9 files changed

`‎lib/matplotlib/backend_bases.py‎`

`‎lib/matplotlib/backends/backend_agg.py‎`

0 commit comments