From af60d03060722772512d190ef2a7ad142d92a841 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 13 Apr 2018 16:14:03 +0200 Subject: [PATCH] make alternative plots_heatmap seriestype --- src/Plots.jl | 1 + src/recipes.jl | 6 +++--- src/series.jl | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Plots.jl b/src/Plots.jl index f1026810..aec4ef17 100644 --- a/src/Plots.jl +++ b/src/Plots.jl @@ -183,6 +183,7 @@ include("output.jl") @shorthands histogram2d @shorthands density @shorthands heatmap +@shorthands plots_heatmap @shorthands hexbin @shorthands sticks @shorthands hline diff --git a/src/recipes.jl b/src/recipes.jl index 611c8407..7b389d29 100644 --- a/src/recipes.jl +++ b/src/recipes.jl @@ -390,8 +390,8 @@ end @deps bar shape # --------------------------------------------------------------------------- -# Heatmap -@recipe function f(::Type{Val{:heatmapr}}, x, y, z) +# Plots Heatmap +@recipe function f(::Type{Val{:plots_heatmap}}, x, y, z) xe, ye = heatmap_edges(x), heatmap_edges(y) m, n = size(z.surf) x_pts, y_pts = fill(NaN, 6 * m * n), fill(NaN, 6 * m * n) @@ -415,7 +415,7 @@ end label := "" () end -@deps heatmapr shape +@deps plots_heatmap shape # --------------------------------------------------------------------------- # Histograms diff --git a/src/series.jl b/src/series.jl index 4c8607fd..8b3f19bb 100644 --- a/src/series.jl +++ b/src/series.jl @@ -8,7 +8,7 @@ const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}} -all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :heatmapr), get(d, :seriestype, :none)) +all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(d, :seriestype, :none)) # unknown convertToAnyVector(x, d::KW) = error("No user recipe defined for $(typeof(x))")