gruff 0.3.7 → 0.4.0

data/lib/gruff/net.rb

@@ -1,4 +1,3 @@
-
 require File.dirname(__FILE__) + '/base'
 
 # Experimental!!! See also the Spider graph.
@@ -6,20 +5,20 @@ class Gruff::Net < Gruff::Base
 
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
   attr_accessor :hide_dots
-  
+
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified
   attr_accessor :line_width
   attr_accessor :dot_radius
 
   def initialize(*args)
     super
-    
+
     @hide_dots = false
     @hide_line_numbers = true
+    @sorted_drawing = true
   end
 
   def draw
-
     super
 
     return unless @has_data
@@ -30,13 +29,13 @@ class Gruff::Net < Gruff::Base
 
     @x_increment = @graph_width / (@column_count - 1).to_f
     circle_radius = dot_radius ||
-      clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
+        clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 2.5), 5.0)
 
     @d = @d.stroke_opacity 1.0
     @d = @d.stroke_width line_width ||
-      clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
+                             clip_value_if_greater_than(@columns / (@norm_data.first[DATA_VALUES_INDEX].size * 4), 5.0)
 
-    if (defined?(@norm_baseline)) then
+    if defined?(@norm_baseline)
       level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
       @d = @d.push
       @d.stroke_color @baseline_color
@@ -48,7 +47,6 @@ class Gruff::Net < Gruff::Base
     end
 
     @norm_data.each do |data_row|
-      prev_x = prev_y = nil
       @d = @d.stroke data_row[DATA_COLOR_INDEX]
       @d = @d.fill data_row[DATA_COLOR_INDEX]
 
@@ -107,7 +105,7 @@ class Gruff::Net < Gruff::Base
     end
   end
 
-private
+  private
 
   def draw_label(center_x, center_y, angle, radius, amount)
     r_offset = 1.1

data/lib/gruff/pie.rb

@@ -37,7 +37,6 @@ class Gruff::Pie < Gruff::Base
 
     diameter = @graph_height
     radius = ([@graph_width, @graph_height].min / 2.0) * 0.8
-    top_x = @graph_left + (@graph_width - diameter) / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
     center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
     total_sum = sums_for_pie()
@@ -64,9 +63,8 @@ class Gruff::Pie < Gruff::Base
         
         label_val = ((data_row[DATA_VALUES_INDEX].first / total_sum) * 100.0).round
         unless label_val < @hide_labels_less_than
-          # End the string with %% to escape the single %.
           # RMagick must use sprintf with the string and % has special significance.
-          label_string = label_val.to_s + '%%'
+          label_string = label_val.to_s + '%'
           @d = draw_label(center_x,center_y, half_angle,
                           radius + (radius * TEXT_OFFSET_PERCENTAGE),
                           label_string)
@@ -92,7 +90,7 @@ private
     x_offset = center_x # + 15.0 # The label points need to be tweaked slightly
     y_offset = center_y  # This one doesn't though
     radius_offset = (radius + r_offset)
-    ellipse_factor = radius_offset * 0.15
+    ellipse_factor = radius_offset * TEXT_OFFSET_PERCENTAGE
     x = x_offset + ((radius_offset + ellipse_factor) * Math.cos(angle.deg2rad))
     y = y_offset + (radius_offset * Math.sin(angle.deg2rad))
     

data/lib/gruff/scatter.rb

@@ -48,19 +48,20 @@ class Gruff::Scatter < Gruff::Base
     @baseline_x_value = @baseline_y_value = nil
     @marker_x_count = nil
   end
-  
-  def draw
-    calculate_spread
-    @sort = false
-    
+
+  def setup_drawing
     # TODO Need to get x-axis labels working. Current behavior will be to not allow.
     @labels = {}
-    
+
+    super
+
     # Translate our values so that we can use the base methods for drawing
     # the standard chart stuff
     @column_count = @x_spread
+  end
 
-    super 
+  def draw
+    super
     return unless @has_data
 
     # Check to see if more than one datapoint was given. NaN can result otherwise.  
@@ -82,13 +83,11 @@ class Gruff::Scatter < Gruff::Base
     #~ end
 
     @norm_data.each do |data_row|      
-      prev_x = prev_y = nil
-
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
         x_value = data_row[DATA_VALUES_X_INDEX][index]
         next if data_point.nil? || x_value.nil? 
 
-        new_x = getXCoord(x_value, @graph_width, @graph_left)
+        new_x = get_x_coord(x_value, @graph_width, @graph_left)
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
         # Reset each time to avoid thin-line errors
@@ -99,9 +98,6 @@ class Gruff::Scatter < Gruff::Base
 
         circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
         @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
-
-        prev_x = new_x
-        prev_y = new_y
       end
     end
 
@@ -147,17 +143,17 @@ class Gruff::Scatter < Gruff::Base
   #
   def data(name, x_data_points=[], y_data_points=[], color=nil)
     
-    raise ArgumentError, "Data Points contain nil Value!" if x_data_points.include?(nil) || y_data_points.include?(nil)
-    raise ArgumentError, "x_data_points is empty!" if x_data_points.empty?
-    raise ArgumentError, "y_data_points is empty!" if y_data_points.empty?
-    raise ArgumentError, "x_data_points.length != y_data_points.length!" if x_data_points.length != y_data_points.length
+    raise ArgumentError, 'Data Points contain nil Value!' if x_data_points.include?(nil) || y_data_points.include?(nil)
+    raise ArgumentError, 'x_data_points is empty!' if x_data_points.empty?
+    raise ArgumentError, 'y_data_points is empty!' if y_data_points.empty?
+    raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
     
     # Call the existing data routine for the y axis data
     super(name, y_data_points, color)
     
     #append the x data to the last entry that was just added in the @data member
-    lastElem = @data.length()-1
-    @data[lastElem] << x_data_points
+    last_elem = @data.length()-1
+    @data[last_elem] << x_data_points
     
     if @maximum_x_value.nil? && @minimum_x_value.nil?
       @maximum_x_value = @minimum_x_value = x_data_points.first
@@ -231,17 +227,17 @@ protected
 
     # Draw vertical line markers and annotate with numbers
     (0..@marker_x_count).each do |index|
-      x = @graph_left + @graph_width - index.to_f * @increment_x_scaled
-      
+
       # TODO Fix the vertical lines.  Not pretty when they don't match up with top y-axis line
-      #~ @d = @d.stroke(@marker_color)
-      #~ @d = @d.stroke_width 1
-      #~ @d = @d.line(x, @graph_top, x, @graph_bottom)
+      # x = @graph_left + @graph_width - index.to_f * @increment_x_scaled
+      # @d = @d.stroke(@marker_color)
+      # @d = @d.stroke_width 1
+      # @d = @d.line(x, @graph_top, x, @graph_bottom)
 
       unless @hide_line_numbers
         marker_label = index * @x_increment + @minimum_x_value.to_f
         y_offset = @graph_bottom + LABEL_MARGIN 
-        x_offset = getXCoord(index.to_f, @increment_x_scaled, @graph_left)
+        x_offset = get_x_coord(index.to_f, @increment_x_scaled, @graph_left)
 
         @d.fill = @font_color
         @d.font = @font if @font
@@ -252,7 +248,7 @@ protected
         @d = @d.annotate_scaled(@base_image, 
                           1.0, 1.0, 
                           x_offset, y_offset, 
-                          label(marker_label), @scale)
+                          label(marker_label, @x_increment), @scale)
       end
     end
     
@@ -261,8 +257,8 @@ protected
   
 private
   
-  def getXCoord(x_data_point, width, offset) #:nodoc:
-    return(x_data_point * width + offset)
+  def get_x_coord(x_data_point, width, offset) #:nodoc:
+    x_data_point * width + offset
   end
   
-end # end Gruff::Scatter
+end # end Gruff::Scatter

data/lib/gruff/side_bar.rb

@@ -7,7 +7,7 @@ class Gruff::SideBar < Gruff::Base
 
   # Spacing factor applied between bars
   attr_accessor :bar_spacing
-  
+
   def draw
     @has_left_labels = true
     super
@@ -16,7 +16,7 @@ class Gruff::SideBar < Gruff::Base
     draw_bars
   end
 
-protected
+  protected
 
   def draw_bars
     # Setup spacing.
@@ -25,10 +25,15 @@ protected
 
     @bars_width = @graph_height / @column_count.to_f
     @bar_width = @bars_width / @norm_data.size
-    @d         = @d.stroke_opacity 0.0
-    height     = Array.new(@column_count, 0)
-    length     = Array.new(@column_count, @graph_left)
-    padding    = (@bar_width * (1 - @bar_spacing)) / 2
+    @d = @d.stroke_opacity 0.0
+    height = Array.new(@column_count, 0)
+    length = Array.new(@column_count, @graph_left)
+    padding = (@bar_width * (1 - @bar_spacing)) / 2
+
+    # if we're a side stacked bar then we don't need to draw ourself at all
+    # because sometimes (due to different heights/min/max) you can actually
+    # see both graphs and it looks like crap
+    return if self.is_a?(Gruff::SideStackedBar)
 
     @norm_data.each_with_index do |data_row, row_index|
       @d = @d.fill data_row[DATA_COLOR_INDEX]
@@ -38,22 +43,32 @@ protected
         # 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])
-        temp2      = @graph_left + @graph_width - height[point_index]
+        temp1 = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
+        temp2 = @graph_left + @graph_width - height[point_index]
         difference = temp2 - temp1
 
-        left_x     = length[point_index] - 1
-        left_y     = @graph_top + (@bars_width * point_index) + (@bar_width * row_index) + padding
-        right_x    = left_x + difference
-        right_y    = left_y + @bar_width * @bar_spacing
+        left_x = length[point_index] - 1
+        left_y = @graph_top + (@bars_width * point_index) + (@bar_width * row_index) + padding
+        right_x = left_x + difference
+        right_y = left_y + @bar_width * @bar_spacing
 
         height[point_index] += (data_point * @graph_width)
 
-        @d           = @d.rectangle(left_x, left_y, right_x, right_y)
+        @d = @d.rectangle(left_x, left_y, right_x, right_y)
 
         # Calculate center based on bar_width and current row
-        label_center = @graph_top + (@bars_width * point_index + @bars_width / 2)
-        draw_label(label_center, point_index)
+
+        if @use_data_label
+          label_center = @graph_top + (@bar_width * (row_index+point_index) + @bar_width / 2)
+          draw_label(label_center, row_index, @norm_data[row_index][DATA_LABEL_INDEX])
+        else
+          label_center = @graph_top + (@bars_width * point_index + @bars_width / 2)
+          draw_label(label_center, point_index)
+        end
+        if @show_labels_for_bar_values
+          val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
+          draw_value_label(right_x+40, (@graph_top + (((row_index+point_index+1) * @bar_width) - (@bar_width / 2)))-12, val.commify, true)
+        end
       end
 
     end
@@ -71,29 +86,30 @@ protected
     # Draw horizontal line markers and annotate with numbers
     @d = @d.stroke(@marker_color)
     @d = @d.stroke_width 1
-    number_of_lines = 5
+    number_of_lines = @marker_count || 5
+    number_of_lines = 1 if number_of_lines == 0
 
     # TODO Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
     increment = significant(@spread.to_f / number_of_lines)
     (0..number_of_lines).each do |index|
 
-      line_diff    = (@graph_right - @graph_left) / number_of_lines
-      x            = @graph_right - (line_diff * index) - 1
-      @d           = @d.line(x, @graph_bottom, x, @graph_top)
-      diff         = index - number_of_lines
+      line_diff = (@graph_right - @graph_left) / number_of_lines
+      x = @graph_right - (line_diff * index) - 1
+      @d = @d.line(x, @graph_bottom, x, @graph_top)
+      diff = index - number_of_lines
       marker_label = diff.abs * increment + @minimum_value
 
       unless @hide_line_numbers
-        @d.fill      = @font_color
-        @d.font      = @font if @font
-        @d.stroke    = 'transparent'
+        @d.fill = @font_color
+        @d.font = @font if @font
+        @d.stroke = 'transparent'
         @d.pointsize = scale_fontsize(@marker_font_size)
-        @d.gravity   = CenterGravity
+        @d.gravity = CenterGravity
         # TODO Center text over line
-        @d           = @d.annotate_scaled( @base_image,
-                          0, 0, # Width of box to draw text in
-                          x, @graph_bottom + (LABEL_MARGIN * 2.0), # Coordinates of text
-                          marker_label.to_s, @scale)
+        @d = @d.annotate_scaled(@base_image,
+                                0, 0, # Width of box to draw text in
+                                x, @graph_bottom + (LABEL_MARGIN * 2.0), # Coordinates of text
+                                marker_label.to_s, @scale)
       end # unless
       @d = @d.stroke_antialias true
     end
@@ -102,18 +118,19 @@ protected
   ##
   # Draw on the Y axis instead of the X
 
-  def draw_label(y_offset, index)
+  def draw_label(y_offset, index, label=nil)
     if !@labels[index].nil? && @labels_seen[index].nil?
-      @d.fill             = @font_color
-      @d.font             = @font if @font
-      @d.stroke           = 'transparent'
-      @d.font_weight      = NormalWeight
-      @d.pointsize        = scale_fontsize(@marker_font_size)
-      @d.gravity          = EastGravity
-      @d                  = @d.annotate_scaled(@base_image,
+      lbl = (@use_data_label) ? label : @labels[index]
+      @d.fill = @font_color
+      @d.font = @font if @font
+      @d.stroke = 'transparent'
+      @d.font_weight = NormalWeight
+      @d.pointsize = scale_fontsize(@marker_font_size)
+      @d.gravity = EastGravity
+      @d = @d.annotate_scaled(@base_image,
                               1, 1,
                               -@graph_left + LABEL_MARGIN * 2.0, y_offset,
-                              @labels[index], @scale)
+                              lbl, @scale)
       @labels_seen[index] = 1
     end
   end

data/lib/gruff/side_stacked_bar.rb

@@ -33,7 +33,10 @@ class Gruff::SideStackedBar < Gruff::SideBar
     height = Array.new(@column_count, 0)
     length = Array.new(@column_count, @graph_left)
     padding = (@bar_width * (1 - @bar_spacing)) / 2
-
+    if @show_labels_for_bar_values
+      label_values = Array.new
+      0.upto(@column_count-1) {|i| label_values[i] = {:value => 0, :right_x => 0}}
+    end
     @norm_data.each_with_index do |data_row, row_index|
       data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
 
@@ -53,16 +56,33 @@ class Gruff::SideStackedBar < Gruff::SideBar
               right_y = left_y + @bar_width * @bar_spacing
     	  length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
-
-        @d = @d.rectangle(left_x, left_y, right_x, right_y)
-
+        
+        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)
+          # Calculate center based on bar_width and current row
+        end
+        # we still need to draw the labels
         # Calculate center based on bar_width and current row
         label_center = @graph_top + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
         draw_label(label_center, point_index)
       end
 
     end
-
+    if @show_labels_for_bar_values
+      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)    
   end
 

data/lib/gruff/spider.rb

@@ -10,6 +10,7 @@ class Gruff::Spider < Gruff::Base
   attr_reader :hide_text
   attr_accessor :hide_axes
   attr_reader :transparent_background
+  attr_accessor :rotation
   
   def transparent_background=(value)
     @transparent_background = value
@@ -19,11 +20,12 @@ class Gruff::Spider < Gruff::Base
   def hide_text=(value)
     @hide_title = @hide_text = value
   end
-  
+
   def initialize(max_value, target_width = 800)
     super(target_width)
     @max_value = max_value
     @hide_legend = true;
+    @rotation = 0
   end
   
   def draw
@@ -39,39 +41,37 @@ class Gruff::Spider < Gruff::Base
     top_x = @graph_left + (@graph_width - diameter) / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
     center_y = @graph_top + (@graph_height / 2.0) - 25 # Move graph up a bit
-    
+
     @unit_length = radius / @max_value
-    
         
     total_sum = sums_for_spider
     prev_degrees = 0.0
     additive_angle = (2 * Math::PI)/ @data.size
     
-    current_angle = 0.0
+    current_angle = rotation * Math::PI / 180.0
 
     # Draw axes
     draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes    
-    
+
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
-    
-     
+
     @d.draw(@base_image)
   end
 
 private
-  
+
   def normalize_points(value)
     value * @unit_length
   end
-  
+
   def draw_label(center_x, center_y, angle, radius, amount)
     r_offset = 50      # The distance out from the center of the pie to get point
     x_offset = center_x      # The label points need to be tweaked slightly
     y_offset = center_y + 0  # This one doesn't though
     x = x_offset + ((radius + r_offset) * Math.cos(angle))
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
-    
+
     # Draw label
     @d.fill = @marker_color
     @d.font = @font if @font
@@ -84,45 +84,46 @@ private
                       x, y, 
                       amount, @scale)
   end
-  
+
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
     return if hide_axes
-    
-    current_angle = 0.0
-    
+
+    current_angle = rotation * Math::PI / 180.0
+
     @data.each do |data_row|
       @d.stroke(line_color || data_row[DATA_COLOR_INDEX])
       @d.stroke_width 5.0
-    
+
       x_offset = radius * Math.cos(current_angle)
       y_offset = radius * Math.sin(current_angle)
 
       @d.line(center_x, center_y,
               center_x + x_offset,
               center_y + y_offset)
-            
+
       draw_label(center_x, center_y, current_angle, radius, data_row[DATA_LABEL_INDEX].to_s) unless hide_text
-            
+
       current_angle += additive_angle
     end
   end
-  
+
   def draw_polygon(center_x, center_y, additive_angle, color = nil)
     points = []
-    current_angle = 0.0
+    current_angle = rotation * Math::PI / 180.0
+
     @data.each do |data_row|
       points << center_x + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.cos(current_angle)
       points << center_y + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.sin(current_angle)
       current_angle += additive_angle
     end
-    
+
     @d.stroke_width 1.0
     @d.stroke(color || @marker_color)
     @d.fill(color || @marker_color)
     @d.fill_opacity 0.4
     @d.polygon(*points)
   end
-  
+
   def sums_for_spider
     @data.inject(0.0) {|sum, data_row| sum += data_row[DATA_VALUES_INDEX].first}
   end