Add pie chart

Added pie chart and donut chart as a POC, to make sure I understand how
to create visualizations using the type system. Some changes were made
to add_data! such that character data can now be provided

README.md

@@ -14,6 +14,7 @@ A Julia package for creating the simplest kinds of Vega visualizations. We curre
 * Bar plots
 * Line plots
 * Scatter plots
+* Pie/Donut charts
 
 In addition, this package wraps Vega's pseudo-type system inside of Julia types. This will eventually provide tools for manipulating graphics with a higher level of control over layout.
 
@@ -26,7 +27,7 @@ This package depends upon [Vega.js](https://github.com/trifacta/vega) from Trifa
 
 # Usage Examples
 
-The current API provides some convenience wrappers around Vega for generating standard kinds of plots. These are described below. If you have any issues with the examples, please try checking out master for `Distributions`, `Grid`, and `KernelDensity`. While these three packages aren't requirements to use Vega.jl, they are used for generating data to plot in the examples.
+The current API provides some convenience wrappers around Vega for generating standard kinds of plots. These are described below. If you have any issues with the examples, please try checking out master for `Distributions`, `Grid`, `Optim` and `KernelDensity`. While these three packages aren't requirements to use Vega.jl, they are used for generating data to plot in the examples.
 
  using Distributions
  using Vega
@@ -98,3 +99,13 @@ The current API provides some convenience wrappers around Vega for generating st
  heatmap(x = x, y = y, group = color)
 
 ![Example 8](content/heatmap.png)
+
+ fruit = ["peaches", "plums", "blueberries", "strawberries", "bananas"]
+ bushels = [100, 32, 180, 46, 21]
+ plot(x = fruit, y = bushels, kind = :pie)
+
+![Example 9](content/pie.png)
+
+ plot(x = fruit, y = bushels, kind = :donut)
+
+![Example 10](content/donut.png)

demo.jl

@@ -72,3 +72,8 @@ for i in 1:n
  end
 end
 heatmap(x = x, y = y, group = color)
+
+fruit = ["peaches", "plums", "blueberries", "strawberries", "bananas"]
+bushels = [100, 32, 180, 46, 21]
+plot(x = fruit, y = bushels, kind = :pie)
+plot(x = fruit, y = bushels, kind = :donut)

src/Vega.jl

@@ -10,7 +10,7 @@ module Vega
  export tojson, tojs
 
  export plot
- export barplot, lineplot, scatterplot, areaplot, heatmap
+ export barplot, lineplot, scatterplot, areaplot, heatmap, piechart, donutchart
 
  export xlab!, ylab!, xlim!, ylim!, title!, legend!
 
@@ -55,6 +55,7 @@ module Vega
  include("derived/scatterplot.jl")
  include("derived/areaplot.jl")
  include("derived/heatmap.jl")
+ include("derived/piechart.jl")
 
 
 end

src/derived/piechart.jl

@@ -0,0 +1,32 @@
+function piechart(; x::AbstractArray = Real[], y::AbstractArray = [], holesize::Int = 0)
+
+ v = VegaVisualization()
+ v.legends = [VegaLegend(fill = "color", title = "group")]
+
+ add_data!(v, x = x, y = y)
+
+ v.scales = [VegaScale(name = "color",
+ domain = VegaDataRef("table", "data.x"),
+ range = "category10",
+ _type = "ordinal")]
+
+ v.marks = [VegaMark(_type = "arc",
+ from = Dict{Any, Any}("data"=> "table", "transform"=> [Dict{Any, Any}("type"=> "pie", "value"=> "data.y")]),
+ properties = VegaMarkProperties(enter = VegaMarkPropertySet(
+ endAngle = VegaValueRef(field = "endAngle"),
+ fill = VegaValueRef(field = "data.x", scale = "color"),
+ innerRadius = VegaValueRef(value = holesize),
+ outerRadius = VegaValueRef(value = 250),
+ startAngle = VegaValueRef(field = "startAngle"),
+ stroke = VegaValueRef(value = "white"),
+ x = VegaValueRef(group = "width", mult = 0.5),
+ y = VegaValueRef(group = "height", mult = 0.5)
+ )
+ )
+ )
+ ]
+
+v
+end
+
+donutchart(;x::AbstractArray = Real[], y::AbstractArray = [], holesize::Int = 175) = piechart(x = x, y = y, holesize = holesize)

src/derived/plot.jl

@@ -13,6 +13,10 @@ function plot(;x::AbstractVector = Int[],
  elseif kind == :hist
  a, b = hist(x)
  v = plot(x = [a][2:end], y = b, kind = :bar)
+ elseif kind == :pie
+ v = piechart(x = x, y = y)
+ elseif kind == :donut
+ v = donutchart(x = x, y = y)
  else
  error("Unknown kind of plot")
  end

src/intermediates/data.jl

@@ -1,6 +1,6 @@
-function add_data!{R <: Real,
- S <: Real,
- T <: Real}(v::VegaVisualization;
+function add_data!{R <: Any,
+ S <: Any,
+ T <: Any}(v::VegaVisualization;
  x::AbstractVector{R} = Int[],
  y::AbstractVector{S} = Int[],
  group::AbstractVector{T} = Int[])
@@ -32,4 +32,4 @@ function add_data!{R <: Real,
  end
 
  return v
-end
+end