wip groupedbar

This commit is contained in:
Pietro Vertechi 2017-08-31 18:55:30 +01:00
parent cc15882faf
commit 6c548f025e

View File

@ -519,16 +519,31 @@ split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in va
# split the group into 1 series per group, and set the label and idxfilter for each
@recipe function f(groupby::GroupBy, args...)
lengthGroup = maximum(union(groupby.groupIds...))
for (i,glab) in enumerate(groupby.groupLabels)
@series begin
label --> string(glab)
idxfilter --> groupby.groupIds[i]
for (key,val) in d
if splittable_kw(key, val, lengthGroup)
:($key) := split_kw(key, val, groupby.groupIds[i])
if !(RecipesBase.group_as_matrix(args[1]))
for (i,glab) in enumerate(groupby.groupLabels)
@series begin
label --> string(glab)
idxfilter --> groupby.groupIds[i]
for (key,val) in d
if splittable_kw(key, val, lengthGroup)
:($key) := split_kw(key, val, groupby.groupIds[i])
end
end
args
end
args
end
else
g = args[1]
x, y = g.args
x_u = unique(x)
y_mat = Array{eltype(y)}(length(x_u), length(groupby.groupLabels))
for i in 1:length(groupby.groupLabels)
xi = x[groupby.groupIds[i]]
yi = y[groupby.groupIds[i]]
x2y = Dict(zip(xi,yi))
y_mat[:, i] = [get(x2y, s, NaN) for s in x_u]
end
label --> reshape(groupby.groupLabels, 1, :)
typeof(g)((x_u, y_mat))
end
end