gerbilcharts 0.5.9 → 0.6.8

data/lib/gerbilcharts/charts.rb

@@ -19,3 +19,5 @@ require 'gerbilcharts/charts/square_line_chart'
 require 'gerbilcharts/charts/matrix_chart'
 require 'gerbilcharts/charts/conversation_ring'
 require 'gerbilcharts/charts/bubble_chart'
+require 'gerbilcharts/charts/line_chart_table'
+require 'gerbilcharts/charts/stacked_area_chart_table'

data/lib/gerbilcharts/charts/chart_base.rb

@@ -53,7 +53,7 @@ class ChartBase
   attr_reader	  :legend_width
   
   def initialize(opt={})
-  
+
     # suck out local options
     @enabletimetracker=false
     if opt[:enabletimetracker]

data/lib/gerbilcharts/charts/line_chart_table.rb

@@ -0,0 +1,38 @@
+module GerbilCharts::Charts
+
+# =Line Chart Table
+# Each model is a separate line & table legend is shown below chart
+#
+# options
+#
+# [+width+]			Width of the chart (pixels)
+# [+height+]		Width of the chart (pixels)
+# [+style+]			Stylesheet file to be applied
+#
+# global visual options
+# [+circle_data_points]	  draw a solid circle around each data point  
+#
+class LineChartTable  < ChartBase
+
+  def initialize(opt={})
+    super(opt)
+  end
+  
+  def create_chart_elements
+	
+    # anchor (line surface)
+    @thechart.create_filter(GerbilCharts::SVGDC::LinearGradientVertical.new("vertgrad","rgb(255,255,255)","rgb(192,192,192)"))
+    
+    # other elements
+    @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::BasicGrid.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
+    @thechart.add_child(GerbilCharts::Surfaces::LineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_SOUTH, :dim => 80 , :always_visible => true ))
+    @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
+    @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
+  end
+
+end
+
+end

data/lib/gerbilcharts/charts/stacked_area_chart_table.rb

@@ -0,0 +1,31 @@
+module GerbilCharts::Charts
+
+# = StackedAreaChart
+# The models are stacked on top of each other !
+#
+class StackedAreaChartTable < ChartBase
+
+  def initialize(opt={})
+    super(opt)
+  end
+  
+  def create_chart_elements
+    
+    # other elements
+    @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::StackedGrid.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30))
+    @thechart.add_child(GerbilCharts::Surfaces::StackedAreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+    @thechart.add_child(GerbilCharts::Surfaces::DetailedLegend.new(:orient=> ORIENT_SOUTH, :dim => 200 , :always_visible => true, :show_stats  => false  ))  
+    @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 , :cumulative => true ))
+    @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
+
+    # optional features
+    if @feature_timetracker
+        @thechart.add_child(GerbilCharts::Surfaces::Tracker.new(:orient => ORIENT_SOUTH, :dim => 10 ))
+    end
+  end
+end
+
+end
+

data/lib/gerbilcharts/models/bucketized_timeseries_graph_model.rb

@@ -11,14 +11,14 @@ module GerbilCharts::Models
 class BucketizedTimeSeriesGraphModel < TimeSeriesGraphModel
   
   attr_reader   :bucket_size_secs		# current bucket size
-  attr_reader   :behavior				# :average or :max
+  attr_reader   :behavior			# :average or :max or :sum
   attr_reader   :last_sweep_pos			# :nodoc:
   
-  def initialize(name,bucketsec, opt={})
+  def initialize(name,bucketsec, opt={:behavior => :average})
     super(name,opt)
     @bucket_size_secs=bucketsec
     @samp_count =0
-    @behavior = :average
+    @behavior = opt[:behavior]
     @last_sweep_pos=0
   end
   
@@ -63,7 +63,8 @@ class BucketizedTimeSeriesGraphModel < TimeSeriesGraphModel
   # returns the time floor of the bucket this belongs to
   # example  8:06 AM will belong to the 8:05AM bucket if bucketsize = 5 min
   #
-  def to_buckettime(tv)
+  def to_buckettime(tv_in)
+  	  tv= normalize_time_input(tv_in)
       exp=tv.tv_sec.divmod(@bucket_size_secs)
       
       if exp[1] >= @bucket_size_secs/2
@@ -98,6 +99,8 @@ class BucketizedTimeSeriesGraphModel < TimeSeriesGraphModel
     elsif @behavior == :maxima
       cval = @yarr.last
       @yarr[@yarr.length-1]=max(cval,val)
+    elsif @behavior == :sum
+      @yarr[@yarr.length-1]+=val
     end
     return @yarr.last
 
@@ -114,15 +117,15 @@ class BucketizedTimeSeriesGraphModel < TimeSeriesGraphModel
     return 0 if @xarr.length == 0
     return 0 if @last_sweep_pos >= @xarr.length
     
-    
     xv=@xarr[@last_sweep_pos]
+    nBucks=bucket_diff(xv,tval)
+
     if tval < xv
         return 0
-    elsif tval == xv
+    elsif tval == xv || nBucks < 1 
         @last_sweep_pos+=1
         rval = @yarr[@last_sweep_pos-1]
     else 
-        nBucks=bucket_diff(xv,tval)
         @last_sweep_pos+= nBucks
     end    
     return rval.nil? ? 0:rval

data/lib/gerbilcharts/models/graph_model_group.rb

@@ -156,7 +156,7 @@ class GraphModelGroup
 
 	if rangeopts == :auto
 		return effective_round_range_y
-	elsif rangeopts == :auto_0
+	elsif rangeopts == :auto_0 or rangeopts == :auto_y0
 		return effective_round_range_y0
 	elsif  rangeopts.respond_to?('size') and rangeopts.size == 2
     	reffy = RawRange.new

data/lib/gerbilcharts/models/presets.rb

@@ -26,8 +26,8 @@ public
               [0,0],  [1,0.2], [5,1],  [10,1],[20,5],
               [30,10],[60,10],[120,15], [300,60], [600,120], 
               [900,300], [1800,300], 
-              [3600,900], [7200,1800],[10800,3600], [14400,3600], [21600,7200],
-              [43200, 10800],   [86400,21600],
+              [3600,900], [7200,1800],[10800,3600], [14400,3600], [21600,3600],
+              [43200, 7200],   [86400,7200],
               [172800, 43200],  [259200,86400],
               [604800,  86400], [1209600,172800], 
               [2419200, 604800],

data/lib/gerbilcharts/models/raw_range.rb

@@ -62,6 +62,7 @@ class RawRange  < Presets
 
   def zeromin
     @rmin=0
+	@rmax=0
   end
 
   def format_value(val)

data/lib/gerbilcharts/surfaces/area_surface.rb

@@ -10,70 +10,77 @@ module GerbilCharts::Surfaces
 #	:zbucketsize	if no data for this many 'x', then insert a zero
 #
 class AreaSurface < Surface
-    def initialize(opts={})
-      super(opts)
-    end
-    
-    def int_render(g)
 
-
-	  range_options_x = parent.get_global_option(:scaling_x,:auto)
+  def initialize(opts={})
+    super(opts)
+  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)
-      zbucketsize 	  = parent.get_global_option(:zero_bucketsize,nil)
+    zbucketsize 	  = parent.get_global_option(:zero_bucketsize,nil)
 
-      rx = parent.modelgroup.effective_range_x(range_options_x)
-      ry = parent.modelgroup.effective_range_y(range_options_y)
+    rx = parent.modelgroup.effective_range_x(range_options_x)
+    ry = parent.modelgroup.effective_range_y(range_options_y)
 
 
-      # any filters ?
-       if parent.get_global_option(:filter,false)
-	  g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
-       end 
+    # any filters ?
+    if parent.get_global_option(:filter,false)
+  	  g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
+    end 
 
-      # ajax if used
-      if parent.usesAjax?
-        set_ajaxSurfaceContext(rx.rmax,ry.rmax,"AREA")
-      end
+    set_ajaxSurfaceContext(rx.rmax,ry.rmax,"AREA") if parent.usesAjax?
 
 	  # butterfly chart
 	  ry.update(-ry.rmax) if butterfly 
 
 	  y_zero = scale_y 0,ry
+
+    f_squarize = parent.get_global_option(:squarize,false)
       
-      parent.modelgroup.each_model_with_index do | mod, i|
+    parent.modelgroup.each_model_with_index do | mod, i|
+
+      if f_squarize
+        g.begin_squarized_polygon 
+      else
         g.begin_polygon
-        firstpoint=true
-        xpos,ypos=0,0
-		last_x=nil
-        mod.each_tuple do |x,y|
+      end
+
+      firstpoint=true
+      xpos,ypos=0,0
+	    last_x=nil
+      mod.each_tuple do |x,y|
 
-		  y =-y if butterfly and i.odd?
+	      y =-y if butterfly and i.odd?
 
-          xpos = scale_x x,rx
-          ypos = scale_y y,ry
+        xpos = scale_x x,rx
+        ypos = scale_y y,ry
 
-          if firstpoint 
-            g.polygon_point xpos,y_zero
-            firstpoint=false
-          end
+        if firstpoint 
+          g.polygon_point xpos,y_zero
+          firstpoint=false
+        end
 
-		  unless zbucketsize.nil?
-		  	if last_x && (x-last_x) > zbucketsize
+	      unless zbucketsize.nil?
+		  	  if last_x && (x-last_x) > zbucketsize
         		g.polygon_point scale_x(last_x,rx) ,y_zero
         		g.polygon_point scale_x(x,rx) ,y_zero
-			end
-			last_x=x
+			    end
+			    last_x=x
 	      end
 
-          g.polygon_point xpos,ypos
-        end
-        g.polygon_point xpos,y_zero
-        g.end_polygon(:id => "item#{i}", "opacity"=>"0.3")
+        g.polygon_point xpos,ypos
       end
+     
+      g.polygon_point xpos,y_zero
+      g.end_polygon(:id => "item#{i}", "opacity"=>"0.8")
     end
 
-end
+    draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
+
+  end
 
 
 end
+end

data/lib/gerbilcharts/surfaces/conversation_ring.rb

@@ -46,9 +46,13 @@ class ConversationRing < Surface
                 end                               
                 
  		# Calculating radius
-                radius1 = 20                
-                effective_radius = (((item.to_f)/parent.modelgroup.sort[0].to_f).to_f * radius1) 
-		effective_radius = [effective_radius,5.0].max
+                radius1 = 20  
+                if parent.modelgroup.sort[0] > 0
+                	effective_radius = (((item.to_f)/parent.modelgroup.sort[0].to_f).to_f * radius1) 
+		        effective_radius = [effective_radius,5.0].max
+                else
+                        effective_radius=0
+                end
 
 		# draw out
                 cx = center_x + (Math.cos((Math::PI/180)*(angle+tot_angle))*(radius_x))

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -9,18 +9,25 @@ class DetailedLegend < GraphElement
 
     attr_reader   :width
     attr_reader   :showvalues
+    attr_reader   :always_visible
     
     def initialize(opts={})
       @class = "legendpanel"
       super(opts)
       @width = opts[:dim] if defined? opts[:dim]
+      @always_visible = opts[:always_visible] || false 
+      @show_stats = opts[:show_stats].nil? ? true:opts[:show_stats]
     end
     
     def int_render(g)
 
 	  return unless parent.get_global_option(:enable_detailed_legend,true) 
 
-	  w=g.newwin("legendpanel_detail", {:visibility => 'hidden'} )
+	  if @always_visible
+	     w=g.newwin("legendpanel_detail")
+	  else
+	     w=g.newwin("legendpanel_detail", {:visibility => 'hidden'} )
+      end
 	  g.setactivewindow(w)
 
 
@@ -58,7 +65,9 @@ class DetailedLegend < GraphElement
 
 	  stat_label_pos = rbox.right + STAT_TABLE_OFFSET
 	  lab = %w(Max Min Avg Latest).inject("") { |m,ai| m += ai.rjust(9)}  
-      g.textout(stat_label_pos, rbox.bottom-2, lab, {'xml:space' => 'preserve', :class => "legendstats"} )
+	  if @show_stats
+      	g.textout(stat_label_pos, rbox.bottom-2, lab, {'xml:space' => 'preserve', :class => "legendstats"} )
+	  end
 
       rbox.top += 16
       rbox.bottom = rbox.top+10
@@ -83,7 +92,9 @@ class DetailedLegend < GraphElement
 			   mod.formatted_val(stat_ana[0]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[2]).to_s.rjust(9) +
 			   mod.formatted_val(stat_ana[4]).to_s.rjust(9) 
-        g.textout(stat_label_pos, rbox.bottom-2, outs, {'xml:space' => 'preserve', :class => 'legendstats'} )
+		if @show_stats
+        	g.textout(stat_label_pos, rbox.bottom-2, outs, {'xml:space' => 'preserve', :class => 'legendstats'} )
+		end
 
         
         rbox.top += 10 + 5
@@ -99,7 +110,7 @@ class DetailedLegend < GraphElement
       super
       @bounds.deflate_v(10,10)
       @bounds.deflate_h(2,4)
-      if @width
+      if isoverlay? and @width 
         @bounds.left = @bounds.right - @width
       end
     end

data/lib/gerbilcharts/surfaces/impulse_surface.rb

@@ -13,7 +13,8 @@ class ImpulseSurface < Surface
 	  range_options_y = parent.get_global_option(:scaling_y,:auto)
       rx = parent.modelgroup.effective_range_x(range_options_x)
       ry = parent.modelgroup.effective_range_y(range_options_y)
-      
+
+
 	  impulse_width = 2
 	  x2  = scale_x Time.at(0),rx
 	  x1  = scale_x Time.at(parent.modelgroup.models[0].bucket_size_secs),rx
@@ -26,19 +27,24 @@ class ImpulseSurface < Surface
 
 
       
-	  w=g.newwin("impulse", "stroke-width" => impulse_width)
+	  w=g.newwin("impulse")
 	  g.setactivewindow(w)
 
+	  xadj=0
       parent.modelgroup.each_model_with_index do | mod, i|
         opts = {:id => "lineitem#{i}"}
-        firstpoint=true
         xpos=0
         ypos=0
         mod.each_tuple do |x,y|
           xpos = scale_x x,rx
           ypos = scale_y y,ry
-          g.line(xpos,@bounds.bottom,xpos,ypos,opts)
+          g.line(xpos + xadj,@bounds.bottom,xpos + xadj,ypos,opts)
+
+		  g.ellipse(xpos + xadj, ypos, 18, 8,  { "stroke-width" => 0, :fill => "orange"}  )
+		  g.textout(xpos + xadj-11, ypos+3, ry.format_value(y)  , { :class => "elementvalue" } )
+
         end
+		xadj=xadj+2
       end
       
 	  g.setactivewindow

data/lib/gerbilcharts/surfaces/line_surface.rb

@@ -10,52 +10,49 @@ module GerbilCharts::Surfaces
 # [+scaling+]               :auto, :auto_y0
 #
 class LineSurface < Surface
-    def initialize(opts={})
-      super(opts)
-    end
+  def initialize(opts={})
+    super(opts)
+  end
     
-    def int_render(g)
+  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)
+    rx = parent.modelgroup.effective_range_x(range_options_x)
+    ry = parent.modelgroup.effective_range_y(range_options_y)
 
 	  ry.update(-ry.rmax) if butterfly 
+    set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE") if parent.usesAjax?
 
-      # ajax if used
-      if parent.usesAjax?
-        set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE")
-      end
+    parent.modelgroup.each_model_with_index do |mod,i|
+      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
+
+  		  # tooltip 
+        opts = {:id => "item#{i}"}
+  		  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 = #{y}")
+  		  end
+
+        # cirle dp
+  		  g.circle(xpos,ypos,4,opts) if parent.get_global_option(:circle_data_points,false)
 
-      parent.modelgroup.each_model_with_index do | mod, i|
-      
-        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)
-				  opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
-				  opts.store(:gerbiltooltip1, mod.name) 
-				  opts.store(:gerbiltooltip2, "Val = #{y}")
-		  end
-		  g.circle(xpos,ypos,4,opts) if parent.get_global_option(:circle_data_points,false)
-        end
-        g.endline(:id => "lineitem#{i}")
       end
-      
-      #draw each model in the group
+      g.endline(:id => "lineitem#{i}")
     end
 
-end
+	  draw_ref_model_line(g,rx,ry) if parent.modelgroup.has_ref_model?
 
+  end
+
+end
 end