[yt-svn] commit/yt: MatthewTurk: Merged in ngoldbaum/yt/yt-3.0 (pull request #1017)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Jul 14 10:54:45 PDT 2014
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/8676f068d48f/
Changeset: 8676f068d48f
Branch: yt-3.0
User: MatthewTurk
Date: 2014-07-14 19:54:38
Summary: Merged in ngoldbaum/yt/yt-3.0 (pull request #1017)
Update contour plots for matplotlib 1.4.0. Closes #764
Affected #: 2 files
diff -r 09146962c600a00acc3200043f73f44bd0221f3b -r 8676f068d48fae5fcc84d69f000686e27c74167c yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -16,6 +16,9 @@
import numpy as np
import h5py
+
+from distutils.version import LooseVersion
+
from matplotlib.patches import Circle
from yt.funcs import *
@@ -263,8 +266,6 @@
self.ncont = ncont
self.field = field
self.factor = factor
- from matplotlib.delaunay.triangulate import Triangulation as triang
- self.triang = triang
self.clim = clim
self.take_log = take_log
if plot_args is None: plot_args = {'colors':'k'}
@@ -333,7 +334,14 @@
# Both the input and output from the triangulator are in plot
# coordinates
- zi = self.triang(x,y).nn_interpolator(z)(xi,yi)
+ if LooseVersion(matplotlib.__version__) < LooseVersion("1.4.0"):
+ from matplotlib.delaunay.triangulate import Triangulation as \
+ triang
+ zi = triang(x,y).nn_interpolator(z)(xi,yi)
+ else:
+ from matplotlib.tri import Triangulation, LinearTriInterpolator
+ triangulation = Triangulation(x, y)
+ zi = LinearTriInterpolator(triangulation, z)(xi,yi)
elif plot._type_name == 'OffAxisProjection':
zi = plot.frb[self.field][::self.factor,::self.factor].transpose()
diff -r 09146962c600a00acc3200043f73f44bd0221f3b -r 8676f068d48fae5fcc84d69f000686e27c74167c yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -19,9 +19,8 @@
import sys
import warnings
-from matplotlib.delaunay.triangulate import Triangulation as triang
+from distutils.version import LooseVersion
from matplotlib.mathtext import MathTextParser
-from distutils import version
from numbers import Number
from ._mpl_imports import FigureCanvasAgg
@@ -66,8 +65,7 @@
# included in matplotlib (not in gentoo, yes in everything else)
# Also accounting for the fact that in 1.2.0, pyparsing got renamed.
try:
- if version.LooseVersion(matplotlib.__version__) < \
- version.LooseVersion("1.2.0"):
+ if LooseVersion(matplotlib.__version__) < LooseVersion("1.2.0"):
from matplotlib.pyparsing import ParseFatalException
else:
if sys.version_info[0] == 3:
@@ -1529,7 +1527,13 @@
y = raw_data['py']
z = raw_data[field]
if logit: z = np.log10(z)
- fvals = triang(x,y).nn_interpolator(z)(xi,yi).transpose()[::-1,:]
+ if LooseVersion(matplotlib.__version__) < LooseVersion("1.4.0"):
+ from matplotlib.delaunay.triangulate import Triangulation as triang
+ fvals = triang(x,y).nn_interpolator(z)(xi,yi).transpose()[::-1,:]
+ else:
+ from matplotlib.tri import Triangulation, LinearTriInterpolator
+ t = Triangulation(x, y)
+ fvals = LinearTriInterpolator(t, z)(xi, yi).transpose()[::-1,:]
ax.contour(fvals, number, colors='w')
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