avoid double call to mkPen when creating PlotCurveItem objects (#817)
* avoid double call to mkPen when creating PlotCurveItem objects * avoid unnecessary calls to mkPen in paint
This commit is contained in:
parent
3e7cace746
commit
297e1d95a5
@ -59,7 +59,6 @@ class PlotCurveItem(GraphicsObject):
|
|||||||
|
|
||||||
self.metaData = {}
|
self.metaData = {}
|
||||||
self.opts = {
|
self.opts = {
|
||||||
'pen': fn.mkPen('w'),
|
|
||||||
'shadowPen': None,
|
'shadowPen': None,
|
||||||
'fillLevel': None,
|
'fillLevel': None,
|
||||||
'brush': None,
|
'brush': None,
|
||||||
@ -70,6 +69,8 @@ class PlotCurveItem(GraphicsObject):
|
|||||||
'mouseWidth': 8, # width of shape responding to mouse click
|
'mouseWidth': 8, # width of shape responding to mouse click
|
||||||
'compositionMode': None,
|
'compositionMode': None,
|
||||||
}
|
}
|
||||||
|
if 'pen' not in kargs:
|
||||||
|
self.opts['pen'] = fn.mkPen('w')
|
||||||
self.setClickable(kargs.get('clickable', False))
|
self.setClickable(kargs.get('clickable', False))
|
||||||
self.setData(*args, **kargs)
|
self.setData(*args, **kargs)
|
||||||
|
|
||||||
@ -482,8 +483,8 @@ class PlotCurveItem(GraphicsObject):
|
|||||||
p.fillPath(self.fillPath, self.opts['brush'])
|
p.fillPath(self.fillPath, self.opts['brush'])
|
||||||
profiler('draw fill path')
|
profiler('draw fill path')
|
||||||
|
|
||||||
sp = fn.mkPen(self.opts['shadowPen'])
|
sp = self.opts['shadowPen']
|
||||||
cp = fn.mkPen(self.opts['pen'])
|
cp = self.opts['pen']
|
||||||
|
|
||||||
## Copy pens and apply alpha adjustment
|
## Copy pens and apply alpha adjustment
|
||||||
#sp = QtGui.QPen(self.opts['shadowPen'])
|
#sp = QtGui.QPen(self.opts['shadowPen'])
|
||||||
@ -496,8 +497,6 @@ class PlotCurveItem(GraphicsObject):
|
|||||||
#pen.setColor(c)
|
#pen.setColor(c)
|
||||||
##pen.setCosmetic(True)
|
##pen.setCosmetic(True)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if sp is not None and sp.style() != QtCore.Qt.NoPen:
|
if sp is not None and sp.style() != QtCore.Qt.NoPen:
|
||||||
p.setPen(sp)
|
p.setPen(sp)
|
||||||
p.drawPath(path)
|
p.drawPath(path)
|
||||||
|
Loading…
Reference in New Issue
Block a user