From 1ad13fb9efe882167b8caa4e3e50f3862699167d Mon Sep 17 00:00:00 2001
From: Julius Krumbiegel <julius.krumbiegel@gmail.com>
Date: Sat, 23 May 2020 13:14:07 +0200
Subject: [PATCH 1/2] add simple histogram recipe

---
 src/basic_recipes/basic_recipes.jl | 72 ++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/src/basic_recipes/basic_recipes.jl b/src/basic_recipes/basic_recipes.jl
index be450372e..0aa8db0cb 100644
--- a/src/basic_recipes/basic_recipes.jl
+++ b/src/basic_recipes/basic_recipes.jl
@@ -1225,3 +1225,75 @@ function plot!(p::Spy)
 
     lines!(p, rect, color = p.framecolor, linewidth = p.framesize)
 end
+
+
+
+"""
+    histogram(values; bins = 15, relative = false)
+
+Plot a histogram of `values`. `bins` can be an `Int` to create that
+number of equal-width bins over the range of `values`.
+Alternatively, it can be a sorted iterable of bin edges. The histogram
+can be normed by setting `relative = true`.
+
+## Attributes
+$(ATTRIBUTES)
+"""
+@recipe(Histogram, values) do scene
+    Attributes(
+        bins = 15, # Int or iterable of edges
+        relative = false,
+    )
+end
+
+
+function plot!(plot::Histogram)
+
+    values = plot[:values]
+
+    edges = lift(values, plot.bins) do vals, bins
+        if bins isa Int
+            mi, ma = float.(extrema(vals))
+            ma = nextfloat(ma) # hist is right-open, so to include the upper data point, make the last bin a tiny bit bigger
+            return range(mi, ma, length = bins+1)
+        else
+            if !issorted(bins)
+                error("Histogram bins are not sorted: $bins")
+            end
+            return bins
+        end
+    end
+    
+    points = lift(edges, plot.relative) do edges, relative
+        range = last(edges) - first(edges)
+
+        counts = zeros(length(edges)-1)
+        foreach(values[]) do v
+            @inbounds for (i, (le, ue)) in enumerate(zip(edges[1:end-1], edges[2:end]))
+                if le <= v < ue
+                    counts[i] += 1
+                    continue
+                end
+            end
+        end
+        centers = edges[1:end-1] .+ (diff(edges) ./ 2)
+
+        weights = relative ? counts ./ sum(counts) : counts
+
+        Point2f0.(centers, weights)
+    end
+
+    widths = lift(diff, edges)
+
+    # plot the values, not the observables, to be in control of updating
+    bp = barplot!(plot, points[]; width = widths[], plot.attributes...).plots[1]
+
+
+    # update the barplot points without triggering, then trigger with `width`
+    on(widths) do w
+        bp[1].val = points[]
+        bp.width = w
+    end
+
+    plot
+end

From a060273019822a0a4787bff26a826e5d86113794 Mon Sep 17 00:00:00 2001
From: SimonDanisch <sdanisch@protonmail.com>
Date: Tue, 2 Jun 2020 13:39:36 +0200
Subject: [PATCH 2/2] fix JuliaPlots/Makie#617

---
 src/basic_recipes/basic_recipes.jl | 4 +++-
 src/conversions.jl                 | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/basic_recipes/basic_recipes.jl b/src/basic_recipes/basic_recipes.jl
index 0aa8db0cb..8f5867ee3 100644
--- a/src/basic_recipes/basic_recipes.jl
+++ b/src/basic_recipes/basic_recipes.jl
@@ -137,6 +137,8 @@ function plot!(plot::Mesh{<: Tuple{<: AbstractVector{P}}}) where P <: AbstractMe
             else
                 to_color.(colors)
             end
+            empty!(real_colors[])
+            
             # Map one single color per mesh to each vertex
             for (mesh, color) in zip(meshes, single_colors)
                 append!(real_colors[], Iterators.repeated(RGBAf0(color), length(coordinates(mesh))))
@@ -1263,7 +1265,7 @@ function plot!(plot::Histogram)
             return bins
         end
     end
-    
+
     points = lift(edges, plot.relative) do edges, relative
         range = last(edges) - first(edges)
 
diff --git a/src/conversions.jl b/src/conversions.jl
index 487b15c71..9b45cdd0e 100644
--- a/src/conversions.jl
+++ b/src/conversions.jl
@@ -511,8 +511,6 @@ function convert_arguments(
     (m,)
 end
 
-
-
 function convert_arguments(P::PlotFunc, r::AbstractVector, f::Function)
     ptype = plottype(P, Lines)
     to_plotspec(ptype, convert_arguments(ptype, r, f.(r)))