gerbilcharts 0.1.9 → 0.2.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.1 2009-09-15
+* Changes
+  * Toolip and alpha effect javascript for PIE charts
+  * Accomodate wide labels on bar charts using tooltips
+  * Optimize pie chart layout further
+  * Fixes to stylesheet
+
 == 0.0.9 2009-09-10
 * Changes
   * PIE Charts

data/lib/gerbilcharts/models/round_time_range.rb

@@ -16,7 +16,7 @@ class RoundTimeRange < RawRange
     @rdelta,@ldelta=round_delta(raw_range.delta)
     @rmin=raw_range.rmin
     @rmax=round_max(raw_range.rmax,@rdelta)
-	@gmhalfhour = Time.now.gmt_offset%3600 
+    @gmhalfhour = Time.now.gmt_offset%3600 
   end
  
    # provide labels
@@ -71,7 +71,7 @@ class RoundTimeRange < RawRange
 private
   # round_max (ceiling)
   def round_max(raw, interval)
-    return 0 if interval == 0 
+    return raw if interval == 0 
     ni_secs = (raw.tv_sec+interval)/interval
     return Time.at(interval * ni_secs.to_i)
   end

data/lib/gerbilcharts/public/brushmetal.css

@@ -1,3 +1,5 @@
+.surfacepanel
+{
 	fill: none;
 	stroke-width: 1;
 	stroke: black;

data/lib/gerbilcharts/surfaces/bar_surface.rb

@@ -14,50 +14,50 @@ class BarSurface < Surface
       @element_spacing = 25
     end
     
-    def int_render(g)
+    def int_render(g)  
+       # bail out of empty models quickly
+       if parent.modelgroup.empty?
+       		g.textout(@bounds.left + @bounds.width/2, @bounds.height/2, 
+                 	  parent.modelgroup.empty_caption,{"text-anchor" => "middle"})
+        	return
+       end
     
-     # bail out of empty models quickly
-     if parent.modelgroup.empty?
-       g.textout(@bounds.left + @bounds.width/2, @bounds.height/2, 
-                 parent.modelgroup.empty_caption,{"text-anchor" => "middle"})
-        return
-      end
-    
-	 # 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)
-	 #p "delta = #{delta} width = #{@bounds.width}"
-	 if delta < 0
-		delta_per_item = delta/(nmodels+1)
-		@element_width += delta_per_item
-		@element_spacing += delta_per_item
-	 end
-	 #p "Spacing =  #{parent.anchor.element_spacing} spacing"
+       # 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
+       end
 		  
-     # atleast one model is present, chhug along  
-	 range_options_y = parent.get_global_option(:scaling_y,:auto)
-     ry = parent.modelgroup.effective_range_y(range_options_y)
-     set_ajaxSurfaceContext(0,ry.rmax,"BAR") if parent.usesAjax?
+       # atleast one model is present, chhug along  
+       range_options_y = parent.get_global_option(:scaling_y,:auto)
+       ry = parent.modelgroup.effective_range_y(range_options_y)
+       set_ajaxSurfaceContext(0,ry.rmax,"BAR") if parent.usesAjax?
      
-     xpos = @bounds.left + @element_spacing 
-     parent.modelgroup.each_model_with_index do | mod, i|
-       
+       xpos = @bounds.left + @element_spacing 
+       parent.modelgroup.each_model_with_index do | mod, i|
        y=mod.latest_val
        ypos = scale_y y,ry
        
-       opts = {:id => "item#{i}", :onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)"}
-       opts.store(:href, mod.href) if mod.hasHref?
-       opts.store(:gerbiltooltip1, mod.userlabel1) if mod.hasUserTips?
-       opts.store(:gerbiltooltip2, mod.userlabel2) if mod.hasUserTips?
+       # 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
-       
-      end
-      
+       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
 
 end

data/lib/gerbilcharts/surfaces/horizontal_axis.rb

@@ -14,7 +14,7 @@ class HorizontalAxis < Axis
       
       rx = parent.modelgroup.effective_round_range_x
       rx.each_label do |val,label|
-          xp = scale_x val,rx
+        xp = scale_x val,rx
           
           # make sure edge ones are visible
           if (xp>=@bounds.right-10)

data/lib/gerbilcharts/surfaces/horizontal_name_axis.rb

@@ -11,16 +11,20 @@ class HorizontalNameAxis < Axis
     end
         
     def int_render(g)
-      super
-      
-	  # p "Horiz name axis #{parent.anchor.element_spacing} spacing"
-      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)
-          g.textout(xp, @bounds.top+15+yoff, m.name, {:class => "axislabel","text-anchor" => "middle"})
-          xp += parent.anchor.element_width + parent.anchor.element_spacing
-      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"}
+	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

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -2,6 +2,13 @@ module GerbilCharts::Surfaces
 
 # = Pie Surface
 class PieSurface < Surface
+
+	MIN_INSIDE_LABEL_ANGLE = 8 				# do not draw outer label for small angles
+	MIN_OUTSIDE_LABEL_ANGLE = 3				# do not draw inner percentages (pie slice) for small angles
+    OUTER_OFFSET_X = 10						# x - distance  offset from pie boundary
+	OUTER_OFFSET_Y = 10  					# y - y offset from pie boundary
+	LEFT_LABEL_OFFSET = 30 					# labels on the left of the PIE offset by this (90-270 deg)
+
     def initialize(opts={})
       super(opts)
     end
@@ -33,54 +40,67 @@ class PieSurface < Surface
      cy = @bounds.height/2
      current_pos_x = cx + radius
      current_pos_y = cy
-
-
+	
      # draw each slice
      tot_angle =0
      parent.modelgroup.each_model_with_index do | mod, i|
-	mod_angle = ((mod.latest_val*360).to_f)/(y_total.to_f)
-	half_angle = tot_angle + mod_angle/2
-	tot_angle = tot_angle + mod_angle 
 
-	new_pos_x = cx + (Math.cos((Math::PI/180)*tot_angle)*radius)
-	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 = (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)
-	
-        opts = {:id => "item#{i}" }
-	g.addshape(GerbilCharts::SVGDC::SVGArc.new(cx,cy,radius,radius,
-						   current_pos_x,current_pos_y,
-					 	   new_pos_x,new_pos_y,mod_angle),
-					       opts)
+		mod_angle = ((mod.latest_val*360).to_f)/(y_total.to_f)
+		half_angle = tot_angle + mod_angle/2
+		tot_angle = tot_angle + mod_angle 
+
+		new_pos_x = cx + (Math.cos((Math::PI/180)*tot_angle)*radius)
+		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)
 
-	if(tot_angle > 270) 
-		if(label_pos_x > cx ) && (label_pos_y > cy )
-			g.textout( label_pos_x, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel' )
-			g.textout( label_pos_x, label_pos_y+10, "#{mod.name}", :class => 'elementlabel' )
-		else
-			g.textout( label_pos_x+10 , label_pos_y , "#{mod.latest_val}", :class => 'elementlabel')
-			g.textout( label_pos_x+10 , label_pos_y+10, "#{mod.name}", :class => 'elementlabel')
+		percent_mod = (mod.latest_val*360/y_total)
+		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)
+	
+   
+		# if tooltips enabled, user can position on pie slice 
+		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
-	 
-	elsif(label_pos_x > cx ) && (label_pos_y > cy )
-		g.textout( label_pos_x, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel' )
-		g.textout( label_pos_x, label_pos_y+10, "#{mod.name}", :class => 'elementlabel' )
-	else
-		g.textout( label_pos_x-30 , label_pos_y , "#{mod.latest_val}", :class => 'elementlabel')
-		g.textout( label_pos_x-30 , label_pos_y+10, "#{mod.name}", :class => 'elementlabel')
-	end
+
+		# draw the slice 
+		g.addshape(GerbilCharts::SVGDC::SVGArc.new(cx,cy,radius,radius,
+				   current_pos_x,current_pos_y,
+				   new_pos_x,new_pos_y,mod_angle),
+				   opts)
+
+		if(percent >= MIN_OUTSIDE_LABEL_ANGLE)
+			if(tot_angle > 270)
+            	if(label_pos_x > cx ) && (label_pos_y > cy )
+             		g.textout( label_pos_x, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel')
+               		g.textout(label_pos_x,label_pos_y+OUTER_OFFSET_Y, "#{mod.name}", :class => 'elementlabel' )      
+			    else                             
+                    g.textout( label_pos_x+OUTER_OFFSET_X, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel' )
+                    g.textout( label_pos_x+OUTER_OFFSET_X, label_pos_y+OUTER_OFFSET_Y, "#{mod.name}", :class => 'elementlabel' ) 
+                end
+          elsif(label_pos_x > cx ) && (label_pos_y > cy )
+               g.textout( label_pos_x, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel' )
+               g.textout( label_pos_x, label_pos_y+OUTER_OFFSET_Y, "#{mod.name}", :class => 'elementlabel' )
+            else
+               g.textout( label_pos_x-LEFT_LABEL_OFFSET, label_pos_y, "#{mod.latest_val}", :class => 'elementlabel' )
+               g.textout( label_pos_x-LEFT_LABEL_OFFSET, label_pos_y+OUTER_OFFSET_Y, "#{mod.name}", :class => 'elementlabel' )
+          end
+	 end
+	
 	
-	if(percent > 8)	
-	g.textout(percent_pos_x,percent_pos_y, "#{percent}%", :class => 'elementvalue')
-	end
-	current_pos_x = new_pos_x
-	current_pos_y = new_pos_y
-	end
+     if(percent > MIN_INSIDE_LABEL_ANGLE)	
+ 	      g.textout(percent_pos_x,percent_pos_y, "#{percent}%", :class => 'elementvalue')
+     end
+
+     current_pos_x = new_pos_x
+     current_pos_y = new_pos_y
+      
+      end
     end
 end
 end

data/lib/gerbilcharts/version.rb

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

data/test/test_bar.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+require 'trafgen'
+
+# 	test pie chart 
+class TestBar < Test::Unit::TestCase
+
+
+  # test  sales figures of 3 sales people
+  # show in a pie chart 
+  def test_monthly_sales
+    modelgroup = GerbilCharts::Models::SimpleTimeSeriesModelGroup.new( 
+				   :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], 
+						      ["Sharmila", 112,22, 45, 70, 218, 245], 
+						      ["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],
+						      ["very very very long name 9th item ", 145,112, 22, 45, 18, 45],
+						      ["Others ", 145,112, 22, 45, 18, 15],
+						      ["VIVEK", 145,112, 22, 45, 18, 170]
+									]
+				 )
+    mychart = GerbilCharts::Charts::BarChart.new( :width => 350, :height => 200, 
+					:style => 'brushmetal.css', :auto_tooltips => true ,
+					:javascripts => {'javascripts/gerbil.js' => false, 'javascripts/prototype.js' => false}
+					        )
+    mychart.modelgroup=modelgroup
+    mychart.render('/tmp/bar_monthly_sales.svg')
+  end   
+end
+
+

data/test/test_pie.rb

@@ -20,14 +20,17 @@ class TestPie < Test::Unit::TestCase
 						      ["Wasim", 112,22, 45, 70, 218, 145], 
 						      ["Buzo" , 0,  23, 25, 40, 18,  59], 
 						      ["Vipin", 145,112, 22, 45, 18, 70],
-						      ["This is a long label", 145,112, 22, 45, 18, 245],
+						      ["label", 145,112, 22, 45, 18, 240],
 						      ["9th item ", 145,112, 22, 45, 18, 45],
 						      ["Others ", 145,112, 22, 45, 18, 15],
 						      ["VIVEK", 145,112, 22, 45, 18, 170]
 									]
 				 )
 
-    mychart = GerbilCharts::Charts::PieChart.new( :width => 350, :height => 200, :style => 'brushmetal.css')
+    mychart = GerbilCharts::Charts::PieChart.new( :width => 350, :height => 200, 
+				:style => 'brushmetal.css', :auto_tooltips => true ,
+				:javascripts => {'/tmp/gerbil.js' => false, '/tmp/prototype.js' => false}
+				)
     mychart.modelgroup=modelgroup
     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.1.9
+  version: 0.2.1
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 +05:30
+date: 2009-09-17 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ test_files:
 - test/test_noob.rb
 - test/test_pie.rb
 - test/test_render_string.rb
+- test/test_bar.rb
 - test/test_models.rb
 - test/test_charts.rb
 - test/test_scaling.rb