gerbilcharts 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.9 2009-09-10
+* Changes
+  * PIE Charts
+  * Fixed color scheme stylesheet brushmetal.css to be more pleasing
+  * Internal helper class svg_arc added 
+
 == 0.0.7 2009-08-15
 * Changes
   * Bug fixes with stacked area

data/Manifest.txt

@@ -54,6 +54,7 @@ lib/gerbilcharts/surfaces/surface.rb
 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/charts/area_chart.rb
 lib/gerbilcharts/charts/bar_chart_compact.rb
 lib/gerbilcharts/charts/bar_chart.rb
@@ -61,6 +62,7 @@ lib/gerbilcharts/charts/chart_base.rb
 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/svgdc/svgdc.rb
 lib/gerbilcharts/svgdc/svg_element.rb
 lib/gerbilcharts/svgdc/filters.rb
@@ -75,3 +77,4 @@ lib/gerbilcharts/svgdc/svg_polygon.rb
 lib/gerbilcharts/svgdc/svg_polyline.rb
 lib/gerbilcharts/svgdc/svg_rect.rb
 lib/gerbilcharts/svgdc/svg_text.rb
+lib/gerbilcharts/svgdc/svg_arc.rb

data/lib/gerbilcharts/charts.rb

@@ -14,3 +14,4 @@ require 'gerbilcharts/charts/bar_chart'
 require 'gerbilcharts/charts/impulse_chart'
 require 'gerbilcharts/charts/line_chart'
 require 'gerbilcharts/charts/stacked_area_chart'
+require 'gerbilcharts/charts/pie_chart'

data/lib/gerbilcharts/charts/pie_chart.rb

@@ -0,0 +1,24 @@
+module GerbilCharts::Charts
+
+# = Pie chart
+# A standard pie  chart. 
+# The latest values of each model is presented as a slice
+#
+class PieChart < ChartBase
+
+  def initialize(opt={})
+    super(opt)
+  end
+  
+  def create_chart_elements
+    
+    @thechart.create_filter(GerbilCharts::SVGDC::LinearGradientVertical.new("vertgrad","rgb(255,255,255)","rgb(224,224,224)"))
+    # other elements
+    @thechart.add_child(GerbilCharts::Surfaces::SurfaceBackground.new(:orient => ORIENT_OVERLAY))
+    @thechart.add_child(GerbilCharts::Surfaces::TitlePanel.new(:orient => ORIENT_OVERLAY, :dim => 30, :just => :left))
+    @thechart.add_child(GerbilCharts::Surfaces::PieSurface.new(:orient => ORIENT_OVERLAY), :anchor => true)
+  end
+end
+
+
+end

data/lib/gerbilcharts/public/brushmetal.css

@@ -1,5 +1,3 @@
-.surfacepanel
-{
 	fill: none;
 	stroke-width: 1;
 	stroke: black;
@@ -42,92 +40,102 @@
 }
 #item0
 {
-	stroke:	blue;
-	fill: blue;
+	stroke:	none;
+	fill: #00FF00;
 }
 #item1
 {
-	stroke: red;
+	stroke: none;
 	fill: red;
 }
 #item2
 {
-	stroke: yellow;
-	fill: yellow ;
+	stroke: none;
+	fill: gold;
 }
 #item3
 {
-	stroke: aqua;
+	stroke: none;
 	fill: magenta;
 }
 #item4
 {
-	stroke:	gray;
-	fill: blue;
+	stroke:	none;
+	fill: olive;
 }
 #item5
 {
-	stroke: green;
-	fill: green;
+	stroke: none;
+	fill: #F88017;
 }
 #item6
 {
-	stroke: orange;
-	fill: orange;
+	stroke: none;
+	fill: #1F75FE;
 }
 #item7
 {
-	stroke: lime;
-	fill: violet;
+	stroke: none;
+	fill: #B87333;
 }
 #item8
 {
-    stroke: brown;
-    fill: navy;
+    stroke: none;
+    fill: #640E29;
+}
+#item9
+{
+    stroke: none;
+    fill: aqua;
+}
+#item10
+{
+    stroke: none;
+    fill: black;
 }
 #lineitem0
 {
-    stroke: blue;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem1
 {
-    stroke: red;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem2
 {
-    stroke: yellow;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem3
 {
-    stroke: aqua;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem4
 {
-    stroke: gray;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem5
 {
-    stroke: green;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem6
 {
-    stroke: orange;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem7
 {
-    stroke: lime;
+    stroke: none;
     stroke-width: 2;
 }
 #lineitem8
 {
-    stroke: brown;
+    stroke: none;
     stroke-width: 2;
 }
 .axislabel
@@ -172,8 +180,17 @@
 }
 .elementlabel
 {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-family: sans;
 	font-size: 10px;
+	fill: black;
+	stroke: none;
+}
+.elementvalue
+{
+	font-family: sans;
+	font-size: 8px;
+	fill: black;
+	stroke: none;
 }
 .trackerpanel
 {

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -1,7 +1,6 @@
 module GerbilCharts::Surfaces
 
 # = Pie Surface
-# Not yet implemented
 class PieSurface < Surface
     def initialize(opts={})
       super(opts)
@@ -11,6 +10,77 @@ class PieSurface < Surface
       g.rectangle_r(@bounds, {:class => @class})
     end
 
-end 
+    
+   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
+    
+     # compute totals
+     y_total = 0
+     parent.modelgroup.each_model_with_index do | mod, i|
+       y_total = y_total + mod.latest_val
+     end
+
+     
+     radius  = @bounds.height * 0.35
+     radius_label = radius + 10
+     cx = @bounds.width/2
+     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)
+
+	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')
+		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
+	
+	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
+    end
+end
 end

data/lib/gerbilcharts/svgdc.rb

@@ -20,3 +20,4 @@ require 'gerbilcharts/svgdc/svg_polygon'
 require 'gerbilcharts/svgdc/svg_polyline'
 require 'gerbilcharts/svgdc/svg_rect'
 require 'gerbilcharts/svgdc/svg_text'
+require 'gerbilcharts/svgdc/svg_arc'

data/lib/gerbilcharts/svgdc/svg_arc.rb

@@ -0,0 +1,40 @@
+module GerbilCharts::SVGDC
+
+# = SVGARC - a simple elliptical arc
+#
+class SVGArc < SVGShape
+  
+  attr_accessor :cx,:cy
+  attr_accessor :px,:py
+  attr_accessor :qx,:qy
+  attr_accessor :r1,:r2
+  attr_accessor :angle
+
+  
+
+  # cx,cy = center point
+  # r1,r2 = radius 1, 2
+  # px,py = starting point
+  # qx,qy = ending  point
+  #
+  # To create rectangle top left corner at (10,10) and width 200,height 100 do :
+  #  SVGRect.new (10,10,200,150) 
+  def initialize(cx,cy,r1,r2,px,py,qx,qy,angle)
+      @cx,@cy,@r1,@r2,@px,@py,@qx,@qy=cx,cy,r1,r2,px,py,qx,qy
+      @angle=angle
+      super()
+  end
+  
+  def render(xfrag)
+    d_str = "M#{cx},#{cy}  L#{px},#{py} A#{r1},#{r2} 0 #{anglestr}  #{qx},#{qy} "
+    h= { :d =>  d_str }
+    render_base(xfrag) { xfrag.path( h.merge(render_attributes)) }
+  end
+
+  def anglestr
+	angle >= 180 ? "1,1" : "0,1"
+  end
+  
+end
+
+end

data/lib/gerbilcharts/version.rb

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

data/test/test_pie.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+require 'trafgen'
+
+# 	test pie chart 
+class TestPie < 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],
+						      ["This is a long label", 145,112, 22, 45, 18, 245],
+						      ["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.modelgroup=modelgroup
+    mychart.render('/tmp/pie_monthly_sales.svg')
+  end   
+   
+ 
+   
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbilcharts
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Vivek Rajagopalan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 +05:30
+date: 2009-09-11 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - 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/svgdc/svgdc.rb
 - lib/gerbilcharts/svgdc/svg_element.rb
 - lib/gerbilcharts/svgdc/filters.rb
@@ -113,6 +114,7 @@ files:
 - lib/gerbilcharts/svgdc/svg_polyline.rb
 - lib/gerbilcharts/svgdc/svg_rect.rb
 - lib/gerbilcharts/svgdc/svg_text.rb
+- lib/gerbilcharts/svgdc/svg_arc.rb
 has_rdoc: true
 homepage: http://gerbilcharts.rubyforge.org
 licenses: []
@@ -150,6 +152,7 @@ test_files:
 - test/test_helper.rb
 - test/test_svgdc.rb
 - test/test_noob.rb
+- test/test_pie.rb
 - test/test_render_string.rb
 - test/test_models.rb
 - test/test_charts.rb