rubyvis 0.1.3 → 0.1.4

data.tar.gz.sig

@@ -1,3 +1 @@
-��!8O
���[��S<!͊���tDp�
-JIcA݃��>�Cr�m�
-A{�F��kb]�Q������t}2ٜ��S�;
+d!FA&{���Ap��O�WC��Q!v���!��a:-�!�	N���[5������z\��譋�LV��?�y��d'ПP}���,u�b�~��p T�$�N%�̗����z��
BtP��SX

data/History.txt

@@ -1,4 +1,12 @@
-=== 0.1.3 / 2010-10-08
+=== 0.1.4 / 2010-10-20
+
+* Bug fix: Order now works on Nest
+* Added log scale spec. domain, range, scale, invert and ticks works like javascript version
+* First stack layout version operational
+* Added grouped and stacked chart examples
+
+
+=== 0.1.3 / 2010-10-08
 
 * New Wedge and  Dot mark
 * New Log scale and Nest. 

data/Manifest.txt

@@ -13,10 +13,13 @@ examples/crimea/crimea_grouped_bar.rb
 examples/crimea/crimea_line.rb
 examples/dot.rb
 examples/first.rb
+examples/grouped_charts.rb
 examples/line.rb
+examples/line_and_step.rb
 examples/pie_and_donut.rb
 examples/scatterplot.rb
 examples/second.rb
+examples/stacked_charts.rb
 examples/third.rb
 lib/rubyvis.rb
 lib/rubyvis/color/color.rb
@@ -28,6 +31,8 @@ lib/rubyvis/format/number.rb
 lib/rubyvis/internals.rb
 lib/rubyvis/javascript_behaviour.rb
 lib/rubyvis/label.rb
+lib/rubyvis/layout.rb
+lib/rubyvis/layout/stack.rb
 lib/rubyvis/mark.rb
 lib/rubyvis/mark/anchor.rb
 lib/rubyvis/mark/area.rb

data/README.txt

@@ -8,13 +8,34 @@ Ruby port of Protovis, a great visualization toolkit
 
 == FEATURES/PROBLEMS:
 
-Implemented: Panel, Bar, Rule, Line and Label. Anchor doesn't work yet 
-I try to maintain, when posible, complete compatibility with Javascript API. Johnson [http://github.com/jbarnette/johnson] - the lovely Javascript wrapper inside Ruby embrace - is our friend. 
+Implemented: All marks, except transient, image and transition. 
+
+Basic protovis examples[http://vis.stanford.edu/protovis/ex/] works exactly like ruby ones with minor sintactic modifications:
+* Area Charts: Ok
+* Bar & Column Charts: Ok
+* Scatterplots: Ok
+* Pie & Donut: Interaction with mouse not implemented
+* Line & Step Charts: Ok
+* Stacked Charts: Ok
+* Grouped Charts: Almost ok. Problems on data stack at third level.
+
+Complex examples requires more works:
+
+* antibiotics: Almost ok. Missing center labels
+* barley: ok
+* crimea: line and grouped line ok.
+
+
+I try to maintain, when posible, complete compatibility with Javascript API, including camel case naming of functions. Johnson [http://github.com/jbarnette/johnson] - the lovely Javascript wrapper inside Ruby embrace - is our friend. 
 
 Until version 0.1.0, lambdas should always should created explicitly for method you may be temted to call it with a block.
+
 On a second stage, traditional block calling could be using maintaining backwards compatibily with Javascript API,
+
 User could use +pv+ freely, cause is defined as a global method which call Rubyvis.
 
++self.parent.index+ doesn't work always as expected. +self.index+ works ok. I'm working on it
+
 == CURRENT PROGRESS
 
 * pv.js
@@ -25,14 +46,20 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 * data/Numbers.js
 * data/Scale.js
 * data/LinearScale.js
+* data/LogScale.js (incomplete)
+* data/Nest.js
 * data/QuantitativeScale.js
-* data/OrdinalScale.js (not tested)
-* mark/Mark.js
+* data/OrdinalScale.js
+* mark/Anchor.js
+* mark/Area.js
 * mark/Bar.js 
-* mark/Panel.js
+* mark/Dot.js 
 * mark/Label.js
 * mark/Line.js
+* mark/Mark.js
+* mark/Panel.js
 * mark/Rule.js
+* mark/Wedge.js
 * scene/SvgBar.js
 * scene/SvgLabel.js
 * scene/SvgLine.js
@@ -55,7 +82,8 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
     vis.render
     puts vis.to_svg
     
-
+See examples directory for original protovis examples adaptations.
+    
 == REQUIREMENTS:
 
 Ruby 1.8.7 or 1.9.1

data/examples/antibiotics/antibiotics.rb

@@ -5,8 +5,8 @@ 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}
+color = pv.colors("darkred", "darkblue")
+ticks = pv.range(-2, 3).map {|e| (10**e).to_f}
 
 #/* Root panel. */
 vis = Rubyvis::Panel.new
@@ -29,7 +29,7 @@ cell = vis.add(pv.Panel)
 
 #/* Label. */
 cell.anchor("center").add(pv.Label)
-    .visible(lambda {|d, y, x| x == y})
+    .visible(lambda {|d, y, x| puts d,y,x; return  x == y})
     .font("bold 14px sans-serif")
     .text(lambda {|d, y, x|  x});
 
@@ -37,18 +37,18 @@ cell.anchor("center").add(pv.Label)
 plot = cell.add(pv.Panel)
     .data(lambda {|y, x| [x]})
     .visible(lambda {|x, y| x != y})
-    .stroke_style(pv.color("#aaa"));
+    .stroke_style("#aaa");
 
 #/* Ticks. */
 tick = pv.Rule.new()
     .visible(lambda {|d, x, y| x != y})
     .data(ticks)
-    .stroke_style(pv.color("#ddd"));
+    .stroke_style("#ddd");
 
 #/* X-axis ticks. */
 xtick = plot.add(pv.Rule)
     .extend(tick)
-    .left(lambda {|d| z.scale(d)});
+    .left(z);
 
 #/* Bottom and top labels. */
 xtick.anchor("bottom").add(pv.Label)
@@ -59,7 +59,7 @@ xtick.anchor("top").add(pv.Label)
 #/* Y-axis ticks. */
 ytick = plot.add(pv.Rule)
     .extend(tick)
-    .bottom(lambda {|d| z.scale(d)});
+    .bottom(z);
 
 #/* Bottom and top labels. */
 ytick.anchor("right").add(pv.Label)
@@ -76,10 +76,10 @@ ytick.anchor("left").add(pv.Label)
 #/* 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])})
+    .stroke_style(lambda {|d| color.scale(d[:gram])})
+    .fill_style(lambda {|d| color.scale(d[:gram]).alpha(0.2)})
+    .left(lambda {|d, x, y|  z.scale(d[x.to_sym])})
+    .bottom(lambda {|d, x, y| z.scale(d[y.to_sym])})
     .title(lambda {|d| d[:name]});
 
 #/* Legend. */

data/examples/barley/barley.rb

@@ -27,7 +27,7 @@ c = pv.Colors.category10()
 # The root panel. */
 vis = Rubyvis::Panel.new
     .width(w)
-    .height(h * pv.keys(site).length)
+    .height(h * pv.keys(site).size)
     .top(15.5)
     .left(0.5)
     .right(0.5)
@@ -44,7 +44,7 @@ cell = vis.add(pv.Panel)
 # Title bar. */
 cell.add(pv.Bar)
     .height(14)
-    .fill_style(pv.color("bisque"))
+    .fill_style("bisque")
   .anchor("center").add(pv.Label)
   .text(lambda{|site| site.key});
 
@@ -62,17 +62,17 @@ dot = cell.add(pv.Panel)
 
 # A label showing the variety. */
 dot.anchor("left").add(pv.Label)
-  .visible(lambda { !self.parent.index})
+  .visible(lambda { self.parent.index!=0})
   .left(-2)
   .text(lambda {|d| d[:variety]})
 
 # X-ticks. */
 vis.add(pv.Rule)
     .data(x.ticks())
-    .left(lambda {|d|  x.scale(d)})
+    .left(lambda {|d|  90+x.scale(d)})
     .bottom(-5)
     .height(5)
-    .stroke_style(pv.color("#999"))
+    .stroke_style("#999")
   .anchor("bottom").add(pv.Label);
 
 # A legend showing the year. */

data/examples/grouped_charts.rb

@@ -0,0 +1,67 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+n = 3
+m = 4
+data = pv.range(n).map {
+    pv.range(m).map {
+        rand() + 0.1;
+      }
+}
+
+
+w = 400
+h = 250
+x = pv.Scale.linear(0, 1.1).range(0, w)
+y = pv.Scale.ordinal(pv.range(n)).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. */
+
+colors=pv.Colors.category20()
+
+bar = vis.add(pv.Panel)
+    .data(data)
+    .top(lambda {y.scale(self.index)})
+    .height(y.range_band)
+  .add(pv.Bar)
+    .data(lambda {|d| d})
+    .top(lambda {self.index * y.range_band / m.to_f})
+    .height(y.range_band / m.to_f)
+    .left(0)
+    .width(x)
+    .fillStyle(lambda { colors.scale(self.index)})
+
+#/* The value label. */
+bar.anchor("right").add(pv.Label)
+    .textStyle("white")
+    .text(lambda {|d| "%0.1f" % d});
+
+#/* The variable label. */
+bar.parent.anchor("left").add(pv.Label)
+    .textAlign("right")
+    .textMargin(5)
+    .text(lambda {"ABCDEFGHIJK"[self.parent.index,1]});
+
+#/* X-axis ticks. */
+vis.add(pv.Rule)
+    .data(x.ticks(5))
+    .left(x)
+    .strokeStyle(lambda {|d| d!=0 ? "rgba(255,255,255,.3)" : "#000"})
+  .add(pv.Rule)
+    .bottom(0)
+    .height(5)
+    .strokeStyle("#000")
+  .anchor("bottom").add(pv.Label)
+    .text(x.tick_format);
+
+vis.render();
+puts vis.to_svg

data/examples/line_and_step.rb

@@ -0,0 +1,61 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+data = pv.range(0, 10, 0.2).map {|x| 
+  OpenStruct.new({:x=> x, :y=> Math.sin(x) + rand() + 1.5})
+}
+
+
+vis = pv.Panel.new().width(200).height(200);
+
+
+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);
+
+#/* X-axis ticks. */
+vis.add(pv.Rule)
+    .data(x.ticks())
+    .visible(lambda {|d|  d > 0})
+    .left(x)
+    .strokeStyle("#eee")
+  .add(pv.Rule)
+    .bottom(-5)
+    .height(5)
+    .strokeStyle("#000")
+  .anchor("bottom").add(pv.Label)
+  .text(x.tick_format)
+
+#/* Y-axis ticks. */
+vis.add(pv.Rule)
+    .data(y.ticks(5))
+    .bottom(y)
+    .strokeStyle(lambda {|d| d!=0 ? "#eee" : "#000"})
+  .anchor("left").add(pv.Label)
+  .text(y.tick_format);
+
+#/* The line. */
+vis.add(pv.Line)
+    .data(data)
+    .interpolate("step-after")
+    .left(lambda {|d| x.scale(d.x)})
+    .bottom(lambda {|d| y.scale(d.y)})
+    .lineWidth(3);
+
+vis.render();
+
+
+    
+
+puts vis.to_svg

data/examples/stacked_charts.rb

@@ -0,0 +1,50 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+data = pv.range(4).map {|i|
+  pv.range(0, 10, 1).map {|x|
+    OpenStruct.new({:x=> x, :y=> Math.sin(x) + rand() * 0.5 + 2})
+  }
+}
+
+w = 400
+h = 200
+
+x = pv.Scale.linear(0, 9.9).range(0, w)
+y = pv.Scale.linear(0, 14).range(0, h)
+
+#/* The root panel. */
+vis = pv.Panel.new()
+    .width(w)
+    .height(h)
+    .bottom(20)
+    .left(20)
+    .right(10)
+    .top(5)
+    if(true)
+#/* 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)
+#/* Y-axis and ticks. */
+vis.add(pv.Rule)
+    .data(y.ticks(3))
+    .bottom(y)
+    .strokeStyle(lambda {|d|  d!=0 ? "rgba(128,128,128,.2)" : "#000"})
+  .anchor("left").add(pv.Label)
+  .text(y.tick_format)
+end
+#/* The stack layout. */
+vis.add(pv.Layout.Stack)
+    .layers(data)
+    .x(lambda {|d| x.scale(d.x)})
+    .y(lambda {|d| y.scale(d.y)})
+  .layer.add(pv.Area)
+
+vis.render();
+puts vis.to_svg

data/examples/third.rb

@@ -1,16 +1,20 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'
 
-vis = pv.Panel.new().width(300).height(150);
+vis = pv.Panel.new().width(200).height(150);
 
-vis.add(pv.Panel).data([1,2]).add(pv.Bar)
-    .data([3,4])
+bar= vis.add(pv.Panel).data(["a","b"]).add(pv.Bar)
+    .data([1,2])
     .width(20)
-    .height(lambda {|d|  d * 20})
+    .height(60)
     .bottom(0)
-    .left(lambda {|d,t| t*60+self.index*30}).add(pv.Label).text(lambda {|d,t| "#{t}-#{d}"})
+    .left(lambda {|d,t| self.parent.index*60+self.index*30})
+    
+    
+ bar.anchor("bottom").add(pv.Label).text(lambda {|d,t| "#{t}-#{d}"})
+ bar.anchor("top").add(pv.Label).text(lambda {"#{self.parent.index}-#{index}"})
+    
     
-
 vis.render()
 #puts vis.children_inspect
 puts vis.to_svg

data/lib/rubyvis.rb

@@ -17,6 +17,8 @@ require 'rubyvis/scale'
 require 'rubyvis/color/color'
 require 'rubyvis/color/colors'
 
+require 'rubyvis/layout'
+
 require 'rubyvis/scene/svg_scene'
 require 'rubyvis/transform'
 
@@ -26,7 +28,7 @@ end
 
 module Rubyvis
   @document=nil
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   API_VERSION='3.3'
   Infinity=1.0 / 0 # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/
   # :section: basic methods

data/lib/rubyvis/layout.rb

@@ -0,0 +1,25 @@
+module Rubyvis
+  def self.Layout
+    Rubyvis::Layout
+  end
+  class Layout < Rubyvis::Panel
+    @properties=Mark.properties.dup    
+    def self.attr_accessor_dsl(*attr)
+      attr.each  do |sym|
+        if sym.is_a? Array
+          name,func=sym
+        else
+          name=sym
+          func=nil
+        end
+        @properties[name]=true
+        self.property_method(name,false, func, self)        
+        define_method(name.to_s+"=") {|v|
+          self.send(name,v)
+        }
+      end
+    end
+  end
+end
+
+#require 'rubyvis/layout/stack'