ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'nicolaisi/brush' into scatterplot-fix

Browse Source
This commit is contained in:
Luke Campagnola 2014-10-25 12:58:51 -04:00
commit cfb4384a3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyqtgraph/graphicsItems/ScatterPlotItem.py
View File

@ -431,7 +431,7 @@ class ScatterPlotItem(GraphicsObject):
if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)): if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)):
pens = args[0] pens = args[0]
if kargs['mask'] is not None: if if 'mask' in kargs and kargs['mask'] is not None:
pens = pens[kargs['mask']] pens = pens[kargs['mask']]
if len(pens) != len(dataSet): if len(pens) != len(dataSet):
raise Exception("Number of pens does not match number of points (%d != %d)" % (len(pens), len(dataSet))) raise Exception("Number of pens does not match number of points (%d != %d)" % (len(pens), len(dataSet)))
@ -453,7 +453,7 @@ class ScatterPlotItem(GraphicsObject):
if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)): if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)):
brushes = args[0] brushes = args[0]
if kargs['mask'] is not None: if 'mask' in kargs and kargs['mask'] is not None:
brushes = brushes[kargs['mask']] brushes = brushes[kargs['mask']]
if len(brushes) != len(dataSet): if len(brushes) != len(dataSet):
raise Exception("Number of brushes does not match number of points (%d != %d)" % (len(brushes), len(dataSet))) raise Exception("Number of brushes does not match number of points (%d != %d)" % (len(brushes), len(dataSet)))