Ticket #7981: trac-7981-show_options.patch

sage/plot/animate.py

@@ -54 +54 @@
         Animation with 5 frames
         sage: a.show()          # optional -- requires convert command
         sage: a[:5].show()      # optional
-    
+        sage: animate([plot(sin(x + float(k), (0,2*pi),ymin=-5,ymax=5)) for k in srange(0,2*pi,0.3)]).show() # optional
+        
     The ``show`` function takes arguments to specify the
     delay between frames (measured in hundredths of a second, default
     value 20) and the number of iterations (default value 0, which

sage/plot/plot.py

@@ -1419 +1419 @@
         # This option should not be passed on to save().
         linkmode = kwds.pop('linkmode', False)
 
-        options = {}
-        options.update(self.SHOW_OPTIONS)
-        options.update(self._extra_kwds)
-        options.update(kwds)
-
         if DOCTEST_MODE:
-            options.pop('filename')
-            self.save(DOCTEST_MODE_FILE, **options)
+            kwds.pop('filename',None)
+            self.save(filename=DOCTEST_MODE_FILE, **kwds)
         elif EMBEDDED_MODE:
-            if options['filename'] is None:
-                options['filename'] = sage.misc.misc.graphics_filename()
-            self.save(**options)
+            kwds.setdefault('filename',sage.misc.misc.graphics_filename())
+            self.save(**kwds)
             if linkmode == True:
-                return "<img src='cell://%s'>" % options['filename']
+                return "<img src='cell://%s'>" % kwds['filename']
             else:
-                html("<img src='cell://%s'>" % options['filename'])
+                html("<img src='cell://%s'>" % kwds['filename'])
         else:
-            if options['filename'] is None:
-                options['filename'] = sage.misc.misc.tmp_filename() + '.png'
-            self.save(**options)
+            kwds.setdefault('filename',sage.misc.misc.tmp_filename() + '.png')
+            self.save(**kwds)
             os.system('%s %s 2>/dev/null 1>/dev/null &' % \
-                (sage.misc.viewer.browser(), options['filename']))
+                (sage.misc.viewer.browser(), kwds['filename']))
 
     def xmin(self, xmin=None):
         """
@@ -1895 +1888 @@
         #subplot.autoscale_view(tight=True) 
         return figure
 
-    def save(self, filename=None, dpi=DEFAULT_DPI, savenow=True, *args, **kwds):
+    def save(self, filename=None, savenow=True, *args, **kwds):
         r"""
         Save the graphics to an image file of type: PNG, PS, EPS, SVG,
         SOBJ, depending on the file extension you give the filename.
@@ -1921 +1914 @@
 
         ::
 
-            sage: c.show(figsize=[5,5], xmin=-1, xmax=3, ymin=-1, ymax=3)        
+            sage: c.show(figsize=[5,5], xmin=-1, xmax=3, ymin=-1, ymax=3)                   sage: point((-1,1),pointsize=30, color='red')
 
+        Also, show options are correctly passed from the graphics object::
 
-        
-        ::
-        
-            sage: point((-1,1),pointsize=30, color='red')
+            sage: c=circle((1,1), 1, color='red',xmin=-3,xmax=3,ymin=-4,ymax=5)
+            sage: c.save(DOCTEST_MODE_FILE)
 
         By default, the figure grows to include all of the graphics
         and text, so the final image may not be exactly the figure
@@ -1945 +1937 @@
             return
 
         if savenow:
-            options=dict()
-            options['transparent']=kwds.pop('transparent',False)
-            figure=self.matplotlib(*args, **kwds)
+            show_options=dict()
+            show_options.update(self.SHOW_OPTIONS)
+            show_options.update(self._extra_kwds)
+            show_options.update(kwds)
+
+            save_options=dict()
+            save_options['transparent']=show_options.pop('transparent',False)
+            save_options['dpi']=show_options.pop('dpi',DEFAULT_DPI)
+
+            figure=self.matplotlib(*args, **show_options)
             # You can output in PNG, PS, EPS, PDF, or SVG format, depending on the file extension. 
             # matplotlib looks at the file extension to see what the renderer should be.
             # The default is FigureCanvasAgg for PNG's because this is by far the most
@@ -1956 +1955 @@
             from matplotlib.backends.backend_agg import FigureCanvasAgg
             figure.set_canvas(FigureCanvasAgg(figure))
 
-            if ext in ['.eps', '.ps', '.pdf']:
-                if dpi is None:
-                    dpi = 72
-            elif ext == '.svg':
-                if dpi is None:
-                    dpi = 80
-            elif ext == '.png':
-                if dpi is None:
-                    dpi = 100
-            else:
-                raise ValueError, "file extension must be either 'png', 'ps, 'eps', 'pdf, 'svg' or 'sobj'"
-            figure.savefig(filename,dpi=dpi,bbox_inches='tight',**options)
+            if ext not in ['.svg', '.png', '.eps', '.ps', '.pdf']:
+                raise ValueError, "file extension must be either 'png', 'ps, 'eps', 'pdf, 'svg', or 'sobj'"
+            figure.savefig(filename,bbox_inches='tight',**save_options)
 
 
 _SelectiveFormatterClass = None