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

fixed the Pen None property.

Browse Source 
- https://groups.google.com/forum/#!topic/pyqtgraph/t6cl1CevlB0

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
This commit is contained in:
Nicholas Tan Jerome 2014-10-16 12:23:32 +02:00
parent 1aeb197b03
commit 6cc0f5e33d
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyqtgraph/graphicsItems/ScatterPlotItem.py
View File

@ -241,8 +241,8 @@ class ScatterPlotItem(GraphicsObject):
'useCache': True, ## If useCache is False, symbols are re-drawn on every paint. 'useCache': True, ## If useCache is False, symbols are re-drawn on every paint.
'antialias': getConfigOption('antialias'), 'antialias': getConfigOption('antialias'),
'name': None, 'name': None,
} }
self.setPen(fn.mkPen(getConfigOption('foreground')), update=False) self.setPen(fn.mkPen(getConfigOption('foreground')), update=False)
self.setBrush(fn.mkBrush(100,100,150), update=False) self.setBrush(fn.mkBrush(100,100,150), update=False)
self.setSymbol('o', update=False) self.setSymbol('o', update=False)
@ -351,16 +351,12 @@ class ScatterPlotItem(GraphicsObject):
newData = self.data[len(oldData):] newData = self.data[len(oldData):]
newData['size'] = -1 ## indicates to use default size newData['size'] = -1 ## indicates to use default size
if 'spots' in kargs: if 'spots' in kargs:
spots = kargs['spots'] spots = kargs['spots']
for i in range(len(spots)): for i in range(len(spots)):
spot = spots[i] spot = spots[i]
for k in spot: for k in spot:
#if k == 'pen':
#newData[k] = fn.mkPen(spot[k])
#elif k == 'brush':
#newData[k] = fn.mkBrush(spot[k])
if k == 'pos': if k == 'pos':
pos = spot[k] pos = spot[k]
if isinstance(pos, QtCore.QPointF): if isinstance(pos, QtCore.QPointF):
@ -369,10 +365,10 @@ class ScatterPlotItem(GraphicsObject):
x,y = pos[0], pos[1] x,y = pos[0], pos[1]
newData[i]['x'] = x newData[i]['x'] = x
newData[i]['y'] = y newData[i]['y'] = y
elif k in ['x', 'y', 'size', 'symbol', 'pen', 'brush', 'data']: elif k == 'pen':
newData[i][k] = fn.mkPen(spot[k])
elif k in ['x', 'y', 'size', 'symbol', 'brush', 'data']:
newData[i][k] = spot[k] newData[i][k] = spot[k]
#elif k == 'data':
#self.pointData[i] = spot[k]
else: else:
raise Exception("Unknown spot parameter: %s" % k) raise Exception("Unknown spot parameter: %s" % k)
elif 'y' in kargs: elif 'y' in kargs:
@ -389,10 +385,10 @@ class ScatterPlotItem(GraphicsObject):
if k in kargs: if k in kargs:
setMethod = getattr(self, 'set' + k[0].upper() + k[1:]) setMethod = getattr(self, 'set' + k[0].upper() + k[1:])
setMethod(kargs[k], update=False, dataSet=newData, mask=kargs.get('mask', None)) setMethod(kargs[k], update=False, dataSet=newData, mask=kargs.get('mask', None))
if 'data' in kargs: if 'data' in kargs:
self.setPointData(kargs['data'], dataSet=newData) self.setPointData(kargs['data'], dataSet=newData)
self.prepareGeometryChange() self.prepareGeometryChange()
self.informViewBoundsChanged() self.informViewBoundsChanged()
self.bounds = [None, None] self.bounds = [None, None]
@ -428,7 +424,7 @@ class ScatterPlotItem(GraphicsObject):
all spots which do not have a pen explicitly set.""" all spots which do not have a pen explicitly set."""
update = kargs.pop('update', True) update = kargs.pop('update', True)
dataSet = kargs.pop('dataSet', self.data) dataSet = kargs.pop('dataSet', self.data)
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 kargs['mask'] is not None: