rubyvis 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.7 / 2010-10-31
+
+* Added image support
+
 === 0.1.6 / 2010-10-30
 
 * Improved documentation for examples. Added description from protovis site on the one borrowed from it and added commentary on new ones.

data/Manifest.txt

@@ -13,7 +13,10 @@ examples/crimea/crimea_grouped_bar.rb
 examples/crimea/crimea_line.rb
 examples/dot.rb
 examples/first.rb
+examples/fixtures/tipsy.gif
 examples/grouped_charts.rb
+examples/image.rb
+examples/image.svg
 examples/line.rb
 examples/line_and_step.rb
 examples/nested_grid.rb
@@ -38,6 +41,7 @@ lib/rubyvis/mark/anchor.rb
 lib/rubyvis/mark/area.rb
 lib/rubyvis/mark/bar.rb
 lib/rubyvis/mark/dot.rb
+lib/rubyvis/mark/image.rb
 lib/rubyvis/mark/label.rb
 lib/rubyvis/mark/line.rb
 lib/rubyvis/mark/panel.rb
@@ -53,6 +57,7 @@ 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_image.rb
 lib/rubyvis/scene/svg_label.rb
 lib/rubyvis/scene/svg_line.rb
 lib/rubyvis/scene/svg_panel.rb

data/examples/image.rb

@@ -0,0 +1,20 @@
+# = Image
+# This example shows how to include an image 
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+img_url="fixtures/tipsy.gif"
+
+vis = pv.Panel.new().width(200).height(200);
+
+dot=vis.add(pv.Image)
+    .data([1,2,3,4,5,6])
+    .bottom(lambda {|d| d*30})
+    .left(lambda {|d| d*30} )
+    .width(9)
+    .height(9)
+    .url(img_url)
+    
+vis.render()
+#puts vis.children_inspect
+puts vis.to_svg

data/examples/image.svg

@@ -0,0 +1 @@
+<svg fill='none' font-family='sans-serif' font-size='10px' height='200.0' stroke='none' stroke-width='1.5' width='200.0' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns='http://www.w3.org/2000/svg'><g transform='translate(0.0,0.0)'><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='20' y='161'/><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='60' y='131'/><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='100' y='101'/><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='140' y='71'/><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='180' y='41'/><image height='9' xlink:href='fixtures/tipsy.gif' preserveAspectRatio='none' width='9' x='220' y='11'/></g></svg>

data/lib/rubyvis.rb

@@ -25,7 +25,7 @@ require 'rubyvis/transform'
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.1.6' 
+  VERSION = '0.1.7' 
   # Protovis API on which current Rubyvis is based
   API_VERSION='3.3'
   # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/

data/lib/rubyvis/mark.rb

@@ -961,6 +961,7 @@ end
 
 require 'rubyvis/mark/anchor'
 require 'rubyvis/mark/bar'
+require 'rubyvis/mark/image'
 require 'rubyvis/mark/panel'
 require 'rubyvis/mark/area'
 require 'rubyvis/mark/line'

data/lib/rubyvis/mark/image.rb

@@ -0,0 +1,96 @@
+module Rubyvis
+  def self.Image
+    Rubyvis::Image
+  end
+  class Image < Bar
+    def type
+      "image"
+    end
+    @properties=Bar.properties.dup
+    attr_accessor :_image
+    def initialize(opts=Hash.new)
+      super(opts)
+      @_image=nil
+    end
+    ##
+    # :attr: url
+    # The URL of the image to display. The set of supported image types is
+    # browser-dependent; PNG and JPEG are recommended.
+    
+    ##
+    # :attr: image_width
+    # The width of the image in pixels. For static images, this property is
+    # computed implicitly from the loaded image resources. For dynamic images, this
+    # property can be used to specify the width of the pixel buffer; otherwise, the
+    # value is derived from the <tt>width</tt> property.
+    
+    ##
+    # :attr: image_height
+    # The height of the image in pixels. For static images, this property is
+    # computed implicitly from the loaded image resources. For dynamic images, this
+    # property can be used to specify the height of the pixel buffer; otherwise, the
+    # value is derived from the <tt>height</tt> property.
+    
+    attr_accessor_dsl :url, :image_width, :image_height
+    
+    
+    # Default properties for images. By default, there is no stroke or fill style.
+    def self.defaults
+      Image.new.extend(Bar.defaults).fill_style(nil)
+    end
+    
+    # @TODO: NOT IMPLEMENTED YET
+    # Specifies the dynamic image function. By default, no image function is
+    # specified and the <tt>url</tt> property is used to load a static image
+    # resource. If an image function is specified, it will be invoked for each
+    # pixel in the image, based on the related <tt>imageWidth</tt> and
+    # <tt>imageHeight</tt> properties.
+    #
+    # <p>For example, given a two-dimensional array <tt>heatmap</tt>, containing
+    # numbers in the range [0, 1] in row-major order, a simple monochrome heatmap
+    # image can be specified as:
+    #
+    #   vis.add(pv.Image)
+    #     .image_width(heatmap[0].length)
+    #     .image_height(heatmap.length)
+    #     .image(pv.ramp("white", "black").by(lambda {|x,y| heatmap[y][x]}))
+    #
+    # For fastest performance, use an ordinal scale which caches the fixed color
+    # palette, or return an object literal with <tt>r</tt>, <tt>g</tt>, <tt>b</tt>
+    # and <tt>a</tt> attributes. A {@link pv.Color} or string can also be returned,
+    # though this typically results in slower performance.
+    
+    def image(f)
+      f,dummy=arguments
+      @_image = lambda {|*args|
+        c=f.js_apply(self,args)
+        c.nil? ? pv.Color.transparent : (c.is_a?(String) ? Rubyvis.color(c) : c )
+      }
+      self
+    end
+    
+    
+    # Scan the proto chain for an image function.
+    def bind
+      mark_bind
+      bind=self.binds
+      mark=self
+      begin
+        binds.image = mark._image
+      end while(!binds.image and (mark==mark.proto))
+    end
+    
+    
+    def build_implied(s)
+      mark_build_implied(s)
+      return if !s.visible
+      # Compute the implied image dimensions. */
+      s.image_width = s.width   if s.image_width.nil?
+      s.image_height = s.height if s.image_height.nil?
+      # Compute the pixel values. */
+      if (s.url.nil? and self.binds.image)
+        raise "not implemented yet"
+      end
+    end
+  end
+end

data/lib/rubyvis/scene/svg_image.rb

@@ -0,0 +1,30 @@
+module Rubyvis
+  module SvgScene
+    def self.image(scenes)
+      e=scenes._g.elements[1]
+      scenes.each_with_index do |s,i|
+        next unless s.visible
+        e=self.fill(e,scenes,i)
+        if s.image
+          raise "Not implemented yet"
+        else
+          e = self.expect(e, "image", {
+          "preserveAspectRatio"=> "none",
+          "cursor"=> s.cursor,
+          "x"=> s.left,
+          "y"=> s.top,
+          "width"=> s.width,
+          "height"=> s.height
+          })
+          
+          e.add_attribute("xlink:href", s.url);
+        end
+        e = self.append(e, scenes, i);
+        
+        #/* stroke */
+        e = self.stroke(e, scenes, i);
+      end
+      e
+    end
+  end
+end

data/lib/rubyvis/scene/svg_scene.rb

@@ -6,6 +6,7 @@ require 'rubyvis/scene/svg_line'
 require 'rubyvis/scene/svg_dot'
 require 'rubyvis/scene/svg_area'
 require 'rubyvis/scene/svg_wedge'
+require 'rubyvis/scene/svg_image'
 
 class REXML::Element
   attr_accessor :_scene
@@ -77,7 +78,7 @@ module Rubyvis
       if type=='svg'
         el.add_namespace(self.svg)
         #el.add_namespace("xmlns:xmlns", self.xmlns)
-        #el.add_namespace("xlink", self.xlink)
+        el.add_namespace("xmlns:xlink", self.xlink)
       end
       el
     end

data/lib/rubyvis/sceneelement.rb

@@ -5,7 +5,7 @@ module Rubyvis
     end
     include Enumerable
     attr_accessor :visible
-    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow, :line_join, :eccentricity, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :layers, :orient, :offset, :order
+    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow, :line_join, :eccentricity, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :layers, :orient, :offset, :order,:url, :image_width, :image_height, :image
     
     def []=(v,i)
       if v.is_a? Numeric

data/web/Rakefile

@@ -15,7 +15,7 @@ task :build_site do
   ruby "build_site.rb"
 end
 
-task :default=>["index.html"]+EXAMPLES_BASE.map {|v| "examples/#{v}.html"}
+task :default=>["index.html","../lib/rubyvis.rb"]+EXAMPLES_BASE.map {|v| "examples/#{v}.html"}
 
 
 file "index.html"=>["index.haml", :build_site]+EXAMPLES_BASE.map {|v| "examples/#{v}.png"}

data/web/examples.haml

@@ -24,3 +24,14 @@
           %embed.svg{:src=>svg_file,:width=>"500", :height=>"300"}
         %object.svg{:data=>svg_file, :type=>"image/svg+xml"}
       .source=find_and_preserve(source)
+    :javascript
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-5764936-8']);
+      _gaq.push(['_trackPageview']);
+      
+      (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+

data/web/index.haml

@@ -36,6 +36,7 @@
               bottom(0).
               left(lambda {self.index * 25})
             vis.render()
+            puts vis.to_svg # Output final SVG
       #svg_code
         %h3 SVG
         %pre
@@ -95,3 +96,12 @@
           API documentation on 
           %a{:href=>'http://rubyvis.rubyforge.org/rubyvis/'}
             http://rubyvis.rubyforge.org/rubyvis/
+    :javascript
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-5764936-8']);
+      _gaq.push(['_trackPageview']);
+      (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-10-30 00:00:00 -03:00
+date: 2010-10-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,10 @@ files:
 - examples/crimea/crimea_line.rb
 - examples/dot.rb
 - examples/first.rb
+- examples/fixtures/tipsy.gif
 - examples/grouped_charts.rb
+- examples/image.rb
+- examples/image.svg
 - examples/line.rb
 - examples/line_and_step.rb
 - examples/nested_grid.rb
@@ -118,6 +121,7 @@ files:
 - lib/rubyvis/mark/area.rb
 - lib/rubyvis/mark/bar.rb
 - lib/rubyvis/mark/dot.rb
+- lib/rubyvis/mark/image.rb
 - lib/rubyvis/mark/label.rb
 - lib/rubyvis/mark/line.rb
 - lib/rubyvis/mark/panel.rb
@@ -133,6 +137,7 @@ files:
 - lib/rubyvis/scene/svg_area.rb
 - lib/rubyvis/scene/svg_bar.rb
 - lib/rubyvis/scene/svg_dot.rb
+- lib/rubyvis/scene/svg_image.rb
 - lib/rubyvis/scene/svg_label.rb
 - lib/rubyvis/scene/svg_line.rb
 - lib/rubyvis/scene/svg_panel.rb