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

Added support for :zlims keyword

Browse Source
This commit is contained in:
Josef Heinen 2016-05-07 12:45:09 +02:00
parent b4fb9af8e4
commit 42a175bd53
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/gr.jl
View File

@ -166,6 +166,25 @@ function gr_polaraxes(rmin, rmax)
GR.restorestate() GR.restorestate()
end end
function gr_getzlims(d, zmin, zmax, adjust)
if haskey(d, :zlims)
if d[:zlims] != :auto
zlims = d[:zlims]
if zlims[1] != NaN
zmin = zlims[1]
end
if zlims[2] != NaN
zmax = zlims[2]
end
adjust = false
end
end
if adjust
zmin, zmax = GR.adjustrange(zmin, zmax)
end
zmin, zmax
end
function gr_display(plt::Plot{GRBackend}, clear=true, update=true, function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
subplot=[0, 1, 0, 1]) subplot=[0, 1, 0, 1])
d = plt.plotargs d = plt.plotargs
@ -531,20 +550,21 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
GR.cellarray(xmin, xmax, ymin, ymax, n, m, counts) GR.cellarray(xmin, xmax, ymin, ymax, n, m, counts)
GR.setviewport(viewport[2] + 0.02, viewport[2] + 0.05, GR.setviewport(viewport[2] + 0.02, viewport[2] + 0.05,
viewport[3], viewport[4]) viewport[3], viewport[4])
GR.setspace(0, maximum(counts), 0, 90) zmin, zmax = gr_getzlims(d, 0, maximum(counts), false)
GR.setspace(zmin, zmax, 0, 90)
diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2)
charheight = max(0.016 * diag, 0.01) charheight = max(0.016 * diag, 0.01)
GR.setcharheight(charheight) GR.setcharheight(charheight)
GR.colormap() GR.colormap()
elseif lt == :contour elseif lt == :contour
x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false) x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false)
zmin, zmax = minimum(z), maximum(z) zmin, zmax = gr_getzlims(d, minimum(z), maximum(z), false)
GR.setspace(zmin, zmax, 0, 90)
if typeof(p[:levels]) <: Array if typeof(p[:levels]) <: Array
h = p[:levels] h = p[:levels]
else else
h = linspace(zmin, zmax, p[:levels]) h = linspace(zmin, zmax, p[:levels])
end end
GR.setspace(zmin, zmax, 0, 90)
GR.setcolormap(GR.COLORMAP_COOLWARM) GR.setcolormap(GR.COLORMAP_COOLWARM)
GR.contour(x, y, h, reshape(z, length(x) * length(y)), 1000) GR.contour(x, y, h, reshape(z, length(x) * length(y)), 1000)
GR.setviewport(viewport[2] + 0.02, viewport[2] + 0.05, GR.setviewport(viewport[2] + 0.02, viewport[2] + 0.05,
@ -559,7 +579,7 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005) GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005)
elseif lt in [:surface, :wireframe] elseif lt in [:surface, :wireframe]
x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false) x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false)
zmin, zmax = GR.adjustrange(minimum(z), maximum(z)) zmin, zmax = gr_getzlims(d, minimum(z), maximum(z), true)
GR.setspace(zmin, zmax, 40, 70) GR.setspace(zmin, zmax, 40, 70)
xtick = GR.tick(xmin, xmax) / 2 xtick = GR.tick(xmin, xmax) / 2
ytick = GR.tick(ymin, ymax) / 2 ytick = GR.tick(ymin, ymax) / 2
@ -591,7 +611,7 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
end end
elseif lt == :heatmap elseif lt == :heatmap
x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false) x, y, z = p[:x], p[:y], transpose_z(p, p[:z].surf, false)
zmin, zmax = GR.adjustrange(minimum(z), maximum(z)) zmin, zmax = gr_getzlims(d, minimum(z), maximum(z), true)
GR.setspace(zmin, zmax, 0, 90) GR.setspace(zmin, zmax, 0, 90)
GR.setcolormap(GR.COLORMAP_COOLWARM) GR.setcolormap(GR.COLORMAP_COOLWARM)
z = reshape(z, length(x) * length(y)) z = reshape(z, length(x) * length(y))
@ -603,7 +623,7 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
end end
elseif lt in [:path3d, :scatter3d] elseif lt in [:path3d, :scatter3d]
x, y, z = p[:x], p[:y], p[:z] x, y, z = p[:x], p[:y], p[:z]
zmin, zmax = GR.adjustrange(minimum(z), maximum(z)) zmin, zmax = gr_getzlims(d, minimum(z), maximum(z), true)
GR.setspace(zmin, zmax, 40, 70) GR.setspace(zmin, zmax, 40, 70)
xtick = GR.tick(xmin, xmax) / 2 xtick = GR.tick(xmin, xmax) / 2
ytick = GR.tick(ymin, ymax) / 2 ytick = GR.tick(ymin, ymax) / 2