[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Apr 14 11:40:30 PDT 2014
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/7c4f06843e5d/
Changeset: 7c4f06843e5d
Branch: yt-fork-eps1
User: john_regan
Date: 2014-04-03 15:06:00
Summary: Created new branch yt-fork-eps1
Affected #: 0 files
https://bitbucket.org/yt_analysis/yt/commits/3283af056b41/
Changeset: 3283af056b41
Branch: yt-fork-eps1
User: John Regan
Date: 2014-04-04 08:44:05
Summary: Updates to the eps_writer.py code including outputting to png and jpeg. single_plot also now accepts image arrays as input
Affected #: 1 file
diff -r 7c4f06843e5d9f8040b1458041e1b2cbfff730cd -r 3283af056b4141f2c1eb5526511e1a52b32fe097 yt/visualization/eps_writer.py
--- a/yt/visualization/eps_writer.py
+++ b/yt/visualization/eps_writer.py
@@ -15,6 +15,7 @@
import pyx
import numpy as np
from matplotlib import cm
+import matplotlib.pyplot as plt
from _mpl_imports import FigureCanvasAgg
from yt.utilities.logger import ytLogger as mylog
@@ -288,9 +289,7 @@
"""
if isinstance(plot, (PlotWindow, PhasePlot)):
plot.refresh()
- else:
- plot._redraw_image()
- if isinstance(plot, (VMPlot, PlotWindow)):
+ elif isinstance(plot, (VMPlot, PlotWindow)):
if isinstance(plot, PlotWindow):
data = plot._frb
width = plot.width[0]
@@ -344,6 +343,26 @@
_ylabel = plot[k].axes.get_ylabel()
if tickcolor == None:
_tickcolor = None
+ elif isinstance(plot, np.ndarray):
+ ax = plt.gca()
+ _xrange = ax.get_xlim()
+ _yrange = ax.get_ylim()
+ _xlog=False
+ _ylog=False
+ if bare_axes:
+ _xlabel = ""
+ _ylabel = ""
+ else:
+ if xlabel != None:
+ _xlabel = xlabel
+ else:
+ _xlabel = ax.get_xlabel()
+ if ylabel != None:
+ _ylabel = ylabel
+ else:
+ _ylabel = ax.get_ylabel()
+ if tickcolor == None:
+ _tickcolor = None
else:
_xrange = plot._axes.get_xlim()
_yrange = plot._axes.get_ylim()
@@ -461,6 +480,13 @@
# Remove colorbar
_p1 = plot._figure
_p1.delaxes(_p1.axes[1])
+ elif isinstance(plot, np.ndarray):
+ fig = plt.figure()
+ iplot = plt.figimage(plot)
+ _p1 = iplot.figure
+ _p1.set_size_inches(self.figsize[0], self.figsize[1])
+ ax = plt.gca();
+ _p1.add_axes(ax)
else:
raise RuntimeError("Unknown plot type")
@@ -855,7 +881,7 @@
#=============================================================================
- def save_fig(self, filename="test", format="eps"):
+ def save_fig(self, filename="test", format="eps", resolution=250):
r"""Saves current figure to a file.
Parameters
@@ -875,6 +901,10 @@
self.canvas.writeEPSfile(filename)
elif format == "pdf":
self.canvas.writePDFfile(filename)
+ elif format == "png":
+ self.canvas.writeGSfile(filename+".png", "png16m", resolution=resolution)
+ elif format == "jpg":
+ self.canvas.writeGSfile(filename+".jpeg", "jpeg", resolution=resolution)
else:
raise RuntimeError("format %s unknown." % (format))
https://bitbucket.org/yt_analysis/yt/commits/b6a34f2f4501/
Changeset: b6a34f2f4501
Branch: yt
User: MatthewTurk
Date: 2014-04-14 20:40:24
Summary: Merged in john_regan/yt-fork-eps1/yt-fork-eps1 (pull request #793)
Updates to eps_writer.py
Affected #: 1 file
diff -r adb3948387b1616858721cc0528556b90b81cde2 -r b6a34f2f4501a91307934381d8aab557e3a47d9e yt/visualization/eps_writer.py
--- a/yt/visualization/eps_writer.py
+++ b/yt/visualization/eps_writer.py
@@ -15,6 +15,7 @@
import pyx
import numpy as np
from matplotlib import cm
+import matplotlib.pyplot as plt
from _mpl_imports import FigureCanvasAgg
from yt.utilities.logger import ytLogger as mylog
@@ -288,9 +289,7 @@
"""
if isinstance(plot, (PlotWindow, PhasePlot)):
plot.refresh()
- else:
- plot._redraw_image()
- if isinstance(plot, (VMPlot, PlotWindow)):
+ elif isinstance(plot, (VMPlot, PlotWindow)):
if isinstance(plot, PlotWindow):
data = plot._frb
width = plot.width[0]
@@ -344,6 +343,26 @@
_ylabel = plot[k].axes.get_ylabel()
if tickcolor == None:
_tickcolor = None
+ elif isinstance(plot, np.ndarray):
+ ax = plt.gca()
+ _xrange = ax.get_xlim()
+ _yrange = ax.get_ylim()
+ _xlog=False
+ _ylog=False
+ if bare_axes:
+ _xlabel = ""
+ _ylabel = ""
+ else:
+ if xlabel != None:
+ _xlabel = xlabel
+ else:
+ _xlabel = ax.get_xlabel()
+ if ylabel != None:
+ _ylabel = ylabel
+ else:
+ _ylabel = ax.get_ylabel()
+ if tickcolor == None:
+ _tickcolor = None
else:
_xrange = plot._axes.get_xlim()
_yrange = plot._axes.get_ylim()
@@ -461,6 +480,13 @@
# Remove colorbar
_p1 = plot._figure
_p1.delaxes(_p1.axes[1])
+ elif isinstance(plot, np.ndarray):
+ fig = plt.figure()
+ iplot = plt.figimage(plot)
+ _p1 = iplot.figure
+ _p1.set_size_inches(self.figsize[0], self.figsize[1])
+ ax = plt.gca();
+ _p1.add_axes(ax)
else:
raise RuntimeError("Unknown plot type")
@@ -855,7 +881,7 @@
#=============================================================================
- def save_fig(self, filename="test", format="eps"):
+ def save_fig(self, filename="test", format="eps", resolution=250):
r"""Saves current figure to a file.
Parameters
@@ -875,6 +901,10 @@
self.canvas.writeEPSfile(filename)
elif format == "pdf":
self.canvas.writePDFfile(filename)
+ elif format == "png":
+ self.canvas.writeGSfile(filename+".png", "png16m", resolution=resolution)
+ elif format == "jpg":
+ self.canvas.writeGSfile(filename+".jpeg", "jpeg", resolution=resolution)
else:
raise RuntimeError("format %s unknown." % (format))
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list