bugfixes
This commit is contained in:
parent
6e5c5e402b
commit
22bc2333a8
|
@ -27,6 +27,7 @@ examples = OrderedDict([
|
||||||
('Scatter Plot', 'ScatterPlot.py'),
|
('Scatter Plot', 'ScatterPlot.py'),
|
||||||
#('PlotItem', 'PlotItem.py'),
|
#('PlotItem', 'PlotItem.py'),
|
||||||
('IsocurveItem', 'isocurve.py'),
|
('IsocurveItem', 'isocurve.py'),
|
||||||
|
('GraphItem', 'GraphItem.py'),
|
||||||
('ImageItem - video', 'ImageItem.py'),
|
('ImageItem - video', 'ImageItem.py'),
|
||||||
('ImageItem - draw', 'Draw.py'),
|
('ImageItem - draw', 'Draw.py'),
|
||||||
('Region-of-Interest', 'ROIExamples.py'),
|
('Region-of-Interest', 'ROIExamples.py'),
|
||||||
|
|
|
@ -4,7 +4,7 @@ PyQtGraph - Scientific Graphics and GUI Library for Python
|
||||||
www.pyqtgraph.org
|
www.pyqtgraph.org
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = '0.9.5'
|
__version__ = None
|
||||||
|
|
||||||
### import all the goodies and add some helper functions for easy CLI use
|
### import all the goodies and add some helper functions for easy CLI use
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,8 @@ class GraphicsItem(object):
|
||||||
return tuple(map(Point, self._pixelVectorCache[1])) ## return a *copy*
|
return tuple(map(Point, self._pixelVectorCache[1])) ## return a *copy*
|
||||||
|
|
||||||
## check global cache
|
## check global cache
|
||||||
key = (dt.m11(), dt.m21(), dt.m31(), dt.m12(), dt.m22(), dt.m32(), dt.m31(), dt.m32())
|
#key = (dt.m11(), dt.m21(), dt.m31(), dt.m12(), dt.m22(), dt.m32(), dt.m31(), dt.m32())
|
||||||
|
key = (dt.m11(), dt.m21(), dt.m12(), dt.m22())
|
||||||
pv = self._pixelVectorGlobalCache.get(key, None)
|
pv = self._pixelVectorGlobalCache.get(key, None)
|
||||||
if direction is None and pv is not None:
|
if direction is None and pv is not None:
|
||||||
self._pixelVectorCache = [dt, pv]
|
self._pixelVectorCache = [dt, pv]
|
||||||
|
|
|
@ -472,8 +472,8 @@ class ScatterPlotItem(GraphicsObject):
|
||||||
|
|
||||||
if isinstance(symbol, np.ndarray) or isinstance(symbol, list):
|
if isinstance(symbol, np.ndarray) or isinstance(symbol, list):
|
||||||
symbols = symbol
|
symbols = symbol
|
||||||
if kargs['mask'] is not None:
|
if mask is not None:
|
||||||
symbols = symbols[kargs['mask']]
|
symbols = symbols[mask]
|
||||||
if len(symbols) != len(dataSet):
|
if len(symbols) != len(dataSet):
|
||||||
raise Exception("Number of symbols does not match number of points (%d != %d)" % (len(symbols), len(dataSet)))
|
raise Exception("Number of symbols does not match number of points (%d != %d)" % (len(symbols), len(dataSet)))
|
||||||
dataSet['symbol'] = symbols
|
dataSet['symbol'] = symbols
|
||||||
|
@ -554,6 +554,7 @@ class ScatterPlotItem(GraphicsObject):
|
||||||
#rec['fragCoords'] = self.fragmentAtlas.getSymbolCoords(*self.getSpotOpts(rec))
|
#rec['fragCoords'] = self.fragmentAtlas.getSymbolCoords(*self.getSpotOpts(rec))
|
||||||
if invalidate:
|
if invalidate:
|
||||||
self.invalidate()
|
self.invalidate()
|
||||||
|
self.informViewBoundsChanged()
|
||||||
|
|
||||||
def getSpotOpts(self, recs, scale=1.0):
|
def getSpotOpts(self, recs, scale=1.0):
|
||||||
if recs.ndim == 0:
|
if recs.ndim == 0:
|
||||||
|
@ -671,6 +672,7 @@ class ScatterPlotItem(GraphicsObject):
|
||||||
GraphicsObject.viewTransformChanged(self)
|
GraphicsObject.viewTransformChanged(self)
|
||||||
self.bounds = [None, None]
|
self.bounds = [None, None]
|
||||||
self.fragments = None
|
self.fragments = None
|
||||||
|
self.informViewBoundsChanged()
|
||||||
|
|
||||||
def generateFragments(self):
|
def generateFragments(self):
|
||||||
tr = self.deviceTransform()
|
tr = self.deviceTransform()
|
||||||
|
|
|
@ -298,9 +298,11 @@ class ViewBox(GraphicsWidget):
|
||||||
def resizeEvent(self, ev):
|
def resizeEvent(self, ev):
|
||||||
#self.setRange(self.range, padding=0)
|
#self.setRange(self.range, padding=0)
|
||||||
#self.updateAutoRange()
|
#self.updateAutoRange()
|
||||||
|
self._itemBoundsCache.clear()
|
||||||
self.updateMatrix()
|
self.updateMatrix()
|
||||||
self.sigStateChanged.emit(self)
|
self.sigStateChanged.emit(self)
|
||||||
self.background.setRect(self.rect())
|
self.background.setRect(self.rect())
|
||||||
|
|
||||||
#self.linkedXChanged()
|
#self.linkedXChanged()
|
||||||
#self.linkedYChanged()
|
#self.linkedYChanged()
|
||||||
|
|
||||||
|
@ -728,7 +730,8 @@ class ViewBox(GraphicsWidget):
|
||||||
|
|
||||||
def itemBoundsChanged(self, item):
|
def itemBoundsChanged(self, item):
|
||||||
self._itemBoundsCache.pop(item, None)
|
self._itemBoundsCache.pop(item, None)
|
||||||
self.updateAutoRange()
|
if item in self.addedItems:
|
||||||
|
self.updateAutoRange()
|
||||||
|
|
||||||
def invertY(self, b=True):
|
def invertY(self, b=True):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user