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

Working on colormaps

Browse Source
This commit is contained in:
Josef Heinen 2016-05-08 10:55:27 +02:00
parent b6334176e4
commit 42d09a6d80
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/gr.jl
View File

@ -427,6 +427,17 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
for p in plt.seriesargs for p in plt.seriesargs
lt = p[:linetype] lt = p[:linetype]
if lt in (:hist2d, :hexbin, :contour, :surface, :wireframe, :heatmap)
if haskey(d, :color_palette)
ci = 1000
for cv in d[:color_palette]
GR.setcolorrep(ci, cv.r, cv.g, cv.b)
ci += 1
end
else
GR.setcolormap(GR.COLORMAP_COOLWARM)
end
end
if get(d, :polar, false) if get(d, :polar, false)
lt = :polar lt = :polar
end end
@ -554,7 +565,6 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
x, y, H = Base.hist2d(E, xbins, ybins) x, y, H = Base.hist2d(E, xbins, ybins)
counts = round(Int32, 1000 + 255 * H / maximum(H)) counts = round(Int32, 1000 + 255 * H / maximum(H))
n, m = size(counts) n, m = size(counts)
GR.setcolormap(GR.COLORMAP_COOLWARM)
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])
@ -573,7 +583,6 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
else else
h = linspace(zmin, zmax, p[:levels]) h = linspace(zmin, zmax, p[:levels])
end end
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,
viewport[3], viewport[4]) viewport[3], viewport[4])
@ -602,7 +611,6 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
end end
z = reshape(z, length(x) * length(y)) z = reshape(z, length(x) * length(y))
if lt == :surface if lt == :surface
GR.setcolormap(GR.COLORMAP_COOLWARM)
GR.gr3.surface(x, y, z, GR.OPTION_COLORED_MESH) GR.gr3.surface(x, y, z, GR.OPTION_COLORED_MESH)
else else
GR.setfillcolorind(0) GR.setfillcolorind(0)
@ -621,7 +629,6 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
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_getzlims(d, minimum(z), maximum(z), true) 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)
z = reshape(z, length(x) * length(y)) z = reshape(z, length(x) * length(y))
GR.surface(x, y, z, GR.OPTION_CELL_ARRAY) GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
if cmap if cmap