PcolorImage: use local cache instead of the ScalarMappable.update_dict

efiring · efiring · commit fc97fc8e6b5f · 2011-02-06T01:55:50.000Z
svn path=/trunk/matplotlib/; revision=8949
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -43,7 +43,7 @@ def revcmap(data):
 def _reverse_cmap_spec(spec):
     """Reverses cmap specification *spec*, can handle both dict and tuple
     type specs."""
-    
+
     if 'red' in spec:
         return revcmap(spec)
     else:
@@ -53,9 +53,9 @@ def _reverse_cmap_spec(spec):
         return revspec
 
 def _generate_cmap(name, lutsize):
-    """Generates the requested cmap from it's name *name*.  The lut size is 
+    """Generates the requested cmap from it's name *name*.  The lut size is
     *lutsize*."""
-    
+
     spec = datad[name]
 
     # Generate the colormap object.
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -97,7 +97,7 @@ def __init__(self, ax,
 
         self._imcache = None
 
-        # this is an expetimental attribute, if True, unsampled image
+        # this is an experimental attribute, if True, unsampled image
         # will be drawn using the affine transform that are
         # appropriately skewed so that the given postition
         # corresponds to the actual position in the coordinate. -JJL
@@ -797,6 +797,9 @@ def __init__(self, ax,
         cm.ScalarMappable.__init__(self, norm, cmap)
         self.axes = ax
         self._rgbacache = None
+        # There is little point in caching the image itself because
+        # it needs to be remade if the bbox or viewlim change,
+        # so caching does help with zoom/pan/resize.
         self.update(kwargs)
         self.set_data(x, y, A)
 
@@ -811,7 +814,7 @@ def make_image(self, magnification=1.0):
         height = (round(t) + 0.5) - (round(b) - 0.5)
         width = width * magnification
         height = height * magnification
-        if self.check_update('array'):
+        if self._rgbacache is None:
             A = self.to_rgba(self._A, alpha=self._alpha, bytes=True)
             self._rgbacache = A
             if self._A.ndim == 2:
@@ -827,9 +830,14 @@ def make_image(self, magnification=1.0):
         im.is_grayscale = self.is_grayscale
         return im
 
+    def changed(self):
+        self._rgbacache = None
+        cm.ScalarMappable.changed(self)
+
     @allow_rasterization
     def draw(self, renderer, *args, **kwargs):
-        if not self.get_visible(): return
+        if not self.get_visible():
+            return
         im = self.make_image(renderer.get_image_magnification())
         gc = renderer.new_gc()
         gc.set_clip_rectangle(self.axes.bbox.frozen())
@@ -871,7 +879,7 @@ def set_data(self, x, y, A):
         self._A = A
         self._Ax = x
         self._Ay = y
-        self.update_dict['array'] = True
+        self._rgbacache = None
 
     def set_array(self, *args):
         raise NotImplementedError('Method not supported')
