From 69190cb4e87a8a6ab0193109dafca60962b6df0b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 10 May 2012 16:29:38 -0400 Subject: [PATCH] Fix plot option defaulting. Replace another plot() function. --- mjo/plot.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mjo/plot.py b/mjo/plot.py index d330123..0eaf079 100644 --- a/mjo/plot.py +++ b/mjo/plot.py @@ -14,19 +14,25 @@ def mjo_plot(*args, **kwargs): """ plot_opts = { 'tick_formatter': 'latex' } - - legend_opts = { 'back_color': 'white', - 'shadow': True } # Merge the user's plot options with mine. The ones given as # kwargs should override the defaults! plot_opts.update(kwargs) kwargs = plot_opts + p = sage_plot(*args, **kwargs) - p.set_legend_options(**legend_opts) + + # Merge the user's legend options with mine. The ones passed to us + # should override the defaults! + default_legend_opts = { 'back_color': 'white', + 'shadow': True } + default_legend_opts.update(p._Graphics__legend_opts) + p._Graphics__legend_opts = default_legend_opts + return p -# Replace both the global `plot` and the one in the module. I am +# Replace both the global `plot` and the ones in the modules. I am # unclear about why this is necessary, and don't care too much. sage.plot.plot.plot = mjo_plot +sage.plot.all.plot = mjo_plot plot = mjo_plot -- 2.44.2