gerbilcharts 0.2.13 → 0.5.9

data/lib/gerbilcharts/surfaces/rect.rb

@@ -27,6 +27,13 @@ class Rect
     @top += t
     @bottom -= b
   end
+
+  def deflate(n)
+	@left+=n
+	@top+=n
+	@bottom-=n
+	@right-=n
+  end
   
   def initfrom(r)
       @left=r.left
@@ -74,6 +81,17 @@ class Rect
   def height
       @bottom-@top
   end
+
+  def translate_x(newx)
+	w=width
+	@left=newx
+	@right=@left+w
+  end
+
+  def offset_x(delta)
+	@left+=delta
+	@right+=delta
+  end
     
  
   def to_s

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -9,22 +9,61 @@ class StackedAreaSurface < Surface
     end
     
     def int_render(g)
-      rx = parent.modelgroup.effective_round_range_x
+	  range_options_x = parent.get_global_option(:scaling_x,:auto)
+
+      rx = parent.modelgroup.effective_range_x(range_options_x)
       ry = parent.modelgroup.cumulative_sweep_round_range_y0
 	  
       # ajax if used
       if parent.usesAjax?
         set_ajaxSurfaceContext(rx.rmax,ry.rmax,"SA")
       end
+
+
+	  # draw reference if any
+	  if parent.modelgroup.has_ref_model?
+	   		ref_model = parent.modelgroup.ref_model
+
+	  		y_zero = scale_y 0,ry
+        	g.begin_polygon
+        	firstpoint=true
+        	xpos,ypos=0,0
+			last_x=nil
+        	ref_model.each_tuple do |x,y|
+
+				xpos = scale_x x,rx
+			    ypos = scale_y y,ry
+
+          		if firstpoint 
+					g.polygon_point xpos,y_zero
+					firstpoint=false
+          		end
+
+				if last_x && (x-last_x) > parent.modelgroup.sweep_interval
+					g.polygon_point scale_x(last_x,rx) ,y_zero
+					g.polygon_point scale_x(x,rx) ,y_zero
+				end
+				last_x=x
+
+          		g.polygon_point xpos,ypos
+        	end
+        	g.polygon_point xpos,y_zero
+        	g.end_polygon(:id => "ref_mod")
+      end
             
       # prepare models for sweeping
       sweep_pos= rx.rmin
       sweep_to = rx.rmax
       polygons = []
 	  modnames = []
+	  
+	  klass_poly = parent.get_global_option(:squarize,false) ? 
+	  					GerbilCharts::SVGDC::SVGSquarizedPolygon :
+	  					GerbilCharts::SVGDC::SVGPolygon 
+
       parent.modelgroup.each_model do | mod|
           mod.begin_sweep
-          polygons << GerbilCharts::SVGDC::SVGPolygon.new
+          polygons << klass_poly.new
 		  modnames << mod.name
       end
         
@@ -36,6 +75,7 @@ class StackedAreaSurface < Surface
             acc_y = 0
             parent.modelgroup.each_model_with_index do | mod, i|
               acc_y +=  mod.sweep(sweep_pos)
+
               xpos = scale_x sweep_pos,rx
               ypos = scale_y acc_y,ry
               

data/lib/gerbilcharts/surfaces/stacked_grid.rb

@@ -5,11 +5,9 @@ module GerbilCharts::Surfaces
 class StackedGrid < Grid
     
   protected
-    
     def grid_range_y
-      return parent.modelgroup.cumulative_round_range_y0
+      return parent.modelgroup.cumulative_sweep_round_range_y0
     end
-  
 end
 
 end

data/lib/gerbilcharts/surfaces/title_panel.rb

@@ -21,10 +21,15 @@ class TitlePanel < Panel
       if @just == :left
         g.textout(@bounds.left, @bounds.top+16,  parent.modelgroup.name, opts)
       else
-        opts.store( "text-anchor", "end" )
-        g.textout(@bounds.right, @bounds.top+16, parent.modelgroup.name, opts)
+        g.textout(@bounds.right, @bounds.top+16, parent.modelgroup.name, opts.merge("text-anchor" => "end"))
       end
       
+	  xoff=0
+      parent.get_global_option(:toolhrefs,[]).each do  |tool|
+     	topts = {:class => "titletool"}
+        g.textout(@bounds.left + xoff, @bounds.top+29, tool[0] , topts.merge(:href => tool[1]) )
+		xoff =xoff+ 7*(tool[0].length )
+      end
     end
     
     def align_to_anchor(anc)

data/lib/gerbilcharts/surfaces/tracker.rb

@@ -20,10 +20,12 @@ class Tracker < GraphElement
     # render the elements directly
     def render_direct(xfrag)
     
+
       # calculate scaling factors
       range_options_x = parent.get_global_option(:scaling_x,:auto)
       rx = parent.modelgroup.effective_range_x(range_options_x)
 
+      return unless rx.rmin.is_a? Time
       
       xfrag.g(:id=> 'gtrackerrect', :visibility=>'hidden') {
              xfrag.rect(:id=>"trackerrect", :class=>"trackerrect", 
@@ -52,12 +54,13 @@ class Tracker < GraphElement
         }
       }
       
-     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_seconds=>rx.rmax.tv_sec-rx.rmin.tv_sec,  
               :gerb_scale =>(rx.delta)/parent.anchor.bounds.width,
+	      :gerb_tzoffset => Time.new.utc_offset,
+	      :gerb_tzname => Time.new.zone,
               :gerb_selts=>1,
               :gerb_selsecs=>1)
       

data/lib/gerbilcharts/surfaces/vertical_axis.rb

@@ -34,13 +34,13 @@ class VerticalAxis < Axis
 
       ry.each_label do |val,label|
           yp = scale_y val,ry
-          yp_label=yp
+          yp_label=yp + 4
           
           # make sure the edge ones are visible
           yp_label = max(yp_label,@bounds.top+10)
           
           g.textout(@bounds.right-4, yp_label, label, {:class => "axislabel", "text-anchor" => "end"})
-          g.line(@bounds.right-3,yp,@bounds.right+2,yp, {:class => "axistickmajor"})
+          g.line(@bounds.right-1,yp,@bounds.right+1,yp, {:class => "axistickmajor"})
       end
 
   end

data/lib/gerbilcharts/svgdc.rb

@@ -23,3 +23,4 @@ require 'gerbilcharts/svgdc/svg_text'
 require 'gerbilcharts/svgdc/svg_arc'
 require 'gerbilcharts/svgdc/svg_arc'
 require 'gerbilcharts/svgdc/css_inliner'
+require 'gerbilcharts/svgdc/svg_ellipse'

data/lib/gerbilcharts/svgdc/css_inliner.rb

@@ -22,8 +22,8 @@ class CssInliner
 			parts.each { |p| p.strip!; p.squeeze!(' ');}
 
 			case  parts[0][0]
-				when 35; @selector_table.store(parts[0][1..-1],parts[1])
-				when 46; @class_table.store(parts[0][1..-1],parts[1])
+				when '#'; @selector_table.store(parts[0][1..-1],parts[1])
+				when '.'; @class_table.store(parts[0][1..-1],parts[1])
 			end
 	end
   end

data/lib/gerbilcharts/svgdc/svg_ellipse.rb

@@ -0,0 +1,21 @@
+module GerbilCharts::SVGDC
+
+# = SVGEllpise 
+# Draws a circle at x, y, and radius rx, ry
+#
+class SVGEllipse < SVGShape
+  
+  attr_accessor :x,:y,:rx,:ry
+  
+  def initialize(x,y,rx,ry)
+    @x,@y,@rx,@ry=x,y,rx,ry
+    super()
+  end
+  
+  def render(xfrag)
+    h = { :cx => @x, :cy => @y, :rx => @rx, :ry => @ry }
+    xfrag.ellipse(h.merge(render_attributes))
+  end
+end
+
+end

data/lib/gerbilcharts/svgdc/svg_polygon.rb

@@ -31,4 +31,23 @@ class SVGPolygon < SVGShape
   
 end
 
+
+class SVGSquarizedPolygon < SVGPolygon
+
+
+  def addpoint(x,y)
+  	@lastpt ||= [] 
+	
+	unless @lastpt.empty?
+			xf,yf = "%.2f"%x, "%.2f"%@lastpt[1]
+			@operstring << "#{xf},#{yf} "
+			xf,yf = "%.2f"%x, "%.2f"%y
+			@operstring << "#{xf},#{yf} "
+	end
+
+	@lastpt = [x,y]
+  end
+  
+end
+
 end

data/lib/gerbilcharts/svgdc/svgdc.rb

@@ -204,7 +204,7 @@ class SVGDC
        # render tooltips optional
        if @use_tooltips
           doc.g(:id=>'ToolTip', :opacity=>'0.8', :visibility=>'hidden', "pointer-events"=>'none') {
-              doc.rect(:id=>'tipbox', :x=>'0', :y=>'5', :width=>'88', :height=> '20', :rx=> '2', :ry=> '2', :fill=>'white', :stroke=>'black')
+              doc.rect(:id=>'tipbox', :x=>'0', :y=>'5', :width=>'88', :height=> '40', :rx=> '2', :ry=> '2', :fill=>'white', :stroke=>'black')
               doc.text(:id=>'tipText', :x=>'5', :y=>'20', "font-family"=> 'Arial', "font-size"=>'12') {
                 doc.tspan(:id=>'tipTitle', :x=>'5', "font-weight"=>'bold') {
                   doc.cdata!("")
@@ -350,6 +350,9 @@ class SVGDC
     rectangle(r.left, r.top, r.width, r.height, opt)
   end
   
+  def circle_r(r, opt={} )
+    circle( (r.left + r.right)/2, (r.bottom+r.top)/2, [r.width,r.height].min/2, opt)
+  end
   
   def select_presentation(opt={})
     @curr_presentation_context.store(:pen,opt[:pen])      	if opt[:pen]

data/lib/gerbilcharts/version.rb

@@ -1,9 +1,8 @@
 module GerbilCharts
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
-    TINY  = 13
-
+    MINOR = 5
+    TINY  = 9 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_bar.rb

@@ -26,7 +26,7 @@ class TestBar < Test::Unit::TestCase
 						      ["VIVEK", 145,112, 22, 45, 18, 170]
 									]
 				 )
-    mychart = GerbilCharts::Charts::BarChart.new( :width => 550, :height => 200, 
+   mychart = GerbilCharts::Charts::BarChart.new( :width => 300, :height => 200, 
 					:style => 'inline:brushmetal.css', :auto_tooltips => true ,
 					:javascripts => ['/tmp/gerbil.js', '/tmp/prototype.js'],
 					:filter => 'LikeButton' 

data/test/test_bubble.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+require 'trafgen'
+
+# tests some easy to use mods
+# 	newbies enter here
+class TestChartsNoob < Test::Unit::TestCase
+
+
+  # alerts 
+  def test_alerts
+ 
+    mychart = GerbilCharts::Charts::BubbleChart.new( :width => 650, :height => 200, 
+														 :style => 'inline:brushmetal.css', 
+						   							    :javascripts => ['inline:/tmp/gerbil.js','inline:/tmp/prototype.js'] )
+
+
+	tend = Time.now
+	tbegin = tend - 3600*24
+
+	model1 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new( "eth0", 3600 )
+	TimeSeriesDataGenerator.new(tbegin,tend,300,1000, 5000 ).each_tuple do |t,v|
+		model1.add(t,v)
+	end
+
+	model2 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new( "wan1", 3600 )
+	TimeSeriesDataGenerator.new(tbegin,tend,300,2, 20).each_tuple do |t,v|
+		model2.add(t,v)
+	end
+
+	model3 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new( "fiber0", 3600 )
+	TimeSeriesDataGenerator.new(tbegin,tend,1800,0, 10).each_tuple do |t,v|
+		model3.add(t,v)
+	end
+
+    modelgroup = GerbilCharts::Models::GraphModelGroup.new( "External Traffic")
+	modelgroup.add model2
+	modelgroup.add model1
+	modelgroup.add model3
+
+
+	mychart.modelgroup=modelgroup
+
+    mychart.render('/tmp/n_bubble.svg')
+    
+  end   
+   
+
+   
+end
+
+

data/test/test_conversation.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+require 'trafgen'
+
+# test conversation bar chart 
+class TestConversation < Test::Unit::TestCase
+
+  def test_monthly_sales
+    modelgroup = GerbilCharts::Models::MatrixModel.new("Conversation Ring Chart")
+   
+    modelgroup.add("192.168.1.25","192.168.1.20",500)
+    modelgroup.add("192.168.1.25","192.168.1.21",7500)
+    modelgroup.add("192.168.1.25","192.168.1.22",6500)
+    modelgroup.add("192.168.1.25","192.168.1.23",5500)
+    modelgroup.add("192.168.1.25","192.168.1.24",4500)
+    modelgroup.add("192.168.1.25","192.168.1.26",10500)
+    modelgroup.add("192.168.1.25","192.168.1.27",500)
+    modelgroup.add("192.168.1.25","192.168.1.28",2500)
+    modelgroup.add("192.168.1.25","192.168.1.29",3500)
+    modelgroup.add("192.168.1.25","192.168.1.30",500) 
+
+    modelgroup.calc_matrix   
+
+    mychart = GerbilCharts::Charts::ConversationRing.new( :width => 450, :height => 250,
+                                                     :style => 'inline:brushmetal.css', :auto_tooltips => true ,
+                                                     :javascripts => ['/tmp/gerbil.js', '/tmp/prototype.js'],
+                                                     :filter => 'LikeButton'
+                                                   )
+ 
+    mychart.modelgroup = modelgroup
+    mychart.render('/tmp/con_monthly_sales.svg')
+
+  end   
+end

data/test/test_lines.rb

@@ -35,9 +35,9 @@ class TestLines  < Test::Unit::TestCase
   # test a line chart
   def test_line_1
  
-    mychart = GerbilCharts::Charts::AreaChart.new( :width => 450, :height => 250, 
-				:javascripts => ['inline:/tmp/gerbil.js' ],
-								  :auto_tooltips => true, :style => 'inline:brushmetal.css')
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 750, :height => 250, 
+				:javascripts => ['inline:gerbil.js' ],
+				:auto_tooltips => false, :style => 'inline:brushmetal.css' )
     mychart.setmodelgroup(@modgroup)
     mychart.render('/tmp/sq_linechart1.svg')
     

data/test/test_matrix.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+require 'trafgen'
+
+# test conversation bar chart 
+class TestMatrix < Test::Unit::TestCase
+
+  def test_monthly_sales
+    modelgroup = GerbilCharts::Models::MatrixModel.new("Traffic Matrix")
+
+    modelgroup.add("192.168.1.25","192.168.1.20",12500)
+    modelgroup.add("192.168.1.26","192.168.1.21",7500)
+    modelgroup.add("192.168.1.25","192.168.1.22",6500)
+    modelgroup.add("192.168.1.27","192.168.1.23",5500)
+    modelgroup.add("192.168.1.28","192.168.1.24",4500)
+    modelgroup.add("192.168.1.29","192.168.1.26",10500)
+    modelgroup.add("192.168.1.25","192.168.1.27",500)
+    modelgroup.add("192.168.1.25","192.168.1.28",2500)
+    modelgroup.add("192.168.1.30","192.168.1.29",3500)
+    modelgroup.add("192.168.1.52","192.168.1.30",500)
+
+    modelgroup.calc_matrix   
+
+    mychart = GerbilCharts::Charts::MatrixChart.new( :width => 1000, :height => 400,
+                                                     :style => 'inline:brushmetal.css', :auto_tooltips => true ,
+                                                     :javascripts => ['/tmp/gerbil.js', '/tmp/prototype.js'],
+                                                     :filter => 'LikeButton'
+                                                   )
+ 
+    mychart.modelgroup = modelgroup
+    mychart.render('/tmp/matrix_monthly_sales.svg')
+
+  end   
+end

data/test/test_noob.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-require 'trafgen'
+require './trafgen'
 
 # tests some easy to use mods
 # 	newbies enter here
@@ -11,15 +11,16 @@ class TestChartsNoob < Test::Unit::TestCase
   # use a simple timeseries model 
   def test_monthly_sales
  
-    mychart = GerbilCharts::Charts::LineChart.new( :width => 350, :height => 200, :style => 'brushmetal.css',
-												   :circle_data_points => true )
+    mychart = GerbilCharts::Charts::SquareLineChart.new( :width => 350, :height => 200, :style => 'inline:brushmetal.css',
+						   :circle_data_points => true, :scaling_y => :auto,
+						   :javascripts => ['/tmp/gerbil.js','/tmp/prototype.js'] )
 
     modelgroup = GerbilCharts::Models::SimpleTimeSeriesModelGroup.new( 
 				   :title => "Sales figures",
 				   :timeseries  =>  (1..6).collect { |month| Time.local(2008,month) },
 				   :models =>       [ ["Bruce", 1,  10, 18, 28, 80,  122],
-									  ["Rex"  , 112,22, 45, 70, 218, 309], 
-									  ["Buzo" , 0,  23, 25, 40, 18,  59] 
+						      ["Rex"  , 112,22, 45, 70, 218, 309], 
+						      ["Buzo" , 0,  23, 25, 40, 18,  59] 
 									]
 				 )
 
@@ -69,7 +70,9 @@ class TestChartsNoob < Test::Unit::TestCase
 
 
 	# demo stacked area
-    mysachart = GerbilCharts::Charts::StackedAreaChart.new( :width => 450, :height => 200, :style => 'brushmetal.css')
+    mysachart = GerbilCharts::Charts::StackedAreaChart.new( :width => 450, :height => 200, :style => 'inline:brushmetal.css',
+							    :scaling_y => :auto, :auto_tooltips => true ,
+ 		                		         :javascripts => ['/tmp/gerbil.js' , '/tmp/prototype.js' ])
 	mysachart.modelgroup=modelgroup
     mysachart.render('/tmp/n_daily_traffic_sa.svg')