figure num=None, coll.color dep

jdh2358 · jdh2358 · commit c17e217779a8 · 2005-02-01T22:05:34.000Z
svn path=/trunk/matplotlib/; revision=904
diff --git a/API_CHANGES b/API_CHANGES
@@ -3,6 +3,10 @@ API CHANGES in matplotlib-0.72
   Line2D, Text, and Patch copy_properties renamed update_from and
   moved into artist base class
 
+ LineCollecitons.color renamed to LineCollections.set_color for
+ consistency with set/get introspection mechanism,
+
+
 API CHANGES in matplotlib-0.71   
 
    Significant numerix namespace changes, introduced to resolve
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 New entries should be added at the top
  
+2005-02-01 Added Fernando's figure num patch, including experemental
+           support for pylab backend switching, LineCOllection.color
+           warns - JDH
+
 2005-01-31 updated datalim in contour - JDH
 
 2005-01-30 Added backend_qtagg.py provided by Sigve Tjora - SC
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -8,7 +8,7 @@
 line segemnts)
 """
 import math
-from matplotlib import rcParams
+from matplotlib import rcParams, verbose
 
 from artist import Artist
 from backend_bases import GraphicsContextBase
@@ -336,6 +336,15 @@ def set_color(self, c):
 ACCEPTS: matplotlib color arg or sequence of rgba tuples"""
         self._colors = self._get_color(c, len(self._colors))
 
+    def color(self, c):
+        """
+Set the color(s) of the line collection.  c can be a matplotlib color arg
+(all patches have same color), or a a sequence or rgba tuples; if it
+is a sequence the patches will cycle through the sequence
+
+ACCEPTS: matplotlib color arg or sequence of rgba tuples"""
+        verbose.report_error('LineCollection.color deprecated; use set_color instead')
+        return self.set_color(c)
 
     def set_alpha(self, alpha):
         """
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -188,6 +188,7 @@
 import mlab  #so I can override hist, psd, etc...
 
 from axes import Axes, PolarAxes
+import backends
 from backends import new_figure_manager, error_msg, \
      draw_if_interactive, show
 
@@ -758,7 +759,7 @@ def figlegend(handles, labels, loc, **kwargs):
     return l
     
 
-def figure(num=1,
+def figure(num=None, # autoincrement if None, else integer from 1-N
            figsize   = None, # defaults to rc figure.figsize
            dpi       = None, # defaults to rc figure.dpi
            facecolor = None, # defaults to rc figure.facecolor
@@ -776,6 +777,9 @@ def figure(num=1,
 
       figure(1)
 
+    If num=None, the figure number will be incremented and a new
+    figure will be created.
+    
     figsize - width in height x inches; defaults to rc figure.figsize
     dpi     - resolution; defaults to rc figure.dpi
     facecolor - the background color; defaults to rc figure.facecolor
@@ -794,6 +798,15 @@ def figure(num=1,
     if num==0:
         error_msg('Figure number can not be 0.\n' + \
                   'Hey, give me a break, this is matlab(TM) compatability')
+        return 
+
+
+    if num is None:
+        allnums = [f.num for f in _pylab_helpers.Gcf.get_all_fig_managers()]
+        if allnums:
+            num = max(allnums) + 1
+        else:
+            num = 1
 
     figManager = _pylab_helpers.Gcf.get_fig_manager(num)
     if figManager is None:
@@ -1585,6 +1598,16 @@ def ion():
     'turn interactive mode on'
     matplotlib.interactive(True)
 
+
+def switch_backend(newbackend):
+    close('all')
+    global new_figure_manager, error_msg,  draw_if_interactive, show
+    matplotlib.use(newbackend)
+    reload(backends)
+    from backends import new_figure_manager, error_msg, \
+         draw_if_interactive, show
+
+    
 ### The following functions were autogenerated by the boilerplate.py
 ### script.  They are simple wrappers around the Axes methods of the
 ### same name
@@ -2528,7 +2551,7 @@ def winter():
     'Line2D', 'Polygon', 'Rectangle', 'Circle', 'Text', 'cm',
     'get_cmap', 'normalize',
 
-    'show', 'rcParams'
+    'show', 'rcParams', 'switch_backend'
     ]
 
 
