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
Appearance settings

Commit 90ded74

Browse filesBrowse files
QuLogicQuLogic
authored
Merge pull request #8711 from anntzer/backends-cleanup
Various cleanups to backends code.
2 parents 60f547a + 22488ff commit 90ded74
Copy full SHA for 90ded74

File tree

Expand file treeCollapse file tree

10 files changed

+53
-203
lines changed
Filter options
Expand file treeCollapse file tree

10 files changed

+53
-203
lines changed

‎lib/matplotlib/backends/backend_agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
-34Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,18 @@ class RendererAgg(RendererBase):
8484

8585
lock = threading.RLock()
8686
def __init__(self, width, height, dpi):
87-
if __debug__: verbose.report('RendererAgg.__init__', 'debug-annoying')
8887
RendererBase.__init__(self)
8988

9089
self.dpi = dpi
9190
self.width = width
9291
self.height = height
93-
if __debug__: verbose.report('RendererAgg.__init__ width=%s, height=%s'%(width, height), 'debug-annoying')
9492
self._renderer = _RendererAgg(int(width), int(height), dpi, debug=False)
9593
self._filter_renderers = []
9694

97-
if __debug__: verbose.report('RendererAgg.__init__ _RendererAgg done',
98-
'debug-annoying')
99-
10095
self._update_methods()
10196
self.mathtext_parser = MathTextParser('Agg')
10297

10398
self.bbox = Bbox.from_bounds(0, 0, self.width, self.height)
104-
if __debug__: verbose.report('RendererAgg.__init__ done',
105-
'debug-annoying')
10699

107100
def __getstate__(self):
108101
# We only want to preserve the init keywords of the Renderer.
@@ -178,8 +171,6 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
178171
"""
179172
Draw the math text using matplotlib.mathtext
180173
"""
181-
if __debug__: verbose.report('RendererAgg.draw_mathtext',
182-
'debug-annoying')
183174
ox, oy, width, height, descent, font_image, used_characters = \
184175
self.mathtext_parser.parse(s, self.dpi, prop)
185176

@@ -193,8 +184,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
193184
"""
194185
Render the text
195186
"""
196-
if __debug__: verbose.report('RendererAgg.draw_text', 'debug-annoying')
197-
198187
if ismath:
199188
return self.draw_mathtext(gc, x, y, s, prop, angle)
200189

@@ -279,9 +268,6 @@ def _get_agg_font(self, prop):
279268
"""
280269
Get the font for text instance t, cacheing for efficiency
281270
"""
282-
if __debug__: verbose.report('RendererAgg._get_agg_font',
283-
'debug-annoying')
284-
285271
fname = findfont(prop)
286272
font = get_font(
287273
fname,
@@ -298,23 +284,15 @@ def points_to_pixels(self, points):
298284
convert point measures to pixes using dpi and the pixels per
299285
inch of the display
300286
"""
301-
if __debug__: verbose.report('RendererAgg.points_to_pixels',
302-
'debug-annoying')
303287
return points*self.dpi/72.0
304288

305289
def tostring_rgb(self):
306-
if __debug__: verbose.report('RendererAgg.tostring_rgb',
307-
'debug-annoying')
308290
return self._renderer.tostring_rgb()
309291

310292
def tostring_argb(self):
311-
if __debug__: verbose.report('RendererAgg.tostring_argb',
312-
'debug-annoying')
313293
return self._renderer.tostring_argb()
314294

315295
def buffer_rgba(self):
316-
if __debug__: verbose.report('RendererAgg.buffer_rgba',
317-
'debug-annoying')
318296
return self._renderer.buffer_rgba()
319297

320298
def clear(self):
@@ -423,10 +401,6 @@ def new_figure_manager(num, *args, **kwargs):
423401
"""
424402
Create a new figure manager instance
425403
"""
426-
if __debug__: verbose.report('backend_agg.new_figure_manager',
427-
'debug-annoying')
428-
429-
430404
FigureClass = kwargs.pop('FigureClass', Figure)
431405
thisFig = FigureClass(*args, **kwargs)
432406
return new_figure_manager_given_figure(num, thisFig)
@@ -465,8 +439,6 @@ def draw(self):
465439
"""
466440
Draw the figure using the renderer
467441
"""
468-
if __debug__: verbose.report('FigureCanvasAgg.draw', 'debug-annoying')
469-
470442
self.renderer = self.get_renderer(cleared=True)
471443
# acquire a lock on the shared font cache
472444
RendererAgg.lock.acquire()
@@ -500,8 +472,6 @@ def tostring_rgb(self):
500472
-------
501473
bytes
502474
'''
503-
if __debug__: verbose.report('FigureCanvasAgg.tostring_rgb',
504-
'debug-annoying')
505475
return self.renderer.tostring_rgb()
506476

507477
def tostring_argb(self):
@@ -515,8 +485,6 @@ def tostring_argb(self):
515485
bytes
516486
517487
'''
518-
if __debug__: verbose.report('FigureCanvasAgg.tostring_argb',
519-
'debug-annoying')
520488
return self.renderer.tostring_argb()
521489

522490
def buffer_rgba(self):
@@ -529,8 +497,6 @@ def buffer_rgba(self):
529497
-------
530498
bytes
531499
'''
532-
if __debug__: verbose.report('FigureCanvasAgg.buffer_rgba',
533-
'debug-annoying')
534500
return self.renderer.buffer_rgba()
535501

536502
def print_raw(self, filename_or_obj, *args, **kwargs):

‎lib/matplotlib/backends/backend_cairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_cairo.py
-18Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
import numpy as np
2929

30-
def _fn_name(): return sys._getframe(1).f_code.co_name
31-
3230
try:
3331
import cairocffi as cairo
3432
except ImportError:
@@ -58,9 +56,6 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
5856
from matplotlib.transforms import Bbox, Affine2D
5957
from matplotlib.font_manager import ttfFontProperty
6058

61-
_debug = False
62-
#_debug = True
63-
6459
# Image::color_conv(format) for draw_image()
6560
if sys.byteorder == 'little':
6661
BYTE_FORMAT = 0 # BGRA
@@ -114,7 +109,6 @@ class RendererCairo(RendererBase):
114109
def __init__(self, dpi):
115110
"""
116111
"""
117-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
118112
self.dpi = dpi
119113
self.gc = GraphicsContextCairo (renderer=self)
120114
self.text_ctx = cairo.Context (
@@ -227,8 +221,6 @@ def draw_markers(self, gc, marker_path, marker_trans, path, transform, rgbFace=N
227221

228222
def draw_image(self, gc, x, y, im):
229223
# bbox - not currently used
230-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
231-
232224
if sys.byteorder == 'little':
233225
im = im[:, :, (2, 1, 0, 3)]
234226
else:
@@ -266,8 +258,6 @@ def draw_image(self, gc, x, y, im):
266258
def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
267259
# Note: x,y are device/display coords, not user-coords, unlike other
268260
# draw_* methods
269-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
270-
271261
if ismath:
272262
self._draw_mathtext(gc, x, y, s, prop, angle)
273263

@@ -297,8 +287,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
297287
ctx.restore()
298288

299289
def _draw_mathtext(self, gc, x, y, s, prop, angle):
300-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
301-
302290
ctx = gc.ctx
303291
width, height, descent, glyphs, rects = self.mathtext_parser.parse(
304292
s, self.dpi, prop)
@@ -335,19 +323,16 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
335323

336324

337325
def flipy(self):
338-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
339326
return True
340327
#return False # tried - all draw objects ok except text (and images?)
341328
# which comes out mirrored!
342329

343330

344331
def get_canvas_width_height(self):
345-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
346332
return self.width, self.height
347333

348334

349335
def get_text_width_height_descent(self, s, prop, ismath):
350-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
351336
if ismath:
352337
width, height, descent, fonts, used_characters = self.mathtext_parser.parse(
353338
s, self.dpi, prop)
@@ -376,15 +361,13 @@ def get_text_width_height_descent(self, s, prop, ismath):
376361

377362

378363
def new_gc(self):
379-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
380364
self.gc.ctx.save()
381365
self.gc._alpha = 1.0
382366
self.gc._forced_alpha = False # if True, _alpha overrides A from RGBA
383367
return self.gc
384368

385369

386370
def points_to_pixels(self, points):
387-
if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
388371
return points/72.0 * self.dpi
389372

390373

@@ -488,7 +471,6 @@ def new_figure_manager(num, *args, **kwargs): # called by backends/__init__.py
488471
"""
489472
Create a new figure manager instance
490473
"""
491-
if _debug: print('%s()' % (_fn_name()))
492474
FigureClass = kwargs.pop('FigureClass', Figure)
493475
thisFig = FigureClass(*args, **kwargs)
494476
return new_figure_manager_given_figure(num, thisFig)

‎lib/matplotlib/backends/backend_gdk.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gdk.py
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import os
88
import sys
99
import warnings
10-
def fn_name(): return sys._getframe(1).f_code.co_name
1110

1211
import gobject
1312
import gtk; gdk = gtk.gdk
@@ -24,16 +23,15 @@ def fn_name(): return sys._getframe(1).f_code.co_name
2423
import matplotlib
2524
from matplotlib import rcParams
2625
from matplotlib._pylab_helpers import Gcf
27-
from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
28-
FigureManagerBase, FigureCanvasBase
26+
from matplotlib.backend_bases import (
27+
RendererBase, GraphicsContextBase, FigureManagerBase, FigureCanvasBase)
2928
from matplotlib.cbook import restrict_dict, warn_deprecated
3029
from matplotlib.figure import Figure
3130
from matplotlib.mathtext import MathTextParser
3231
from matplotlib.transforms import Affine2D
3332
from matplotlib.backends._backend_gdk import pixbuf_get_pixels_array
3433

3534
backend_version = "%d.%d.%d" % gtk.pygtk_version
36-
_debug = False
3735

3836
# Image formats that this backend supports - for FileChooser and print_figure()
3937
IMAGE_FORMAT = sorted(['bmp', 'eps', 'jpg', 'png', 'ps', 'svg']) # 'raw', 'rgb'

‎lib/matplotlib/backends/backend_gtk.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk.py
-20Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import six
55

66
import os, sys, warnings
7-
def fn_name(): return sys._getframe(1).f_code.co_name
87

98
if six.PY3:
109
warnings.warn(
@@ -44,9 +43,6 @@ def fn_name(): return sys._getframe(1).f_code.co_name
4443

4544
backend_version = "%d.%d.%d" % gtk.pygtk_version
4645

47-
_debug = False
48-
#_debug = True
49-
5046
# the true dots per inch on the screen; should be display dependent
5147
# see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi
5248
PIXELS_PER_INCH = 96
@@ -225,7 +221,6 @@ def __init__(self, figure):
225221
"See Matplotlib usage FAQ for"
226222
" more info on backends.",
227223
alternative="GTKAgg")
228-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
229224
FigureCanvasBase.__init__(self, figure)
230225
gtk.DrawingArea.__init__(self)
231226

@@ -261,7 +256,6 @@ def destroy(self):
261256
gobject.source_remove(self._idle_draw_id)
262257

263258
def scroll_event(self, widget, event):
264-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
265259
x = event.x
266260
# flipy so y=0 is bottom of canvas
267261
y = self.allocation.height - event.y
@@ -273,7 +267,6 @@ def scroll_event(self, widget, event):
273267
return False # finish event propagation?
274268

275269
def button_press_event(self, widget, event):
276-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
277270
x = event.x
278271
# flipy so y=0 is bottom of canvas
279272
y = self.allocation.height - event.y
@@ -297,29 +290,23 @@ def button_press_event(self, widget, event):
297290
return False # finish event propagation?
298291

299292
def button_release_event(self, widget, event):
300-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
301293
x = event.x
302294
# flipy so y=0 is bottom of canvas
303295
y = self.allocation.height - event.y
304296
FigureCanvasBase.button_release_event(self, x, y, event.button, guiEvent=event)
305297
return False # finish event propagation?
306298

307299
def key_press_event(self, widget, event):
308-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
309300
key = self._get_key(event)
310-
if _debug: print("hit", key)
311301
FigureCanvasBase.key_press_event(self, key, guiEvent=event)
312302
return True # stop event propagation
313303

314304
def key_release_event(self, widget, event):
315-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
316305
key = self._get_key(event)
317-
if _debug: print("release", key)
318306
FigureCanvasBase.key_release_event(self, key, guiEvent=event)
319307
return True # stop event propagation
320308

321309
def motion_notify_event(self, widget, event):
322-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
323310
if event.is_hint:
324311
x, y, state = event.window.get_pointer()
325312
else:
@@ -355,7 +342,6 @@ def _get_key(self, event):
355342
return key
356343

357344
def configure_event(self, widget, event):
358-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
359345
if widget.window is None:
360346
return
361347
w, h = event.width, event.height
@@ -408,8 +394,6 @@ def _pixmap_prepare(self, width, height):
408394
Make sure _._pixmap is at least width, height,
409395
create new pixmap if necessary
410396
"""
411-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
412-
413397
create_pixmap = False
414398
if width > self._pixmap_width:
415399
# increase the pixmap in 10%+ (rather than 1 pixel) steps
@@ -438,8 +422,6 @@ def _render_figure(self, pixmap, width, height):
438422
def expose_event(self, widget, event):
439423
"""Expose_event for all GTK backends. Should not be overridden.
440424
"""
441-
if _debug: print('FigureCanvasGTK.%s' % fn_name())
442-
443425
if GTK_WIDGET_DRAWABLE(self):
444426
if self._need_redraw:
445427
x, y, w, h = self.allocation
@@ -556,7 +538,6 @@ class FigureManagerGTK(FigureManagerBase):
556538
557539
"""
558540
def __init__(self, canvas, num):
559-
if _debug: print('FigureManagerGTK.%s' % fn_name())
560541
FigureManagerBase.__init__(self, canvas, num)
561542

562543
self.window = gtk.Window()
@@ -610,7 +591,6 @@ def notify_axes_change(fig):
610591
self.canvas.grab_focus()
611592

612593
def destroy(self, *args):
613-
if _debug: print('FigureManagerGTK.%s' % fn_name())
614594
if hasattr(self, 'toolbar') and self.toolbar is not None:
615595
self.toolbar.destroy()
616596
if hasattr(self, 'vbox'):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.