From cbd0efe79a6ef3642ec5ede840c98799c7e43842 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Wed, 19 Jun 2013 19:32:55 -0400
Subject: [PATCH] ImageItem informs ViewBox when its size changes Minor edits
---
pyqtgraph/graphicsItems/ImageItem.py | 8 +++++---
pyqtgraph/graphicsItems/LegendItem.py | 1 -
pyqtgraph/graphicsItems/ScatterPlotItem.py | 2 ++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pyqtgraph/graphicsItems/ImageItem.py b/pyqtgraph/graphicsItems/ImageItem.py
index fad88bee..530db7fb 100644
--- a/pyqtgraph/graphicsItems/ImageItem.py
+++ b/pyqtgraph/graphicsItems/ImageItem.py
@@ -196,10 +196,12 @@ class ImageItem(GraphicsObject):
return
else:
gotNewData = True
- if self.image is None or image.shape != self.image.shape:
- self.prepareGeometryChange()
+ shapeChanged = (self.image is None or image.shape != self.image.shape)
self.image = image.view(np.ndarray)
-
+ if shapeChanged:
+ self.prepareGeometryChange()
+ self.informViewBoundsChanged()
+
prof.mark('1')
if autoLevels is None:
diff --git a/pyqtgraph/graphicsItems/LegendItem.py b/pyqtgraph/graphicsItems/LegendItem.py
index 86973b04..69ddffea 100644
--- a/pyqtgraph/graphicsItems/LegendItem.py
+++ b/pyqtgraph/graphicsItems/LegendItem.py
@@ -92,7 +92,6 @@ class LegendItem(GraphicsWidget, GraphicsWidgetAnchor):
# Thanks, Ulrich!
# cycle for a match
for sample, label in self.items:
- print label.text, name
if label.text == name: # hit
self.items.remove( (sample, label) ) # remove from itemlist
self.layout.removeItem(sample) # remove from layout
diff --git a/pyqtgraph/graphicsItems/ScatterPlotItem.py b/pyqtgraph/graphicsItems/ScatterPlotItem.py
index bec6a318..c8324901 100644
--- a/pyqtgraph/graphicsItems/ScatterPlotItem.py
+++ b/pyqtgraph/graphicsItems/ScatterPlotItem.py
@@ -35,6 +35,8 @@ for k, c in coords.items():
def drawSymbol(painter, symbol, size, pen, brush):
+ if symbol is None:
+ return
painter.scale(size, size)
painter.setPen(pen)
painter.setBrush(brush)
--
GitLab