[yt-svn] commit/yt: 9 new changesets
Bitbucket
commits-noreply at bitbucket.org
Wed Oct 10 17:00:35 PDT 2012
9 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/f2764b963f74/
changeset: f2764b963f74
branch: yt
user: ngoldbaum
date: 2012-10-08 22:39:33
summary: Prepending sys.path with current working directory when running via 'yt load'.
The ipython embed api doesn't do this automatically for some reason.
affected #: 1 file
diff -r bbb6d92725d80fa6b8ed60725524bdaeb8539325 -r f2764b963f74e9b3a95cb2ca9bb725e776c3b291 yt/utilities/command_line.py
--- a/yt/utilities/command_line.py
+++ b/yt/utilities/command_line.py
@@ -1095,8 +1095,12 @@
)
else:
from IPython.config.loader import Config
+ import sys
cfg = Config()
+ # prepend sys.path with current working directory
+ sys.path.insert(0,'')
IPython.embed(config=cfg,user_ns=local_ns)
+
class YTMapserverCmd(YTCommand):
args = ("proj", "field", "weight",
https://bitbucket.org/yt_analysis/yt/changeset/60ac41fcb525/
changeset: 60ac41fcb525
branch: yt
user: ngoldbaum
date: 2012-10-09 19:22:56
summary: Fixing the way write_projection saves pdf, eps, and ps files. Closes #433
affected #: 1 file
diff -r b5b438054310909ce9395a5b359a9bc0caf7326e -r 60ac41fcb525de416acdfb52a3eac061a3484e00 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,8 +420,10 @@
else:
dpi = None
- if filename[-4:] == '.png':
- suffix = ''
+ if filename[-4:] in ['.png','.pdf','.eps']:
+ suffix = filename[-4:]
+ elif filename[-3:] == ['.ps']:
+ suffix = filename[-3:]
else:
suffix = '.png'
filename = "%s%s" % (filename, suffix)
@@ -432,9 +434,6 @@
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
canvas = FigureCanvasPS
- else:
- mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
- canvas = FigureCanvasAgg(fig)
canvas.print_figure(filename)
return filename
https://bitbucket.org/yt_analysis/yt/changeset/e3eb7f5db7c6/
changeset: e3eb7f5db7c6
branch: yt
user: ngoldbaum
date: 2012-10-09 19:35:01
summary: Removing the import * from write_projection. Small adjustments to avoid errors.
eps writing is broken (something is wrong on the matplotlib end)
affected #: 1 file
diff -r 60ac41fcb525de416acdfb52a3eac061a3484e00 -r e3eb7f5db7c674cacf48cc74a449ecd862c364d5 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -379,7 +379,7 @@
take_log=True)
"""
import matplotlib
- from ._mpl_imports import *
+ from ._mpl_imports import FigureCanvasAgg, FigureCanvasPdf, FigureCanvasPS
# If this is rendered as log, then apply now.
if take_log:
@@ -427,14 +427,14 @@
else:
suffix = '.png'
filename = "%s%s" % (filename, suffix)
- mylog.info("Saving plot %s", fn)
+ mylog.info("Saving plot %s", filename)
if suffix == ".png":
canvas = FigureCanvasAgg(fig)
elif suffix == ".pdf":
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
canvas = FigureCanvasPS
- canvas.print_figure(filename)
+ canvas.print_figure(canvas,filename)
return filename
https://bitbucket.org/yt_analysis/yt/changeset/a812f858bfe9/
changeset: a812f858bfe9
branch: yt
user: ngoldbaum
date: 2012-10-09 19:35:47
summary: Merging.
affected #: 0 files
https://bitbucket.org/yt_analysis/yt/changeset/7fe50a49a33d/
changeset: 7fe50a49a33d
branch: yt
user: ngoldbaum
date: 2012-10-09 19:37:15
summary: Fixing a typo in the previous commit.
affected #: 1 file
diff -r a812f858bfe9f3123d865706adbbef619e575c01 -r 7fe50a49a33dad6aefc58dad1280d4e8204730c1 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -434,7 +434,7 @@
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
canvas = FigureCanvasPS
- canvas.print_figure(canvas,filename)
+ canvas.print_figure(filename)
return filename
https://bitbucket.org/yt_analysis/yt/changeset/cb26d14b546e/
changeset: cb26d14b546e
branch: yt
user: ngoldbaum
date: 2012-10-09 20:20:18
summary: Needed to make sure the instance of FigureCanvasPS is instantiated. Thanks swskillman.
affected #: 1 file
diff -r 7fe50a49a33dad6aefc58dad1280d4e8204730c1 -r cb26d14b546e778488c1dd254e4b5178f5173610 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -433,7 +433,7 @@
elif suffix == ".pdf":
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
- canvas = FigureCanvasPS
+ canvas = FigureCanvasPS(fig)
canvas.print_figure(filename)
return filename
https://bitbucket.org/yt_analysis/yt/changeset/7f8facef5611/
changeset: 7f8facef5611
branch: yt
user: ngoldbaum
date: 2012-10-09 20:42:39
summary: Updating to use os.path.splitext. Thanks for the suggestion Kacper!
affected #: 1 file
diff -r cb26d14b546e778488c1dd254e4b5178f5173610 -r 7f8facef5611e45ca30fb2a74f108cb40714e41e yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -420,11 +420,12 @@
else:
dpi = None
- if filename[-4:] in ['.png','.pdf','.eps']:
- suffix = filename[-4:]
- elif filename[-3:] == ['.ps']:
- suffix = filename[-3:]
- else:
+ suffix = os.path.splitext(filename)[1]
+
+ if suffix not in ['.png','.pdf','.eps','.ps','']:
+ mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
+ canvas = FigureCanvasAgg(fig)
+ if suffix == '':
suffix = '.png'
filename = "%s%s" % (filename, suffix)
mylog.info("Saving plot %s", filename)
https://bitbucket.org/yt_analysis/yt/changeset/71c08c9a117b/
changeset: 71c08c9a117b
branch: yt
user: ngoldbaum
date: 2012-10-09 21:05:36
summary: Similar fixes for plot window. Cleaning up image writer.
affected #: 2 files
diff -r 7f8facef5611e45ca30fb2a74f108cb40714e41e -r 71c08c9a117b27216111cdf86b8125c6c82a20a0 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -422,9 +422,6 @@
suffix = os.path.splitext(filename)[1]
- if suffix not in ['.png','.pdf','.eps','.ps','']:
- mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
- canvas = FigureCanvasAgg(fig)
if suffix == '':
suffix = '.png'
filename = "%s%s" % (filename, suffix)
@@ -435,6 +432,10 @@
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
canvas = FigureCanvasPS(fig)
+ else:
+ mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
+ canvas = FigureCanvasAgg(fig)
+
canvas.print_figure(filename)
return filename
diff -r 7f8facef5611e45ca30fb2a74f108cb40714e41e -r 71c08c9a117b27216111cdf86b8125c6c82a20a0 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -849,7 +849,8 @@
if mpl_kwargs is None: mpl_kwargs = {}
if name == None:
name = str(self.pf)
- elif name.endswith('.png'):
+ suffix = os.path.splitext(name)[1]
+ if suffix != '':
for k, v in self.plots.iteritems():
names.append(v.save(name,mpl_kwargs))
return names
@@ -1401,24 +1402,25 @@
self.cax = self.figure.add_axes(caxrect)
def save(self, name, mpl_kwargs, canvas = None):
- if name[-4:] == '.png':
- suffix = ''
+ suffix = os.path.splitext(name)[1]
+
+ if suffix == '':
+ suffix = '.png'
+ name = "%s%s" % (name, suffix)
+ mylog.info("Saving plot %s", name)
+ if suffix == ".png":
+ canvas = FigureCanvasAgg(self.figure)
+ elif suffix == ".pdf":
+ canvas = FigureCanvasPdf(self.figure)
+ elif suffix in (".eps", ".ps"):
+ canvas = FigureCanvasPS(self.figure)
else:
- suffix = '.png'
- fn = "%s%s" % (name, suffix)
- mylog.info("Saving plot %s", fn)
- if canvas is None:
- if suffix == ".png":
- canvas = FigureCanvasAgg(self.figure)
- elif suffix == ".pdf":
- canvas = FigureCanvasPdf(self.figure)
- elif suffix in (".eps", ".ps"):
- canvas = FigureCanvasPS
- else:
- mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
- canvas = FigureCanvasAgg(self.figure)
- canvas.print_figure(fn,**mpl_kwargs)
- return fn
+ mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
+ canvas = FigureCanvasAgg(self.figure)
+
+
+ canvas.print_figure(name,**mpl_kwargs)
+ return name
def _get_best_layout(self, size):
aspect = 1.0*size[0]/size[1]
https://bitbucket.org/yt_analysis/yt/changeset/55f172f94082/
changeset: 55f172f94082
branch: yt
user: MatthewTurk
date: 2012-10-11 02:00:34
summary: Merged in ngoldbaum/yt (pull request #293)
affected #: 2 files
diff -r f180d1f7c69863af81f5662df66da37b0e71b4ea -r 55f172f9408258b84c29824f97ba4e9b3b344cd2 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -379,7 +379,7 @@
take_log=True)
"""
import matplotlib
- from ._mpl_imports import *
+ from ._mpl_imports import FigureCanvasAgg, FigureCanvasPdf, FigureCanvasPS
# If this is rendered as log, then apply now.
if take_log:
@@ -420,21 +420,22 @@
else:
dpi = None
- if filename[-4:] == '.png':
- suffix = ''
- else:
+ suffix = os.path.splitext(filename)[1]
+
+ if suffix == '':
suffix = '.png'
filename = "%s%s" % (filename, suffix)
- mylog.info("Saving plot %s", fn)
+ mylog.info("Saving plot %s", filename)
if suffix == ".png":
canvas = FigureCanvasAgg(fig)
elif suffix == ".pdf":
canvas = FigureCanvasPdf(fig)
elif suffix in (".eps", ".ps"):
- canvas = FigureCanvasPS
+ canvas = FigureCanvasPS(fig)
else:
mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
canvas = FigureCanvasAgg(fig)
+
canvas.print_figure(filename)
return filename
diff -r f180d1f7c69863af81f5662df66da37b0e71b4ea -r 55f172f9408258b84c29824f97ba4e9b3b344cd2 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -858,7 +858,8 @@
if mpl_kwargs is None: mpl_kwargs = {}
if name == None:
name = str(self.pf)
- elif name.endswith('.png'):
+ suffix = os.path.splitext(name)[1]
+ if suffix != '':
for k, v in self.plots.iteritems():
names.append(v.save(name,mpl_kwargs))
return names
@@ -1410,24 +1411,25 @@
self.cax = self.figure.add_axes(caxrect)
def save(self, name, mpl_kwargs, canvas = None):
- if name[-4:] == '.png':
- suffix = ''
+ suffix = os.path.splitext(name)[1]
+
+ if suffix == '':
+ suffix = '.png'
+ name = "%s%s" % (name, suffix)
+ mylog.info("Saving plot %s", name)
+ if suffix == ".png":
+ canvas = FigureCanvasAgg(self.figure)
+ elif suffix == ".pdf":
+ canvas = FigureCanvasPdf(self.figure)
+ elif suffix in (".eps", ".ps"):
+ canvas = FigureCanvasPS(self.figure)
else:
- suffix = '.png'
- fn = "%s%s" % (name, suffix)
- mylog.info("Saving plot %s", fn)
- if canvas is None:
- if suffix == ".png":
- canvas = FigureCanvasAgg(self.figure)
- elif suffix == ".pdf":
- canvas = FigureCanvasPdf(self.figure)
- elif suffix in (".eps", ".ps"):
- canvas = FigureCanvasPS
- else:
- mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
- canvas = FigureCanvasAgg(self.figure)
- canvas.print_figure(fn,**mpl_kwargs)
- return fn
+ mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
+ canvas = FigureCanvasAgg(self.figure)
+
+
+ canvas.print_figure(name,**mpl_kwargs)
+ return name
def _get_best_layout(self, size):
aspect = 1.0*size[0]/size[1]
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