rubyvis 0.1.2 → 0.1.3

data/History.txt

@@ -1,4 +1,16 @@
-=== 0.1.2 / 2010-10-04
+=== 0.1.3 / 2010-10-08
+
+* New Wedge and  Dot mark
+* New Log scale and Nest. 
+* Area mark working. 
+* Automatic color scales doesn't work on every ocasion, yet
+* Color, Format::Number and Quantitative fixed. 
+* Fixed attributes works as expected (damn c like 0=false)
+* Added examples (antibiotics and barley)
+* Bug fix: right anchor doesn't affect labels.
+* Crimea grouped bars works. Ordinal scales operational
+
+=== 0.1.2 / 2010-10-04
 
 * Bug fix: SvgScene.panel only parse first element. Crimea-line example works (almost) as expected
 * Support for lines as anchors (not tested, yet)

data/Manifest.txt

@@ -2,10 +2,20 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+examples/antibiotics/antibiotics.rb
+examples/antibiotics/antibiotics_data.rb
+examples/area.rb
+examples/bar_column_chart.rb
 examples/barley/barley.rb
+examples/barley/barley_data.rb
 examples/crimea/crimea.rb
+examples/crimea/crimea_grouped_bar.rb
 examples/crimea/crimea_line.rb
+examples/dot.rb
 examples/first.rb
+examples/line.rb
+examples/pie_and_donut.rb
+examples/scatterplot.rb
 examples/second.rb
 examples/third.rb
 lib/rubyvis.rb
@@ -22,21 +32,28 @@ lib/rubyvis/mark.rb
 lib/rubyvis/mark/anchor.rb
 lib/rubyvis/mark/area.rb
 lib/rubyvis/mark/bar.rb
+lib/rubyvis/mark/dot.rb
 lib/rubyvis/mark/label.rb
 lib/rubyvis/mark/line.rb
 lib/rubyvis/mark/panel.rb
 lib/rubyvis/mark/rule.rb
+lib/rubyvis/mark/wedge.rb
+lib/rubyvis/nest.rb
 lib/rubyvis/property.rb
 lib/rubyvis/scale.rb
 lib/rubyvis/scale/linear.rb
+lib/rubyvis/scale/log.rb
 lib/rubyvis/scale/ordinal.rb
 lib/rubyvis/scale/quantitative.rb
+lib/rubyvis/scene/svg_area.rb
 lib/rubyvis/scene/svg_bar.rb
+lib/rubyvis/scene/svg_dot.rb
 lib/rubyvis/scene/svg_label.rb
 lib/rubyvis/scene/svg_line.rb
 lib/rubyvis/scene/svg_panel.rb
 lib/rubyvis/scene/svg_rule.rb
 lib/rubyvis/scene/svg_scene.rb
+lib/rubyvis/scene/svg_wedge.rb
 lib/rubyvis/sceneelement.rb
 lib/rubyvis/transform.rb
 spec/bar_spec.rb
@@ -44,9 +61,11 @@ spec/internal_spec.rb
 spec/javascript_behaviour_spec.rb
 spec/label_spec.rb
 spec/mark_spec.rb
+spec/nest_spec.rb
 spec/panel_spec.rb
 spec/scale_linear_datetime_spec.rb
 spec/scale_linear_spec.rb
+spec/scale_ordinal_spec.rb
 spec/scale_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/examples/antibiotics/antibiotics.rb

@@ -0,0 +1,96 @@
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
+require 'rubyvis'
+load(File.dirname(__FILE__)+"/antibiotics_data.rb")
+
+s = 180
+_p = 20
+z = pv.Scale.log(0.001, 1000).range(0, s)
+color = pv.colors("darkred", "darkblue").by(lambda {|d|  d[:gram]})
+ticks = pv.range(-2, 3).map {|e| 10**e}
+
+#/* Root panel. */
+vis = Rubyvis::Panel.new
+    .height(s * $antibiotics.size+ _p * ($antibiotics.size- 1))
+    .width(lambda {self.height()})
+    .top(14.5)
+    .left(14.5)
+    .bottom(44)
+    .right(14);
+
+#/* Cell for each antibiotic pair. */
+cell = vis.add(pv.Panel)
+    .data($antibiotics)
+    .width(s)
+    .left(lambda {(s + _p) * self.index})
+  .add(pv.Panel)
+    .data($antibiotics)
+    .height(s)
+    .top(lambda{(s + _p) * self.index})
+
+#/* Label. */
+cell.anchor("center").add(pv.Label)
+    .visible(lambda {|d, y, x| x == y})
+    .font("bold 14px sans-serif")
+    .text(lambda {|d, y, x|  x});
+
+#/* Dot plot and frame. */
+plot = cell.add(pv.Panel)
+    .data(lambda {|y, x| [x]})
+    .visible(lambda {|x, y| x != y})
+    .stroke_style(pv.color("#aaa"));
+
+#/* Ticks. */
+tick = pv.Rule.new()
+    .visible(lambda {|d, x, y| x != y})
+    .data(ticks)
+    .stroke_style(pv.color("#ddd"));
+
+#/* X-axis ticks. */
+xtick = plot.add(pv.Rule)
+    .extend(tick)
+    .left(lambda {|d| z.scale(d)});
+
+#/* Bottom and top labels. */
+xtick.anchor("bottom").add(pv.Label)
+    .visible(lambda {cell.index == $antibiotics.size- 1});
+xtick.anchor("top").add(pv.Label)
+    .visible(lambda {cell.index == 0});
+
+#/* Y-axis ticks. */
+ytick = plot.add(pv.Rule)
+    .extend(tick)
+    .bottom(lambda {|d| z.scale(d)});
+
+#/* Bottom and top labels. */
+ytick.anchor("right").add(pv.Label)
+    .visible(lambda {cell.parent.index == $antibiotics.size- 1})
+    .text_angle(Math::PI / 2.0)
+    .text_baseline("bottom")
+    .text_align("center");
+ytick.anchor("left").add(pv.Label)
+    .visible(lambda {cell.parent.index == 0})
+    .text_angle(-Math::PI / 2.0)
+    .text_baseline("bottom")
+    .text_align("center");
+
+#/* Dot plot. */
+dot = plot.add(pv.Dot)
+    .data($bacteria)
+    .stroke_style(pv.color("red"))
+    .fill_style(lambda {self.stroke_style()})
+    .left(lambda {|d, x, y| z.scale(d[x])})
+    .bottom(lambda {|d, x, y| z.scale(d[y])})
+    .title(lambda {|d| d[:name]});
+
+#/* Legend. */
+vis.add(pv.Dot)
+    .extend(dot)
+    .data([{gram:"positive"}, {gram:"negative"}])
+    .bottom(-30)
+    .left(lambda { self.index * 100})
+    .title(nil)
+  .anchor("right").add(pv.Label)
+    .text(lambda {|d| "Gram-" + d[:gram]});
+
+vis.render();
+puts vis.to_svg

data/examples/antibiotics/antibiotics_data.rb

@@ -0,0 +1,20 @@
+$antibiotics = ["penicillin", "streptomycin", "neomycin"];
+
+$bacteria = [
+  {name: "Mycobacterium tuberculosis", penicillin: 800, streptomycin: 5, neomycin: 2, gram: "negative"},
+  {name: "Salmonella schottmuelleri", penicillin: 10, streptomycin: 0.8, neomycin: 0.09, gram: "negative"},
+  {name: "Proteus vulgaris", penicillin: 3, streptomycin: 0.1, neomycin: 0.1, gram: "negative"},
+  {name: "Klebsiella pneumoniae", penicillin: 850, streptomycin: 1.2, neomycin: 1, gram: "negative"},
+  {name: "Brucella abortus", penicillin: 1, streptomycin: 2, neomycin: 0.02, gram: "negative"},
+  {name: "Pseudomonas aeruginosa", penicillin: 850, streptomycin: 2, neomycin: 0.4, gram: "negative"},
+  {name: "Escherichia coli", penicillin: 100, streptomycin: 0.4, neomycin: 0.1, gram: "negative"},
+  {name: "Salmonella (Eberthella) typhosa", penicillin: 1, streptomycin: 0.4, neomycin: 0.008, gram: "negative"},
+  {name: "Aerobacter aerogenes", penicillin: 870, streptomycin: 1, neomycin: 1.6, gram: "negative"},
+  {name: "Brucella antracis", penicillin: 0.001, streptomycin: 0.01, neomycin: 0.007, gram: "positive"},
+  {name: "Streptococcus fecalis", penicillin: 1, streptomycin: 1, neomycin: 0.1, gram: "positive"},
+  {name: "Staphylococcus aureus", penicillin: 0.03, streptomycin: 0.03, neomycin: 0.001, gram: "positive"},
+  {name: "Staphylococcus albus", penicillin: 0.007, streptomycin: 0.1, neomycin: 0.001, gram: "positive"},
+  {name: "Streptococcus hemolyticus", penicillin: 0.001, streptomycin: 14, neomycin: 10, gram: "positive"},
+  {name: "Streptococcus viridans", penicillin: 0.005, streptomycin: 10, neomycin: 40, gram: "positive"},
+  {name: "Diplococcus pneumoniae", penicillin: 0.005, streptomycin: 11, neomycin: 10, gram: "positive"}
+];

data/examples/area.rb

@@ -0,0 +1,103 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+data = pv.range(0, 10, 1).map {|x| 
+  OpenStruct.new({:x=> x, :y=> Math.sin(x) + 2})
+}
+
+
+w = 400
+h = 200
+x = pv.Scale.linear(data, lambda {|d| d.x}).range(0, w)
+
+
+y = pv.Scale.linear(0, 4).range(0, h);
+
+#/* The root panel. */
+vis = pv.Panel.new()
+    .width(w)
+    .height(h)
+    .bottom(20)
+    .left(20)
+    .right(10)
+    .top(5)
+
+# Y-axis and ticks.
+vis.add(pv.Rule)
+    .data(y.ticks(5))
+    .bottom(y)
+    .stroke_style(lambda {|d| d!=0 ? "#eee" : "#000"})
+  .anchor("left").add(pv.Label)
+  .text(y.tick_format)
+
+# X-axis and ticks.
+vis.add(pv.Rule)
+    .data(x.ticks())
+    .visible(lambda {|d| d!=0})
+    .left(x)
+    .bottom(-5)
+    .height(5)
+    .anchor("bottom").add(pv.Label)
+  .text(x.tick_format)
+
+#/* The area with top line. */
+vis.add(pv.Area)
+    .data(data)
+    .bottom(1)
+    .left(lambda {|d| x.scale(d.x)})
+    .height(lambda {|d| y.scale(d.y)})
+    .fill_style("rgb(121,173,210)")
+  .anchor("top").add(pv.Line)
+  .line_width(3)
+
+vis.render();
+
+
+puts vis.to_svg
+
+=begin
+<svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="430" height="225">
+<g transform="translate(20, 5)">
+<line shape-rendering="crispEdges" x1="0" y1="200" x2="400" y2="200" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="0" y1="150" x2="400" y2="150" stroke="rgb(238,238,238)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="0" y1="100" x2="400" y2="100" stroke="rgb(238,238,238)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="0" y1="50" x2="400" y2="50" stroke="rgb(238,238,238)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="0" y1="0" x2="400" y2="0" stroke="rgb(238,238,238)" stroke-width="1"/>
+</g>
+<g transform="translate(20, 5)">
+<text pointer-events="none" x="-3" dy="0.35em" transform="translate(0, 200)" fill="rgb(0,0,0)" text-anchor="end">0</text>
+<text pointer-events="none" x="-3" dy="0.35em" transform="translate(0, 150)" fill="rgb(0,0,0)" text-anchor="end">1</text>
+<text pointer-events="none" x="-3" dy="0.35em" transform="translate(0, 100)" fill="rgb(0,0,0)" text-anchor="end">2</text>
+<text pointer-events="none" x="-3" dy="0.35em" transform="translate(0, 50)" fill="rgb(0,0,0)" text-anchor="end">3</text>
+<text pointer-events="none" x="-3" dy="0.35em" fill="rgb(0,0,0)" text-anchor="end">4</text>
+</g>
+<g transform="translate(20, 5)">
+<line shape-rendering="crispEdges" x1="44.44444444444444" y1="200" x2="44.44444444444444" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="88.88888888888889" y1="200" x2="88.88888888888889" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="133.33333333333331" y1="200" x2="133.33333333333331" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="177.77777777777777" y1="200" x2="177.77777777777777" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="222.22222222222223" y1="200" x2="222.22222222222223" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="266.66666666666663" y1="200" x2="266.66666666666663" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="311.11111111111114" y1="200" x2="311.11111111111114" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="355.55555555555554" y1="200" x2="355.55555555555554" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+<line shape-rendering="crispEdges" x1="400" y1="200" x2="400" y2="205" stroke="rgb(0,0,0)" stroke-width="1"/>
+</g>
+<g transform="translate(20, 5)">
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(44.4444, 205)" fill="rgb(0,0,0)" text-anchor="middle">1</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(88.8889, 205)" fill="rgb(0,0,0)" text-anchor="middle">2</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(133.333, 205)" fill="rgb(0,0,0)" text-anchor="middle">3</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(177.778, 205)" fill="rgb(0,0,0)" text-anchor="middle">4</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(222.222, 205)" fill="rgb(0,0,0)" text-anchor="middle">5</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(266.667, 205)" fill="rgb(0,0,0)" text-anchor="middle">6</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(311.111, 205)" fill="rgb(0,0,0)" text-anchor="middle">7</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(355.556, 205)" fill="rgb(0,0,0)" text-anchor="middle">8</text>
+<text pointer-events="none" y="3" dy="0.71em" transform="translate(400, 205)" fill="rgb(0,0,0)" text-anchor="middle">9</text>
+</g>
+<g transform="translate(20, 5)">
+<path d="M0,99L44.44444444444444,56.92645075960516L88.88888888888889,53.535128658715905L133.33333333333331,91.94399959700664L177.77777777777777,136.8401247653964L222.22222222222223,146.94621373315692L266.66666666666663,112.9707749099463L311.11111111111114,66.15067006406053L355.55555555555554,49.53208766883091L400,78.39407573791217L400,199L355.55555555555554,199L311.11111111111114,199L266.66666666666663,199L222.22222222222223,199L177.77777777777777,199L133.33333333333331,199L88.88888888888889,199L44.44444444444444,199L0,199Z" fill="rgb(121,173,210)"/>
+</g>
+<g transform="translate(20, 5)">
+<path d="M0,99L44.44444444444444,56.92645075960516L88.88888888888889,53.535128658715905L133.33333333333331,91.94399959700664L177.77777777777777,136.8401247653964L222.22222222222223,146.94621373315692L266.66666666666663,112.9707749099463L311.11111111111114,66.15067006406053L355.55555555555554,49.53208766883091L400,78.39407573791217" stroke="rgb(31,119,180)" stroke-width="3"/>
+</g>
+</svg>
+=end

data/examples/bar_column_chart.rb

@@ -0,0 +1,55 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+data = pv.range(10).map {|d| rand + 0.1 }
+
+
+
+#/* Sizing and scales. *
+w = 400
+h = 250
+x = pv.Scale.linear(0, 1.1).range(0, w)
+y = pv.Scale.ordinal(pv.range(10)).split_banded(0, h, 4/5.0)
+
+#/* The root panel. */
+vis = pv.Panel.new()
+    .width(w)
+    .height(h)
+    .bottom(20)
+    .left(20)
+    .right(10)
+    .top(5);
+
+#/* The bars. */
+bar = vis.add(pv.Bar)
+    .data(data)
+    .top(lambda { y.scale(self.index)})
+    .height(y.range_band)
+    .left(0)
+    .width(x)
+
+#/* The value label. */
+bar.anchor("right").add(pv.Label)
+    .text_style("white")
+    .text(lambda {|d| "%0.1f" % d})
+
+#/* The variable label. */
+bar.anchor("left").add(pv.Label)
+    .text_margin(5)
+    .text_align("right")
+    .text(lambda { "ABCDEFGHIJK"[self.index,1]});
+
+#/* X-axis ticks. */
+vis.add(pv.Rule)
+    .data(x.ticks(5))
+    .left(x)
+    .stroke_style(lambda {|d|  d!=0 ? "rgba(255,255,255,.3)" : "#000"})
+  .add(pv.Rule)
+    .bottom(0)
+    .height(5)
+    .stroke_style("#000")
+  .anchor("bottom").add(pv.Label)
+  .text(x.tick_format);
+
+vis.render();
+puts vis.to_svg

data/examples/barley/barley.rb

@@ -1,13 +1,21 @@
 $:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
-
+load(File.dirname(__FILE__)+"/barley_data.rb")
 # Nest yields data by site then year. */
 
-barley = pv.nest(barley)
-    .key(lambda {|d| d.site})
+# Compute yield medians by site and by variety. */
+median=lambda {|data| pv.median(data, lambda {|d| d[:yield]}) }
+
+site = pv.nest($barley).key(lambda {|d| d[:site]}).rollup(median)
+
+variety = pv.nest($barley).key(lambda {|d| d[:variety]}).rollup(median);
+
+
+barley = pv.nest($barley)
+    .key(lambda {|d| d[:site]})
     .sort_keys(lambda {|a, b| site[b] - site[a]})
-    .key(lambda {|d| d.year})
-    .sort_values(function {|a, b| variety[b.variety] - variety[a.variety]})
+    .key(lambda {|d| d[:year]})
+    .sort_values(lambda {|a, b| variety[b[:variety]] - variety[a[:variety]]})
     .entries()
 
 # Sizing and scales. */
@@ -17,12 +25,12 @@ x = pv.Scale.linear(10, 90).range(0, w)
 c = pv.Colors.category10()
 
 # The root panel. */
-var vis = new pv.Panel()
+vis = Rubyvis::Panel.new
     .width(w)
     .height(h * pv.keys(site).length)
     .top(15.5)
     .left(0.5)
-    .right(.5)
+    .right(0.5)
     .bottom(25);
 
 # A panel per site-year. */
@@ -31,40 +39,40 @@ cell = vis.add(pv.Panel)
     .height(h)
     .left(90)
     .top(lambda { self.index * h})
-    .strokeStyle("#999");
+    .stroke_style(pv.color("#999"));
 
 # Title bar. */
 cell.add(pv.Bar)
     .height(14)
-    .fillStyle("bisque")
+    .fill_style(pv.color("bisque"))
   .anchor("center").add(pv.Label)
   .text(lambda{|site| site.key});
 
 # A dot showing the yield. */
-var dot = cell.add(pv.Panel)
+dot = cell.add(pv.Panel)
 .data(lambda {|site| site.values})
     .top(23)
   .add(pv.Dot)
   .data(lambda {|year| year.values})
-  .left(lamdba {|d| x(d.yield)})
+  .left(lambda {|d| x.scale(d[:yield])})
     .top(lambda {self.index * 11})
-    .shapeSize(10)
-    .lineWidth(2)
-    .strokeStyle(lambda {|d| c(d.year)})
+    .shape_size(10)
+    .line_width(2)
+    .stroke_style(lambda {|d| c.scale(d[:year])})
 
 # A label showing the variety. */
 dot.anchor("left").add(pv.Label)
   .visible(lambda { !self.parent.index})
   .left(-2)
-  .text(lambda {|d| d.variety})
+  .text(lambda {|d| d[:variety]})
 
 # X-ticks. */
 vis.add(pv.Rule)
     .data(x.ticks())
-    .left(lambda {|d| 90 + x.scale(d)})
+    .left(lambda {|d|  x.scale(d)})
     .bottom(-5)
     .height(5)
-    .strokeStyle("#999")
+    .stroke_style(pv.color("#999"))
   .anchor("bottom").add(pv.Label);
 
 # A legend showing the year. */
@@ -74,6 +82,8 @@ vis.add(pv.Dot)
     .left(lambda {|d| 260 + self.index * 40})
     .top(-8)
   .anchor("right").add(pv.Label)
-  .text(lambda {|d| d.year})
+  .text(lambda {|d| d[:year]})
+
+vis.render()
 
-vis.render()
+puts vis.to_svg