fixed some problems with colorbar updates in interactive mode

jdh2358 · jdh2358 · commit d47869725e69 · 2004-12-22T18:18:38.000Z
svn path=/trunk/matplotlib/; revision=805
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -30,7 +30,7 @@
 backend      : GTKAgg    # the default backend
 numerix      : Numeric   # Numeric or numarray
 interactive  : False     # see http://matplotlib.sourceforge.net/interactive.html
-toolbar      : classic   # None | classic | toolbar2
+toolbar      : toolbar2   # None | classic | toolbar2
 timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
 
 # Where your matplotlib data lives if you installed to a non-default
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2004-12-22 Fixed colorbar bug which caused colorbar not to respond to
+           changes in colormap in some instances - JDH
+
 2004-12-22 Refactored NavigationToolbar in tkagg to support app
            embedding , init now takes (canvas, window) rather than
            (canvas, figman) - JDH
@@ -20,7 +23,7 @@ New entries should be added at the top
 2004-12-18 Minor refactoring of tkagg toolbar to support embedding in
            an application - JDH
 
-2004-12-14 Added linestyle to collections -  JDH
+2004-12-14 Added linestyle to collections (currently broken) -  JDH
 
 2004-12-14 Applied Nadia's setupext patch to fix libstdc++ link
            problem with contour and solaris  -JDH
diff --git a/TODO b/TODO
@@ -612,3 +612,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE add hold option to plot
 
+
+-- fix linestyle for collections
+
+-- update ticklabels and range for colorbar when clim changes
diff --git a/examples/contour_demo.py b/examples/contour_demo.py
@@ -8,14 +8,14 @@
 Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
 
 # difference of Gaussians
-im = imshow(Z2-Z1, interpolation='bilinear', origin='lower')
+#im = imshow(Z2-Z1, interpolation='bilinear', origin='lower')
 axis('off')
 levels, colls = contour(Z2-Z1, levels=6,
                         linewidths=arange(.5, 4, .5),
                         colors=('r', 'green', 'blue', (1,1,0), '#afeeee', 0.5),
                         origin='lower')
 legend(loc='lower left')
-colorbar()
+#colorbar()
 savefig('test')
 show()
 
diff --git a/examples/subplot_demo.py b/examples/subplot_demo.py
@@ -19,7 +19,7 @@ def f(t):
 #axis([0,5,-1,1])
 
 subplot(212)
-plot(t3, cos(2*pi*t3), 'r>')
+plot(t3, cos(2*pi*t3), 'r.')
 grid(True)
 xlabel('time (s)')
 ylabel('Undamped')
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1057,10 +1057,9 @@ def autolev(N):
             col.set_label(fmt%level)
             self.add_collection(col)
             levels.append(level)
-            #col.set_linestyle('dashed') # dashed|dotted|solid|dashdot
+            #col.set_linestyle('dashdot') # dashed|dotted|solid|dashdot
             #dashes = 0, (4,2,8,1)
             #col.set_linestyle( (dashes,) ) # offset, onoffseq
-
             collections.append(col)
 
 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -206,7 +206,7 @@ def draw_regpoly_collection(
         
 
     def draw_line_collection(self, segments, transform, clipbox,
-                             colors, linewidths, linestyles, antialiaseds,
+                             colors, linewidths, linestyle, antialiaseds,
                              offsets, transOffset):
         """
         This is a function for optimized line drawing.  If you need to
@@ -229,7 +229,7 @@ def draw_line_collection(self, segments, transform, clipbox,
 
         linewidths is a tuple of linewidths
 
-        linestyles is a tuple of (offset, onoffseq) tuples
+        linestyle is an (offset, onoffseq) tuple or None,None for solid
 
         antialiseds is a tuple of ones or zeros indicating whether the
         segment should be aa or not
@@ -249,7 +249,7 @@ def draw_line_collection(self, segments, transform, clipbox,
         i = 0
         Nc = len(colors)
         Nlw = len(linewidths)
-        Nls = len(linestyles)        
+
         Naa = len(antialiaseds)
 
         usingOffsets = offsets is not None
@@ -262,6 +262,9 @@ def draw_line_collection(self, segments, transform, clipbox,
             
         gc.set_clip_rectangle(clipbox.get_bounds())
 
+        if linestyle[0] is not None:
+            offset, seq = linestyle
+            gc.set_dashes( offset, seq )
 
         for i in xrange(N):
             x, y = zip(*segments[i % Nsegments])
@@ -274,9 +277,7 @@ def draw_line_collection(self, segments, transform, clipbox,
             gc.set_foreground( rgb, isRGB=True)
             gc.set_alpha( alpha )
             gc.set_linewidth( linewidths[i % Nlw] )
-
-            offset, seq = linestyles[i % Nls]
-            gc.set_dashes( offset, seq )            
+    
             gc.set_antialiased( antialiaseds[i % Naa] )
             if usingOffsets:
                 xo, yo = transOffset.xy_tup(offsets[i % Noffsets])
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -73,7 +73,6 @@ def draw_if_interactive():
         if figManager != None:
             figManager.canvas.draw()
 
-
 def show(mainloop=True):
     """
     Show all the figures and enter the gtk main loop
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1298,8 +1298,6 @@ def notify_axes_change(fig):
             'this will be called whenever the current axes is changed'        
             if self.tb != None: self.tb.update()
         self.canvas.figure.add_axobserver(notify_axes_change)
-
-
         
     def destroy(self, *args):
         DEBUG_MSG("destroy()", 1, self)
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -467,8 +467,8 @@ def notify(self, mappable):
         If this is called then we are pegged to another mappable.
         Update the cmap, norm accordingly
         """
-        self.cmap = mappable.cmap
-        self.norm = mappable.norm
+        self.set_cmap(mappable.cmap)
+        self.set_norm(mappable.norm)
 
     def changed(self):
         """
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -249,7 +249,7 @@ def __init__(self, segments,
                  linewidths    = None,
                  colors        = None,
                  antialiaseds  = None,
-                 linestyles = 'solid',
+                 linestyle = 'solid',
 		 offsets = None,
 		 transOffset = None,
                  ):
@@ -270,7 +270,7 @@ def __init__(self, segments,
 if linewidths, colors, or antialiaseds is None, they default to
 their rc params setting, in sequence form"""
         
-        slCollection.__init__(self)
+        Collection.__init__(self)
 
         if linewidths is None   :
             linewidths   = (rcParams['lines.linewidth'], )
@@ -284,11 +284,12 @@ def __init__(self, segments,
         self._colors = colors
         self._aa = antialiaseds
         self._lw = linewidths
-        self.set_linestyle(linestyles)
+        self.set_linestyle(linestyle)
 	self._offsets = offsets
 	self._transOffset = transOffset
 
     def draw(self, renderer):
+        
         renderer.open_group('linecollection')
         self._transform.freeze()
         if self._transOffset is not None: self._transOffset.freeze()
@@ -313,25 +314,16 @@ def set_linewidth(self, lw):
 
     def set_linestyle(self, ls):
         """
-Set the linestyles(s) for the collection.  ls can be a string
-linestyle ('solid', 'dashed', 'dashdot', 'dotted) or a sequence of
-such strings.  Alteratively it can be a sequence of on-off dash
-tuples.
-
-ACCEPTS: string or sequence of strings or (offset, on-off dash seq) tuples"""
-
-        gc = GraphicsContextBase()
-        def get_onoff(val):
-            if is_string_like(val):
-                return GraphicsContextBase.dashd[val]
-            elif iterable(val) and len(val)==2:
-                return val
-            else: raise ValueError('Do not know how to convert %s to dashes'%val)
-
-        if is_string_like(ls): ls = [ls]
-                                  
+Set the linestyles(s) for the collection.  
+ACCEPTS: ['solid' | 'dashed', 'dashdot', 'dotted' |  (offset, on-off-dash-seq) ]"""
+        if is_string_like(ls):
+            dashes = GraphicsContextBase.dashd[ls]            
+        elif iterable(ls) and len(ls)==2:
+            dashes = ls
+        else: raise ValueError('Do not know how to convert %s to dashes'%ls)
+
         
-        self._ls = [get_onoff(val) for val in ls]
+        self._ls = dashes
 
     def color(self, c):
         """
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -97,7 +97,23 @@ def set_alpha(self, alpha):
         """
         Artist.set_alpha(self, alpha)
         self._imcache = None
-        
+
+    def set_cmap(self, cmap):
+        'set the colormap for luminance data'
+        self._imcache = None
+        cm.ScalarMappable.set_cmap(self, cmap)
+
+                
+    def set_norm(self, norm):
+        'set the colormap for luminance data'
+        self._imcache = None
+        cm.ScalarMappable.set_norm(self, norm)
+
+    def set_clim(self, vmin=None, vmax=None):
+        'set the norm limits for image scaling'
+        self._imcache = None
+        cm.ScalarMappable.set_clim(self, vmin, vmax)
+
     def make_image(self, flipy):        
         if self._A is not None:
             if self._imcache is None:
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -464,10 +464,17 @@ def axes(*args, **kwargs):
     draw_if_interactive()
     return a
 
-def delaxes(ax):
+def delaxes(*args):
     """
-    remove ax from the current figure.  If ax doesn't exist an error
-    will be raised"""
+    delaxes(ax) - remove ax from the current figure.  If ax doesn't
+    exist an error will be raised.
+
+    delaxes(): delete the current axes
+    """
+    if not len(args):
+        ax = gca()
+    else:
+        ax = args[0]
     ret = gcf().delaxes(ax)
     draw_if_interactive()
     return ret
@@ -505,7 +512,7 @@ def clim(vmin=None, vmax=None):
     0.05)
     
     """  
-    im = gci._current
+    im = gci()
     if im is None:
         error_msg('You must first define an image, eg with imshow')
         return
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
