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

pyplot trisurface support

Browse Source
This commit is contained in:
Thomas Breloff 2016-04-26 14:20:07 -04:00
parent 6c9e818abd
commit b9d20142a2
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/backends/pyplot.jl
View File

@ -492,26 +492,43 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
end end
if lt in (:surface, :wireframe) if lt in (:surface, :wireframe)
x, y, z = map(Array, (x,y,z)) if typeof(z) <: AbstractMatrix
if !ismatrix(x) || !ismatrix(y) x, y, z = map(Array, (x,y,z))
x = repmat(x', length(y), 1) if !ismatrix(x) || !ismatrix(y)
y = repmat(y, 1, length(d[:x])) x = repmat(x', length(y), 1)
z = z' y = repmat(y, 1, length(d[:x]))
end z = z'
if lt == :surface end
extrakw[:cmap] = pyfillcolormap(d) if lt == :surface
extrakw[:cmap] = pyfillcolormap(d)
needs_colorbar = true
end
handle = ax[lt == :surface ? :plot_surface : :plot_wireframe](x, y, z;
label = d[:label],
zorder = plt.n,
rstride = 1,
cstride = 1,
linewidth = d[:linewidth],
edgecolor = pylinecolor(d),
extrakw...
)
push!(handles, handle)
elseif typeof(z) <: AbstractVector
# tri-surface plot (http://matplotlib.org/mpl_toolkits/mplot3d/tutorial.html#tri-surface-plots)
handle = ax[:plot_trisurf](x, y, z;
label = d[:label],
zorder = plt.n,
cmap = pyfillcolormap(d),
linewidth = d[:linewidth],
edgecolor = pylinecolor(d)
)
push!(handles, handle)
needs_colorbar = true needs_colorbar = true
else
error("Unsupported z type $(typeof(z)) for linetype=$lt")
end end
handle = ax[lt == :surface ? :plot_surface : :plot_wireframe](x, y, z;
label = d[:label],
zorder = plt.n,
rstride = 1,
cstride = 1,
linewidth = d[:linewidth],
edgecolor = pylinecolor(d),
extrakw...
)
push!(handles, handle)
end end
if lt == :heatmap if lt == :heatmap