gerbilcharts 0.2.4 → 0.2.5

data/lib/gerbilcharts/surfaces/area_surface.rb

@@ -9,41 +9,43 @@ class AreaSurface < Surface
     end
     
     def int_render(g)
-
-
 	  range_options_x = parent.get_global_option(:scaling_x,:auto)
 	  range_options_y = parent.get_global_option(:scaling_y,:auto)
+	  butterfly       = parent.get_global_option(:butterfly,false)
+
       rx = parent.modelgroup.effective_range_x(range_options_x)
       ry = parent.modelgroup.effective_range_y(range_options_y)
 
-	  p "range y = #{ry}"
-      
       # ajax if used
       if parent.usesAjax?
         set_ajaxSurfaceContext(rx.rmax,ry.rmax,"AREA")
       end
 
+	  # butterfly chart
+	  ry.update(-ry.rmax) if butterfly 
+
+	  y_zero = scale_y 0,ry
       
       parent.modelgroup.each_model_with_index do | mod, i|
-      
         g.begin_polygon
         firstpoint=true
         xpos=0
         ypos=0
         mod.each_tuple do |x,y|
+
+		  y =-y if butterfly and i.odd?
+
           xpos = scale_x x,rx
           ypos = scale_y y,ry
           if firstpoint 
-            g.polygon_point xpos,@bounds.bottom
+            g.polygon_point xpos,y_zero
             firstpoint=false
           end
           g.polygon_point xpos,ypos
         end
-        g.polygon_point xpos,@bounds.bottom
+        g.polygon_point xpos,y_zero
         g.end_polygon(:id => "item#{i}", "opacity"=>"0.3")
-        g.rectangle(xpos+2*i,ypos,(i+1)*2,@bounds.bottom-ypos,{:id => "item#{i}"})
       end
-      
     end
 
 end

data/lib/gerbilcharts/surfaces/bar_surface.rb

@@ -51,8 +51,10 @@ class BarSurface < Surface
 			   if parent.get_global_option(:auto_tooltips,false)
 				opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
 				opts.store(:gerbiltooltip1, mod.name) 
-					opts.store(:gerbiltooltip2, "Val = #{mod.latest_val}")
+				opts.store(:gerbiltooltip2, "Val = #{mod.latest_val}")
 			   end
+
+			   opts.merge!(:href => mod.href) if mod.hasHref?
        
 			   # draw the bar
 			   g.rectangle(xpos, ypos, @element_width, @bounds.bottom - ypos, opts)

data/lib/gerbilcharts/surfaces/chart.rb

@@ -31,7 +31,7 @@ class Chart < GraphElement
   # The second parameter says if you want the js inlined in the HTML.
   #
   def set_defaults
-     @javascripts = { "/javascripts/gerbil.js" => false, "/javascripts/prototype.js" => false }
+     @javascripts = { "gerbil.js" => true }
   end
   
   def set_modelgroup(g)

data/lib/gerbilcharts/surfaces/graph_element.rb

@@ -79,11 +79,9 @@ class GraphElement
 
   # setup SVG group element and call int_render
   def render(sdc)
-      w=sdc.newwin(@group)
-      # w.add_transformation(TTranslate.new(@bounds.left, @bounds.top))
-      sdc.setactivewindow(w)
-      int_render(sdc)
-      sdc.setactivewindow
+      sdc.newwin(@group) do |sdc|
+			  int_render(sdc)
+	  end
   end
   
   # render direct  - directly render SVG using builder for complex elements
@@ -145,11 +143,7 @@ class GraphElement
 
   # query a global option, return the defval if option is not set
   def get_global_option(optsym, defval)
-		  if @global_chart_options[optsym]
-			return @global_chart_options[optsym]
-		  else
-			return defval
-		  end
+		@global_chart_options[optsym] || defval 
   end
   
 # utility methods to derived classes  

data/lib/gerbilcharts/surfaces/grid.rb

@@ -12,35 +12,43 @@ class Grid < GraphElement
     end
     
     def int_render(g)
+	  ry = grid_range_y
+	  rx = grid_range_x
 
 	  # horizontal grid lines
-      ry = grid_range_y
-      ry.each_label do |val,label|
-          yp = scale_y val,ry
-          g.line(@bounds.left,yp,@bounds.right,yp, {:class => "gridlineh"})
-      end
+	  g.newwin('hgrid', {:class => "gridlineh"} ) do |g|
+			  ry.each_label do |val,label|
+				  yp = scale_y val,ry
+				  g.line(@bounds.left,yp,@bounds.right,yp)
+			  end
+	  end 
 
 	  # horiz subticks
-      ry = grid_range_y
-      ry.each_tick(@tick_count)  do |val|
-          yp = scale_y val,ry
-          g.line(@bounds.left,yp,@bounds.right,yp, {:class => "gridlinesub"})
-      end
-
+	  g.newwin('hgridsub', {:class => "gridlinesub"} ) do |g|
+			  ry.each_tick(@tick_count)  do |val|
+				  yp = scale_y val,ry
+				  g.line(@bounds.left,yp,@bounds.right,yp)
+			  end
+	  end
 
         
 	  # vertical subticks  
-      rx = grid_range_x
-      rx.each_label do |val,label|
-          xp = scale_x val,rx
-          g.line(xp,@bounds.top,xp,@bounds.bottom, {:class => "gridlinev"})
-      end
-
-	  rx.each_tick(0) do |val|
-          xp = scale_x val,rx
-          g.line(xp,@bounds.top,xp,@bounds.bottom, {:class => "gridlinesub"})
+	  g.newwin('vgrid', {:class => "gridlinev"} ) do |g|
+			  rx.each_label do |val,label|
+				  xp = scale_x val,rx
+				  g.line(xp,@bounds.top,xp,@bounds.bottom)
+			  end
+	  end
+
+
+	  g.newwin('vgridsub', {:class => "gridlinesub"} ) do |g|
+			  rx.each_tick(0) do |val|
+				  xp = scale_x val,rx
+				  g.line(xp,@bounds.top,xp,@bounds.bottom)
+			  end
 	  end
 
+
     end
     
   protected

data/lib/gerbilcharts/surfaces/legend.rb

@@ -17,6 +17,8 @@ class Legend < GraphElement
       # count determines the bounds
       @bounds.bottom = @bounds.top + 15 * parent.modelgroup.count
       g.rectangle_r(@bounds, {:class => @class})
+
+	  g.rectangle(@bounds.left-5,@bounds.top,5,5)
       
       rbox = Rect.new
       rbox.initfrom(@bounds)
@@ -29,7 +31,6 @@ class Legend < GraphElement
 
 		# Adding tool tips
 		opts = { :class => "legendtext" }
-		parent.get_global_option(:auto_tooltips,false)
 		opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
 		opts.store(:gerbiltooltip1, mod.name) 
 		opts.store(:gerbiltooltip2, "Val = #{mod.latest_val}")
@@ -44,21 +45,14 @@ class Legend < GraphElement
       
     end
 
-
     def align_to_anchor(anc)
       super
-      
       @bounds.deflate_v(10,10)
       @bounds.deflate_h(2,4)
-      
       if @width
         @bounds.left = @bounds.right - @width
       end
-      
     end
-    
-
 end
-
 end
 

data/lib/gerbilcharts/surfaces/line_surface.rb

@@ -18,9 +18,13 @@ class LineSurface < Surface
       
 	  range_options_x = parent.get_global_option(:scaling_x,:auto)
 	  range_options_y = parent.get_global_option(:scaling_y,:auto)
+	  butterfly       = parent.get_global_option(:butterfly,false)
+
       rx = parent.modelgroup.effective_range_x(range_options_x)
       ry = parent.modelgroup.effective_range_y(range_options_y)
-      
+
+	  ry.update(-ry.rmax) if butterfly 
+
       # ajax if used
       if parent.usesAjax?
         set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE")
@@ -30,12 +34,13 @@ class LineSurface < Surface
       
         mod.each_tuple do |x,y|
 
+		  y = -y if butterfly and i.odd?
+
 		  # the basic line 
           xpos = scale_x x,rx
           ypos = scale_y y,ry
           g.lineto xpos,ypos
 
-
 		  # datapoint and a tooltip 
        	  opts = {:id => "item#{i}"}
 		  if parent.get_global_option(:auto_tooltips,false)

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -73,6 +73,7 @@ class PieSurface < Surface
 				  opts.store(:gerbiltooltip1, mod.name) 
 				  opts.store(:gerbiltooltip2, "Val = #{mod.latest_val}")
 		end
+		opts.merge!(:href => mod.href) if mod.hasHref?
 
 		# draw the slice 
 		g.addshape(GerbilCharts::SVGDC::SVGArc.new(cx,cy,radius,radius,

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -11,7 +11,7 @@ class StackedAreaSurface < Surface
     def int_render(g)
       rx = parent.modelgroup.effective_round_range_x
       ry = parent.modelgroup.cumulative_sweep_round_range_y0
-
+	  
       # ajax if used
       if parent.usesAjax?
         set_ajaxSurfaceContext(rx.rmax,ry.rmax,"SA")
@@ -21,9 +21,11 @@ class StackedAreaSurface < Surface
       sweep_pos= rx.rmin
       sweep_to = rx.rmax
       polygons = []
+	  modnames = []
       parent.modelgroup.each_model do | mod|
           mod.begin_sweep
           polygons << GerbilCharts::SVGDC::SVGPolygon.new
+		  modnames << mod.name
       end
         
       # sweep interval
@@ -46,14 +48,22 @@ class StackedAreaSurface < Surface
             
             sweep_pos += sweep_interval
      end
-      # layout all polygons in reverse
-      i=polygons.length-1
-	  last_x = scale_x sweep_to,rx
-      polygons.reverse_each do |p|
+
+     # layout all polygons in reverse
+     i=polygons.length-1
+	 last_x = scale_x sweep_to,rx
+     polygons.reverse_each do |p|
 	    p.addpoint(last_x,@bounds.bottom)
-        g.addshape(p,{:id => "item#{i}"})
+
+		opts = {:id => "item#{i}" }
+		if parent.get_global_option(:auto_tooltips,false)
+			opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
+			opts.store(:gerbiltooltip1, modnames[i]) 
+		end
+
+        g.addshape(p,opts)
         i -= 1
-      end
+     end
       
     end
 

data/lib/gerbilcharts/surfaces/surface.rb

@@ -11,7 +11,7 @@ class Surface < GraphElement
     end
     
     def int_render(g)
-   end
+    end
 
     def set_ajaxSurfaceContext(mxx, mxy, type)
       parent.set_ajaxContext(:axmxx => mxx, :axmxy => mxy, :axsurface => type)

data/lib/gerbilcharts/surfaces/tracker.rb

@@ -23,6 +23,11 @@ class Tracker < GraphElement
       # calculate scaling factors
       rx = parent.modelgroup.effective_round_range_x
       
+      xfrag.g(:id=> 'gtrackerrect', :visibility=>'hidden') {
+             xfrag.rect(:id=>"trackerrect", :class=>"trackerrect", 
+                       :height=>parent.anchor.bounds.height, :width=>30, :x=>100, :y=>parent.anchor.bounds.top)     
+      }
+
       # output the SVG fragment directly
       xfrag.g(:id => 'gtrackerpanel') {
             xfrag.rect(:id=>"trackerpanel", :class=>"trackerpanel", 
@@ -32,10 +37,6 @@ class Tracker < GraphElement
                        :onmouseup=>"TrackerMouseUp(evt)")
       }
       
-      xfrag.g(:id=> 'gtrackerrect', :visibility=>'hidden') {
-             xfrag.rect(:id=>"trackerrect", :class=>"trackerrect", 
-                       :height=>parent.anchor.bounds.height, :width=>30, :x=>100, :y=>parent.anchor.bounds.top)     
-      }
       
       ty = parent.anchor.bounds.height/2
       xfrag.g(:id=> 'gtrackertext', :visibility=>'hidden', :transform => "translate(200 50)") {
@@ -49,8 +50,11 @@ class Tracker < GraphElement
         }
       }
       
-      xfrag.g(:id=>"gtrackerdata",  
-              :gerb_fromts=>rx.rmin,  
+	  raise "Time Tracker expects X-Axis to be a time interval " unless rx.rmin.is_a? Time
+
+
+      xfrag.g(:id=>"gtrackerdata",   :visibility=>'hidden',
+              :gerb_fromts=>rx.rmin.tv_sec,  
               :gerb_scale =>(rx.delta)/parent.anchor.bounds.width,
               :gerb_selts=>"1",
               :gerb_selsecs=>"1")

data/lib/gerbilcharts/surfaces/vertical_axis.rb

@@ -13,6 +13,7 @@ class VerticalAxis < Axis
 
 	  @use_cumulative_y = false 
 	  @use_cumulative_y = opts[:cumulative] if opts[:cumulative]
+	  @butterfly=true
     end
     
   def int_render(g)
@@ -21,13 +22,15 @@ class VerticalAxis < Axis
       
       return if parent.modelgroup.empty?
       
-	  p "axis = #{parent.get_global_option(:scaling_y,false)}"
 	  if @use_cumulative_y
         ry = parent.modelgroup.cumulative_sweep_round_range_y0
 	  else
       	ry = parent.modelgroup.effective_range_y(parent.get_global_option(:scaling_y,:auto))
 	  end
 
+	  ry.update(-ry.rmax) if @butterfly
+
+
       ry.each_label do |val,label|
           yp = scale_y val,ry
           yp_label=yp

data/lib/gerbilcharts/svgdc/svgdc.rb

@@ -24,8 +24,9 @@ class SVGDC
   attr_accessor     :height
   attr_reader       :curr_win, :base_win
   attr_reader	    :curr_presentation_context
-  attr_reader       :svg_styles
   attr_reader       :svg_predefs
+  attr_reader       :svg_styles
+  attr_reader       :ref_styles
   attr_reader       :svg_javascript
   attr_reader       :ref_javascripts
   attr_reader       :ajaxOptions
@@ -46,26 +47,25 @@ class SVGDC
   # 	Searches for the stylesheet in the current directory or in the gerbilcharts/public directory
   # 	If you want to use your own stylesheets put them in the working directory, or in the
   # 	public directory of gerbilcharts.
-  def set_stylesheet(cssfile)
-  	if File.exists? cssfile
-	   @svg_styles=File.read(cssfile)
+  # To inline stylesheet use "inline:<stylesheetname>" , eg "inline:brushmetal.css"
+  # Default is to xref a stylesheet 
+  def set_stylesheet(cssfile_in)
+  	cssfile=cssfile_in.gsub(/^inline:/,'')
+
+	if cssfile.length <  cssfile_in.length
+		@svg_styles = get_file_content(cssfile)
 	else
-	   try_from_gem = File.dirname(__FILE__) + "/../public/" + cssfile
-	   if not File.exists? try_from_gem
-	   	  p "The stylesheet #{cssfile} was not found. Make sure it exists in the current directory, or in the gem public area"
-		  raise "Stylesheet #{cssfile} not found in current directory or in the gerbilcharts/public folder"
-	   else
-	      @svg_styles=File.read(try_from_gem)
-	   end
+	    @ref_styles = cssfile 
 	end
+
   end
   
   def add_javascriptfile(jsfile,inlined)
     if  inlined
-      @svg_javascript = "" if @svg_javascript == nil
-      @svg_javascript << File.read(jsfile)      
+      @svg_javascript ||= ""  
+      @svg_javascript << get_file_content(jsfile)      
     else
-      @ref_javascripts = [] if @ref_javascripts == nil
+      @ref_javascripts ||= [] 
       @ref_javascripts << jsfile
     end
   end
@@ -103,9 +103,16 @@ class SVGDC
   def newwin(name, opts={})
     w=SVGWin.new(name, opts)
     @curr_win << w
-    w
+	@curr_win = w
+	yield self  if block_given?
+	reset if block_given?
+	return w if not block_given?
   end
   
+  def reset
+  	@curr_win = @base_win
+  end
+
   def setactivewindow(w=nil)
     @curr_win = w ? w : @base_win
   end
@@ -132,9 +139,7 @@ class SVGDC
        doc.svg(svg_attributes)   {
        
        # stylesheet (inlined into SVG)
-       if @svg_styles
-         doc.style(@svg_styles, :type => "text/css") 
-       end
+       doc.style(@svg_styles, :type => "text/css")  if @svg_styles
     
        # javascripts (ajax, etc) hrefed
        if @ref_javascripts
@@ -208,8 +213,12 @@ class SVGDC
    doc = Builder::XmlMarkup.new(:target => svg_string, :indent => 2, :standalone => "no")
    doc.instruct!
    doc.declare! :DOCTYPE, :svg, :PUBLIC,"-//W3C//DTD SVG 1.1//EN","http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
-   
 
+   # stylesheet instruction if hreferenced
+   if @ref_styles
+	   doc.instruct! "xml-stylesheet",  :href => @ref_styles, :type => "text/css"
+   end
+   
    render_to_frag(doc,opts)
    
    # return the svg_string
@@ -331,6 +340,19 @@ class SVGDC
   	@curr_presentation_context = []
   end
   
+private
+
+  # search for the file in the current directory or the gem path
+  def  get_file_content(fname)
+		if File.exists? fname
+		   return File.read(fname)
+		else
+		   try_from_gem = File.dirname(__FILE__) + "/../public/" + fname
+		   return File.read(try_from_gem) if File.exists? try_from_gem
+		end
+	   raise "Resource #{fname} not found in current directory or in the gerbilcharts/public folder"
+  end
+
 end
 
 end