mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't use pywrap (closes #983)

Browse Source
This commit is contained in:
Steven G. Johnson 2017-07-26 16:34:03 -04:00
parent 228d3af1fa
commit 2c191dbdbf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/backends/pyplot.jl
View File

@ -70,18 +70,18 @@ function _initialize_backend(::PyPlotBackend)
append!(Base.Multimedia.displays, otherdisplays) append!(Base.Multimedia.displays, otherdisplays)
export PyPlot export PyPlot
const pycolors = PyPlot.pywrap(PyPlot.pyimport("matplotlib.colors")) const pycolors = PyPlot.pyimport("matplotlib.colors")
const pypath = PyPlot.pywrap(PyPlot.pyimport("matplotlib.path")) const pypath = PyPlot.pyimport("matplotlib.path")
const mplot3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d")) const mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
const pypatches = PyPlot.pywrap(PyPlot.pyimport("matplotlib.patches")) const pypatches = PyPlot.pyimport("matplotlib.patches")
const pyfont = PyPlot.pywrap(PyPlot.pyimport("matplotlib.font_manager")) const pyfont = PyPlot.pyimport("matplotlib.font_manager")
const pyticker = PyPlot.pywrap(PyPlot.pyimport("matplotlib.ticker")) const pyticker = PyPlot.pyimport("matplotlib.ticker")
const pycmap = PyPlot.pywrap(PyPlot.pyimport("matplotlib.cm")) const pycmap = PyPlot.pyimport("matplotlib.cm")
const pynp = PyPlot.pywrap(PyPlot.pyimport("numpy")) const pynp = PyPlot.pyimport("numpy")
pynp.seterr(invalid="ignore") pynp["seterr"](invalid="ignore")
const pytransforms = PyPlot.pywrap(PyPlot.pyimport("matplotlib.transforms")) const pytransforms = PyPlot.pyimport("matplotlib.transforms")
const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections")) const pycollections = PyPlot.pyimport("matplotlib.collections")
const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d")) const pyart3d = PyPlot.pyimport("mpl_toolkits.mplot3d.art3d")
# we don't want every command to update the figure # we don't want every command to update the figure
PyPlot.ioff() PyPlot.ioff()
@ -118,7 +118,7 @@ py_color(grad::ColorGradient) = py_color(grad.colors)
function py_colormap(grad::ColorGradient) function py_colormap(grad::ColorGradient)
pyvals = [(z, py_color(grad[z])) for z in grad.values] pyvals = [(z, py_color(grad[z])) for z in grad.values]
cm = pycolors.LinearSegmentedColormap[:from_list]("tmp", pyvals) cm = pycolors["LinearSegmentedColormap"][:from_list]("tmp", pyvals)
cm[:set_bad](color=(0,0,0,0.0), alpha=0.0) cm[:set_bad](color=(0,0,0,0.0), alpha=0.0)
cm cm
end end
@ -256,7 +256,7 @@ function labelfunc(scale::Symbol, backend::PyPlotBackend)
end end
function py_mask_nans(z) function py_mask_nans(z)
# PyPlot.pywrap(pynp.ma[:masked_invalid](PyPlot.pywrap(z))) # pynp.ma[:masked_invalid](z)))
PyCall.pycall(pynp.ma[:masked_invalid], Any, z) PyCall.pycall(pynp.ma[:masked_invalid], Any, z)
# pynp.ma[:masked_where](pynp.isnan(z),z) # pynp.ma[:masked_where](pynp.isnan(z),z)
end end