changed heatmap to hist2d, see #147 for details

src/Plots.jl

@@ -33,6 +33,8 @@ export
   bar!,
   histogram,
   histogram!,
+  histogram2d,
+  histogram2d!,
   density,
   density!,
   heatmap,
@@ -149,6 +151,8 @@ bar(args...; kw...)        = plot(args...; kw...,  linetype = :bar)
 bar!(args...; kw...)       = plot!(args...; kw..., linetype = :bar)
 histogram(args...; kw...)  = plot(args...; kw...,  linetype = :hist)
 histogram!(args...; kw...) = plot!(args...; kw..., linetype = :hist)
+histogram2d(args...; kw...)  = plot(args...; kw...,  linetype = :hist2d)
+histogram2d!(args...; kw...) = plot!(args...; kw..., linetype = :hist2d)
 density(args...; kw...)    = plot(args...; kw...,  linetype = :density)
 density!(args...; kw...)   = plot!(args...; kw..., linetype = :density)
 heatmap(args...; kw...)    = plot(args...; kw...,  linetype = :heatmap)

src/args.jl

@@ -10,7 +10,7 @@ const _allAxes = [:auto, :left, :right]
 const _3dTypes = [:path3d, :scatter3d, :surface, :wireframe]
 const _allTypes = vcat([
                         :none, :line, :path, :steppre, :steppost, :sticks, :scatter,
-                        :heatmap, :hexbin, :hist, :density, :bar, :hline, :vline, :ohlc,
+                        :heatmap, :hexbin, :hist, :hist2d, :hist3d, :density, :bar, :hline, :vline, :ohlc,
                         :contour, :pie
                        ], _3dTypes)
 @compat const _typeAliases = Dict(
@@ -39,7 +39,6 @@ const _allTypes = vcat([
 
 ishistlike(lt::Symbol) = lt in (:hist, :density)
 islinelike(lt::Symbol) = lt in (:line, :path, :steppre, :steppost)
-isheatmaplike(lt::Symbol) = lt in (:heatmap, :hexbin)
 
 
 const _allStyles = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
@@ -129,7 +128,7 @@ _seriesDefaults[:markerstrokecolor] = :match
 _seriesDefaults[:markerstrokealpha] = nothing
 # _seriesDefaults[:ribbon]          = nothing
 # _seriesDefaults[:ribboncolor]     = :match
-_seriesDefaults[:nbins]           = 30               # number of bins for heatmaps and hists
+_seriesDefaults[:nbins]           = 30               # number of bins for hists
 _seriesDefaults[:smooth]          = false               # regression line?
 _seriesDefaults[:group]           = nothing           # groupby vector
 # _seriesDefaults[:annotation]      = nothing           # annotation tuple(s)... (x,y,annotation)

src/backends/gadfly.jl

@@ -36,7 +36,7 @@ function getLineGeom(d::Dict)
   xbins, ybins = maketuple(d[:nbins])
   if lt == :hexbin
     Gadfly.Geom.hexbin(xbincount = xbins, ybincount = ybins)
-  elseif lt == :heatmap
+  elseif lt == :hist2d
     Gadfly.Geom.histogram2d(xbincount = xbins, ybincount = ybins)
   elseif lt == :hist
     Gadfly.Geom.histogram(bincount = xbins)
@@ -303,7 +303,7 @@ function addGadflySeries!(plt::Plot, d::Dict)
   lt = d[:linetype]
   if lt == :ohlc
     error("Haven't re-implemented after refactoring")
-  elseif lt in (:heatmap, :hexbin) && (isa(d[:linecolor], ColorGradient) || isa(d[:linecolor], ColorFunction))
+  elseif lt in (:hist2d, :hexbin) && (isa(d[:linecolor], ColorGradient) || isa(d[:linecolor], ColorFunction))
     push!(gplt.scales, Gadfly.Scale.ContinuousColorScale(p -> RGB(getColorZ(d[:linecolor], p))))
   elseif lt == :scatter && d[:markershape] == :none
     d[:markershape] = :ellipse
@@ -314,7 +314,7 @@ function addGadflySeries!(plt::Plot, d::Dict)
     prepend!(layers, addGadflyMarker!(plt, length(gplt.layers), d, plt.plotargs, smooth...))
   end
 
-  lt in (:heatmap, :hexbin, :contour) || addToGadflyLegend(plt, d)
+  lt in (:hist2d, :hexbin, :contour) || addToGadflyLegend(plt, d)
 
   # now save the layers that apply to this series
   d[:gadflylayers] = layers

src/backends/gr.jl

@@ -160,7 +160,7 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
           x, y = 1:size(p[:y], 1), p[:y]
         elseif p[:linetype] in [:hist, :density]
           x, y = Base.hist(p[:y])
-        elseif p[:linetype] in [:heatmap, :hexbin]
+        elseif p[:linetype] in [:hist2d, :hexbin]
           E = zeros(length(p[:x]),2)
           E[:,1] = p[:x]
           E[:,2] = p[:y]
@@ -423,7 +423,7 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
           GR.polyline([xy, xy], [ymin, ymax])
         end
       end
-    elseif p[:linetype] in [:heatmap, :hexbin]
+    elseif p[:linetype] in [:hist2d, :hexbin]
       E = zeros(length(p[:x]),2)
       E[:,1] = p[:x]
       E[:,2] = p[:y]

src/backends/plotly.jl

@@ -296,7 +296,7 @@ function plotly_series(d::Dict; plot_index = nothing)
     d_out[:type] = "bar"
     d_out[:x], d_out[:y] = x, y
 
-  elseif lt == :heatmap
+  elseif lt == :hist2d
     d_out[:type] = "histogram2d"
     d_out[:x], d_out[:y] = x, y
     if isa(d[:nbins], Tuple)

src/backends/pyplot.jl

@@ -169,7 +169,7 @@ function getPyPlotFunction(plt::Plot, axis::Symbol, linetype::Symbol)
       :density    => :hist,
       :sticks     => :bar,
       :bar        => :bar,
-      :heatmap    => :hexbin,
+      :hist2d     => :hexbin,
       :hexbin     => :hexbin,
       :scatter    => :scatter,
       :contour    => :contour,
@@ -351,7 +351,7 @@ function _add_series(pkg::PyPlotPackage, plt::Plot; kw...)
       extra_kwargs[:linewidth] = (lt == :sticks ? 0.1 : 0.9)
     end
 
-  elseif lt in (:heatmap, :hexbin)
+  elseif lt in (:hist2d, :hexbin)
     extra_kwargs[:gridsize] = d[:nbins]
     extra_kwargs[:cmap] = getPyPlotColorMap(d[:linecolor])
 
@@ -461,7 +461,7 @@ function _add_series(pkg::PyPlotPackage, plt::Plot; kw...)
     plotfunc(x, y, z; extra_kwargs...)
   elseif lt in _3dTypes
     plotfunc(d[:x], d[:y], d[:z]; extra_kwargs...)
-  elseif lt in (:scatter, :heatmap, :hexbin)
+  elseif lt in (:scatter, :hist2d, :hexbin)
     plotfunc(d[:x], d[:y]; extra_kwargs...)
   else
     plotfunc(d[:x], d[:y]; extra_kwargs...)[1]
@@ -784,7 +784,7 @@ function addPyPlotLegend(plt::Plot, ax)
   leg = plt.plotargs[:legend]
   if leg != :none
     # gotta do this to ensure both axes are included
-    args = filter(x -> !(x[:linetype] in (:hist,:density,:hexbin,:heatmap,:hline,:vline,:contour, :surface, :wireframe, :path3d, :scatter3d)), plt.seriesargs)
+    args = filter(x -> !(x[:linetype] in (:hist,:density,:hexbin,:hist2d,:hline,:vline,:contour, :surface, :wireframe, :path3d, :scatter3d)), plt.seriesargs)
     args = filter(x -> x[:label] != "", args)
     if length(args) > 0
       leg = ax[:legend]([d[:serieshandle] for d in args],

src/backends/supported.jl

@@ -80,7 +80,7 @@ supportedArgs(::GadflyPackage) = [
   ]
 supportedAxes(::GadflyPackage) = [:auto, :left]
 supportedTypes(::GadflyPackage) = [:none, :line, :path, :steppre, :steppost, :sticks,
-                                   :scatter, :heatmap, :hexbin, :hist, :bar,
+                                   :scatter, :hist2d, :hexbin, :hist, :bar,
                                    :hline, :vline, :contour]
 supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
 supportedMarkers(::GadflyPackage) = vcat(_allMarkers, Shape)
@@ -166,7 +166,7 @@ supportedArgs(::PyPlotPackage) = [
   ]
 supportedAxes(::PyPlotPackage) = _allAxes
 supportedTypes(::PyPlotPackage) = [:none, :line, :path, :steppre, :steppost, #:sticks,
-                                   :scatter, :heatmap, :hexbin, :hist, :density, :bar,
+                                   :scatter, :hist2d, :hexbin, :hist, :density, :bar,
                                    :hline, :vline, :contour, :path3d, :scatter3d, :surface, :wireframe]
 supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot]
 # supportedMarkers(::PyPlotPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :hexagon]
@@ -240,7 +240,7 @@ supportedArgs(::GRPackage) = [
   ]
 supportedAxes(::GRPackage) = _allAxes
 supportedTypes(::GRPackage) = [:none, :line, :path, :steppre, :steppost, :sticks,
-                               :scatter, :heatmap, :hexbin, :hist, :density, :bar,
+                               :scatter, :hist2d, :hexbin, :hist, :density, :bar,
                                :hline, :vline, :contour, :path3d, :scatter3d, :surface,
                                :wireframe, :ohlc, :pie]
 supportedStyles(::GRPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
@@ -304,7 +304,7 @@ supportedArgs(::QwtPackage) = [
     # :yflip,
     # :z,
   ]
-supportedTypes(::QwtPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
+supportedTypes(::QwtPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :hist2d, :hexbin, :hist, :bar, :hline, :vline]
 supportedMarkers(::QwtPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :star8, :hexagon]
 supportedScales(::QwtPackage) = [:identity, :log10]
 subplotSupported(::QwtPackage) = true
@@ -363,7 +363,7 @@ supportedArgs(::UnicodePlotsPackage) = [
     # :z,
   ]
 supportedAxes(::UnicodePlotsPackage) = [:auto, :left]
-supportedTypes(::UnicodePlotsPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
+supportedTypes(::UnicodePlotsPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :hist2d, :hexbin, :hist, :bar, :hline, :vline]
 supportedStyles(::UnicodePlotsPackage) = [:auto, :solid]
 supportedMarkers(::UnicodePlotsPackage) = [:none, :auto, :ellipse]
 supportedScales(::UnicodePlotsPackage) = [:identity]
@@ -495,7 +495,7 @@ supportedArgs(::BokehPackage) = [
     # :levels,
   ]
 supportedAxes(::BokehPackage) = [:auto, :left]
-supportedTypes(::BokehPackage) = [:none, :path, :scatter] #,:steppre, :steppost, :sticks, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :contour]
+supportedTypes(::BokehPackage) = [:none, :path, :scatter] #,:steppre, :steppost, :sticks, :hist2d, :hexbin, :hist, :bar, :hline, :vline, :contour]
 supportedStyles(::BokehPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
 supportedMarkers(::BokehPackage) = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5] #vcat(_allMarkers, Shape)
 supportedScales(::BokehPackage) = [:identity, :ln] #, :ln, :log2, :log10, :asinh, :sqrt]
@@ -562,7 +562,7 @@ supportedArgs(::PlotlyPackage) = [
   ]
 supportedAxes(::PlotlyPackage) = [:auto, :left]
 supportedTypes(::PlotlyPackage) = [:none, :line, :path, :scatter, :steppre, :steppost,
-                                   :heatmap, :hist, :density, :bar, :contour, :surface, :path3d, :scatter3d,
+                                   :hist2d, :hist, :density, :bar, :contour, :surface, :path3d, :scatter3d,
                                    :pie] #,, :sticks, :hexbin, :hline, :vline]
 supportedStyles(::PlotlyPackage) = [:auto, :solid, :dash, :dot, :dashdot]
 supportedMarkers(::PlotlyPackage) = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross,
@@ -632,7 +632,7 @@ supportedArgs(::PlotlyJSPackage) = [
   ]
 supportedAxes(::PlotlyJSPackage) = [:auto, :left]
 supportedTypes(::PlotlyJSPackage) = [:none, :line, :path, :scatter, :steppre, :steppost,
-                                   :heatmap, :hist, :density, :bar, :contour, :surface, :path3d, :scatter3d,
+                                   :hist2d, :hist, :density, :bar, :contour, :surface, :path3d, :scatter3d,
                                    :pie] #,, :sticks, :hexbin, :hline, :vline]
 supportedStyles(::PlotlyJSPackage) = [:auto, :solid, :dash, :dot, :dashdot]
 supportedMarkers(::PlotlyJSPackage) = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross,
@@ -700,7 +700,7 @@ supportedArgs(::GLVisualizePackage) = [
     # :levels,
   ]
 supportedAxes(::GLVisualizePackage) = [:auto, :left]
-supportedTypes(::GLVisualizePackage) = [:contour] #, :path, :scatter ,:steppre, :steppost, :sticks, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :contour]
+supportedTypes(::GLVisualizePackage) = [:contour] #, :path, :scatter ,:steppre, :steppost, :sticks, :hist2d, :hexbin, :hist, :bar, :hline, :vline, :contour]
 supportedStyles(::GLVisualizePackage) = [:auto, :solid] #, :dash, :dot, :dashdot, :dashdotdot]
 supportedMarkers(::GLVisualizePackage) = [:none, :auto, :ellipse] #, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5] #vcat(_allMarkers, Shape)
 supportedScales(::GLVisualizePackage) = [:identity] #, :log, :log2, :log10, :asinh, :sqrt]
@@ -765,7 +765,7 @@ supportedArgs(::PGFPlotsPackage) = [
     # :levels,
   ]
 supportedAxes(::PGFPlotsPackage) = [:auto, :left]
-supportedTypes(::PGFPlotsPackage) = [:contour] #, :path, :scatter ,:steppre, :steppost, :sticks, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :contour]
+supportedTypes(::PGFPlotsPackage) = [:contour] #, :path, :scatter ,:steppre, :steppost, :sticks, :hist2d, :hexbin, :hist, :bar, :hline, :vline, :contour]
 supportedStyles(::PGFPlotsPackage) = [:auto, :solid] #, :dash, :dot, :dashdot, :dashdotdot]
 supportedMarkers(::PGFPlotsPackage) = [:none, :auto, :ellipse] #, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5] #vcat(_allMarkers, Shape)
 supportedScales(::PGFPlotsPackage) = [:identity] #, :log, :log2, :log10, :asinh, :sqrt]

src/backends/winston.jl

@@ -88,7 +88,7 @@ function _add_series(::WinstonPackage, plt::Plot; kw...)
 
 
 
-  ## lintype :path, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar
+  ## lintype :path, :step, :stepinverted, :sticks, :dots, :none, :hist2d, :hexbin, :hist, :bar
   if d[:linetype] == :none
     Winston.add(wplt, Winston.Points(d[:x], d[:y]; copy_remove(e, :kind)..., color=getColor(d[:markercolor])))
 
@@ -123,7 +123,7 @@ function _add_series(::WinstonPackage, plt::Plot; kw...)
   # elseif d[:linetype] == :dots
   #     fn = Winston.XXX
 
-  # elseif d[:linetype] == :heatmap
+  # elseif d[:linetype] == :hist2d
   #     fn = Winston.XXX
 
   # elseif d[:linetype] == :hexbin

src/recipes.jl

@@ -127,7 +127,7 @@ end
 "Sparsity plot... heatmap of non-zero values of a matrix"
 function spy{T<:Real}(y::AMat{T}; kw...)
   I,J,V = findnz(y)
-  heatmap(J, I; leg=false, yflip=true, nbins=size(y), kw...)
+  heatmap(J, I; leg=false, yflip=true, kw...)
 end
 
 "Adds a+bx... straight line over the current plot"