Changeset 5278:122c820a2276

Timestamp:

07/04/07 16:56:19 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

Added/improved how animated plotting works in SAGE.

Location:

sage/plot

Files:

• all.py (modified) (1 diff)
• animate.py (added)
• plot.py (modified) (3 diffs)

sage/plot/all.py

@@ -5 +5 @@
                   plot_vector_field, matrix_plot, bar_chart,
                   is_Graphics,
-                  show_default,
-                  plot_animated_gif)
+                  show_default)
+
+from animate import Animation as animate
 
 from plot3d import (Graphics3d, point3d, line3d, plot3d)

sage/plot/plot.py

@@ -120 +120 @@
 """
 
-#*****************************************************************************
-#  Copyright (C) 2006 Alex Clemesha <clemesha@gmail.com> and William Stein <wstein@ucsd.edu>
-#
+############################################################################
+#  Copyright (C) 2006 Alex Clemesha <clemesha@gmail.com> and William Stein <wstein@gmail.com>
 #  Distributed under the terms of the GNU General Public License (GPL)
-#
 #                  http://www.gnu.org/licenses/
-#*****************************************************************************
-
-import pdb
+############################################################################
 
 from sage.structure.sage_object import SageObject
 
-## IMPORTANT: Do not import matplotlib at module scope.  It takes a
+## IMPORTANT: Do *not* import matplotlib at module scope.  It takes a
 ## surprisingliy long time to initialize itself.  It's better if it is
 ## imported in functions, so it only gets started if it is actually
@@ -2684 +2680 @@
         if not isinstance(array, (list, tuple)):
             raise TypeError,"array (=%s) must be a list of lists of Graphics objects"%(array)
+        array = list(array)
         self._glist = []
         self._rows = len(array)
@@ -2913 +2910 @@
     return R
 
-
-
-#####################################
-def plot_animated_gif(G, delay=20, outfile=None, iterations=0,
-                      xmin=None, xmax=None, ymin=None, ymax=None, *args, **kwds):
-    """
-    Returns an animated gif composed from rendering the
-    graphics objects in the list G.
-
-    This function will only work if the Imagemagick command line tools
-    package is installed, i.e., you have the"convert" command.
-
-    INPUT:
-        G -- a list of plot objects
-        delay -- (default: 20) delay in hundredths of a second between frames
-        outfile -- file that the animated gif gets saved to
-        iterations -- integer (default: 0); number of iterations of
-                      animation.  If 0, loop forever. 
-        other options -- all are passed to the save command, 
-                         which is called on each input.
-
-    AUTHOR:
-        -- William Stein
-    """
-    if not outfile:
-        outfile = sage.misc.misc.graphics_filename(ext='gif')
-    if len(G) == 0:
-        raise ValueError, "G must be nonempty"
-    d = sage.misc.misc.tmp_dir()
-    if xmin is None: xmin = G[0].xmin()
-    if xmax is None: xmax = G[0].xmax()
-    if ymin is None: ymin = G[0].ymin()
-    if ymax is None: ymax = G[0].ymax()
-    for i in range(len(G)):
-        filename = '%s/%s'%(d,sage.misc.misc.pad_zeros(i,8))
-        G[i].save(filename + '.png', xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax, *args, **kwds)
-    if not outfile.endswith('.gif'):
-        outfile += '.gif'
-    outfile = os.path.abspath(outfile)
-    cmd = 'cd "%s"; convert -delay %s -loop %s *.png "%s"'%(d, int(delay), int(iterations), outfile)
-    os.system(cmd)
-