From 471b09bd6cb564c024dd5d0a99b4849299e1410f Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Fri, 10 Feb 2017 11:24:48 +0100 Subject: [PATCH 1/2] gr: added support for hexbin plots --- src/backends/gr.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index b092edd7..5b4a3eb8 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -33,7 +33,7 @@ const _gr_attr = merge_with_base_supported([ :arrow, ]) const _gr_seriestype = [ - :path, :scatter, + :path, :scatter, :hexbin, :heatmap, :pie, :image, :contour, :path3d, :scatter3d, :surface, :wireframe, :shape @@ -798,6 +798,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) gr_draw_markers(series, x, y) end + elseif st == :hexbin + GR.hexbin(x, y, nbins = series[:bins]) + elseif st == :contour zmin, zmax = gr_lims(zaxis, false) clims = sp[:clims] From eb7534d319afc07782277984460fb2ea0504cb9a Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Tue, 14 Feb 2017 09:55:46 +0100 Subject: [PATCH 2/2] gr: corrected alignment of rotated axes labels --- src/backends/gr.jl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 5b4a3eb8..f79258ab 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -33,7 +33,7 @@ const _gr_attr = merge_with_base_supported([ :arrow, ]) const _gr_seriestype = [ - :path, :scatter, :hexbin, + :path, :scatter, :heatmap, :pie, :image, :contour, :path3d, :scatter3d, :surface, :wireframe, :shape @@ -653,6 +653,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) flip = sp[:yaxis][:flip] mirror = sp[:xaxis][:mirror] gr_set_font(sp[:xaxis][:tickfont], + halign = (:left, :hcenter, :right)[sign(sp[:xaxis][:rotation]) + 2], valign = (mirror ? :bottom : :top), color = sp[:xaxis][:foreground_color_axis], rotation = sp[:xaxis][:rotation]) @@ -670,6 +671,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) mirror = sp[:yaxis][:mirror] gr_set_font(sp[:yaxis][:tickfont], halign = (mirror ? :left : :right), + valign = (:top, :vcenter, :bottom)[sign(sp[:yaxis][:rotation]) + 2], color = sp[:yaxis][:foreground_color_axis], rotation = sp[:yaxis][:rotation]) for (cv, dv) in zip(yticks...) @@ -798,9 +800,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) gr_draw_markers(series, x, y) end - elseif st == :hexbin - GR.hexbin(x, y, nbins = series[:bins]) - elseif st == :contour zmin, zmax = gr_lims(zaxis, false) clims = sp[:clims]