rubyvis 0.3.3 → 0.3.4

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.3.4 / 2010-12-11
+
+* Implemented Layout::Grid and Layout::Tree
+* New example: census treemap. Added spec for layout
+* Examples reordered
+* Bug fix: Area with 0 on height create infinite loop
+* Bug fix: Layout::Pack overlaps circles on NE position
+
 === 0.3.3 / 2010-11-23
 
 * Implemented Rubyvis::Layout::Pack, Rubyvis::Layout::Indent and Rubyvis::Flatten

data/Manifest.txt

@@ -2,42 +2,48 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-examples/antibiotics/antibiotics_data.rb
-examples/antibiotics/antibiotics_scatter.rb
-examples/antibiotics/antibiotics_wedge.rb
-examples/area.rb
-examples/area_interpolation.rb
-examples/bar_column_chart.rb
-examples/barley/barley.rb
-examples/barley/barley_data.rb
-examples/bubble_charts.rb
-examples/cars/cars.rb
-examples/cars/cars_data.rb
-examples/circle_packing.rb
-examples/crimea/crimea_data.rb
-examples/crimea/crimea_grouped_bar.rb
-examples/crimea/crimea_line.rb
-examples/dendogram.rb
-examples/dot.rb
-examples/first_protovis_api.rb
-examples/first_rbp_api.rb
-examples/fixtures/tipsy.gif
-examples/grouped_charts.rb
-examples/icicle.rb
-examples/image.rb
-examples/indent.rb
-examples/line.rb
-examples/line_and_step.rb
-examples/line_interpolation.rb
-examples/nested_grid.rb
-examples/pie_and_donut.rb
-examples/scatterplot.rb
-examples/second.rb
-examples/stacked_charts.rb
-examples/sunburst.rb
-examples/third.rb
-examples/treemap/treemap.rb
-examples/treemap/treemap_data.rb
+examples/1_basic/1a_bar_rbp_api.rb
+examples/1_basic/1b_bar_pv_api.rb
+examples/1_basic/2_bar_and_rule.rb
+examples/1_basic/3_grouped_bars.rb
+examples/1_basic/area_interpolation.rb
+examples/1_basic/dot.rb
+examples/1_basic/fixtures/tipsy.gif
+examples/1_basic/grid.rb
+examples/1_basic/image.rb
+examples/1_basic/line.rb
+examples/1_basic/line_interpolation.rb
+examples/2_medium/censo_agropecuario/censo_agropecuario_chile_data.rb
+examples/2_medium/censo_agropecuario/census_treemap.rb
+examples/2_medium/censo_agropecuario/create_data.rb
+examples/2_medium/censo_agropecuario/resultset.csv
+examples/2_medium/nested_grid.rb
+examples/3_pv_conventional/area.rb
+examples/3_pv_conventional/bar_column_chart.rb
+examples/3_pv_conventional/grouped_charts.rb
+examples/3_pv_conventional/line_and_step.rb
+examples/3_pv_conventional/pie_and_donut.rb
+examples/3_pv_conventional/scatterplot.rb
+examples/3_pv_conventional/stacked_charts.rb
+examples/4_pv_custom/antibiotics/antibiotics_data.rb
+examples/4_pv_custom/antibiotics/antibiotics_scatter.rb
+examples/4_pv_custom/antibiotics/antibiotics_wedge.rb
+examples/4_pv_custom/barley/barley.rb
+examples/4_pv_custom/barley/barley_data.rb
+examples/4_pv_custom/cars/cars.rb
+examples/4_pv_custom/cars/cars_data.rb
+examples/4_pv_custom/crimea/crimea_data.rb
+examples/4_pv_custom/crimea/crimea_grouped_bar.rb
+examples/4_pv_custom/crimea/crimea_line.rb
+examples/5_pv_hierarchies/bubble_charts.rb
+examples/5_pv_hierarchies/bubble_charts_matrix.rb
+examples/5_pv_hierarchies/circle_packing.rb
+examples/5_pv_hierarchies/dendogram.rb
+examples/5_pv_hierarchies/icicle.rb
+examples/5_pv_hierarchies/indent.rb
+examples/5_pv_hierarchies/node_link_tree.rb
+examples/5_pv_hierarchies/sunburst.rb
+examples/5_pv_hierarchies/treemap.rb
 lib/rubyvis.rb
 lib/rubyvis/color/color.rb
 lib/rubyvis/color/colors.rb
@@ -51,12 +57,14 @@ lib/rubyvis/internals.rb
 lib/rubyvis/javascript_behaviour.rb
 lib/rubyvis/layout.rb
 lib/rubyvis/layout/cluster.rb
+lib/rubyvis/layout/grid.rb
 lib/rubyvis/layout/hierarchy.rb
 lib/rubyvis/layout/indent.rb
 lib/rubyvis/layout/network.rb
 lib/rubyvis/layout/pack.rb
 lib/rubyvis/layout/partition.rb
 lib/rubyvis/layout/stack.rb
+lib/rubyvis/layout/tree.rb
 lib/rubyvis/layout/treemap.rb
 lib/rubyvis/mark.rb
 lib/rubyvis/mark/anchor.rb
@@ -98,6 +106,7 @@ spec/histogram_spec.rb
 spec/internal_spec.rb
 spec/javascript_behaviour_spec.rb
 spec/label_spec.rb
+spec/layout_stack_spec.rb
 spec/line_spec.rb
 spec/mark_spec.rb
 spec/nest_spec.rb

data/examples/{first_rbp_api.rb → 1_basic/1a_bar_rbp_api.rb}

@@ -2,7 +2,7 @@
 # This is the RBP API version of "Getting Started" example of Protovis introduction.
 # On this example we  build a bar chart using panel and bar marks.
 # A mark represents a set of graphical elements that share data and visual encodings. Although marks are simple by themselves, you can combine them in interesting ways to make rich, interactive visualizations
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
     
 vis = Rubyvis::Panel.new do 

data/examples/{first_protovis_api.rb → 1_basic/1b_bar_pv_api.rb}

@@ -2,7 +2,7 @@
 # This is the protovis API version of "Getting Started" example of Protovis introduction.
 # On this example we  build a bar chart using panel and bar marks.
 # A mark represents a set of graphical elements that share data and visual encodings. Although marks are simple by themselves, you can combine them in interesting ways to make rich, interactive visualizations
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 vis = Rubyvis::Panel.new.width(150).height(150);
 

data/examples/{second.rb → 1_basic/2_bar_and_rule.rb}

@@ -1,7 +1,7 @@
 # = Inheritance and labels
 # Second example of Protovis "Getting Started section"
-# The rule’s label inherits the data and bottom property, causing it to appear on the rule and render the value (datum) as text. The bar’s label uses the bottom anchor to tweak positioning, so that the label is centered at the bottom of the bar. 
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+# The rule's label inherits the data and bottom property, causing it to appear on the rule and render the value (datum) as text. The bar’s label uses the bottom anchor to tweak positioning, so that the label is centered at the bottom of the bar. 
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 vis = pv.Panel.new()

data/examples/{third.rb → 1_basic/3_grouped_bars.rb}

@@ -1,6 +1,6 @@
 # = Using parent
 # This example shows how to group bars on groups and use the parent property to identify and color them
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 vis = pv.Panel.new().width(200).height(150);

data/examples/{area_interpolation.rb → 1_basic/area_interpolation.rb}

@@ -7,7 +7,7 @@
 # * cardinal
 # 
 # See also "Line Interpolation":line_interpolation.html
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 data = Rubyvis.range(0, 10, 0.5).map {|x| 

data/examples/{dot.rb → 1_basic/dot.rb}

@@ -1,6 +1,6 @@
 # = Dot and anchors
 # This example shows how looks differents positions of anchors on dots
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 vis = pv.Panel.new().width(200).height(200);

data/examples/1_basic/grid.rb

@@ -0,0 +1,29 @@
+# = Grid
+# A simple heatmap, using a Bar.fill_style to represent
+# data
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
+require 'rubyvis'
+
+w = 400
+h = 400
+
+vis = pv.Panel.new()
+  .width(w)
+  .height(h)
+  .bottom(0)
+  .left(0)
+  .right(0)
+  .top(0)
+
+  arrays=10.times.map {|i| 10.times.map {|j| i/10.0+j/100.0}}
+
+  vis.add(Rubyvis::Layout::Grid).rows(arrays).
+    cell.add(Rubyvis::Bar).
+    fill_style(Rubyvis.ramp("white", "black")).anchor("center").
+    add(Rubyvis::Label).
+    text_style(Rubyvis.ramp("black","white"))
+
+vis.render();
+
+
+puts vis.to_svg

data/examples/{image.rb → 1_basic/image.rb}

@@ -1,6 +1,6 @@
 # = Image
 # This example shows how to include an image 
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 img_url="fixtures/tipsy.gif"

data/examples/{line.rb → 1_basic/line.rb}

@@ -1,7 +1,7 @@
 # = Line Chart
 # This line chart is constructed a Line mark.
 # The second line, inside the first one, is created using an anchor.
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 data = pv.range(0, 10, 0.1).map {|x| 

data/examples/{line_interpolation.rb → 1_basic/line_interpolation.rb}

@@ -9,7 +9,7 @@
 # * cardinal
 # 
 # See also "Area Interpolation":area_interpolation.html
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 data = pv.range(0, 10, 1).map {|x| 

data/examples/2_medium/censo_agropecuario/censo_agropecuario_chile_data.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+$censo = [
+{:glosa=>"Alto Bío-Bío", :te=>1, :superficie=>161659.68, :ovinos=>8092, :bovinos=>7736},
+{:glosa=>"Alto Bío-Bío", :te=>2, :superficie=>44214.8, :ovinos=>881, :bovinos=>1327},
+{:glosa=>"Alto Bío-Bío", :te=>3, :superficie=>0, :ovinos=>45, :bovinos=>45},
+{:glosa=>"Alto Bío-Bío", :te=>5, :superficie=>12451.1, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Antuco", :te=>1, :superficie=>67807.4, :ovinos=>1211, :bovinos=>1993},
+{:glosa=>"Antuco", :te=>2, :superficie=>9449.69, :ovinos=>22, :bovinos=>57},
+{:glosa=>"Antuco", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Antuco", :te=>5, :superficie=>12883, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Cabrero", :te=>1, :superficie=>33278.04, :ovinos=>1383, :bovinos=>16849},
+{:glosa=>"Cabrero", :te=>2, :superficie=>26802.78, :ovinos=>5, :bovinos=>135},
+{:glosa=>"Cabrero", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Laja", :te=>1, :superficie=>16540.64, :ovinos=>1953, :bovinos=>5818},
+{:glosa=>"Laja", :te=>2, :superficie=>12741.56, :ovinos=>0, :bovinos=>52},
+{:glosa=>"Laja", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>166},
+{:glosa=>"Laja", :te=>4, :superficie=>0.1, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Los Angeles", :te=>1, :superficie=>120432.71, :ovinos=>3640, :bovinos=>87098},
+{:glosa=>"Los Angeles", :te=>2, :superficie=>20205.1, :ovinos=>13, :bovinos=>219},
+{:glosa=>"Los Angeles", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>9},
+{:glosa=>"Los Angeles", :te=>4, :superficie=>19.4, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Mulchén", :te=>1, :superficie=>87515.1, :ovinos=>5472, :bovinos=>28562},
+{:glosa=>"Mulchén", :te=>2, :superficie=>101300.3, :ovinos=>149, :bovinos=>279},
+{:glosa=>"Mulchén", :te=>3, :superficie=>0, :ovinos=>22, :bovinos=>41},
+{:glosa=>"Mulchén", :te=>4, :superficie=>10, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Nacimiento", :te=>1, :superficie=>25258.2, :ovinos=>2535, :bovinos=>4027},
+{:glosa=>"Nacimiento", :te=>2, :superficie=>47295.23, :ovinos=>155, :bovinos=>266},
+{:glosa=>"Nacimiento", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>3},
+{:glosa=>"Negrete", :te=>1, :superficie=>10213.42, :ovinos=>564, :bovinos=>7424},
+{:glosa=>"Negrete", :te=>2, :superficie=>1875.2, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Negrete", :te=>3, :superficie=>0, :ovinos=>0, :bovinos=>42},
+{:glosa=>"Quilaco", :te=>1, :superficie=>21624.2, :ovinos=>5078, :bovinos=>5765},
+{:glosa=>"Quilaco", :te=>2, :superficie=>70669.92, :ovinos=>71, :bovinos=>428},
+{:glosa=>"Quilaco", :te=>3, :superficie=>0, :ovinos=>135, :bovinos=>359},
+{:glosa=>"Quilaco", :te=>4, :superficie=>18.1, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Quilleco", :te=>1, :superficie=>46422.6399999999, :ovinos=>8635, :bovinos=>17881},
+{:glosa=>"Quilleco", :te=>2, :superficie=>51873.11, :ovinos=>99, :bovinos=>161},
+{:glosa=>"Quilleco", :te=>4, :superficie=>1089.7, :ovinos=>0, :bovinos=>0},
+{:glosa=>"San Rosendo", :te=>1, :superficie=>3101.07, :ovinos=>52, :bovinos=>314},
+{:glosa=>"San Rosendo", :te=>2, :superficie=>4809.14, :ovinos=>0, :bovinos=>10},
+{:glosa=>"Santa Bárbara", :te=>1, :superficie=>91126.6000000003, :ovinos=>9540, :bovinos=>15316},
+{:glosa=>"Santa Bárbara", :te=>2, :superficie=>30337.87, :ovinos=>273, :bovinos=>678},
+{:glosa=>"Santa Bárbara", :te=>3, :superficie=>0, :ovinos=>12, :bovinos=>37},
+{:glosa=>"Santa Bárbara", :te=>4, :superficie=>45.5, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Tucapel", :te=>1, :superficie=>76164.0399999999, :ovinos=>8941, :bovinos=>5436},
+{:glosa=>"Tucapel", :te=>2, :superficie=>46603.55, :ovinos=>12, :bovinos=>60},
+{:glosa=>"Tucapel", :te=>3, :superficie=>0, :ovinos=>18, :bovinos=>16},
+{:glosa=>"Tucapel", :te=>4, :superficie=>7.8, :ovinos=>0, :bovinos=>0},
+{:glosa=>"Yumbel", :te=>1, :superficie=>31260.98, :ovinos=>1462, :bovinos=>7899},
+{:glosa=>"Yumbel", :te=>2, :superficie=>25284.95, :ovinos=>1, :bovinos=>52},
+{:glosa=>"Yumbel", :te=>3, :superficie=>0, :ovinos=>3, :bovinos=>167},
+{:glosa=>"Yumbel", :te=>4, :superficie=>7.1, :ovinos=>0, :bovinos=>0}
+]

data/examples/2_medium/censo_agropecuario/census_treemap.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8 
+# = Censo Agropecuario 2007, Chile: Treemap
+# This treemap represents farm explotations on Biobío province, Chile.
+# Colors represent different 'comunas' and bar inside one color
+# represent different types of explotation
+$:.unshift(File.dirname(__FILE__)+"/../../../lib")
+require 'rubyvis'
+load(File.dirname(__FILE__)+"/censo_agropecuario_chile_data.rb")
+
+w = 500
+h = 500
+max_s=30
+
+c_p_c={}
+
+te = {
+ 1=>"Explotación agropecuaria con actividad",
+ 2=>"Explotación forestal", 
+ 3=>"Explotación agropecuaria sin tierra", 
+ 4=>"Explotación agropecuaria temporalmente sin actividad", 
+ 5=>"Parques nacionales y reservas forestales"}
+
+number=Rubyvis::Format.number
+color=Rubyvis::Colors.category20
+
+$censo.each_with_index do |c,i|
+  c_p_c[c[:glosa]]||=Hash.new
+  c_p_c[c[:glosa]][c[:te]]=OpenStruct.new(c)
+end
+
+
+
+nodes = pv.dom(c_p_c).root("censo").nodes
+
+# The root panel.
+vis = pv.Panel.new()
+    .width(w)
+    .height(h)
+    .bottom(20)
+    .left(30)
+    .right(10)
+    .top(5);
+
+treemap = vis.add(Rubyvis::Layout::Treemap).
+  nodes(nodes).mode("squarify").round(true).
+  size(lambda {|d| d.node_value.superficie})
+
+treemap.leaf.add(Rubyvis::Panel).
+  fill_style(lambda{|d| 
+  color.scale(d.node_value.glosa)}).
+  stroke_style("#fff").
+  line_width(1).
+  antialias(false).
+  title(lambda {|d| d.parent_node ? d.node_value.glosa+"-#{te[d.node_value.te]}" : ""})
+
+treemap.node_label.add(Rubyvis::Label).
+  text_style(lambda {|d| pv.rgb(0, 0, 0, 1)}).
+  visible(lambda {|d| d.node_value and d.node_value.superficie>200}).
+  text(lambda {|d| number.format(d.node_value.superficie.to_i)})
+    
+
+vis.render()
+puts vis.to_svg

data/examples/2_medium/censo_agropecuario/create_data.rb

@@ -0,0 +1,10 @@
+require 'statsample'
+a=Statsample::CSV.read('resultset.csv')
+File.open("censo_agropecuario_chile_data.rb","w") do |fp|
+  fp.puts "# encoding: UTF-8"
+  fp.puts "$censo = ["
+  a.each do |row|
+    fp.puts row.inject({}) {|ac,v| ac[v[0].to_sym]=v[1];ac}.inspect+","
+  end
+  fp.puts "]"
+end

data/examples/2_medium/censo_agropecuario/resultset.csv

@@ -0,0 +1,51 @@
+"glosa","te","superficie","ovinos","bovinos"
+"Alto Bío-Bío",1,161659.68,8092,7736
+"Alto Bío-Bío",2,44214.8,881,1327
+"Alto Bío-Bío",3,0,45,45
+"Alto Bío-Bío",5,12451.1,0,0
+"Antuco",1,67807.4,1211,1993
+"Antuco",2,9449.69,22,57
+"Antuco",3,0,0,0
+"Antuco",5,12883,0,0
+"Cabrero",1,33278.04,1383,16849
+"Cabrero",2,26802.78,5,135
+"Cabrero",3,0,0,0
+"Laja",1,16540.64,1953,5818
+"Laja",2,12741.56,0,52
+"Laja",3,0,0,166
+"Laja",4,0.1,0,0
+"Los Angeles",1,120432.71,3640,87098
+"Los Angeles",2,20205.1,13,219
+"Los Angeles",3,0,0,9
+"Los Angeles",4,19.4,0,0
+"Mulchén",1,87515.1,5472,28562
+"Mulchén",2,101300.3,149,279
+"Mulchén",3,0,22,41
+"Mulchén",4,10,0,0
+"Nacimiento",1,25258.2,2535,4027
+"Nacimiento",2,47295.23,155,266
+"Nacimiento",3,0,0,3
+"Negrete",1,10213.42,564,7424
+"Negrete",2,1875.2,0,0
+"Negrete",3,0,0,42
+"Quilaco",1,21624.2,5078,5765
+"Quilaco",2,70669.92,71,428
+"Quilaco",3,0,135,359
+"Quilaco",4,18.1,0,0
+"Quilleco",1,46422.6399999999,8635,17881
+"Quilleco",2,51873.11,99,161
+"Quilleco",4,1089.7,0,0
+"San Rosendo",1,3101.07,52,314
+"San Rosendo",2,4809.14,0,10
+"Santa Bárbara",1,91126.6000000003,9540,15316
+"Santa Bárbara",2,30337.87,273,678
+"Santa Bárbara",3,0,12,37
+"Santa Bárbara",4,45.5,0,0
+"Tucapel",1,76164.0399999999,8941,5436
+"Tucapel",2,46603.55,12,60
+"Tucapel",3,0,18,16
+"Tucapel",4,7.8,0,0
+"Yumbel",1,31260.98,1462,7899
+"Yumbel",2,25284.95,1,52
+"Yumbel",3,0,3,167
+"Yumbel",4,7.1,0,0

data/examples/{nested_grid.rb → 2_medium/nested_grid.rb}

@@ -1,8 +1,7 @@
 # = Nested grid
-# Two level nested grid.
-# The first is created at random with n rows and m columns
-# The second level is a 9x9 grid inside the cell of first level
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+# Two level nested grid.  The first is created at random with n rows and m columns The second level is a 9x9 grid inside the cell of first level
+# You can obtain the same result using a grid layout
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 

data/examples/{area.rb → 3_pv_conventional/area.rb}

@@ -3,7 +3,7 @@
 # Although this example is basic, it provides a good starting point for adding more complex features. For instance, multiple series of data can be added to produce a stacked area chart. 
 # * "Protovis version":http://vis.stanford.edu/protovis/ex/area.html
 # * Syntax: RBP
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 data = pv.range(0, 10, 0.1).map {|x| 

data/examples/{bar_column_chart.rb → 3_pv_conventional/bar_column_chart.rb}

@@ -2,7 +2,7 @@
 # This simple bar chart is constructed using a bar mark. A linear scale is used to compute the width of the bar, while an ordinal scale sets the top position and height for the categorical dimension. Next, rules and labels are added for reference values.
 # Bars can be used in a variety of ways. For instance, they can be stacked or grouped to show multiple data series, or arranged as vertical columns rather than bars. 
 
-$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 
 data = pv.range(10).map {|d| rand + 0.1 }