rubyvis 0.3.3 → 0.3.4

data/lib/rubyvis/internals.rb

@@ -123,8 +123,8 @@ module Rubyvis
   def self.range(*arguments)
     start, stop, step=arguments
     if (arguments.size == 1)
-      stop = start;
-      start = 0;
+      stop = start
+      start = 0
     end
     step||= 1
     raise "range must be finite" if ((stop - start) / step.to_f).infinite?

data/lib/rubyvis/layout.rb

@@ -32,8 +32,10 @@ module Rubyvis
 end
 
 require 'rubyvis/layout/stack'
+require 'rubyvis/layout/grid'
 require 'rubyvis/layout/network'
 require 'rubyvis/layout/hierarchy'
+require 'rubyvis/layout/tree'
 require 'rubyvis/layout/treemap'
 require 'rubyvis/layout/partition'
 require 'rubyvis/layout/cluster'

data/lib/rubyvis/layout/grid.rb

@@ -0,0 +1,105 @@
+module Rubyvis
+  class Layout
+    # Alias for Rubyvis::Layout::Grid 
+    def self.Grid
+      Rubyvis::Layout::Grid
+    end
+    
+    # Implements a grid layout with regularly-sized rows and columns. The
+    # number of rows and columns are determined from their respective
+    # properties. For example, the 2×3 array:
+    #
+    # <pre>1 2 3
+    # 4 5 6</pre>
+    #
+    # can be represented using the <tt>rows</tt> property as:
+    #
+    # <pre>[[1, 2, 3], [4, 5, 6]]</pre>
+    #
+    # If your data is in column-major order, you can equivalently use the
+    # <tt>columns</tt> property. If the <tt>rows</tt> property is an array, it
+    # takes priority over the <tt>columns</tt> property. The data is implicitly
+    # transposed, as if the {@link pv.transpose} operator were applied.
+    #
+    # <p>This layout exports a single <tt>cell</tt> mark prototype, which is
+    # intended to be used with a bar, panel, layout, or subclass thereof. The data
+    # property of the cell prototype is defined as the elements in the array. For
+    # example, if the array is a two-dimensional array of values in the range
+    # [0,1], a simple heatmap can be generated as:
+    #
+    # <pre>vis.add(pv.Layout.Grid)
+    #     .rows(arrays)
+    #   .cell.add(pv.Bar)
+    #     .fillStyle(pv.ramp("white", "black"))</pre>
+    #
+    # The grid subdivides the full width and height of the parent panel into equal
+    # rectangles. Note, however, that for large, interactive, or animated heatmaps,
+    # you may see significantly better performance through dynamic {@link pv.Image}
+    # generation.
+    #
+    # <p>For irregular grids using value-based spatial partitioning, see {@link
+    # pv.Layout.Treemap}.
+
+    
+    
+    class Grid < Layout
+      attr_accessor :_grid
+      attr_accessor :cell
+      @properties=Layout.properties.dup
+      def initialize
+        super
+        @cell=_cell
+      end
+      def _cell
+        that=self
+        m=Rubyvis::Mark.new().
+          data(lambda {that.scene[that.index]._grid}).
+          width(lambda {that.width/that.cols.to_f}).
+          height(lambda {that.height/that.rows.to_f}).
+          left(lambda {(that.width/that.cols.to_f)*(self.index % that.cols)}).
+          top(lambda {(that.height/that.rows.to_f)*(self.index / that.cols).floor})
+        m.parent=self
+        m
+      end
+      private :_cell
+      
+      
+      ##
+      # :attr: rows
+      # The number of rows. This property can also be specified as the data in
+      # row-major order; in this case, the rows property is implicitly set to the
+      # length of the array, and the cols property is set to the length of the first
+      # element in the array.
+      #
+      
+      ##
+      # :attr: cols
+      #
+      # The number of columns. This property can also be specified as the data in
+      # column-major order; in this case, the cols property is implicitly set to the
+      # length of the array, and the rows property is set to the length of the first
+      # element in the array.
+      #
+
+      attr_accessor_dsl :rows, :cols
+      def self.defaults
+        Rubyvis::Layout::Grid.new.mark_extend(Rubyvis::Layout.defaults).
+          rows(1).
+          cols(1)
+      end
+      def build_implied(s)
+        layout_build_implied(s)
+        r=s.rows
+        c=s.cols
+        r=Rubyvis.transpose(c) if c.is_a? Array
+        if r.is_a? Array
+          s._grid=Rubyvis.blend(r)
+          s.rows=r.size
+          s.cols=r[0] ? r[0].size : 0
+        else
+          s._grid=Rubyvis.repeat([s.data],r*c)
+        end
+      end
+    end
+  end
+end

data/lib/rubyvis/layout/pack.rb

@@ -1,6 +1,6 @@
 module Rubyvis
   class Layout
-    # Alias for Rubyvis::Layout::Indent 
+    # Alias for Rubyvis::Layout::Indent
     def self.Pack
       Rubyvis::Layout::Pack
     end
@@ -37,7 +37,7 @@ module Rubyvis
     # H. Wang, G. Dai, and H. Wang, ACM CHI 2006.
     #/
     class Pack < Hierarchy
-      @properties=Hierarchy.properties.dup 
+      @properties=Hierarchy.properties.dup
       def initialize
         super
         @node.
@@ -45,15 +45,15 @@ module Rubyvis
         stroke_style("rgb(31, 119, 180)").
         fill_style("rgba(31, 119, 180, 0.25)")
 
-      
-      @node_label.text_align("center")
-        
+
+        @node_label.text_align("center")
+
         @link=nil
-        
+
         @radius = lambda { 1 }
       end
-      
-      
+
+
       ##
       # :attr: spacing
       # The spacing parameter; defaults to 1, which provides a little bit of padding
@@ -62,7 +62,7 @@ module Rubyvis
       # nodes as large as possible, with no padding on enclosing circles.
       #
       # @type number
-      
+
       ##
       # :attr: order
       # The sibling node order. The default order is <tt>null</tt>, which means to
@@ -73,10 +73,10 @@ module Rubyvis
       # beforehand using the {@link pv.Dom} operator.
       #
       # @see pv.Dom.Node#sort
-      
-      
+
+
       attr_accessor_dsl :spacing, :order
-      
+
       ##
       # Default properties for circle-packing layouts. The default spacing parameter
       # is 1 and the default order is "ascending".
@@ -86,11 +86,11 @@ module Rubyvis
         spacing(1).
         order("ascending")
       end
-            
-      
+
+
       # TODO is it possible for spacing to operate in pixel space?
       # Right now it appears to be multiples of the smallest radius.
-      
+
       ##
       # Specifies the sizing function. By default, a sizing function is disabled and
       # all nodes are given constant size. The sizing function is invoked for each
@@ -109,7 +109,7 @@ module Rubyvis
       # @returns {pv.Layout.Pack} this.
       def size(f)
         if f.is_a? Proc
-          @radius=lambda {|*args| Math.sqrt(f.js_apply(self,args))} 
+          @radius=lambda {|*args| Math.sqrt(f.js_apply(self,args))}
         else
           f=Math.sqrt(f)
           @radius=lambda {f}
@@ -117,7 +117,7 @@ module Rubyvis
         self
       end
       ## @private Compute the radii of the leaf nodes. #/
-      
+
       def radii(nodes)
         stack=Mark.stack
         stack.unshift(nil)
@@ -138,7 +138,7 @@ module Rubyvis
           nodes.push(c)
           c=c.next_sibling
         end
-      
+
         # Sort.
         case @s.order
         when "ascending"
@@ -148,7 +148,7 @@ module Rubyvis
         when 'reverse'
           nodes.reverse
         end
-        
+
         return pack_circle(nodes)
       end
       def bound(n)
@@ -164,7 +164,7 @@ module Rubyvis
         b.n = c
         c._p = b
       end
-      def splice(a, b) 
+      def splice(a, b)
         a.n = b
         b._p = a
       end
@@ -174,7 +174,7 @@ module Rubyvis
         dr = a.radius + b.radius
         (dr * dr - dx * dx - dy * dy) > 0.001 # within epsilon
       end
-      
+
       ## @private #/
       def place(a, b, c)
         da = b.radius + c.radius
@@ -183,20 +183,19 @@ module Rubyvis
         dy = b.y - a.y
         dc = Math.sqrt(dx * dx + dy * dy)
         cos = (db * db + dc * dc - da * da) / (2.0 * db * dc)
-        
         theta = Math.acos(cos)
         x = cos * db
         h = Math.sin(theta) * db
-        dx /= dc
-        dy /= dc
+        dx = dx/dc
+        dy = dy/dc
         c.x = a.x + x * dx + h * dy
         c.y = a.y + x * dy - h * dx
       end
-      
+
       # @private #/
-      def transform(n, x, y, k) 
+      def transform(n, x, y, k)
         c=n.first_child
-        while(c) do 
+        while(c) do
           c.x += n.x
           c.y += n.y
           transform(c, x, y, k)
@@ -207,29 +206,29 @@ module Rubyvis
         n.radius *= k
         n.mid_angle=0 # Undefined on protovis
       end
-      
 
-      def pack_circle(nodes) 
+
+      def pack_circle(nodes)
         @x_min = Infinity
         @x_max = -Infinity
         @y_min = Infinity
         @y_max = -Infinity
         a=b=c=j=k=nil
-      
-      
+
+
         # Create first node.
         a = nodes[0];
         a.x = -a.radius
         a.y = 0
         bound(a)
-      
+
         # Create second node. #/
         if (nodes.size > 1)
           b = nodes[1]
           b.x = b.radius
           b.y = 0
           bound(b)
-      
+
           # Create third node and build chain.
           if (nodes.size > 2)
             c = nodes[2]
@@ -239,35 +238,35 @@ module Rubyvis
             a._p = c
             insert(c, b)
             b = a.n
-      
+
             # Now iterate through the rest.
             i=3
-            while(i<nodes.size) do
+            while(i < nodes.size) do
               c=nodes[i]
               place(a, b, c)
-              
+
               # Search for the closest intersection. #/
               isect = 0
               s1 = 1
               s2 = 1
-              
+
               j=b.n
               while(j!=b) do
-                if (intersects(j,c))
-                  isect=1;
-                  break;
+                if (intersects(j, c))
+                  isect=1
+                  break
                 end
                 j=j.n
                 s1+=1
               end
-              
+
               if isect==1
                 k=a._p
-                while(k!=k._p) do
+                while(k!=j._p) do
                   if(intersects(k,c))
-                    if(s2<s1)
+                    if(s2 < s1)
                       isect=-1
-                      k=j
+                      j=k
                     end
                     break
                   end
@@ -275,10 +274,10 @@ module Rubyvis
                   s2+=1
                 end
               end
-              
-      
+
+
               # Update node chain. #/
-              if (isect == 0) 
+              if (isect == 0)
                 insert(a, c)
                 b = c
                 bound(c)
@@ -293,11 +292,11 @@ module Rubyvis
               end
               i+=1
             end
-            
-            
+
+
           end
         end
-      
+
         # Re-center the circles and return the encompassing radius. #/
         cx = (@x_min + @x_max) / 2.0
         cy = (@y_min + @y_max) / 2.0
@@ -309,20 +308,20 @@ module Rubyvis
         end
         cr + @s.spacing
       end
-      
-      
+
+
       def build_implied(s)
         return nil if hierarchy_build_implied(s)
         @s=s
         nodes = s.nodes
         root = nodes[0]
         radii(nodes)
-      
+
         # Recursively compute the layout. #/
         root.x = 0
         root.y = 0
         root.radius = pack_tree(root)
-        
+
         w = self.width
         h = self.height
         k = 1.0 / [2.0 * root.radius / w, 2.0 * root.radius / h].max

data/lib/rubyvis/layout/stack.rb

@@ -79,7 +79,10 @@ module Rubyvis
       attr_accessor :_x, :_y, :_values, :prop
 
       def self.defaults
-        Stack.new.mark_extend(Layout.defaults).orient("bottom-left").offset("zero").layers([[]])
+        Stack.new.mark_extend(Layout.defaults).
+          orient("bottom-left").
+          offset("zero").
+          layers([[]])
       end
       
       # Constructs a new, empty stack layout. Layouts are not typically constructed
@@ -90,8 +93,8 @@ module Rubyvis
         @none=lambda {nil}
         @prop = {"t"=> @none, "l"=> @none, "r"=> @none, "b"=> @none, "w"=> @none, "h"=> @none}
         @values=nil
-        @_x=lambda {return 0}
-        @_y=lambda {return 0}
+        @_x=lambda {0}
+        @_y=lambda {0}
         @_values=Rubyvis.identity
       end
       def x(f)
@@ -123,7 +126,7 @@ module Rubyvis
       
       def build_implied(s)
         # puts "Build stack" if $DEBUG
-        panel_build_implied(s)
+        layout_build_implied(s)
         data = s.layers
         n = data.size
         m = nil
@@ -149,20 +152,20 @@ module Rubyvis
         stack.unshift(nil)
         values = []
         n.times {|i|
-        dy[i] = []
-        y[i] = []
-        o.parent.index = i
-        stack[0] = data[i]
-        values[i] = self._values.js_apply(o.parent, stack);
-        m = values[i].size if (i==0) 
-        stack.unshift(nil)
-        m.times {|j|
-          stack[0] = values[i][j]
-          o.index = j
-          x[j] = self._x.js_apply(o, stack) if i==0
-          dy[i][j] = self._y.js_apply(o, stack)
-        }
-        stack.shift()
+          dy[i] = []
+          y[i] = []
+          o.parent.index = i
+          stack[0] = data[i]
+          values[i] = self._values.js_apply(o.parent, stack)
+          m = values[i].size if (i==0) 
+          stack.unshift(nil)
+          m.times {|j|
+            stack[0] = values[i][j]
+            o.index = j
+            x[j] = self._x.js_apply(o, stack) if i==0
+            dy[i][j] = self._y.js_apply(o, stack)
+          }
+          stack.shift()
         }
         stack.shift()
         
@@ -250,11 +253,11 @@ module Rubyvis
         # Propagate the offset to the other series. */
         m.times {|j|
         o = y[_index[0]][j]
-        (1...n).each {|i|
-          
-          o += dy[_index[i - 1]][j]
-          y[_index[i]][j] = o
-        }
+          (1...n).each {|i|
+            
+            o += dy[_index[i - 1]][j]
+            y[_index[i]][j] = o
+          }
         }
         
         # /* Find the property definitions for dynamic substitution. */
@@ -265,7 +268,6 @@ module Rubyvis
         py = orient[0,1]
         
         @values=values
-        
         @prop.each {|k,v|
           @prop[k]=@none
         }