Avoid constructing shadow pens when no shadow pen is set
Basically, profiling has pointed me to the fact that a fair bit of code time is spent in `setShadowPen()` (actually, it's in `mkPen()`, which `setShadowPen()` calls), even when no shadow pen is specified. In my application, I'm calling `pyqtgraph.PlotDataItem.setdata()`, which calls through PlotDataItem->setData, PlotDataItem->updateItems. At some point in the call stack, the default value for `shadowPen` is being inserted into the kwargs, which then causes the specious calling of setShadowPen. Anyways, if we check if shadowPen is a value other then none, this doesn't happen.
This commit is contained in:
Connor Wolf
fake-name
parent
a4fe86a52d
commit
17e90af36c
@ -4,7 +4,7 @@ try:
|
||||
HAVE_OPENGL = True
|
||||
except:
|
||||
HAVE_OPENGL = False
|
||||
|
||||
|
||||
import numpy as np
|
||||
from .GraphicsObject import GraphicsObject
|
||||
from .. import functions as fn
|
||||
@ -15,48 +15,48 @@ from .. import debug
|
||||
|
||||
__all__ = ['PlotCurveItem']
|
||||
class PlotCurveItem(GraphicsObject):
|
||||
|
||||
|
||||
|
||||
|
||||
"""
|
||||
Class representing a single plot curve. Instances of this class are created
|
||||
automatically as part of PlotDataItem; these rarely need to be instantiated
|
||||
directly.
|
||||
|
||||
|
||||
Features:
|
||||
|
||||
|
||||
- Fast data update
|
||||
- Fill under curve
|
||||
- Mouse interaction
|
||||
|
||||
|
||||
==================== ===============================================
|
||||
**Signals:**
|
||||
sigPlotChanged(self) Emitted when the data being plotted has changed
|
||||
sigClicked(self) Emitted when the curve is clicked
|
||||
==================== ===============================================
|
||||
"""
|
||||
|
||||
|
||||
sigPlotChanged = QtCore.Signal(object)
|
||||
sigClicked = QtCore.Signal(object)
|
||||
|
||||
|
||||
def __init__(self, *args, **kargs):
|
||||
"""
|
||||
Forwards all arguments to :func:`setData <pyqtgraph.PlotCurveItem.setData>`.
|
||||
|
||||
|
||||
Some extra arguments are accepted as well:
|
||||
|
||||
|
||||
============== =======================================================
|
||||
**Arguments:**
|
||||
parent The parent GraphicsObject (optional)
|
||||
clickable If True, the item will emit sigClicked when it is
|
||||
clickable If True, the item will emit sigClicked when it is
|
||||
clicked on. Defaults to False.
|
||||
============== =======================================================
|
||||
"""
|
||||
GraphicsObject.__init__(self, kargs.get('parent', None))
|
||||
self.clear()
|
||||
|
||||
|
||||
## this is disastrous for performance.
|
||||
#self.setCacheMode(QtGui.QGraphicsItem.DeviceCoordinateCache)
|
||||
|
||||
|
||||
self.metaData = {}
|
||||
self.opts = {
|
||||
'shadowPen': None,
|
||||
@ -69,23 +69,22 @@ class PlotCurveItem(GraphicsObject):
|
||||
'mouseWidth': 8, # width of shape responding to mouse click
|
||||
'compositionMode': None,
|
||||
}
|
||||
if 'pen' not in kargs:
|
||||
self.opts['pen'] = fn.mkPen('w')
|
||||
|
||||
self.setClickable(kargs.get('clickable', False))
|
||||
self.setData(*args, **kargs)
|
||||
|
||||
|
||||
def implements(self, interface=None):
|
||||
ints = ['plotData']
|
||||
if interface is None:
|
||||
return ints
|
||||
return interface in ints
|
||||
|
||||
|
||||
def name(self):
|
||||
return self.opts.get('name', None)
|
||||
|
||||
|
||||
def setClickable(self, s, width=None):
|
||||
"""Sets whether the item responds to mouse clicks.
|
||||
|
||||
|
||||
The *width* argument specifies the width in pixels orthogonal to the
|
||||
curve that will respond to a mouse click.
|
||||
"""
|
||||
@ -93,41 +92,41 @@ class PlotCurveItem(GraphicsObject):
|
||||
if width is not None:
|
||||
self.opts['mouseWidth'] = width
|
||||
self._mouseShape = None
|
||||
self._boundingRect = None
|
||||
|
||||
self._boundingRect = None
|
||||
|
||||
def setCompositionMode(self, mode):
|
||||
"""Change the composition mode of the item (see QPainter::CompositionMode
|
||||
in the Qt documentation). This is useful when overlaying multiple items.
|
||||
|
||||
|
||||
============================================ ============================================================
|
||||
**Most common arguments:**
|
||||
QtGui.QPainter.CompositionMode_SourceOver Default; image replaces the background if it
|
||||
is opaque. Otherwise, it uses the alpha channel to blend
|
||||
the image with the background.
|
||||
QtGui.QPainter.CompositionMode_Overlay The image color is mixed with the background color to
|
||||
QtGui.QPainter.CompositionMode_Overlay The image color is mixed with the background color to
|
||||
reflect the lightness or darkness of the background.
|
||||
QtGui.QPainter.CompositionMode_Plus Both the alpha and color of the image and background pixels
|
||||
QtGui.QPainter.CompositionMode_Plus Both the alpha and color of the image and background pixels
|
||||
are added together.
|
||||
QtGui.QPainter.CompositionMode_Multiply The output is the image color multiplied by the background.
|
||||
============================================ ============================================================
|
||||
"""
|
||||
self.opts['compositionMode'] = mode
|
||||
self.update()
|
||||
|
||||
|
||||
def getData(self):
|
||||
return self.xData, self.yData
|
||||
|
||||
|
||||
def dataBounds(self, ax, frac=1.0, orthoRange=None):
|
||||
## Need this to run as fast as possible.
|
||||
## check cache first:
|
||||
cache = self._boundsCache[ax]
|
||||
if cache is not None and cache[0] == (frac, orthoRange):
|
||||
return cache[1]
|
||||
|
||||
|
||||
(x, y) = self.getData()
|
||||
if x is None or len(x) == 0:
|
||||
return (None, None)
|
||||
|
||||
|
||||
if ax == 0:
|
||||
d = x
|
||||
d2 = y
|
||||
@ -140,7 +139,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
mask = (d2 >= orthoRange[0]) * (d2 <= orthoRange[1])
|
||||
d = d[mask]
|
||||
#d2 = d2[mask]
|
||||
|
||||
|
||||
if len(d) == 0:
|
||||
return (None, None)
|
||||
|
||||
@ -155,7 +154,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
if len(d) == 0:
|
||||
return (None, None)
|
||||
b = (d.min(), d.max())
|
||||
|
||||
|
||||
elif frac <= 0.0:
|
||||
raise Exception("Value for parameter 'frac' must be > 0. (got %s)" % str(frac))
|
||||
else:
|
||||
@ -167,7 +166,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
## adjust for fill level
|
||||
if ax == 1 and self.opts['fillLevel'] is not None:
|
||||
b = (min(b[0], self.opts['fillLevel']), max(b[1], self.opts['fillLevel']))
|
||||
|
||||
|
||||
## Add pen width only if it is non-cosmetic.
|
||||
pen = self.opts['pen']
|
||||
spen = self.opts['shadowPen']
|
||||
@ -175,10 +174,10 @@ class PlotCurveItem(GraphicsObject):
|
||||
b = (b[0] - pen.widthF()*0.7072, b[1] + pen.widthF()*0.7072)
|
||||
if spen is not None and not spen.isCosmetic() and spen.style() != QtCore.Qt.NoPen:
|
||||
b = (b[0] - spen.widthF()*0.7072, b[1] + spen.widthF()*0.7072)
|
||||
|
||||
|
||||
self._boundsCache[ax] = [(frac, orthoRange), b]
|
||||
return b
|
||||
|
||||
|
||||
def pixelPadding(self):
|
||||
pen = self.opts['pen']
|
||||
spen = self.opts['shadowPen']
|
||||
@ -197,11 +196,11 @@ class PlotCurveItem(GraphicsObject):
|
||||
(ymn, ymx) = self.dataBounds(ax=1)
|
||||
if xmn is None or ymn is None:
|
||||
return QtCore.QRectF()
|
||||
|
||||
|
||||
px = py = 0.0
|
||||
pxPad = self.pixelPadding()
|
||||
if pxPad > 0:
|
||||
# determine length of pixel in local x, y directions
|
||||
# determine length of pixel in local x, y directions
|
||||
px, py = self.pixelVectors()
|
||||
try:
|
||||
px = 0 if px is None else px.length()
|
||||
@ -211,68 +210,68 @@ class PlotCurveItem(GraphicsObject):
|
||||
py = 0 if py is None else py.length()
|
||||
except OverflowError:
|
||||
py = 0
|
||||
|
||||
|
||||
# return bounds expanded by pixel size
|
||||
px *= pxPad
|
||||
py *= pxPad
|
||||
#px += self._maxSpotWidth * 0.5
|
||||
#py += self._maxSpotWidth * 0.5
|
||||
self._boundingRect = QtCore.QRectF(xmn-px, ymn-py, (2*px)+xmx-xmn, (2*py)+ymx-ymn)
|
||||
|
||||
|
||||
return self._boundingRect
|
||||
|
||||
|
||||
def viewTransformChanged(self):
|
||||
self.invalidateBounds()
|
||||
self.prepareGeometryChange()
|
||||
|
||||
|
||||
#def boundingRect(self):
|
||||
#if self._boundingRect is None:
|
||||
#(x, y) = self.getData()
|
||||
#if x is None or y is None or len(x) == 0 or len(y) == 0:
|
||||
#return QtCore.QRectF()
|
||||
|
||||
|
||||
|
||||
|
||||
#if self.opts['shadowPen'] is not None:
|
||||
#lineWidth = (max(self.opts['pen'].width(), self.opts['shadowPen'].width()) + 1)
|
||||
#else:
|
||||
#lineWidth = (self.opts['pen'].width()+1)
|
||||
|
||||
|
||||
|
||||
|
||||
#pixels = self.pixelVectors()
|
||||
#if pixels == (None, None):
|
||||
#pixels = [Point(0,0), Point(0,0)]
|
||||
|
||||
|
||||
#xmin = x.min()
|
||||
#xmax = x.max()
|
||||
#ymin = y.min()
|
||||
#ymax = y.max()
|
||||
|
||||
|
||||
#if self.opts['fillLevel'] is not None:
|
||||
#ymin = min(ymin, self.opts['fillLevel'])
|
||||
#ymax = max(ymax, self.opts['fillLevel'])
|
||||
|
||||
|
||||
#xmin -= pixels[0].x() * lineWidth
|
||||
#xmax += pixels[0].x() * lineWidth
|
||||
#ymin -= abs(pixels[1].y()) * lineWidth
|
||||
#ymax += abs(pixels[1].y()) * lineWidth
|
||||
|
||||
|
||||
#self._boundingRect = QtCore.QRectF(xmin, ymin, xmax-xmin, ymax-ymin)
|
||||
#return self._boundingRect
|
||||
|
||||
|
||||
|
||||
def invalidateBounds(self):
|
||||
self._boundingRect = None
|
||||
self._boundsCache = [None, None]
|
||||
|
||||
|
||||
def setPen(self, *args, **kargs):
|
||||
"""Set the pen used to draw the curve."""
|
||||
self.opts['pen'] = fn.mkPen(*args, **kargs)
|
||||
self.invalidateBounds()
|
||||
self.update()
|
||||
|
||||
|
||||
def setShadowPen(self, *args, **kargs):
|
||||
"""Set the shadow pen used to draw behind tyhe primary pen.
|
||||
This pen must have a larger width than the primary
|
||||
This pen must have a larger width than the primary
|
||||
pen to be visible.
|
||||
"""
|
||||
self.opts['shadowPen'] = fn.mkPen(*args, **kargs)
|
||||
@ -284,7 +283,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
self.opts['brush'] = fn.mkBrush(*args, **kargs)
|
||||
self.invalidateBounds()
|
||||
self.update()
|
||||
|
||||
|
||||
def setFillLevel(self, level):
|
||||
"""Set the level filled to when filling under the curve"""
|
||||
self.opts['fillLevel'] = level
|
||||
@ -296,11 +295,11 @@ class PlotCurveItem(GraphicsObject):
|
||||
"""
|
||||
=============== ========================================================
|
||||
**Arguments:**
|
||||
x, y (numpy arrays) Data to show
|
||||
x, y (numpy arrays) Data to show
|
||||
pen Pen to use when drawing. Any single argument accepted by
|
||||
:func:`mkPen <pyqtgraph.mkPen>` is allowed.
|
||||
shadowPen Pen for drawing behind the primary pen. Usually this
|
||||
is used to emphasize the curve by providing a
|
||||
is used to emphasize the curve by providing a
|
||||
high-contrast border. Any single argument accepted by
|
||||
:func:`mkPen <pyqtgraph.mkPen>` is allowed.
|
||||
fillLevel (float or None) Fill the area 'under' the curve to
|
||||
@ -318,18 +317,18 @@ class PlotCurveItem(GraphicsObject):
|
||||
to be drawn. "finite" causes segments to be omitted if
|
||||
they are attached to nan or inf values. For any other
|
||||
connectivity, specify an array of boolean values.
|
||||
compositionMode See :func:`setCompositionMode
|
||||
compositionMode See :func:`setCompositionMode
|
||||
<pyqtgraph.PlotCurveItem.setCompositionMode>`.
|
||||
=============== ========================================================
|
||||
|
||||
|
||||
If non-keyword arguments are used, they will be interpreted as
|
||||
setData(y) for a single argument and setData(x, y) for two
|
||||
arguments.
|
||||
|
||||
|
||||
|
||||
|
||||
"""
|
||||
self.updateData(*args, **kargs)
|
||||
|
||||
|
||||
def updateData(self, *args, **kargs):
|
||||
profiler = debug.Profiler()
|
||||
|
||||
@ -341,12 +340,12 @@ class PlotCurveItem(GraphicsObject):
|
||||
elif len(args) == 2:
|
||||
kargs['x'] = args[0]
|
||||
kargs['y'] = args[1]
|
||||
|
||||
|
||||
if 'y' not in kargs or kargs['y'] is None:
|
||||
kargs['y'] = np.array([])
|
||||
if 'x' not in kargs or kargs['x'] is None:
|
||||
kargs['x'] = np.arange(len(kargs['y']))
|
||||
|
||||
|
||||
for k in ['x', 'y']:
|
||||
data = kargs[k]
|
||||
if isinstance(data, list):
|
||||
@ -356,9 +355,9 @@ class PlotCurveItem(GraphicsObject):
|
||||
raise Exception("Plot data must be 1D ndarray.")
|
||||
if 'complex' in str(data.dtype):
|
||||
raise Exception("Can not plot complex data types.")
|
||||
|
||||
|
||||
profiler("data checks")
|
||||
|
||||
|
||||
#self.setCacheMode(QtGui.QGraphicsItem.NoCache) ## Disabling and re-enabling the cache works around a bug in Qt 4.6 causing the cached results to display incorrectly
|
||||
## Test this bug with test_PlotWidget and zoom in on the animated plot
|
||||
self.invalidateBounds()
|
||||
@ -366,46 +365,46 @@ class PlotCurveItem(GraphicsObject):
|
||||
self.informViewBoundsChanged()
|
||||
self.yData = kargs['y'].view(np.ndarray)
|
||||
self.xData = kargs['x'].view(np.ndarray)
|
||||
|
||||
|
||||
profiler('copy')
|
||||
|
||||
|
||||
if 'stepMode' in kargs:
|
||||
self.opts['stepMode'] = kargs['stepMode']
|
||||
|
||||
|
||||
if self.opts['stepMode'] is True:
|
||||
if len(self.xData) != len(self.yData)+1: ## allow difference of 1 for step mode plots
|
||||
raise Exception("len(X) must be len(Y)+1 since stepMode=True (got %s and %s)" % (self.xData.shape, self.yData.shape))
|
||||
else:
|
||||
if self.xData.shape != self.yData.shape: ## allow difference of 1 for step mode plots
|
||||
raise Exception("X and Y arrays must be the same shape--got %s and %s." % (self.xData.shape, self.yData.shape))
|
||||
|
||||
|
||||
self.path = None
|
||||
self.fillPath = None
|
||||
self._mouseShape = None
|
||||
#self.xDisp = self.yDisp = None
|
||||
|
||||
|
||||
if 'name' in kargs:
|
||||
self.opts['name'] = kargs['name']
|
||||
if 'connect' in kargs:
|
||||
self.opts['connect'] = kargs['connect']
|
||||
if 'pen' in kargs:
|
||||
self.setPen(kargs['pen'])
|
||||
if 'shadowPen' in kargs:
|
||||
if 'shadowPen' in kargs and kargs['shadowPen'] is not None:
|
||||
self.setShadowPen(kargs['shadowPen'])
|
||||
if 'fillLevel' in kargs:
|
||||
if 'fillLevel' in kargs and kargs['fillLevel'] is not None:
|
||||
self.setFillLevel(kargs['fillLevel'])
|
||||
if 'brush' in kargs:
|
||||
if 'brush' in kargs and kargs['brush'] is not None:
|
||||
self.setBrush(kargs['brush'])
|
||||
if 'antialias' in kargs:
|
||||
self.opts['antialias'] = kargs['antialias']
|
||||
|
||||
|
||||
|
||||
profiler('set')
|
||||
self.update()
|
||||
profiler('update')
|
||||
self.sigPlotChanged.emit(self)
|
||||
profiler('emit')
|
||||
|
||||
|
||||
def generatePath(self, x, y):
|
||||
if self.opts['stepMode']:
|
||||
## each value in the x/y arrays generates 2 points.
|
||||
@ -424,9 +423,9 @@ class PlotCurveItem(GraphicsObject):
|
||||
y = y2.reshape(y2.size)[1:-1]
|
||||
y[0] = self.opts['fillLevel']
|
||||
y[-1] = self.opts['fillLevel']
|
||||
|
||||
|
||||
path = fn.arrayToQPath(x, y, connect=self.opts['connect'])
|
||||
|
||||
|
||||
return path
|
||||
|
||||
|
||||
@ -439,7 +438,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
self.path = self.generatePath(*self.getData())
|
||||
self.fillPath = None
|
||||
self._mouseShape = None
|
||||
|
||||
|
||||
return self.path
|
||||
|
||||
@debug.warnOnException ## raising an exception here causes crash
|
||||
@ -447,27 +446,27 @@ class PlotCurveItem(GraphicsObject):
|
||||
profiler = debug.Profiler()
|
||||
if self.xData is None or len(self.xData) == 0:
|
||||
return
|
||||
|
||||
|
||||
if HAVE_OPENGL and getConfigOption('enableExperimental') and isinstance(widget, QtOpenGL.QGLWidget):
|
||||
self.paintGL(p, opt, widget)
|
||||
return
|
||||
|
||||
|
||||
x = None
|
||||
y = None
|
||||
path = self.getPath()
|
||||
profiler('generate path')
|
||||
|
||||
|
||||
if self._exportOpts is not False:
|
||||
aa = self._exportOpts.get('antialias', True)
|
||||
else:
|
||||
aa = self.opts['antialias']
|
||||
|
||||
|
||||
p.setRenderHint(p.Antialiasing, aa)
|
||||
|
||||
|
||||
cmode = self.opts['compositionMode']
|
||||
if cmode is not None:
|
||||
p.setCompositionMode(cmode)
|
||||
|
||||
|
||||
if self.opts['brush'] is not None and self.opts['fillLevel'] is not None:
|
||||
if self.fillPath is None:
|
||||
if x is None:
|
||||
@ -478,14 +477,14 @@ class PlotCurveItem(GraphicsObject):
|
||||
p2.lineTo(x[0], y[0])
|
||||
p2.closeSubpath()
|
||||
self.fillPath = p2
|
||||
|
||||
|
||||
profiler('generate fill path')
|
||||
p.fillPath(self.fillPath, self.opts['brush'])
|
||||
profiler('draw fill path')
|
||||
|
||||
|
||||
sp = self.opts['shadowPen']
|
||||
cp = self.opts['pen']
|
||||
|
||||
|
||||
## Copy pens and apply alpha adjustment
|
||||
#sp = QtGui.QPen(self.opts['shadowPen'])
|
||||
#cp = QtGui.QPen(self.opts['pen'])
|
||||
@ -496,7 +495,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
#c.setAlpha(c.alpha() * self.opts['alphaHint'])
|
||||
#pen.setColor(c)
|
||||
##pen.setCosmetic(True)
|
||||
|
||||
|
||||
if sp is not None and sp.style() != QtCore.Qt.NoPen:
|
||||
p.setPen(sp)
|
||||
p.drawPath(path)
|
||||
@ -510,25 +509,25 @@ class PlotCurveItem(GraphicsObject):
|
||||
#print "Render hints:", int(p.renderHints())
|
||||
#p.setPen(QtGui.QPen(QtGui.QColor(255,0,0)))
|
||||
#p.drawRect(self.boundingRect())
|
||||
|
||||
|
||||
def paintGL(self, p, opt, widget):
|
||||
p.beginNativePainting()
|
||||
import OpenGL.GL as gl
|
||||
|
||||
|
||||
## set clipping viewport
|
||||
view = self.getViewBox()
|
||||
if view is not None:
|
||||
rect = view.mapRectToItem(self, view.boundingRect())
|
||||
#gl.glViewport(int(rect.x()), int(rect.y()), int(rect.width()), int(rect.height()))
|
||||
|
||||
|
||||
#gl.glTranslate(-rect.x(), -rect.y(), 0)
|
||||
|
||||
|
||||
gl.glEnable(gl.GL_STENCIL_TEST)
|
||||
gl.glColorMask(gl.GL_FALSE, gl.GL_FALSE, gl.GL_FALSE, gl.GL_FALSE) # disable drawing to frame buffer
|
||||
gl.glDepthMask(gl.GL_FALSE) # disable drawing to depth buffer
|
||||
gl.glStencilFunc(gl.GL_NEVER, 1, 0xFF)
|
||||
gl.glStencilOp(gl.GL_REPLACE, gl.GL_KEEP, gl.GL_KEEP)
|
||||
|
||||
gl.glStencilFunc(gl.GL_NEVER, 1, 0xFF)
|
||||
gl.glStencilOp(gl.GL_REPLACE, gl.GL_KEEP, gl.GL_KEEP)
|
||||
|
||||
## draw stencil pattern
|
||||
gl.glStencilMask(0xFF)
|
||||
gl.glClear(gl.GL_STENCIL_BUFFER_BIT)
|
||||
@ -540,12 +539,12 @@ class PlotCurveItem(GraphicsObject):
|
||||
gl.glVertex2f(rect.x()+rect.width(), rect.y())
|
||||
gl.glVertex2f(rect.x(), rect.y()+rect.height())
|
||||
gl.glEnd()
|
||||
|
||||
|
||||
gl.glColorMask(gl.GL_TRUE, gl.GL_TRUE, gl.GL_TRUE, gl.GL_TRUE)
|
||||
gl.glDepthMask(gl.GL_TRUE)
|
||||
gl.glStencilMask(0x00)
|
||||
gl.glStencilFunc(gl.GL_EQUAL, 1, 0xFF)
|
||||
|
||||
|
||||
try:
|
||||
x, y = self.getData()
|
||||
pos = np.empty((len(x), 2))
|
||||
@ -570,7 +569,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
|
||||
finally:
|
||||
p.endNativePainting()
|
||||
|
||||
|
||||
def clear(self):
|
||||
self.xData = None ## raw values
|
||||
self.yData = None
|
||||
@ -586,7 +585,7 @@ class PlotCurveItem(GraphicsObject):
|
||||
def mouseShape(self):
|
||||
"""
|
||||
Return a QPainterPath representing the clickable shape of the curve
|
||||
|
||||
|
||||
"""
|
||||
if self._mouseShape is None:
|
||||
view = self.getViewBox()
|
||||
@ -599,14 +598,14 @@ class PlotCurveItem(GraphicsObject):
|
||||
mousePath = stroker.createStroke(path)
|
||||
self._mouseShape = self.mapFromItem(view, mousePath)
|
||||
return self._mouseShape
|
||||
|
||||
|
||||
def mouseClickEvent(self, ev):
|
||||
if not self.clickable or ev.button() != QtCore.Qt.LeftButton:
|
||||
return
|
||||
if self.mouseShape().contains(ev.pos()):
|
||||
ev.accept()
|
||||
self.sigClicked.emit(self)
|
||||
|
||||
|
||||
|
||||
|
||||
class ROIPlotItem(PlotCurveItem):
|
||||
@ -621,7 +620,7 @@ class ROIPlotItem(PlotCurveItem):
|
||||
#roi.connect(roi, QtCore.SIGNAL('regionChanged'), self.roiChangedEvent)
|
||||
roi.sigRegionChanged.connect(self.roiChangedEvent)
|
||||
#self.roiChangedEvent()
|
||||
|
||||
|
||||
def getRoiData(self):
|
||||
d = self.roi.getArrayRegion(self.roiData, self.roiImg, axes=self.axes)
|
||||
if d is None:
|
||||
@ -629,7 +628,7 @@ class ROIPlotItem(PlotCurveItem):
|
||||
while d.ndim > 1:
|
||||
d = d.mean(axis=1)
|
||||
return d
|
||||
|
||||
|
||||
def roiChangedEvent(self):
|
||||
d = self.getRoiData()
|
||||
self.updateData(d, self.xVals)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user