handle any number of positional arguments (#21)

Author: greimel

README.md

@@ -56,6 +56,5 @@ fig = lplot(Scatter, cs_df, :xxx, :yyy; color = :s_c, marker = :g_m,  markersize
 
 * combine different plots (e.g. `visual(Scatter) + linear`)
 * use other inputs than tables (the "slicing context")
-* handle plot types where the number of positional arguments is not 2 (e.g. `Band`)
 
 Open an issue if you find more.

src/compose.jl

@@ -1,4 +1,4 @@
-function tplot(P, df, x_var, y_var; attr_var_pairs...)
+function tplot(P, df, args...; attr_var_pairs...)
 	fig = Figure()
 
 	# 1. Grouping	
@@ -20,7 +20,7 @@ function tplot(P, df, x_var, y_var; attr_var_pairs...)
 	# 2a. Plot
 
 	# 2b. Layout
-	grouped_plot_layout(P, fig, df, x_var, y_var, layout_vars, group_dict, style_dict, kws, group_pairs, style_pairs)
+	grouped_plot_layout(P, fig, df, args, layout_vars, group_dict, style_dict, kws, group_pairs, style_pairs)
 
 	# 3. Legend
 	leg, cb = nothing, nothing

src/layout.jl

@@ -1,4 +1,4 @@
-function grouped_plot_layout(P, fig, df, x_var, y_var, layout_vars, group_dict, style_dict, kws, groups, styles)
+function grouped_plot_layout(P, fig, df, args, layout_vars, group_dict, style_dict, kws, groups, styles)
 	linkxaxes  = true
 	linkyaxes  = true
 	linkzcolor = true
@@ -50,7 +50,7 @@ function grouped_plot_layout(P, fig, df, x_var, y_var, layout_vars, group_dict,
 		end
 
 		# Do the plot
-		plt = grouped_plot(P, axs[i, j], groupdf, group_dict, x_var, y_var, kws, groups, styles)
+		plt = grouped_plot(P, axs[i, j], groupdf, group_dict, args, kws, groups, styles)
 
 		let 
 			padding = (3f0, 3f0, 3f0, 3f0)
@@ -72,8 +72,8 @@ function grouped_plot_layout(P, fig, df, x_var, y_var, layout_vars, group_dict,
 	end	
 
 	# spanned labels
-	span_label(:x, var_lab(x_var), axs, fig[1,1])
-	span_label(:y, var_lab(y_var), axs, fig[1,1])
+	span_label(:x, var_lab(args[1]), axs, fig[1,1])
+	span_label(:y, var_lab(args[2]), axs, fig[1,1])
 
 	# Link axes
 	linkyaxes && linkyaxes!(axs...)

src/plot.jl

@@ -1,26 +1,26 @@
 struct Incremental end
 struct AllAtOnce end
 
+mode(::Type) = Incremental()
 mode(::Type{Scatter}) = AllAtOnce()
 mode(::Type{BarPlot}) = AllAtOnce()
-mode(::Type{Lines}) = Incremental()
 
 grouped_plot(P, args...; kwargs...) = _grouped_plot(mode(P), P, args...; kwargs...)
 
-function _grouped_plot(::AllAtOnce, P, ax, df, group_dict, x_var, y_var, kws, group_pairs, style_pairs)
-	x = get(df, x_var)
-	y = get(df, y_var)
+function _grouped_plot(::AllAtOnce, P, ax, df, group_dict, args, kws, group_pairs, style_pairs)
+	xyz = [get(df, arg) for arg in args]
 
 	pairs = lookup_symbols(df, group_pairs, style_pairs, group_dict)
 
-	plt = plot!(P, ax, x, y; kws..., pairs...)
+	plt = plot!(P, ax, xyz...; kws..., pairs...)
 
-	categorical_ticks!(ax, x, y)
+	categorical_ticks!(ax, xyz[1], xyz[2])
 
 	(; plt)
 end
 
-function _grouped_plot(::Incremental, P, ax, gdf, group_dict, x_var, y_var, kws, group_pairs, style_pairs)
+function _grouped_plot(::Incremental, P, ax, gdf, group_dict, args, kws, group_pairs, style_pairs)
+	
 
 	if length(group_pairs) > 0
 		grp = Symbol[Symbol(p[2]) for p in pairs(group_pairs)]
@@ -33,14 +33,13 @@ function _grouped_plot(::Incremental, P, ax, gdf, group_dict, x_var, y_var, kws,
 	end
 
 	out = combine(groupby(gdf, grp)) do df
-		x = get(df, x_var)
-		y = get(df, y_var)
+		xyz = [get(df, arg) for arg in args]
 
 		pairs = lookup_symbols(df, group_pairs, style_pairs, group_dict)
 
-		plt = plot!(P, ax, x, y; kws..., pairs...)
+		plt = plot!(P, ax, xyz...; kws..., pairs...)
 
-		categorical_ticks!(ax, x, y)
+		categorical_ticks!(ax, xyz[1], xyz[2])
 
 		(; plt)
 	end