lib/gruffy/side_stacked_bar.rb in gruffy-1.0.4 vs lib/gruffy/side_stacked_bar.rb in gruffy-1.1.0

@@ -1,21 +1,15 @@
 require File.dirname(__FILE__) + '/base'
 require File.dirname(__FILE__) + '/side_bar'
 require File.dirname(__FILE__) + '/stacked_mixin'
 
-##
-# New gruffy graph type added to enable sideways stacking bar charts 
-# (basically looks like a x/y flip of a standard stacking bar chart)
-#
-# [e-mail] 
-
 class Gruffy::SideStackedBar < Gruffy::SideBar
   include StackedMixin
 
   # Spacing factor applied between bars
   attr_accessor :bar_spacing
-  
+
   def draw
     @has_left_labels = true
     get_maximum_by_stack
     super
   end
@@ -40,30 +34,28 @@
     @norm_data.each_with_index do |data_row, row_index|
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
 
     	  ## using the original calcs from the stacked bar chart to get the difference between
     	  ## part of the bart chart we wish to stack.
-    	  temp1 = @graph_left + (@graph_width -
-                                    data_point * @graph_width - 
-                                    height[point_index]) + 1
-    	  temp2 = @graph_left + @graph_width - height[point_index] - 1
+    	  temp1 = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
+    	  temp2 = @graph_left + @graph_width - height[point_index]
     	  difference = temp2 - temp1
 
     	  @d = @d.fill data_row[DATA_COLOR_INDEX]
 
         left_x = length[point_index] #+ 1
               left_y = @graph_top + (@bar_width * point_index) + padding
     	  right_x = left_x + difference
               right_y = left_y + @bar_width * @bar_spacing
     	  length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
-        
+
         if @show_labels_for_bar_values
           label_values[point_index][:value] += @norm_data[row_index][3][point_index]
           label_values[point_index][:right_x] = right_x
         end
-                
+
         # if a data point is 0 it can result in weird really thing lines
         # that shouldn't even be there being drawn on top of the existing
         # bar - this is bad
         if data_point != 0
           @d = @d.rectangle(left_x, left_y, right_x, right_y)
@@ -80,11 +72,11 @@
       label_values.each_with_index do |data, i|
         val = (@label_formatting || "%.2f") % data[:value]
         draw_value_label(data[:right_x]+40, (@graph_top + (((i+1) * @bar_width) - (@bar_width / 2)))-12, val.commify, true)
       end
     end
-    
-    @d.draw(@base_image)    
+
+    @d.draw(@base_image)
   end
 
   def larger_than_max?(data_point, index=0)
     max(data_point, index) > @maximum_value
   end