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

make GR use hascolorbar

Browse Source
This commit is contained in:
Daniel Schwabeneder 2017-09-09 10:05:58 +02:00
parent da5a538f89
commit 7dfa1ec984
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/backends/gr.jl
View File

@ -341,7 +341,7 @@ function gr_draw_markers(series::Series, x, y, clims)
mz = normalize_zvals(series[:marker_z], clims) mz = normalize_zvals(series[:marker_z], clims)
GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillintstyle(GR.INTSTYLE_SOLID)
gr_draw_markers(series, x, y, series[:markersize], mz) gr_draw_markers(series, x, y, series[:markersize], mz)
if mz != nothing if hascolorbar(series[:subplot])
GR.setscale(0) GR.setscale(0)
gr_colorbar(series[:subplot], clims) gr_colorbar(series[:subplot], clims)
end end
@ -447,25 +447,21 @@ end
# add the colorbar # add the colorbar
function gr_colorbar(sp::Subplot) function gr_colorbar(sp::Subplot)
if sp[:colorbar] != :none gr_set_viewport_cmap(sp)
gr_set_viewport_cmap(sp) GR.colorbar()
GR.colorbar() gr_set_viewport_plotarea()
gr_set_viewport_plotarea()
end
end end
function gr_colorbar(sp::Subplot, clims) function gr_colorbar(sp::Subplot, clims)
if sp[:colorbar] != :none xmin, xmax = gr_xy_axislims(sp)[1:2]
xmin, xmax = gr_xy_axislims(sp)[1:2] gr_set_viewport_cmap(sp)
gr_set_viewport_cmap(sp) l = zeros(Int32, 1, 256)
l = zeros(Int32, 1, 256) l[1,:] = Int[round(Int, _i) for _i in linspace(1000, 1255, 256)]
l[1,:] = Int[round(Int, _i) for _i in linspace(1000, 1255, 256)] GR.setwindow(xmin, xmax, clims[1], clims[2])
GR.setwindow(xmin, xmax, clims[1], clims[2]) GR.cellarray(xmin, xmax, clims[2], clims[1], 1, length(l), l)
GR.cellarray(xmin, xmax, clims[2], clims[1], 1, length(l), l) ztick = 0.5 * GR.tick(clims[1], clims[2])
ztick = 0.5 * GR.tick(clims[1], clims[2]) GR.axes(0, ztick, xmax, clims[1], 0, 1, 0.005)
GR.axes(0, ztick, xmax, clims[1], 0, 1, 0.005) gr_set_viewport_plotarea()
gr_set_viewport_plotarea()
end
end end
gr_view_xcenter() = 0.5 * (viewport_plotarea[1] + viewport_plotarea[2]) gr_view_xcenter() = 0.5 * (viewport_plotarea[1] + viewport_plotarea[2])
@ -677,14 +673,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# reduced from before... set some flags based on the series in this subplot # reduced from before... set some flags based on the series in this subplot
# TODO: can these be generic flags? # TODO: can these be generic flags?
outside_ticks = false outside_ticks = false
cmap = false cmap = hascolorbar(sp)
draw_axes = sp[:framestyle] != :none draw_axes = sp[:framestyle] != :none
# axes_2d = true # axes_2d = true
for series in series_list(sp) for series in series_list(sp)
st = series[:seriestype] st = series[:seriestype]
if st in (:contour, :surface, :heatmap) || series[:marker_z] != nothing
cmap = true
end
if st == :pie if st == :pie
draw_axes = false draw_axes = false
end end
@ -698,7 +691,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
end end
if cmap && sp[:colorbar] != :none if cmap
# note: add extra midpadding on the right for the colorbar # note: add extra midpadding on the right for the colorbar
viewport_plotarea[2] -= 0.1 viewport_plotarea[2] -= 0.1
end end
@ -983,7 +976,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
# create the colorbar of contour levels # create the colorbar of contour levels
if sp[:colorbar] != :none if cmap
gr_set_viewport_cmap(sp) gr_set_viewport_cmap(sp)
l = round.(Int32, 1000 + (h - ignorenan_minimum(h)) / (ignorenan_maximum(h) - ignorenan_minimum(h)) * 255) l = round.(Int32, 1000 + (h - ignorenan_minimum(h)) / (ignorenan_maximum(h) - ignorenan_minimum(h)) * 255)
GR.setwindow(xmin, xmax, zmin, zmax) GR.setwindow(xmin, xmax, zmin, zmax)

13
src/utils.jl
View File

@ -561,6 +561,19 @@ end
_update_clims(zmin, zmax, emin, emax) = min(zmin, emin), max(zmax, emax) _update_clims(zmin, zmax, emin, emax) = min(zmin, emin), max(zmax, emax)
function hascolorbar(sp::Subplot)
cbar = sp[:colorbar]
hascbar = false
if cbar != :none
for series in series_list(sp)
if series[:seriestype] in (:heatmap, :contour, :surface) || series[:marker_z] != nothing || series[:line_z] != nothing
hascbar = true
end
end
end
hascbar
end
# --------------------------------------------------------------- # ---------------------------------------------------------------
makekw(; kw...) = KW(kw) makekw(; kw...) = KW(kw)