fixed a close(fig) bug

jdh2358 · jdh2358 · commit 770d0a05958d · 2005-02-01T23:55:07.000Z
svn path=/trunk/matplotlib/; revision=909
diff --git a/API_CHANGES b/API_CHANGES
@@ -3,9 +3,11 @@ 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,
+  LineCollecitons.color renamed to LineCollections.set_color for
+  consistency with set/get introspection mechanism,
 
+  pylab figure now defaults to num=None, which creates a new figure
+  with a guaranteed unique number 
 
 API CHANGES in matplotlib-0.71   
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,7 +2,8 @@ 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
+           warns, savefig now a figure method, fixed a close(fig) bug
+           - JDH
 
 2005-01-31 updated datalim in contour - JDH
 
@@ -28,7 +29,7 @@ New entries should be added at the top
 2005-01-24 Fixed a mathtext parser bug that prevented font changes in
            sub/superscripts - JDH
 
-2005-01-24 Fixed contour wto work w/ interactive changes in colormaps,
+2005-01-24 Fixed contour to work w/ interactive changes in colormaps,
            clim, etc - JDH
 
 ===============================================================
diff --git a/examples/agg_oo.py b/examples/agg_oo.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+"""
+A pure OO (look Ma, no pylab!) example using the agg backend
+"""
+from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+from matplotlib.figure import Figure
+
+fig = Figure()
+canvas = FigureCanvas(fig)
+ax = fig.add_subplot(111)
+ax.plot([1,2,3])
+ax.set_title('hi mom')
+ax.grid(True)
+ax.set_xlabel('time')
+ax.set_ylabel('volts')
+canvas.print_figure('test')
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -662,6 +662,7 @@ class FigureCanvasBase:
               )
 
     def __init__(self, figure):
+        figure.set_canvas(self)
         self.figure = figure
         self.cid = 0
         # a dictionary from event name to a dictionary that maps cid->func
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -286,6 +286,7 @@ def destroy(self, *args):
         if self.window is not None:
             #print 'calling window destroy'
             self.window.destroy()
+            pass
         self.window = None
 
 class AxisMenu:
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -59,8 +59,12 @@ def __init__(self,
         self._set_artist_props(self.figurePatch)
 
         self._hold = rcParams['axes.hold']
+        self.canvas = None
         self.clf()
 
+    def set_canvas(self, canvas):
+        'set the canvas the contains the figure'
+        self.canvas = canvas
         
     def hold(self, b=None):
         """
@@ -427,3 +431,26 @@ def add_axobserver(self, func):
         'whenever the axes state change, func(self) will be called'
         self._axobservers.append(func)
         
+
+    def savefig(self, *args, **kwargs):
+        """
+SAVEFIG(fname, dpi=150, facecolor='w', edgecolor='w',
+orientation='portrait'):
+
+Save the current figure to filename fname.  dpi is the resolution
+in dots per inch.
+
+Output file types currently supported are jpeg and png and will be
+deduced by the extension to fname
+
+facecolor and edgecolor are the colors os the figure rectangle
+
+orientation is either 'landscape' or 'portrait' - not supported on
+all backends; currently only on postscript output."""
+    
+        for key in ('dpi', 'facecolor', 'edgecolor'):
+            if not kwargs.has_key(key):
+                kwargs[key] = rcParams['savefig.%s'%key]
+
+        self.canvas.print_figure(*args, **kwargs)
+    
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -610,10 +610,10 @@ def close(*args):
             _pylab_helpers.Gcf.destroy(arg)
         elif isinstance(arg, Figure):
             for manager in _pylab_helpers.Gcf.get_all_fig_managers():
-                if manager.figure==arg:
+                if manager.canvas.figure==arg:
                     _pylab_helpers.Gcf.destroy(manager.num)
         else:
-            error_msg('Unrecognized argument type to close')
+            error_msg('Unrecognized argument type %s to close'%type(arg))
     else:
         error_msg('close takes 0 or 1 arguments')
 
@@ -757,6 +757,15 @@ def figlegend(handles, labels, loc, **kwargs):
     l=  gcf().legend(handles, labels, loc, **kwargs)
     draw_if_interactive()
     return l
+
+def savefig(*args, **kwargs):    
+    try: ret =  gcf().savefig(*args, **kwargs)
+    except RuntimeError, msg:
+        msg = raise_msg_to_str(msg)
+        error_msg(msg)
+        raise RuntimeError(msg)
+    else: return ret
+savefig.__doc__ = Figure.savefig.__doc__
     
 
 def figure(num=None, # autoincrement if None, else integer from 1-N
@@ -767,23 +776,27 @@ def figure(num=None, # autoincrement if None, else integer from 1-N
            frameon = True,
            ):
     """
-    figure(num = 1, figsize=(8, 6), dpi=80, facecolor='w', edgecolor='k')
+    figure(num = None, figsize=(8, 6), dpi=80, facecolor='w', edgecolor='k')
+
 
+    Create a new figure and return a handle to it.  If num=None, the
+    figure number will be incremented and a new figure will be
+    created.
 
-    Create a new figure and return a handle to it
 
-    If figure(num) already exists, make it active and return the
-    handle to it.
+    If num is an integer, and figure(num) already exists, make it
+    active and return the handle to it.  If figure(num) does not exist
+    it will be created.  Numbering starts at 1, matlab style
 
       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
-    edgecolor - the border color; defaults to rc figure.edgecolor
+
+    kwargs:
+
+      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
+      edgecolor - the border color; defaults to rc figure.edgecolor
 
     rcParams gives the default values from the .matplotlibrc file
 
@@ -1019,28 +1032,6 @@ def save(fname, X, fmt='%1.4f'):
     if origShape is not None:
         X.shape = origShape
 
-def savefig(*args, **kwargs):
-    """
-    SAVEFIG(fname, dpi=150, facecolor='w', edgecolor='w',
-            orientation='portrait'):
-
-    Save the current figure to filename fname.  dpi is the resolution
-    in dots per inch.
-
-    Output file types currently supported are jpeg and png and will be
-    deduced by the extension to fname
-
-    facecolor and edgecolor are the colors os the figure rectangle
-
-    orientation is either 'landscape' or 'portrait' - not supported on
-    all backends; currently only on postscript output."""
-
-    for key in ('dpi', 'facecolor', 'edgecolor'):
-        if not kwargs.has_key(key):
-            kwargs[key] = rcParams['savefig.%s'%key]
-
-    manager = get_current_fig_manager()
-    manager.canvas.print_figure(*args, **kwargs)
 
 class _ObjectInspector:
 

Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,7 @@ class FigureCanvasBase:`
`662`	`662`	`)`
`663`	`663`
`664`	`664`	`def __init__(self, figure):`
	`665`	`+ figure.set_canvas(self)`
`665`	`666`	`self.figure = figure`
`666`	`667`	`self.cid = 0`
`667`	`668`	`# a dictionary from event name to a dictionary that maps cid->func`