8000 brought ../backends/backend_qt4agg.py into pep8 compliance · mkcor/matplotlib@4fd11be · GitHub
[go: up one dir, main page]
Skip to content

Commit 4fd11be

Browse files
tacaswelltacaswell
committed
brought ../backends/backend_qt4agg.py into pep8 compliance
1 parent 4bcdd68 commit 4fd11be

File tree

2 files changed

+41
-27
lines changed

2 files changed

+41
-27
lines changed

‎lib/matplotlib/backends/backend_qt4agg.py

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,24 @@
33
"""
44
from __future__ import division, print_function
55

6-
import os, sys
6+
import os # not used
7+
import sys
78
import ctypes
89

910
import matplotlib
1011
from matplotlib.figure import Figure
1112

1213
from backend_agg import FigureCanvasAgg
13-
from backend_qt4 import QtCore, QtGui, FigureManagerQT, FigureCanvasQT,\
14-
show, draw_if_interactive, backend_version, \
15-
NavigationToolbar2QT
14+
from backend_qt4 import QtCore
15+
from backend_qt4 import QtGui
16+
from backend_qt4 import FigureManagerQT
17+
from backend_qt4 import FigureCanvasQT
18+
from backend_qt4 import NavigationToolbar2QT
19+
##### not used
20+
from backend_qt4 import show
21+
from backend_qt4 import draw_if_interactive
22+
from backend_qt4 import backend_version
23+
######
1624

1725
DEBUG = False
1826

@@ -21,13 +29,14 @@
2129
_decref.restype = None
2230

2331

24-
def new_figure_manager( num, *args, **kwargs ):
32+
def new_figure_manager(num, *args, **kwargs):
2533
"""
2634
Create a new figure manager instance
2735
"""
28-
if DEBUG: print('backend_qtagg.new_figure_manager')
36+
if DEBUG:
37+
print('backend_qtagg.new_figure_manager')
2938
FigureClass = kwargs.pop('FigureClass', Figure)
30-
thisFig = FigureClass( *args, **kwargs )
39+
thisFig = FigureClass(*args, **kwargs)
3140
return new_figure_manager_given_figure(num, thisFig)
3241

3342

@@ -36,26 +45,28 @@ def new_figure_manager_given_figure(num, figure):
3645
Create a new figure manager instance for the given figure.
3746
"""
3847
canvas = FigureCanvasQTAgg(figure)
39-
return FigureManagerQT( canvas, num )
48+
return FigureManagerQT(canvas, num)
4049

4150

4251
class NavigationToolbar2QTAgg(NavigationToolbar2QT):
4352
def _get_canvas(self, fig):
4453
return FigureCanvasQTAgg(fig)
4554

55+
4656
class FigureManagerQTAgg(FigureManagerQT):
4757
def _get_toolbar(self, canvas, parent):
4858
# must be inited after the window, drawingArea and figure
4959
# attrs are set
50-
if matplotlib.rcParams['toolbar']=='classic':
60+
if matplotlib.rcParams['toolbar'] == 'classic':
5161
print("Classic toolbar is not supported")
52-
elif matplotlib.rcParams['toolbar']=='toolbar2':
62+
elif matplotlib.rcParams['toolbar'] == 'toolbar2':
5363
toolbar = NavigationToolbar2QTAgg(canvas, parent)
5464
else:
5565
toolbar = None
5666
return toolbar
5767

58-
class FigureCanvasQTAgg( FigureCanvasQT, FigureCanvasAgg ):
68+
69+
class FigureCanvasQTAgg(FigureCanvasQT, FigureCanvasAgg):
5970
"""
6071
The canvas the figure renders into. Calls the draw and print fig
6172
methods, creates the renderers, etc...
@@ -65,30 +76,32 @@ class FigureCanvasQTAgg( FigureCanvasQT, FigureCanvasAgg ):
6576
figure - A Figure instance
6677
"""
6778

68-
def __init__( self, figure ):
69-
if DEBUG: print('FigureCanvasQtAgg: ', figure)
70-
FigureCanvasQT.__init__( self, figure )
71-
FigureCanvasAgg.__init__( self, figure )
79+
def __init__(self, figure):
80+
if DEBUG:
81+
print('FigureCanvasQtAgg: ', figure)
82+
FigureCanvasQT.__init__(self, figure)
83+
FigureCanvasAgg.__init__(self, figure)
7284
self.drawRect = False
7385
self.rect = []
7486
self.blitbox = None
7587
self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent)
7688

77-
def drawRectangle( self, rect ):
89+
def drawRectangle(self, rect):
7890
self.rect = rect
7991
self.drawRect = True
80-
self.repaint( )
92+
self.repaint()
8193

82-
def paintEvent( self, e ):
94+
def paintEvent(self, e):
8395
"""
8496
Copy the image from the Agg canvas to the qt.drawable.
8597
In Qt, all drawing should be done inside of here when a widget is
8698
shown onscreen.
8799
"""
88100

89-
#FigureCanvasQT.paintEvent( self, e )
90-
if DEBUG: print('FigureCanvasQtAgg.paintEvent: ', self, \
91-
self.get_width_height())
101+
#FigureCanvasQT.paintEvent(self, e)
102+
if DEBUG:
103+
print('FigureCanvasQtAgg.paintEvent: ', self,
104+
self.get_width_height())
92105

93106
if self.blitbox is None:
94107
# matplotlib is in rgba byte order. QImage wants to put the bytes
@@ -110,8 +123,9 @@ def paintEvent( self, e ):
110123

111124
# draw the zoom rectangle to the QPainter
112125
if self.drawRect:
113-
p.setPen( QtGui.QPen( QtCore.Qt.black, 1, QtCore.Qt.DotLine ) )
114-
p.drawRect( self.rect[0], self.rect[1], self.rect[2], self.rect[3] )
126+
p.setPen(QtGui.QPen(QtCore.Qt.black, 1, QtCore.Qt.DotLine))
127+
p.drawRect(self.rect[0], self.rect[1],
128+
self.rect[2], self.rect[3])
115129
p.end()
116130

117131
# This works around a bug in PySide 1.1.2 on Python 3.x,
@@ -129,15 +143,16 @@ def paintEvent( self, e ):
129143
t = int(b) + h
130144
reg = self.copy_from_bbox(bbox)
131145
stringBuffer = reg.to_string_argb()
132-
qImage = QtGui.QImage(stringBuffer, w, h, QtGui.QImage.Format_ARGB32)
146+
qImage = QtGui.QImage(stringBuffer, w, h,
147+
QtGui.QImage.Format_ARGB32)
133148
pixmap = QtGui.QPixmap.fromImage(qImage)
134-
p = QtGui.QPainter( self )
149+
p = QtGui.QPainter(self)
135150
p.drawPixmap(QtCore.QPoint(l, self.renderer.height-t), pixmap)
136151
p.end()
137152
self.blitbox = None
138153
self.drawRect = False
139154

140-
def draw( self ):
155+
def draw(self):
141156
"""
142157
Draw the figure with Agg, and queue a request
143158
for a Qt draw.

‎lib/matplotlib/tests/test_coding_standards.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ class StandardReportWithExclusions(pep8.StandardReport):
119119
'*/matplotlib/backends/backend_pdf.py',
120120
'*/matplotlib/backends/backend_pgf.py',
121121
'*/matplotlib/backends/backend_ps.py',
122-
'*/matplotlib/backends/backend_qt4agg.py',
123122
'*/matplotlib/backends/backend_svg.py',
124123
'*/matplotlib/backends/backend_template.py',
125124
'*/matplotlib/backends/backend_tkagg.py',

0 commit comments

Comments
 (0)
0