merge pyqtgraph from dev

2012-12-26 18:54:12 -05:00 · 2012-12-26 18:54:12 -05:00 · 33acd04de7
commit 33acd04de7
parent 01f2099b46
2 changed files with 6 additions and 1 deletions
--- a/graphicsItems/ArrowItem.py
+++ b/graphicsItems/ArrowItem.py
@ -54,3 +54,8 @@ class ArrowItem(QtGui.QGraphicsPathItem):
    def paint(self, p, *args):
        p.setRenderHint(QtGui.QPainter.Antialiasing)
        QtGui.QGraphicsPathItem.paint(self, p, *args)
+
+    def shape(self):
+        #if not self.opts['pxMode']:
+            #return QtGui.QGraphicsPathItem.shape(self)
+        return self.path
--- a/graphicsItems/GraphicsItem.py
+++ b/graphicsItems/GraphicsItem.py
@ -496,4 +496,4 @@ class GraphicsItem(object):
                #self._exportOpts['antialias'] = True
        else:
            self._exportOpts = False
-    
+