Fixed ItemSample handling of ScatterPlotItem
This commit is contained in:
parent
ee0825d677
commit
96a5f9290d
@ -126,6 +126,11 @@ class LegendItem(GraphicsWidget, GraphicsWidgetAnchor):
|
|||||||
|
|
||||||
|
|
||||||
class ItemSample(GraphicsWidget):
|
class ItemSample(GraphicsWidget):
|
||||||
|
""" Class responsible for drawing a single item in a LegendItem (sans label).
|
||||||
|
|
||||||
|
This may be subclassed to draw custom graphics in a Legend.
|
||||||
|
"""
|
||||||
|
## Todo: make this more generic; let each item decide how it should be represented.
|
||||||
def __init__(self, item):
|
def __init__(self, item):
|
||||||
GraphicsWidget.__init__(self)
|
GraphicsWidget.__init__(self)
|
||||||
self.item = item
|
self.item = item
|
||||||
@ -142,15 +147,21 @@ class ItemSample(GraphicsWidget):
|
|||||||
p.setPen(fn.mkPen(None))
|
p.setPen(fn.mkPen(None))
|
||||||
p.drawPolygon(QtGui.QPolygonF([QtCore.QPointF(2,18), QtCore.QPointF(18,2), QtCore.QPointF(18,18)]))
|
p.drawPolygon(QtGui.QPolygonF([QtCore.QPointF(2,18), QtCore.QPointF(18,2), QtCore.QPointF(18,18)]))
|
||||||
|
|
||||||
|
if not isinstance(self.item, pg.ScatterPlotItem):
|
||||||
p.setPen(fn.mkPen(opts['pen']))
|
p.setPen(fn.mkPen(opts['pen']))
|
||||||
p.drawLine(2, 18, 18, 2)
|
p.drawLine(2, 18, 18, 2)
|
||||||
|
|
||||||
symbol = opts.get('symbol', None)
|
symbol = opts.get('symbol', None)
|
||||||
if symbol is not None:
|
if symbol is not None:
|
||||||
|
if isinstance(self.item, pg.PlotDataItem):
|
||||||
|
opts = self.item.scatter.opts
|
||||||
|
|
||||||
|
pen = pg.mkPen(opts['pen'])
|
||||||
|
brush = pg.mkBrush(opts['brush'])
|
||||||
|
size = opts['size']
|
||||||
|
|
||||||
p.translate(10,10)
|
p.translate(10,10)
|
||||||
pen = pg.mkPen(opts['symbolPen'])
|
path = pg.graphicsItems.ScatterPlotItem.drawSymbol(p, symbol, size, pen, brush)
|
||||||
brush = pg.mkBrush(opts['symbolBrush'])
|
|
||||||
path = pg.graphicsItems.ScatterPlotItem.drawSymbol(p, symbol, opts['symbolSize'], pen, brush)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -168,6 +168,7 @@ class GLViewWidget(QtOpenGL.QGLWidget):
|
|||||||
def orbit(self, azim, elev):
|
def orbit(self, azim, elev):
|
||||||
"""Orbits the camera around the center position. *azim* and *elev* are given in degrees."""
|
"""Orbits the camera around the center position. *azim* and *elev* are given in degrees."""
|
||||||
self.opts['azimuth'] += azim
|
self.opts['azimuth'] += azim
|
||||||
|
#self.opts['elevation'] += elev
|
||||||
self.opts['elevation'] = np.clip(self.opts['elevation'] + elev, -90, 90)
|
self.opts['elevation'] = np.clip(self.opts['elevation'] + elev, -90, 90)
|
||||||
self.update()
|
self.update()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user