Merge branch 'develop' of https://github.com/johnelund/pyqtgraph into johnelund-develop

This commit is contained in:
Luke Campagnola 2014-01-18 23:26:27 -05:00
commit e97aebb343

View File

@ -3,7 +3,7 @@ from .LabelItem import LabelItem
from ..Qt import QtGui, QtCore
from .. import functions as fn
from ..Point import Point
from .ScatterPlotItem import ScatterPlotItem
from .ScatterPlotItem import ScatterPlotItem, drawSymbol
from .PlotDataItem import PlotDataItem
from .GraphicsWidgetAnchor import GraphicsWidgetAnchor
__all__ = ['LegendItem']
@ -167,7 +167,7 @@ class ItemSample(GraphicsWidget):
size = opts['size']
p.translate(10,10)
path = ScatterPlotItem.drawSymbol(p, symbol, size, pen, brush)
path = drawSymbol(p, symbol, size, pen, brush)