gerbilcharts 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.3 2009-10-19
+* Changes
+  * New Squarized Line Surface
+  * Sophisticated grid works well with time axis
+  * Legend panel autosizing
+  * Bar chart labels now stagger automatically depending on chart size
+  * Fixed line chart problem due to a bad CSS 
+
 == 0.2.2 2009-09-21
 * Changes
   * SVG filters specular lighting effect 

data/Manifest.txt

@@ -55,6 +55,7 @@ lib/gerbilcharts/surfaces/title_panel.rb
 lib/gerbilcharts/surfaces/tracker.rb
 lib/gerbilcharts/surfaces/vertical_axis.rb
 lib/gerbilcharts/surfaces/pie_surface.rb
+lib/gerbilcharts/surfaces/square_line_surface.rb
 lib/gerbilcharts/charts/area_chart.rb
 lib/gerbilcharts/charts/bar_chart_compact.rb
 lib/gerbilcharts/charts/bar_chart.rb
@@ -63,6 +64,7 @@ lib/gerbilcharts/charts/impulse_chart.rb
 lib/gerbilcharts/charts/line_chart.rb
 lib/gerbilcharts/charts/stacked_area_chart.rb
 lib/gerbilcharts/charts/pie_chart.rb
+lib/gerbilcharts/charts/square_line_chart.rb
 lib/gerbilcharts/svgdc/svgdc.rb
 lib/gerbilcharts/svgdc/svg_element.rb
 lib/gerbilcharts/svgdc/filters.rb

data/lib/gerbilcharts/charts/area_chart.rb

@@ -21,7 +21,7 @@ class AreaChart < ChartBase
     @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::AreaSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
-    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => 100))  
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
     

data/lib/gerbilcharts/charts/bar_chart.rb

@@ -11,9 +11,10 @@ class BarChart < ChartBase
   def initialize(opt={})
     super(opt)
     
-    @staggerlabels = 2
+    @staggerlabels =  optimum_stagger(opt[:width])
     @staggerlabels = opt[:stagger] if opt[:stagger]
   end
+
   
   def create_chart_elements
     
@@ -27,7 +28,23 @@ class BarChart < ChartBase
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalNameAxis.new(:orient => ORIENT_SOUTH, :dim => (15 * @staggerlabels.to_i), :stagger => @staggerlabels))
   end
+
+
+  protected
+
+	# compute the optimum stagger level based on the width of the bar chart so we
+	# do not have nasty overlaps atleast when labels are 15 chars wide (eg, big ip address)
+	def optimum_stagger(width)
+		case width
+			when (0..250); return 4
+			when (250..350); return 3
+			when (350..600); return 2
+			else; return 1
+		end
+	end
+
 end
 
 
+
 end

data/lib/gerbilcharts/charts/chart_base.rb

@@ -46,6 +46,7 @@ class ChartBase
   attr_reader     :thechart
   attr_reader     :renderopts
   attr_reader     :feature_timetracker
+  attr_reader	  :legend_width
   
   def initialize(opt={})
   
@@ -59,6 +60,9 @@ class ChartBase
     # pass on options to chart object
     @thechart = GerbilCharts::Surfaces::Chart.new(opt)
     @renderopts = {}
+
+	# common relative widths
+	@legend_width = [opt[:width]/4,100].max
   end
 
   def set_renderoptions=(opts)

data/lib/gerbilcharts/charts/impulse_chart.rb

@@ -16,7 +16,7 @@ class ImpulseChart < ChartBase
     @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::ImpulseSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
-    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => 100))  
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
     @thechart.add_child(GerbilCharts::Surfaces::VerticalAxis.new(:orient => ORIENT_WEST, :dim => 40 ))
     @thechart.add_child(GerbilCharts::Surfaces::HorizontalTimeAxis.new(:orient => ORIENT_SOUTH, :dim => 25 ))
     

data/lib/gerbilcharts/charts/line_chart.rb

@@ -14,7 +14,6 @@ module GerbilCharts::Charts
 #
 class LineChart < ChartBase
 
-
   def initialize(opt={})
     super(opt)
   end
@@ -29,7 +28,7 @@ class LineChart < ChartBase
     @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::Legend.new(:orient=> ORIENT_OVERLAY, :dim => 100))  
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
     @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

data/lib/gerbilcharts/charts/square_line_chart.rb

@@ -0,0 +1,38 @@
+module GerbilCharts::Charts
+
+# =Square Line Chart
+# Each model is a squarized  line.
+#
+# 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 SquareLineChart < 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::SquareLineSurface.new(:orient => ORIENT_OVERLAY),:anchor => true)
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
+    @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.rb

@@ -16,7 +16,7 @@ class StackedAreaChart < ChartBase
     @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::Legend.new(:orient=> ORIENT_OVERLAY, :dim => 100))  
+    @thechart.add_child(GerbilCharts::Surfaces::Legend.new(:orient=> ORIENT_OVERLAY, :dim => @legend_width))  
     @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 ))
 

data/lib/gerbilcharts/charts.rb

@@ -15,3 +15,4 @@ require 'gerbilcharts/charts/impulse_chart'
 require 'gerbilcharts/charts/line_chart'
 require 'gerbilcharts/charts/stacked_area_chart'
 require 'gerbilcharts/charts/pie_chart'
+require 'gerbilcharts/charts/square_line_chart'

data/lib/gerbilcharts/models/graph_model.rb

@@ -1,6 +1,6 @@
 module GerbilCharts::Models
 
-# GraphModel - Basic interface to a model in GerbilCharts
+# = GraphModel - Basic interface to a model in GerbilCharts
 #
 # You can create your own model as long as all the methods here are implemented
 # or you can use one of the predefined graph models.

data/lib/gerbilcharts/models/monotonous_graph_model.rb

@@ -26,23 +26,18 @@ class MonotonousGraphModel < GraphModel
   # A new datapoint must have a x_val greater than the previous one
   def add(x_val,y_val)
 
-    
     if @xarr.length > 0 and @xarr.last > x_val
       raise "Expecting monotonous series data"  
     end
   
+  	# x updates
     @xrange.update x_val
-
     @xarr << x_val 
     
-    if @transformer
-        trval = @transformer.xform(y_val)
-        @yarr << trval
-        @yrange.update trval
-    else
-        @yarr << y_val
-        @yrange.update y_val
-    end
+	# y updates
+    y_val = @transformer.xform(y_val) if @transformer
+    @yarr << y_val
+    @yrange.update y_val
      
   end
   

data/lib/gerbilcharts/models/round_time_range.rb

@@ -1,5 +1,9 @@
 module GerbilCharts::Models
 
+MINUTE=60
+HOUR=3600
+DAY=86400
+
 # 
 # rounded time range - Rounds the max to a nice preset
 #  This class allows for labels at clean intervals instead of
@@ -47,19 +51,32 @@ class RoundTimeRange < RawRange
    end
 
   # provide ticks (per label interval)
+  # note the tpl is not used !
   def each_tick(tpl)
     raise "Range not aligned with presets (call round range first)" if not @ldelta
-  
-    lint = @lmax/tpl
-    if @rmin % lint != 0
-      v = (@rmin+lint) - (@rmin%lint)
+    
+    return if @ldelta == 0
+
+	subtick_delta = ideal_subtick_interval(@ldelta)
+      
+	if (@rmin.tv_sec % @ldelta) != @gmhalfhour
+      ni_sec = (@rmin.tv_sec+@ldelta)/@ldelta
+
+	  # if labeling hours, make sure you account tz weirdness like india GMT +5:30
+	  if @ldelta >= 3600
+		 v = Time.at(@ldelta* ni_sec.to_i  - @gmhalfhour)
+	  else
+	  	 v = Time.at(@ldelta * ni_sec.to_i)
+	  end
     else
       v = @rmin
     end
-    while (v<@rmax) do
-      yield v
-      v = v+lint
+
+    while (v<=@rmax) do
+      yield v    
+      v = v+subtick_delta
     end
+
   end
   
   # format min value completely
@@ -99,6 +116,22 @@ private
     return last_pre,last_lab
   end
 
+  # ideal subticks
+  #  You dont want to do a fixed subdivision of a time interval will be ugly
+  #  Eg. 10x of 2 hours will be 12 min ticks = FAIL
+  def ideal_subtick_interval(label_interval)
+
+	case ldelta
+		when (0..1*MINUTE); return 10
+		when (1*MINUTE..2*HOUR); return 15*MINUTE
+		when (2*HOUR..6*HOUR); return 30*MINUTE
+		when (6*HOUR..12*HOUR); return 1*HOUR
+		when (12*HOUR..1*DAY); return 3*HOUR
+		else; return 1*DAY
+	end
+  end
+
+
   
 end
 

data/lib/gerbilcharts/public/brushmetal.css

@@ -1,84 +1,90 @@
 .surfacepanel
 {
 	fill: none;
-	stroke-width: 1;
-	stroke: black;
+        stroke-width: 1;
+        stroke: black;
 }
 .gridlineh
-{	
-	stroke-width: 1;
-	stroke: lightgray;
+{
+        stroke-width: 1;
+        stroke: lightgray;
 }
 .gridlinev
 {
-	stroke-width: 1;
-	stroke: lightgray;	
+        stroke-width: 1;
+        stroke: lightgray;
+}
+.gridlinesub
+{
+        stroke-width: 0.4;
+        stroke: lightgray;
 }
 .surfaceback
 {
-	fill: url(#vertgrad);
+        fill: url(#vertgrad);
 }
 .axispanel
 {
-	fill: lightgray;
+        fill: lightgray;
 }
 .axistickmajor
 {
-	stroke-width: 2;
-	stroke: black;
+        stroke-width: 2;
+        stroke: black;
 }
 .axistickminor
 {
-	stroke-width: 1;
-	stroke: black;
+        stroke-width: 1;
+        stroke: black;
 }
 .panel
 {
-	fill: white;
+        fill: white;
 }
+
 .legend
 {
-	fill: red;
+        fill: red;
 }
 #item0
 {
-	stroke:	none;
-	fill: #00FF00;
+        stroke: none;
+        fill: #1F75FE;
 }
 #item1
 {
-	stroke: none;
-	fill: red;
+        stroke: none;
+        fill: #B87333;
 }
 #item2
 {
-	stroke: none;
-	fill: gold;
+        stroke: none;
+        fill: gold;
 }
 #item3
 {
-	stroke: none;
-	fill: magenta;
+        stroke: none;
+        fill: magenta;
 }
 #item4
 {
-	stroke:	none;
-	fill: olive;
+        stroke: none;
+        fill: olive;
 }
 #item5
 {
-	stroke: none;
-	fill: #F88017;
+        stroke: none;
+        fill: green;
 }
 #item6
 {
-	stroke: none;
-	fill: #1F75FE;
+        stroke: none;
+        fill: red;
 }
 #item7
 {
-	stroke: none;
-	fill: #B87333;
+        stroke: none;
+        fill: #F88017;
 }
 #item8
 {
@@ -97,37 +103,37 @@
 }
 #lineitem0
 {
-    stroke: none;
+    stroke: #1F75FE;
     stroke-width: 2;
 }
 #lineitem1
 {
-    stroke: none;
+    stroke: #B87333;
     stroke-width: 2;
 }
 #lineitem2
 {
-    stroke: none;
+    stroke: gold;
     stroke-width: 2;
 }
 #lineitem3
 {
-    stroke: none;
+    stroke: magenta;
     stroke-width: 2;
 }
 #lineitem4
 {
-    stroke: none;
+    stroke: olive;
     stroke-width: 2;
 }
 #lineitem5
 {
-    stroke: none;
+    stroke: green;
     stroke-width: 2;
 }
 #lineitem6
 {
-    stroke: none;
+    stroke: red;
     stroke-width: 2;
 }
 #lineitem7
@@ -142,57 +148,58 @@
 }
 .axislabel
 {
-	font-family: sans;
-	font-size: 10px;
-	fill: black;
-	stroke: none;
+        font-family: sans;
+        font-size: 10px;
+        fill: black;
+        stroke: none;
 }
 
 .axislabelt0
 {
-	font-family: sans;
-	font-size: 8px;
-	fill: black;
-	stroke: none;
+        font-family: sans;
+        font-size: 8px;
+        fill: black;
+        stroke: none;
 }
 .titletext
 {
-	fill: gray;
-	stroke: none;
-	font-family: Arial, Helvetica, sans-serif;;
-	font-size: 24px;
-	font-weight: bold;
+        fill: gray;
+        stroke: none;
+        font-family: Arial, Helvetica, sans-serif;;
+        font-size: 24px;
+        font-weight: bold;
 }
 .titlepanel
 {
-	fill: white;
-	fill-opacity: 0.5;
+        fill: white;
+        fill-opacity: 0.5;
 }
 .legendpanel
 {
-	fill: white;
-	fill-opacity: 0.5;
+        fill: white;
+        fill-opacity: 0.5;
 }
+
 .legendtext
 {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	fill: black;
-	stroke: none;
+        font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+        font-size: 10px;
+        fill: black;
+        stroke: none;
 }
 .elementlabel
 {
-	font-family: sans;
-	font-size: 10px;
-	fill: black;
-	stroke: none;
+        font-family: sans;
+        font-size: 10px;
+        fill: black;
+        stroke: none;
 }
 .elementvalue
 {
-	font-family: sans;
-	font-size: 8px;
-	fill: black;
-	stroke: none;
+        font-family: sans;
+        font-size: 8px;
+        fill: black;
+        stroke: none;
 }
 .trackerpanel
 {
@@ -209,6 +216,7 @@
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
     font-size: 14px;
 }
+                                                                                                        209,1         97%
 .trackertextfromts
 {
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;

data/lib/gerbilcharts/surfaces/axis.rb

@@ -16,13 +16,11 @@ class Axis < GraphElement
       @stagger_levels=1
     end
     
-    
     def int_render(g)
       g.rectangle_r(@bounds, {:class => @class})
     end
     
     def get_stagger_off(level, offset)
-        #p "stager levles = #{@stagger_levels}"        
       return (level % @stagger_levels) * offset
     end
     

data/lib/gerbilcharts/surfaces/bar_surface.rb

@@ -3,15 +3,18 @@ module GerbilCharts::Surfaces
 # = Bar Surface
 # Draws latest values from models in a bar chart
 #
+# Options 
+#  element_width : optimum width of bars
+#  element_spacing : optimum spacing of bars
 class BarSurface < Surface
   
     attr_reader     :element_width		# optimum width of bar
-    attr_reader     :element_spacing		# optimum spacing between bars
+    attr_reader     :element_spacing	# optimum spacing between bars
   
     def initialize(opts={})
       super(opts)
-      @element_width = 20
-      @element_spacing = 25
+      @element_width = opts[:element_width]||20
+      @element_spacing = opts[:element_spacing]|| 25
     end
     
     def int_render(g)  
@@ -24,11 +27,13 @@ class BarSurface < Surface
     
        # see if the element spacing or width need to be adjusted to fit
        nmodels = parent.modelgroup.count
-       delta = @bounds.width - (nmodels * (@element_width + @element_spacing) + @element_spacing)
-       if delta < 0
-	  delta_per_item = delta/(nmodels+2)
-	  @element_width += delta_per_item
-	  @element_spacing = 2 * @element_width
+       extra_space = @bounds.width - (nmodels * (@element_width + @element_spacing) + @element_spacing)
+       if extra_space < 0
+			  delta_per_item = extra_space/(2*nmodels)
+			  @element_width += delta_per_item
+			  @element_spacing += delta_per_item
+	   else
+	   	  @element_spacing += extra_space /(nmodels)
        end
 		  
        # atleast one model is present, chhug along  
@@ -38,24 +43,23 @@ class BarSurface < Surface
      
        xpos = @bounds.left + @element_spacing 
        parent.modelgroup.each_model_with_index do | mod, i|
-       y=mod.latest_val
-       ypos = scale_y y,ry
+			   y=mod.latest_val
+			   ypos = scale_y y,ry
        
-       # Adding tool tips to the rectangle 
-       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 = #{mod.latest_val}")
-       end
+			   # Adding tool tips to the rectangle 
+			   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 = #{mod.latest_val}")
+			   end
        
-	# draw the abr
-       g.rectangle(xpos, ypos, @element_width, @bounds.bottom - ypos, opts)
-       g.textout( xpos+@element_width/2, ypos-5, 
-			mod.latest_formatted_val,
-			{:class => "elementlabel", "text-anchor" => "middle"}
-		)
-       xpos += @element_spacing + @element_width       
+			   # draw the bar
+			   g.rectangle(xpos, ypos, @element_width, @bounds.bottom - ypos, opts)
+			   g.textout( xpos+@element_width/2, ypos-5, 
+						  mod.latest_formatted_val,
+						  {:class => "elementlabel", "text-anchor" => "middle"})
+			   xpos += @element_spacing + @element_width       
        end      
     end
 end

data/lib/gerbilcharts/surfaces/grid.rb

@@ -4,24 +4,43 @@ module GerbilCharts::Surfaces
 #  Draws both x and y grids
 class Grid < GraphElement
     
+	attr_reader :tick_count
+
     def initialize(opts={})
       super(opts)
+	  @tick_count = 5
     end
     
     def int_render(g)
-		return
 
+	  # 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
+      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
+
+
         
+	  # 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"})
+	  end
+
     end
     
   protected
@@ -33,7 +52,6 @@ class Grid < GraphElement
   def grid_range_y
      return parent.modelgroup.effective_round_range_y0
   end
-    
   
 end
 

data/lib/gerbilcharts/surfaces/horizontal_axis.rb

@@ -21,7 +21,7 @@ class HorizontalAxis < Axis
             xp = @bounds.right-10
           end
           
-          g.textout(xp, @bounds.top+10, label, {:class => "axislabel"})
+          g.textout(xp, @bounds.top+10, label, {:class => "axislabel", "text-anchor" => "middle"})
           g.line(xp,@bounds.top-2,xp,@bounds.top+3, {:class => "axistickmajor"})
       end
       

data/lib/gerbilcharts/surfaces/horizontal_name_axis.rb

@@ -11,22 +11,22 @@ class HorizontalNameAxis < Axis
     end
         
     def int_render(g)
-    super      
-    xp = @bounds.left + parent.anchor.element_spacing + parent.anchor.element_width/2
-    parent.modelgroup.each_model_with_index  do |m,i|
-        yoff=get_stagger_off(i,10)
-	#Adding tool tips to the text 	
-	opts = { :class => "axislabel"}
-	if parent.get_global_option(:auto_tooltips,false)
-		opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
-		opts.store(:gerbiltooltip1, m.name) 
-		opts.store(:gerbiltooltip2, "Val = #{m.latest_val}")
-	end
-        g.textout(xp, @bounds.top+15+yoff, m.name[0..4], opts)
-        xp += parent.anchor.element_width + parent.anchor.element_spacing
-     end
-    end
-  
-end
+			super      
+			xp = @bounds.left + parent.anchor.element_spacing + parent.anchor.element_width/2
+			parent.modelgroup.each_model_with_index  do |m,i|
+				yoff=get_stagger_off(i,10)
+
+				#Adding tool tips to the text 	
+				opts = { :class => "axislabel","text-anchor"=> "middle" }
+				parent.get_global_option(:auto_tooltips,false)
 
+				opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)") 
+				opts.store(:gerbiltooltip1, m.name) 
+				opts.store(:gerbiltooltip2, "Val = #{m.latest_val}")
+			
+				g.textout(xp, @bounds.top+15+yoff, m.name[0..14], opts)
+				xp += parent.anchor.element_width + parent.anchor.element_spacing
+			end
+	 end
+  end
 end

data/lib/gerbilcharts/surfaces/horizontal_time_axis.rb

@@ -15,7 +15,7 @@ class HorizontalTimeAxis < HorizontalAxis
       
       rx = parent.modelgroup.effective_round_range_x
       sfmt = rx.format_min_value
-      g.textout(@bounds.left-20, @bounds.top+20, sfmt, {:class => "axislabelt0"})
+      g.textout(@bounds.left-20, @bounds.top+20, sfmt, {:class => "axislabelt0" })
       g.line(@bounds.left,@bounds.top,@bounds.left,@bounds.top+10,{:class => "axistickmajor"})
       
     end

data/lib/gerbilcharts/surfaces/legend.rb

@@ -14,7 +14,6 @@ class Legend < GraphElement
     end
     
     def int_render(g)
-      
       # count determines the bounds
       @bounds.bottom = @bounds.top + 15 * parent.modelgroup.count
       g.rectangle_r(@bounds, {:class => @class})
@@ -27,10 +26,16 @@ class Legend < GraphElement
       rbox.bottom = rbox.top+10
        
       parent.modelgroup.each_model_with_index do | mod, i|
-      
-        
+
+		# 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}")
+	
         g.rectangle_r(rbox, :id => "item#{i}")
-        g.textout(rbox.right+5, rbox.bottom-2, mod.name, {:class => "legendtext"})
+        g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
         
         rbox.top += 10 + 5
         rbox.bottom = rbox.top+10

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -59,8 +59,8 @@ class PieSurface < Surface
 		new_pos_y = cy + (Math.sin((Math::PI/180)*tot_angle)*radius)
 		label_pos_x = cx + (Math.cos((Math::PI/180)*half_angle)*radius_label)
 		label_pos_y = cy + (Math.sin((Math::PI/180)*half_angle)*radius_label)
-
-		percent_mod = (mod.latest_val*360/y_total)
+		
+		percent_mod = ((mod.latest_val*360).to_i/y_total.to_i)
 		percent = (percent_mod*100/360)
 		percent_pos_x = cx + ((Math.cos((Math::PI/180)*half_angle)*radius_label)*0.6)
 		percent_pos_y = cy + ((Math.sin((Math::PI/180)*half_angle)*radius_label)*0.6)

data/lib/gerbilcharts/surfaces/square_line_surface.rb

@@ -0,0 +1,60 @@
+module GerbilCharts::Surfaces
+
+# = Square Line Surface
+# Squarized line surface 
+# Control the color,thickness of the line via the stylesheet item lineitem1, lineitem2 etc
+#
+# Supported global options
+#
+# [+circle_data_points+]    Draw a solid circle around datapoints
+# [+scaling+]               :auto, :auto_y0
+#
+class SquareLineSurface < Surface
+    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)
+      rx = parent.modelgroup.effective_range_x(range_options_x)
+      ry = parent.modelgroup.effective_range_y(range_options_y)
+      
+      # ajax if used
+      if parent.usesAjax?
+        set_ajaxSurfaceContext(rx.rmax,ry.rmax,"LINE")
+      end
+
+      parent.modelgroup.each_model_with_index do | mod, i|
+      
+	  	prev_ypos=nil
+        mod.each_tuple do |x,y|
+
+		  # the basic line 
+          xpos = scale_x x,rx
+          ypos = scale_y y,ry
+
+		  prev_ypos ||= ypos 
+          g.lineto xpos,prev_ypos
+		  g.lineto xpos,ypos
+		  prev_ypos=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
+    end
+
+end
+
+end

data/lib/gerbilcharts/surfaces/stacked_area_surface.rb

@@ -9,8 +9,7 @@ class StackedAreaSurface < Surface
     end
     
     def int_render(g)
-      
-      
+   #   debugger
       rx = parent.modelgroup.effective_round_range_x
       ry = parent.modelgroup.cumulative_sweep_round_range_y0
 
@@ -24,6 +23,7 @@ class StackedAreaSurface < Surface
       sweep_to = rx.rmax
       polygons = []
       parent.modelgroup.each_model do | mod|
+#	debugger
           mod.begin_sweep
           polygons << GerbilCharts::SVGDC::SVGPolygon.new
       end
@@ -33,11 +33,10 @@ class StackedAreaSurface < Surface
       
       # perform the sweep
       while (sweep_pos<=sweep_to)  
-      
+  #    debugger
             acc_y = 0
-            
             parent.modelgroup.each_model_with_index do | mod, i|
-            
+  #          debugger
               acc_y +=  mod.sweep(sweep_pos)
               xpos = scale_x sweep_pos,rx
               ypos = scale_y acc_y,ry
@@ -50,12 +49,12 @@ class StackedAreaSurface < Surface
             end
             
             sweep_pos += sweep_interval
-      end
-
+     end
+#     debugger
       # layout all polygons in reverse
       i=polygons.length-1
       polygons.reverse_each do |p|
-        g.addshape(p, {:id => "item#{i}"})
+        g.addshape(p,{:id => "item#{i}"})
         i -= 1
       end
       

data/lib/gerbilcharts/surfaces.rb

@@ -30,3 +30,4 @@ require 'gerbilcharts/surfaces/pie_surface'
 require 'gerbilcharts/surfaces/stacked_area_surface'
 require 'gerbilcharts/surfaces/surface_background'
 require 'gerbilcharts/surfaces/tracker'
+require 'gerbilcharts/surfaces/square_line_surface'

data/lib/gerbilcharts/svgdc/svg_polyline.rb

@@ -14,7 +14,8 @@ class SVGPolyline < SVGShape
   end
   
   def lineto(x,y)
-    @operstring << "#{x},#{y} "
+    fmt="%.2f"
+    @operstring << "#{fmt%x},#{fmt%y} "
   end
   
   def render(xfrag)

data/lib/gerbilcharts/version.rb

@@ -2,7 +2,7 @@ module GerbilCharts
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_bar.rb

@@ -18,16 +18,18 @@ class TestBar < Test::Unit::TestCase
 						      ["Wasim", 112,22, 45, 70, 218, 145], 
 						      ["Buzo" , 0,  23, 25, 40, 18,  59], 
 						      ["Vipin", 145,112, 22, 45, 18, 70],
-						      ["label", 145,112, 22, 45, 18, 240],
+						      ["covad11.covad.nc.us", 145,112, 22, 45, 18, 240],
 						      ["very very very long name 9th item ", 145,112, 22, 45, 18, 45],
+						      ["192.168.201.200 ", 145,112, 22, 45, 18, 15],
+						      ["192.168.201.200 ", 145,112, 22, 45, 18, 15],
 						      ["Others ", 145,112, 22, 45, 18, 15],
 						      ["VIVEK", 145,112, 22, 45, 18, 170]
 									]
 				 )
-    mychart = GerbilCharts::Charts::BarChart.new( :width => 350, :height => 200, 
+    mychart = GerbilCharts::Charts::BarChart.new( :width => 550, :height => 200, 
 					:style => 'brushmetal.css', :auto_tooltips => true ,
-					:javascripts => {'javascripts/gerbil.js' => false, 'javascripts/prototype.js' => false}
-					        )
+					:javascripts => {'/tmp/gerbil.js' => false, '/tmp/prototype.js' => false}
+				       	        )
     mychart.modelgroup=modelgroup
     mychart.render('/tmp/bar_monthly_sales.svg')
   end   

data/test/test_charts.rb

@@ -109,7 +109,10 @@ class TestCharts < Test::Unit::TestCase
   # test a area chart
   def test_stacked_area_1
  
-    mychart = GerbilCharts::Charts::StackedAreaChart.new( :width => 350, :height => 200, :style => 'brushmetal.css')
+    mychart = GerbilCharts::Charts::StackedAreaChart.new( :width => 350, :height => 200, 
+					:style => 'brushmetal.css', :auto_tooltips=> true,
+					:javascripts => {'/tmp/gerbil.js' => false, '/tmp/prototype.js' => false , '/tmp/scriptaculous.js' => false}
+					)
     mychart.setmodelgroup(@modgroupbucketized)
     mychart.render('/tmp/c_sachart1.svg')
     

data/test/test_lines.rb

@@ -0,0 +1,100 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestLines  < Test::Unit::TestCase
+
+   attr_reader  :test_vector_tm1
+   attr_reader  :test_vector_tm2
+   attr_reader  :mod1, :mod2, :modbucket1
+  
+   def setup
+     @test_vector_tm1 = []
+     @test_vector_tm2 = []
+     @test_vector_tm3 = []
+     tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
+     sbeg = tbeg
+     sec_inc = 1000
+     
+     for i in (0..20)
+      @test_vector_tm1 << [sbeg + i*sec_inc, i*sec_inc*1000 ]
+      @test_vector_tm2 << [sbeg + i*sec_inc, i*sec_inc*1200 ]
+      @test_vector_tm3 << [sbeg + i*sec_inc, i*sec_inc*1000*rand() ]
+    end
+
+    @mod1 = GerbilCharts::Models::TimeSeriesGraphModel.new("External Gateway")
+    @mod1.add_tuples @test_vector_tm1
+  
+    @mod2 = GerbilCharts::Models::TimeSeriesGraphModel.new("209.216.22.220")
+    @mod2.add_tuples @test_vector_tm2
+  
+    @mod3 = GerbilCharts::Models::TimeSeriesGraphModel.new("udldev Print Server")
+    @mod3.add_tuples @test_vector_tm3
+  
+    @modgroup = GerbilCharts::Models::GraphModelGroup.new("Hosts")
+    @modgroup.add(@mod1)
+    @modgroup.add(@mod2)
+    @modgroup.add(@mod3)
+    
+    setup_bucketized_models()
+
+   end
+  
+  def setup_bucketized_models
+    # bucketized models
+     modbucket1 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new("Out Bw",60)
+     tbeg = Time.local( 1978, "jun", 5, 9, 10, 0, 0)
+     sbeg = tbeg
+     
+     #second with some gaps
+    sbeg = tbeg
+    test_vector_bucket_1 = []
+    test_vector_bucket_1 << [sbeg + 60, 1000 ]
+    test_vector_bucket_1 << [sbeg + 120, 1000 ]
+    test_vector_bucket_1 << [sbeg + 180, 1000 ]
+    test_vector_bucket_1 << [sbeg + 239, 1000 ]
+    test_vector_bucket_1 << [sbeg + 295, 1000 ]
+    test_vector_bucket_1 << [sbeg + 296, 1000 ]
+    test_vector_bucket_1 << [sbeg + 297, 5000 ]
+    test_vector_bucket_1 << [sbeg + 298, 1000 ]
+    test_vector_bucket_1 << [sbeg + 360, 1000 ]
+    test_vector_bucket_1 << [sbeg + 420, 1000 ]
+    test_vector_bucket_1 << [sbeg + 480, 1000 ]
+    test_vector_bucket_1 << [sbeg + 530, 1000 ]
+    test_vector_bucket_1 << [sbeg + 604, 1000 ]
+    test_vector_bucket_1 << [sbeg + 800, 1000 ]
+    modbucket1.add_tuples(test_vector_bucket_1)
+    
+     #second with some gaps
+    modbucket2 = GerbilCharts::Models::BucketizedTimeSeriesGraphModel.new("In Bw",60)
+    sbeg = tbeg
+    test_vector_bucket_2 = []
+    test_vector_bucket_2 << [sbeg + 10, 1800 ]
+    test_vector_bucket_2 << [sbeg + 20, 2600 ]
+    test_vector_bucket_2 << [sbeg + 22, 1000 ]
+    test_vector_bucket_2 << [sbeg + 60, 1000 ]
+    test_vector_bucket_2 << [sbeg + 120, 1900 ]
+    test_vector_bucket_2 << [sbeg + 180, 700 ]
+    test_vector_bucket_2 << [sbeg + 240, 5000 ]
+    test_vector_bucket_2 << [sbeg + 301, 1000 ]
+    test_vector_bucket_2 << [sbeg + 350, 1000 ]
+    test_vector_bucket_2 << [sbeg + 420, 100 ]
+    test_vector_bucket_2 << [sbeg + 470, 500 ]
+    test_vector_bucket_2 << [sbeg + 540, 1000 ]
+    modbucket2.add_tuples(test_vector_bucket_2)
+
+    @modgroupbucketized = GerbilCharts::Models::GraphModelGroup.new("Bandwidth")
+    @modgroupbucketized .add(modbucket1)
+    @modgroupbucketized .add(modbucket2)
+    
+  end
+  
+
+  # test a line chart
+  def test_line_1
+ 
+    mychart = GerbilCharts::Charts::AreaChart.new( :width => 450, :height => 400, :style => 'brushmetal.css')
+    mychart.setmodelgroup(@modgroup)
+    mychart.render('/tmp/sq_linechart1.svg')
+    
+  end   
+   
+end

data/test/test_pie.rb

@@ -15,7 +15,7 @@ class TestPie < Test::Unit::TestCase
 				   :title => "Sales figures",
 				   :timeseries  =>  (1..6).collect { |month| Time.local(2008,month) },
 				   :models =>       [ ["Bruce", 1,  10, 18, 28, 80,  134],
-						      ["Rex"  , 112,22, 45, 70, 218, 309], 
+						      ["Rex"  , 112,22, 45, 70, 218, 309.98], 
 						      ["Sharmila", 112,22, 45, 70, 218, 245], 
 						      ["Wasim", 112,22, 45, 70, 218, 145], 
 						      ["Buzo" , 0,  23, 25, 40, 18,  59], 
@@ -33,7 +33,7 @@ class TestPie < Test::Unit::TestCase
 				:filter => 'LikeButton' 
 				)
     mychart.modelgroup=modelgroup
-    mychart.render('/tmp/pie_monthly_sales_lit.svg')
+    mychart.render('/tmp/pie_monthly_sales.svg')
   end   
    
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +05:30
+date: 2009-10-19 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/gerbilcharts/surfaces/title_panel.rb
 - lib/gerbilcharts/surfaces/tracker.rb
 - lib/gerbilcharts/surfaces/vertical_axis.rb
+- lib/gerbilcharts/surfaces/square_line_surface.rb
 - lib/gerbilcharts/charts/area_chart.rb
 - lib/gerbilcharts/charts/bar_chart_compact.rb
 - lib/gerbilcharts/charts/bar_chart.rb
@@ -100,6 +101,7 @@ files:
 - lib/gerbilcharts/charts/line_chart.rb
 - lib/gerbilcharts/charts/stacked_area_chart.rb
 - lib/gerbilcharts/charts/pie_chart.rb
+- lib/gerbilcharts/charts/square_line_chart.rb
 - lib/gerbilcharts/svgdc/svgdc.rb
 - lib/gerbilcharts/svgdc/svg_element.rb
 - lib/gerbilcharts/svgdc/filters.rb
@@ -152,6 +154,7 @@ test_files:
 - test/test_helper.rb
 - test/test_svgdc.rb
 - test/test_noob.rb
+- test/test_lines.rb
 - test/test_pie.rb
 - test/test_render_string.rb
 - test/test_bar.rb