gerbilcharts 0.2.13 → 0.5.9

data/lib/gerbilcharts/surfaces/detailed_legend.rb

@@ -4,6 +4,9 @@ module GerbilCharts::Surfaces
 # legend panel shows names/colors of items in a separate box (transparent)
 class DetailedLegend < GraphElement
   
+	WIDTH_MAX = 500
+	STAT_TABLE_OFFSET=120
+
     attr_reader   :width
     attr_reader   :showvalues
     
@@ -15,16 +18,34 @@ class DetailedLegend < GraphElement
     
     def int_render(g)
 
+	  return unless parent.get_global_option(:enable_detailed_legend,true) 
+
 	  w=g.newwin("legendpanel_detail", {:visibility => 'hidden'} )
 	  g.setactivewindow(w)
 
+
+	  # get max modname, used to calculate width of detailed panel
+	  max_name_length=0
+      parent.modelgroup.each_model do | mod |
+	  	max_name_length = [max_name_length,mod.name.length].max
+	  end
+
+	  @bounds.left = @bounds.right-WIDTH_MAX  if @bounds.width > WIDTH_MAX
+
       # count determines the bounds
       @bounds.bottom = @bounds.top + 16 + 15 * parent.modelgroup.count
       g.rectangle_r(@bounds, {:class => @class})
 
 	  # toggle detail/mini legend 
 	  g.rectangle(@bounds.left-5,@bounds.top,5,5, {:href => "javascript:void(0);", 
-	  											   :onclick => "showMiniLegend();" })
+	  											   :onclick => "showMiniLegend();",
+												   :fill => "white",
+												   :stroke => "none", 
+												   :gerbiltooltip1 => "Click to show compact legend" }) 
+	  g.textout(@bounds.left-4,@bounds.top+5,'>', {'font-size' => '9', :href => "javascript:void(0);", 
+	  											   :onclick => "showMiniLegend();", :stroke => '#DDDDDD',
+												   :gerbiltooltip1 => "Click to show compact legend" }) 
+
       
       rbox = Rect.new
       rbox.initfrom(@bounds)
@@ -34,12 +55,10 @@ class DetailedLegend < GraphElement
       rbox.bottom = rbox.top+10
        
 
-	  stat_label_pos = rbox.right + [140,@bounds.width-200].max
-	  stat_label_width = 45
-	  ["Min", "Max", "Avg", "Latest"].each do |lab|
-        g.textout(stat_label_pos, rbox.bottom-2, lab, {:class => "legendstats"} )
-		stat_label_pos += stat_label_width
-	  end
+
+	  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"} )
 
       rbox.top += 16
       rbox.bottom = rbox.top+10
@@ -52,16 +71,19 @@ class DetailedLegend < GraphElement
 		opts.store(:gerbiltooltip1, mod.name) 
 		opts.store(:gerbiltooltip2, "Latest Value = #{mod.latest_val}")
 	
-        g.rectangle_r(rbox, :id => "item#{i}")
+		boxopts = { :id => "item#{i}" }
+		boxopts.store(:fill , color_for_id(i)) if i > 10
+        g.rectangle_r(rbox, boxopts )
         g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
 
 		stat_ana = mod.get_statistical_analysis
 
-	  	stat_label_pos = rbox.right + [140,@bounds.width-200].max
-		[0,1,2,4].each do |sid|
-        	g.textout(stat_label_pos, rbox.bottom-2, mod.formatted_val(stat_ana[sid]), {:class => 'legendstats'} )
-			stat_label_pos += stat_label_width
-		end
+	  	stat_label_pos = rbox.right + STAT_TABLE_OFFSET
+		outs = mod.formatted_val(stat_ana[1]).to_s.rjust(9) +
+			   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'} )
 
         
         rbox.top += 10 + 5

data/lib/gerbilcharts/surfaces/graph_element.rb

@@ -69,6 +69,7 @@ class GraphElement
   end
   
   def scale_y val,range
+  	return 0 if range.invalid?
     return @bounds.bottom - @bounds.height * range.scale_factor(val)
   end
   
@@ -143,7 +144,7 @@ class GraphElement
 
   # query a global option, return the defval if option is not set
   def get_global_option(optsym, defval)
-		@global_chart_options[optsym] || defval 
+		@global_chart_options.has_key?(optsym)? @global_chart_options[optsym]: defval 
   end
   
 # utility methods to derived classes  
@@ -157,6 +158,12 @@ protected
     return (a<b)?a:b
   end
 
+  # random but consistent color for ID
+  # depends on a lazily generated map of 100 colors 
+  def color_for_id(id)
+		@@mcolors ||= Array.new(100){ |t| "#%06x" % (rand * 0xffffff) }
+		return @@mcolors[id]
+  end
 
 end
 

data/lib/gerbilcharts/surfaces/grid.rb

@@ -32,10 +32,16 @@ class Grid < GraphElement
 	  end
 
         
+      scaling_x  = parent.get_global_option(:scaling_x,:auto)
+      rwx = parent.modelgroup.effective_range_x(scaling_x)
+	  if scaling_x.is_a? Array
+		rx = GerbilCharts::Models::RoundTimeRange.new(rwx)
+      end
+
 	  # vertical subticks  
 	  g.newwin('vgrid', {:class => "gridlinev"} ) do |g|
 			  rx.each_label do |val,label|
-				  xp = scale_x val,rx
+				  xp = scale_x val,rwx
 				  g.line(xp,@bounds.top,xp,@bounds.bottom)
 			  end
 	  end
@@ -43,7 +49,7 @@ class Grid < GraphElement
 
 	  g.newwin('vgridsub', {:class => "gridlinesub"} ) do |g|
 			  rx.each_tick(0) do |val|
-				  xp = scale_x val,rx
+				  xp = scale_x val,rwx
 				  g.line(xp,@bounds.top,xp,@bounds.bottom)
 			  end
 	  end

data/lib/gerbilcharts/surfaces/horizontal_axis.rb

@@ -15,8 +15,15 @@ class HorizontalAxis < Axis
       range_options_x = parent.get_global_option(:scaling_x,:auto)
       rawx = parent.modelgroup.effective_range_x(range_options_x)
 
+
 	  # need roundx for labels
-      roundx = parent.modelgroup.effective_round_range_x
+	  if range_options_x.is_a? Array
+      	roundx = GerbilCharts::Models::RoundTimeRange.new rawx
+	  else
+      	roundx = parent.modelgroup.effective_round_range_x
+      end
+
+
       roundx.each_label do |val,label|
         xp = scale_x val,rawx
 
@@ -27,8 +34,10 @@ class HorizontalAxis < Axis
             xp = @bounds.right-10
         end
           
-        g.textout(xp, @bounds.top+10, label, {:class => "axislabel", "text-anchor" => "middle"})
-        g.line(xp,@bounds.top-2,xp,@bounds.top+3, {:class => "axistickmajor"})
+	if (xp>=15)
+		g.textout(xp, @bounds.top+11, label, {:class => "axislabel", "text-anchor" => "middle"})
+		g.line(xp,@bounds.top-2,xp,@bounds.top+1, {:class => "axistickmajor"})
+	end
       end
       
     end

data/lib/gerbilcharts/surfaces/horizontal_time_axis.rb

@@ -13,12 +13,13 @@ class HorizontalTimeAxis < HorizontalAxis
     def int_render(g)
       super
 
-      rx = parent.modelgroup.effective_round_range_x
-      sfmt = rx.format_min_value
+      range_options_x = parent.get_global_option(:scaling_x,:auto)
+      rx = parent.modelgroup.effective_range_x(range_options_x)
+      sfmt = Time.at(rx.rmin).getlocal.to_s
 
 
-      g.textout(@bounds.left-20, @bounds.top+20, sfmt, {:class => "axislabelt0" })
-      g.line(@bounds.left,@bounds.top,@bounds.left,@bounds.top+10,{:class => "axistickmajor"})
+      g.textout(@bounds.left-20, @bounds.top+22, sfmt, {:class => "axislabelt0" })
+      g.line(@bounds.left,@bounds.top,@bounds.left,@bounds.top+2,{:class => "axistickmajor"})
       
     end
     

data/lib/gerbilcharts/surfaces/impulse_surface.rb

@@ -30,7 +30,7 @@ class ImpulseSurface < Surface
 	  g.setactivewindow(w)
 
       parent.modelgroup.each_model_with_index do | mod, i|
-        opts = {:id => "item#{i}"}
+        opts = {:id => "lineitem#{i}"}
         firstpoint=true
         xpos=0
         ypos=0

data/lib/gerbilcharts/surfaces/legend.rb

@@ -14,6 +14,7 @@ class Legend < GraphElement
     end
     
     def int_render(g)
+	  return if not parent.get_global_option(:enable_legend,true) 
 
 	  w=g.newwin("legendpanel_mini")
 	  g.setactivewindow(w)
@@ -24,11 +25,38 @@ class Legend < GraphElement
 
 	  # toggle detail/mini legend 
 	  g.rectangle(@bounds.left-5,@bounds.top,5,5, {:href => "javascript:void(0);", 
-	  											   :onclick => "showDetailedLegend();" })
-      
+	  											   :onclick => "showDetailedLegend();",
+												   :fill => "white",
+												   :stroke => "none",
+												   :gerbiltooltip1 => "Click to show a detailed legend" })
+
+	  g.textout(@bounds.left-7,@bounds.top+5,'+', {'font-size' => '9', :href => "javascript:void(0);", 
+	  											   :onclick => "showDetailedLegend();", :stroke => '#DDDDDD' ,
+												   :gerbiltooltip1 => "Click to show a detailed legend" }) 
+
+	  # shift 
+	  g.rectangle(@bounds.left-5,@bounds.top+15,5,5, {:href => "javascript:void(0);", 
+	  											   :onclick => "shiftLegend(#{-@bounds.left+50});",
+												   :fill => "white",
+												   :stroke => "none",
+												   :gerbiltooltip1 => "Click to move legend to left side" })
+	  g.textout(@bounds.left-7,@bounds.top+15,'<', {'font-size' => '9', :href => "javascript:void(0);", 
+	  											   :onclick => "shiftLegend(#{-@bounds.left+50});", :stroke => '#DDDDDD', 
+												   :gerbiltooltip1 => "Click to move legend to left side" })
+
+
+	  # shift 
+	  g.rectangle(@bounds.left-5,@bounds.top+25,5,5, {:href => "javascript:void(0);", 
+	  											   :onclick => "shiftLegend(0);",
+												   :fill => "white",
+												   :stroke => "none" ,
+												   :gerbiltooltip1 => "Click to move legend to right side"})
+	  g.textout(@bounds.left-7,@bounds.top+25,'>', {'font-size' => '9', :href => "javascript:void(0);", 
+	  											   :onclick => "shiftLegend(0);", :stroke => '#DDDDDD', 
+												   :gerbiltooltip1 => "Click to move legend to right side"})
       rbox = Rect.new
       rbox.initfrom(@bounds)
-      rbox.left += 2
+      rbox.left += 20
       rbox.right = rbox.left + 10
       rbox.top += 2
       rbox.bottom = rbox.top+10
@@ -41,9 +69,18 @@ class Legend < GraphElement
 		opts.store(:gerbiltooltip1, mod.name) 
 		opts.store(:gerbiltooltip2, "Latest Value = #{mod.latest_val}")
 	
-        g.rectangle_r(rbox, :id => "item#{i}")
-        g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
-        
+	    # Selector
+        ctlbox = Rect.new
+		ctlbox.initfrom(rbox)
+		ctlbox.offset_x(-16)
+	    ctlbox.deflate(1)
+        g.circle_r(ctlbox, {:id => "lbx#{i}", :fill => 'gray', :stroke => 'none', :href => "javascript:void(0);", :onclick => "ToggleVisibility(#{i})"})
+	
+		boxopts = {:id => "item#{i}"}
+		boxopts.store(:fill , color_for_id(i)) if i > 10
+		g.rectangle_r(rbox, boxopts )
+		g.textout(rbox.right+5, rbox.bottom-2, mod.name,opts)
+						
         rbox.top += 10 + 5
         rbox.bottom = rbox.top+10
 

data/lib/gerbilcharts/surfaces/mark_band.rb

@@ -9,7 +9,23 @@ class MarkBand < GraphElement
     end
     
     def int_render(g)
-      g.rectangle_r(@bounds, {:class => @class})
+
+	return unless parent.modelgroup.has_x_markers?
+
+        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)
+
+        mx_arr = parent.modelgroup.x_markers
+
+	band_r=@bounds.clone
+	band_r.left = scale_x mx_arr[0],rx
+	band_r.right = scale_x mx_arr[1],rx
+
+        g.rectangle_r(band_r, {:class => 'x_mk'})
+
     end
 end
 

data/lib/gerbilcharts/surfaces/matrix_surface.rb

@@ -0,0 +1,87 @@
+module GerbilCharts::Surfaces
+
+#  Matrix  Surface
+#  Conversation Chart is drawn
+#
+class MatrixSurface < Surface
+  
+    def initialize(opts={})
+      super(opts)
+    end
+    
+    def int_render(g) 
+      # any filters ?
+     if parent.get_global_option(:filter,false)
+	g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
+     end 
+       
+     # An Outer Rectangle
+     g.rectangle(@bounds.left, @bounds.top, @bounds.right, @bounds.bottom)
+
+     # Adding horizontal and vertical lines to the rectangle
+     # Vertical Lines
+     vline_spacing = @bounds.width / (parent.modelgroup.zendlen+1)
+     vline_next = 0
+     for i in 0...(parent.modelgroup.zendlen)
+          g.line(vline_spacing+vline_next,@bounds.top,vline_spacing+vline_next,@bounds.bottom,:class => "gridlinev")
+          vline_next += vline_spacing 
+     end
+    
+     # Horizontal Lines
+      hline_spacing = (@bounds.height)/ (parent.modelgroup.aendlen+1) 
+      hline_next = @bounds.top
+      for i in 0...(parent.modelgroup.aendlen)
+          g.line(@bounds.left,hline_spacing+hline_next,@bounds.right,hline_spacing+hline_next,:class => "gridlineh")
+          hline_next += hline_spacing
+      end  
+      
+      # X - Axis
+      aend = hline_spacing/2 + @bounds.top
+      parent.modelgroup.aenduniq.each_with_index do |item,i|
+            g.textout(@bounds.left,@bounds.left+(hline_spacing)+aend,item, {:class => "elementlabel"})
+            aend += hline_spacing       
+      end
+
+     # Y - Axis
+     zend = vline_spacing/2
+     parent.modelgroup.zenduniq.each_with_index do |item,i|
+	   xpos = @bounds.left+vline_spacing+zend 
+	   ypos = @bounds.left+(hline_spacing/2)+@bounds.top
+           opts = {:class => "elementlabel",
+                   "text-anchor" => "middle", 
+                   :transform => "rotate(-45 #{xpos} #{ypos})"}
+           g.textout(@bounds.left+vline_spacing+zend,@bounds.left+(hline_spacing/2)+@bounds.top,item,opts)
+           zend += vline_spacing          
+     end
+
+    # Drawing circle based on the values 
+      cy_value = 0
+      parent.modelgroup.hash.each_pair do |key,value|
+          cx_value = 0
+          value.each_with_index do |item,i|
+                 if item == 0
+                    opts = {:id => "item20"}
+                 else
+  	 	    opts = {:id => "item#{i}"}
+                 end
+                 # Adding Tool Tips 
+                 string ="(" + key + "," + parent.modelgroup.zenduniq[i] +")"
+                 if parent.get_global_option(:auto_tooltips,false)
+                                  opts.merge!(:onmouseover => "OpacityDown(evt)", :onmouseout => "OpacityUp(evt)")
+                                  opts.store(:gerbiltooltip1, string)
+                                  opts.store(:gerbiltooltip2, "Val = #{item}")
+                 end   
+                 # Calculating Radius of the circle based on values
+                 radius = (((item.to_f)/parent.modelgroup.sort[0].to_f).to_f * (hline_spacing/2)).to_f
+		 radius = radius * parent.modelgroup.multiply_factor
+                 g.addshape(GerbilCharts::SVGDC::SVGCircle.new(@bounds.left+vline_spacing+(vline_spacing/2)+cx_value,
+                                                               @bounds.left+hline_spacing+(hline_spacing/2)+cy_value+@bounds.top,
+                                                               radius),
+                                                               opts)
+                 cx_value += vline_spacing
+          end
+          cy_value += hline_spacing  
+      end
+   end
+end
+end

data/lib/gerbilcharts/surfaces/pie_surface.rb

@@ -5,116 +5,129 @@ 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
+  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)
+	PERCENT_OFFSET_X = -4					# pull slice label this much (tweak)
 
-    def initialize(opts={})
+  def initialize(opts={})
       super(opts)
     end
     
-    def int_render(g)
+  def int_render(g)
       g.rectangle_r(@bounds, {:class => @class})
     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
-
-     # any filters ?
-     if parent.get_global_option(:filter,false)
-	g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
-     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
+
+    # any filters ?
+    if parent.get_global_option(:filter,false)
+      g.curr_win.add_options({:filter => "url(##{parent.get_global_option(:filter,false)})" })
+    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).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)
-	
-   
-		# 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_formatted_val}")
-		end
-		opts.merge!(:href => mod.href) if mod.hasHref?
+    # compute totals
+    y_total = 0
+    parent.modelgroup.each_model_with_index do | mod, i|
+      y_total = y_total + mod.latest_val
+    end
 
-		# draw a circle if there is only one data		
-		if (mod_angle >= 360)
-			g.addshape(GerbilCharts::SVGDC::SVGCircle.new(cx,cy,radius),opts)		
-		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
+    last_label_pos_y=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)
 
-		# 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_formatted_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_formatted_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_formatted_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_formatted_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 > MIN_INSIDE_LABEL_ANGLE) 
-	if(tot_angle > 270)	
- 	      g.textout(percent_pos_x,percent_pos_y+15, "#{percent}%", :class => 'elementvalue')
-    	else
- 	      g.textout(percent_pos_x,percent_pos_y, "#{percent}%", :class => 'elementvalue')	
-	end
-     end
-
-     current_pos_x = new_pos_x
-     current_pos_y = new_pos_y
+      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_OFFSET_X
+      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, "#{mod.latest_formatted_val}")
+      end
+      opts.merge!(:href => mod.href) if mod.hasHref?
+
+      # draw a circle if there is only one data
+      if (mod_angle >= 360)
+        g.addshape(GerbilCharts::SVGDC::SVGCircle.new(cx,cy,radius),opts)
+      else
+        # 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)
+      end
       
+	  elementlabel_clsn = [ [30,'elementlabel_large'], [60, 'elementlabel_huge'] ].inject('elementlabel')  do  |mem,it|
+			  percent > it[0] ? it[1]:mem
+      end
+
+      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+OUTER_OFFSET_Y, "#{mod.name}", :class => elementlabel_clsn )
+          else
+            label_pos_y_off = (last_label_pos_y-label_pos_y) < 5 ? 5:0
+            g.textout( label_pos_x+OUTER_OFFSET_X, label_pos_y+OUTER_OFFSET_Y+label_pos_y_off, "#{mod.name}", :class => elementlabel_clsn )
+          end
+        elsif(label_pos_x > cx ) && (label_pos_y > cy)
+          g.textout( label_pos_x, label_pos_y+OUTER_OFFSET_Y, "#{mod.name}", :class => elementlabel_clsn )
+        else
+          g.textout( label_pos_x-LEFT_LABEL_OFFSET, label_pos_y+OUTER_OFFSET_Y, "  #{mod.name}", :class => elementlabel_clsn )
+        end
       end
+
+
+      if(percent > MIN_INSIDE_LABEL_ANGLE)
+		elementvalue_clsn = [ [30,'elementvalue_large'], [60, 'elementvalue_huge'] ].inject('elementvalue')  do  |mem,it|
+			  percent > it[0] ? it[1]:mem
+	    end
+	    if (label_pos_y-percent_pos_y).abs < 10
+			percent_pos_y -= 10 if percent_pos_y < label_pos_y
+			percent_pos_y += 10 if percent_pos_y > label_pos_y
+		end
+        if(tot_angle > 270)
+          g.textout(percent_pos_x,percent_pos_y+5, "#{percent}%", :class => elementvalue_clsn)
+          g.textout(percent_pos_x,percent_pos_y+15, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
+        else
+          g.textout(percent_pos_x,percent_pos_y, "#{percent}%", :class => elementvalue_clsn)
+          g.textout(percent_pos_x,percent_pos_y+10, "#{mod.latest_formatted_val}", :class => 'elementlabel' )
+        end
+      end
+
+      current_pos_x = new_pos_x
+      current_pos_y = new_pos_y
+
+      last_label_pos_y = label_pos_y
     end
+  end
+
 end
 end