gruff 0.0.9 → 0.1.0

data/README

@@ -2,10 +2,14 @@
 
 A library for making beautiful graphs.
 
-See samples at http://nubyonrails.topfunky.com/articles/2005/10/24/gruff-graphing-library-for-ruby
+See samples at http://nubyonrails.com/pages/gruff
 
-See the test suite in test/line_test.rb for examples. (More documentation coming soon.)
+See the test suite in test/line_test.rb for examples.
+
+== Documentation
+
+Most of the documentation is in the Gruff::Base class.
 
 == WARNING
 
-This is alpha-quality software. It works well according to my tests, but the API may change and other features will be added. Backwards compatibility is not guaranteed until the 1.0 release.
+This is beta-quality software. It works well according to my tests, but the API may change and other features will be added.

data/lib/gruff/area.rb

@@ -14,7 +14,7 @@ class Gruff::Area < Gruff::Base
     @norm_data.each do |data_row|
       poly_points = Array.new
       prev_x = prev_y = 0.0
-      @d = @d.fill current_color
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
 
       data_row[1].each_with_index do |data_point, index|
         # Use incremented x and scaled y
@@ -49,7 +49,6 @@ class Gruff::Area < Gruff::Base
 
       @d = @d.polyline(*poly_points)
 
-      increment_color()
     end
 
     @d.draw(@base_image)

data/lib/gruff/bar.rb

@@ -1,45 +1,67 @@
 
 require File.dirname(__FILE__) + '/base'
+require File.dirname(__FILE__) + '/bar_conversion'
 
 class Gruff::Bar < Gruff::Base
 
-    def draw
-      super
-
-      return unless @has_data
-
-      # Setup spacing.
-      #
-      # Columns sit side-by-side.
-      spacing_factor = 0.9
-      @bar_width = @graph_width / (@column_count * @data.length).to_f
-    
-      @d = @d.stroke_opacity 0.0
-    
-      @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill current_color
-      
-        data_row[1].each_with_index do |data_point, point_index|
-          # TODO Try this out
-          ##data_point = 0 if data_point.nil?
-          
-          # Use incremented x and scaled y
-          left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
-          left_y = @graph_top + (@graph_height - data_point * @graph_height) + 1
-          right_x = left_x + @bar_width * spacing_factor
-          right_y = @graph_top + @graph_height - 1
-          
-          @d = @d.rectangle(left_x, left_y, right_x, right_y)
-          
-          # Calculate center based on bar_width and current row
-          label_center = @graph_left + (@data.length * @bar_width * point_index) + (@data.length * @bar_width / 2.0)
-          draw_label(label_center, point_index)
-        end
-
-        increment_color()
+  def draw
+    super
+
+    return unless @has_data
+
+    # Setup spacing.
+    #
+    # Columns sit side-by-side.
+    spacing_factor = 0.9
+    @bar_width = @graph_width / (@column_count * @data.length).to_f
+
+    @d = @d.stroke_opacity 0.0
+
+    # setup the BarConversion Object
+    conversion = Gruff::BarConversion.new()
+    conversion.graph_height = @graph_height
+    conversion.graph_top = @graph_top
+    # set up the right mode [1,2,3] see BarConversion for further explains
+    if @minimum_value >= 0 then
+      # all bars go from zero to positiv
+      conversion.mode = 1
+    else
+      # all bars go from 0 to negativ
+      if @maximum_value <= 0 then
+        conversion.mode = 2
+      else
+        # bars either go from zero to negativ or to positiv
+        conversion.mode = 3
+        conversion.spread = @spread
+        conversion.minimum_value = @minimum_value
+        conversion.zero = -@minimum_value/@spread
+      end
+    end
+
+    # iterate over all normalised data
+    @norm_data.each_with_index do |data_row, row_index|
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
+
+      data_row[1].each_with_index do |data_point, point_index|
+        # Use incremented x and scaled y
+        # x
+        left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index)))
+        right_x = left_x + @bar_width * spacing_factor
+        # y
+        conv = []
+        conversion.getLeftYRightYscaled( data_point, conv )
+
+        # create new bar
+        @d = @d.rectangle(left_x, conv[0], right_x, conv[1])
+
+        # Calculate center based on bar_width and current row
+        label_center = @graph_left + (@data.length * @bar_width * point_index) + (@data.length * @bar_width / 2.0)
+        draw_label(label_center, point_index)
       end
-    
-      @d.draw(@base_image)    
+
     end
 
+    @d.draw(@base_image)    
+  end
+
 end

data/lib/gruff/bar_conversion.rb

@@ -0,0 +1,63 @@
+##############################################################################
+#
+#  Ruby Gruff/bar_conversion 
+#
+#  Copyright: David Stokar
+#
+#  Date Written: 2006/01/27
+#
+#  $Revision: 0.2 $
+#
+#  $Log: bar_conversion.rb $
+#  $Log: Added comments $
+#  ------------------------------------------------------------------------
+#  This program was written by David Stokar is
+#  licensed under the GNU GPL license. Please see below for details. This
+#  header contains information regarding licensing terms under the GPL, and
+#  information regarding obtaining source code from the Author. Consequently,
+#  pursuant to section 3(c) of the GPL, you must accompany the information
+#  found in this header with any distribution you make of this Program.
+#  ------------------------------------------------------------------------
+##############################################################################
+
+#
+#	This class perfoms the y coordinats conversion for the bar class
+#	There are 3 cases: 1. Bars all go from zero in positiv direction
+#					   2. Bars all go from zero to negativ direction	
+#					   3. Bars either go from zero to positiv or from zero to negativ	
+#
+class Gruff::BarConversion
+	attr_writer :mode
+	attr_writer :zero
+	attr_writer :graph_top
+	attr_writer :graph_height
+	attr_writer :minimum_value
+	attr_writer :spread
+	
+	def getLeftYRightYscaled( data_point, result )
+		case @mode
+		when 1 then # Case one
+			# minimum value >= 0 ( only positiv values )
+      result[0] = @graph_top + @graph_height*(1 - data_point) + 1
+  		result[1] = @graph_top + @graph_height - 1
+		when 2 then  # Case two
+			# only negativ values
+   		result[0] = @graph_top + 1
+  		result[1] = @graph_top + @graph_height*(1 - data_point) - 1
+		when 3 then # Case three
+			# positiv and negativ values
+    	val = data_point-@minimum_value/@spread
+    	if ( data_point >= @zero ) then
+    		result[0] = @graph_top + @graph_height*(1 - (val-@zero)) + 1
+	    	result[1] = @graph_top + @graph_height*(1 - @zero) - 1
+    	else
+				result[0] = @graph_top + @graph_height*(1 - (val-@zero)) + 1
+	    	result[1] = @graph_top + @graph_height*(1 - @zero) - 1
+    	end
+		else
+			result[0] = 0.0
+			result[1] = 0.0
+		end				
+	end	
+
+end

data/lib/gruff/base.rb

@@ -8,21 +8,25 @@
 #
 # Other contributors:
 #
-# Jarkko Laine, Mike Perham, Andreas Schwarz, Alun Eyre, Guillaume Theoret, and others.
+# Jarkko Laine, Mike Perham, Andreas Schwarz, Alun Eyre, Guillaume Theoret, David Stokar, and others.
 #
 
 require 'RMagick'
 
-require 'yaml'
+#require 'yaml'
 
 module Gruff
   
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
   
   class Base
   
     include Magick
 
+    DATA_LABEL_INDEX = 0
+    DATA_VALUES_INDEX = 1
+    DATA_COLOR_INDEX = 2
+
     # A hash of names for the individual columns, where the key is the array index for the column this label represents.
     #
     # Not all columns need to be named.
@@ -30,6 +34,9 @@ module Gruff
     # Example: 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008
     attr_accessor :labels
 
+    # Get or set the list of colors that will be used to draw the bars or lines.
+    attr_accessor :colors
+
     # The large title of the graph displayed at the top
     attr_accessor :title
 
@@ -37,8 +44,17 @@ module Gruff
     # RMagick must be built with the Freetype libraries for this to work properly.
     attr_accessor :font
 
+    # Hide various elements
     attr_accessor :hide_line_markers, :hide_legend, :hide_title
 
+    # Message shown when there is no data. Fits up to 20 characters. Defaults to "No Data."
+    attr_accessor :no_data_message
+
+    # Optionally set the size of the legend font. Based on an 800x600px graph. Default is 20.
+    #
+    # Will be scaled down if graph is smaller than 800px wide.
+    attr_accessor :legend_font_size
+
     # Graph is drawn at 4/3 ratio (800x600, 400x300, etc.).
     #
     # Looks for Bitstream Vera as the default font. Expects an environment var of MAGICK_FONT_PATH to be set.
@@ -61,18 +77,22 @@ module Gruff
       @raw_rows = 800.0 * (@rows/@columns)
       @column_count = 0
       @maximum_value = 0
+      @minimum_value = 0
       @has_data = false
       @data = Array.new
       @labels = Hash.new
       @labels_seen = Hash.new
       @scale = @columns / @raw_columns
+      @legend_font_size = 20
+
+      @no_data_message = "No Data"
 
       @hide_line_markers = @hide_legend = @hide_title = false
 
       reset_themes()
       theme_keynote()
     end
-
+    
     # Add a color to the list of available colors for lines.
     #
     # Example: 
@@ -82,7 +102,7 @@ module Gruff
     end
 
     # Replace the entire color list with a new array of colors. You need to have one more color
-    # than the number of datasets you intend to draw.
+    # than the number of datasets you intend to draw. Also aliased as the colors= setter method.
     #
     # Example: 
     #  replace_colors('#cc99cc', '#d9e043', '#34d8a2')
@@ -162,16 +182,21 @@ module Gruff
       @base_image = render_gradiated_background('#ff47a4', '#ff1f81')
     end
 
-    # dataset is an array where the first element is the name of the dataset
+    # Parameters are an array where the first element is the name of the dataset
     # and the value is an array of values to plot.
     #
-    # Can be called multiple times with different datasets
-    # for a multi-valued graph.
+    # Can be called multiple times with different datasets for a multi-valued graph.
+    #
+    # If the color argument is nil, the next color from the default theme will be used.
+    #
+    # NOTE: If you want to use a preset theme, you must set it before calling data().
     #
     # Example:
-    #  data("Bart S.", [95, 45, 78, 89, 88, 76])
-    def data(name, data_points=[])
-      @data << [name, data_points]
+    #
+    #  data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
+    #
+    def data(name, data_points=[], color=nil)
+      @data << [name, data_points, color || increment_color]
       # Set column count if this is larger than previous counts
       @column_count = (data_points.length > @column_count) ? data_points.length : @column_count
 
@@ -179,11 +204,19 @@ module Gruff
       data_points.each_with_index do |data_point, index|
         next if data_point.nil?
         
-       @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
-#        @maximum_value = (data_point > @maximum_value) ? data_point : @maximum_value
+        # Setup max/min so spread starts at the low end of the data points (instead of 0)
+        if @maximum_value == 0 && @minimum_value == 0 && data_point != 0
+          @maximum_value = @minimum_value = data_point
+        end
+        
+        @maximum_value = larger_than_max?(data_point, index) ? max(data_point, index) : @maximum_value
         if @maximum_value > 0
           @has_data = true
         end
+        @minimum_value = (data_point < @minimum_value) ? data_point : @minimum_value
+        if @minimum_value < 0
+      	  @has_data = true
+        end
       end
     end
 
@@ -228,6 +261,7 @@ protected
       
       normalize()
       setup_graph_measurements()
+      sort_norm_data() # Sort norm_data with avg largest values set first (for display)
       
       draw_line_markers()
       draw_legend()
@@ -237,19 +271,21 @@ protected
     # Make copy of data with values scaled between 0-100
     def normalize
       if @norm_data.nil?
-        @norm_data = Array.new
+        @norm_data = []
         return unless @has_data
-        
+        @spread = @maximum_value.to_f - @minimum_value.to_f
+        @spread = 1 if @spread == 0 # Protect from divide by 0
+        min_val = @minimum_value.to_f
         @data.each do |data_row|
-          norm_data_points = Array.new
-          data_row[1].each do |data_point|
+          norm_data_points = []
+          data_row[DATA_VALUES_INDEX].each do |data_point|
             if data_point.nil?
               norm_data_points << nil
             else
-              norm_data_points << (data_point.to_f/@maximum_value.to_f)
+              norm_data_points << ((data_point.to_f - min_val ) / @spread)
             end
           end
-          @norm_data << [data_row[0], norm_data_points]
+          @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX]]
         end
       end
     end
@@ -284,14 +320,18 @@ protected
       number_of_lines = 4
 
       # TODO Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
-      increment = significant(@maximum_value.to_f / number_of_lines)
-      inc_graph = @graph_height.to_f / (@maximum_value.to_f / increment)
+      
+      # added relative height
+      spread = @maximum_value.to_f - @minimum_value.to_f
+      increment = significant(spread / number_of_lines)
+      inc_graph = @graph_height.to_f / (spread / increment)
+      #inc_graph = @graph_height.to_f / increment
 
       (0..number_of_lines).each do |index|
         y = @graph_top + @graph_height - index.to_f * inc_graph
         @d = @d.line(@graph_left, y, @graph_right, y)
 
-        marker_label = index * increment
+        marker_label = index * increment + @minimum_value.to_f
 
         @d.fill = @marker_color
         @d.font = @font
@@ -302,6 +342,7 @@ protected
                           100, 20,
                           -10, y - (@marker_pointsize/2.0), 
                           marker_label.to_s, @scale)
+        #                  "help", @scale)
       end
     end
 
@@ -309,17 +350,13 @@ protected
     def draw_legend
       return if @hide_legend
 
-      # Sort norm_data with avg largest values set first (for display)
-      sort_norm_data()
-      
-      @color_index = 0
-      @legend_labels = @norm_data.collect {|item| item[0] }
+      @legend_labels = @data.collect {|item| item[DATA_LABEL_INDEX] }
 
       legend_square_width = 20 # small square with color of this item
 
       # May fix legend drawing problem at small sizes
       @d.font = @font
-      @d.pointsize = 20
+      @d.pointsize = legend_font_size
 
       metrics = @d.get_type_metrics(@base_image, @legend_labels.join(''))
       legend_text_width = metrics.width
@@ -332,7 +369,7 @@ protected
         # Draw label
         @d.fill = @marker_color
         @d.font = @font
-        @d.pointsize = scale_fontsize(20)
+        @d.pointsize = scale_fontsize(legend_font_size)
         @d.stroke = 'transparent'
         @d.font_weight = NormalWeight
         @d.gravity = WestGravity
@@ -344,13 +381,11 @@ protected
         # Now draw box with color of this dataset
         legend_box_y_offset = 2 # Move box down slightly to center
         @d = @d.stroke 'transparent'
-        @d = @d.fill current_color
+        @d = @d.fill @data[index][DATA_COLOR_INDEX]
         @d = @d.rectangle(current_x_offset, 70 + legend_box_y_offset, 
                           current_x_offset + legend_square_width, 70 + legend_square_width + legend_box_y_offset)
-        
-        increment_color()
 
-        @d.pointsize = 20
+        @d.pointsize = legend_font_size
         metrics = @d.get_type_metrics(@base_image, legend_label.to_s)
         current_string_offset = metrics.width + (legend_square_width * 2.7)
         current_x_offset += current_string_offset
@@ -403,7 +438,7 @@ protected
         @d = @d.annotate_scaled( @base_image, 
                         @raw_columns, @raw_rows/2.0,
                         0, 10, 
-                        'No Data', @scale)
+                        @no_data_message, @scale)
     end
 
     # Use with a theme definition method to draw a gradiated (or solid color) background.
@@ -421,16 +456,6 @@ protected
       image[0]
     end
 
-    def current_color
-      @colors[@color_index]
-    end
-    
-    def increment_color
-      @color_index += 1
-      raise(ColorlistExhaustedException, "There are no more colors left to use.") if @color_index == @colors.length
-      current_color
-    end
-
     def reset_themes
       @color_index = 0
       @labels_seen = Hash.new
@@ -460,12 +485,18 @@ protected
       data_point > @maximum_value
     end
 
+	  def less_than_min?(data_point, index=0)
+      data_point < @minimum_value
+    end
+
     def max(data_point, index)
       data_point
     end
 
-
-    # Round down to significant digits
+	  def min(data_point, index)
+      data_point
+    end
+   
     def significant(inc)
       factor = 1.0
       while (inc < 10)
@@ -498,6 +529,22 @@ protected
       total_sum
     end
 
+private
+    
+    def increment_color
+      if @color_index == 0
+        @color_index += 1
+        return @colors[0]
+      else
+        if @color_index < @colors.length
+          @color_index += 1
+          return @colors[@color_index - 1]
+        else
+          raise(ColorlistExhaustedException, "There are no more colors left to use.")
+        end
+      end
+    end
+
   end
   
   class ColorlistExhaustedException < StandardError; end

data/lib/gruff/line.rb

@@ -9,18 +9,18 @@ class Gruff::Line < Gruff::Base
   # Color of the baseline
   attr_accessor :baseline_color
   
+  # Hide parts of the graph to fit more datapoints, or for a different appearance.
   attr_accessor :hide_dots, :hide_lines
-	
-  #
+
   # Call with target pixel width of graph (800, 400, 300), and/or 'false' to omit lines (points only).
   #
   #  g = Gruff::Line.new(400) # 400px wide with lines
   #
-  #  g = Gruff::Line.new(400, false) # 400px wide, no lines
+  #  g = Gruff::Line.new(400, false) # 400px wide, no lines (for backwards compatibility)
   #
-  #  g = Gruff::Line.new(false) # Defaults to 800px wide, no lines
+  #  g = Gruff::Line.new(false) # Defaults to 800px wide, no lines (for backwards compatibility)
   # 
-  # TODO Remove and go back to normal. Call hide_dots or hide_lines instead
+  # The preferred way is to call hide_dots or hide_lines instead.
   def initialize(*args)
     raise ArgumentError, "Wrong number of arguments" if args.length > 2
     if args.empty? or ((not Numeric === args.first) && (not String === args.first)) then
@@ -46,27 +46,27 @@ class Gruff::Line < Gruff::Base
     @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
  
     if (defined?(@norm_baseline)) then
-     level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
-     @d = @d.push
-     @d.stroke_color @baseline_color
-     @d.fill_opacity 0.0
-     @d.stroke_dasharray(10, 20)
-     @d.stroke_width 5
-     @d.line(@graph_left, level, @graph_left + @graph_width, level)
-     @d = @d.pop
+      level = @graph_top + (@graph_height - @norm_baseline * @graph_height)
+      @d = @d.push
+      @d.stroke_color @baseline_color
+      @d.fill_opacity 0.0
+      @d.stroke_dasharray(10, 20)
+      @d.stroke_width 5
+      @d.line(@graph_left, level, @graph_left + @graph_width, level)
+      @d = @d.pop
     end
 
     @norm_data.each do |data_row|
       prev_x = prev_y = 0.0
-      @d = @d.stroke current_color
-      @d = @d.fill current_color
+      @d = @d.stroke data_row[DATA_COLOR_INDEX]
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
 
       data_row[1].each_with_index do |data_point, index|
         new_x = @graph_left + (@x_increment * index)
-        draw_label(new_x, index)
-
         next if data_point.nil?
 
+        draw_label(new_x, index)
+
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
         if !@hide_lines and prev_x > 0 and prev_y > 0 then
@@ -78,7 +78,6 @@ class Gruff::Line < Gruff::Base
         prev_y = new_y
       end
 
-      increment_color()
     end
 
     @d.draw(@base_image)

data/lib/gruff/photo_bar.rb

@@ -1,5 +1,9 @@
 require File.dirname(__FILE__) + '/base'
 
+# EXPERIMENTAL!
+#
+# Doesn't work yet.
+#
 class Gruff::PhotoBar < Gruff::Base
 
 # TODO
@@ -14,14 +18,19 @@ class Gruff::PhotoBar < Gruff::Base
   # The name of a pre-packaged photo-based theme.
   attr_accessor :theme
 
+#   def initialize(target_width=800)
+#     super
+#     init_photo_bar_graphics()
+#   end
+
   def draw
     super
-
     return unless @has_data
 
-    # TODO init_photo_bar_graphics() inside an overriden draw_legend()
-    init_photo_bar_graphics()
+    return # TODO Remove for further development
 
+    init_photo_bar_graphics()
+    
     #Draw#define_clip_path()
     #Draw#clip_path(pathname)
     #Draw#composite....with bar graph image OverCompositeOp
@@ -35,7 +44,7 @@ class Gruff::PhotoBar < Gruff::Base
     #
     # Columns sit side-by-side.
     spacing_factor = 0.9
-    @bar_width = current_color.columns
+    @bar_width = @norm_data[0][DATA_COLOR_INDEX].columns
 
     @norm_data.each_with_index do |data_row, row_index|
   
@@ -47,11 +56,11 @@ class Gruff::PhotoBar < Gruff::Base
         right_x = left_x + @bar_width * spacing_factor
         right_y = @graph_top + @graph_height - 1
       
-        bar_image_width = current_color.columns
+        bar_image_width = data_row[DATA_COLOR_INDEX].columns
         bar_image_height = right_y.to_f - left_y.to_f
       
         # Crop to scale for data
-        bar_image = current_color.crop(0, 0, bar_image_width, bar_image_height)
+        bar_image = data_row[DATA_COLOR_INDEX].crop(0, 0, bar_image_width, bar_image_height)
         
         @d.gravity = NorthWestGravity
         @d = @d.composite(left_x, left_y, bar_image_width, bar_image_height, bar_image)
@@ -61,7 +70,6 @@ class Gruff::PhotoBar < Gruff::Base
         draw_label(label_center, point_index)
       end
 
-      increment_color()
     end
 
     @d.draw(@base_image)    

data/lib/gruff/pie.rb

@@ -14,30 +14,33 @@ class Gruff::Pie < Gruff::Base
     radius = @graph_height / 2.0
     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)
+    center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
     total_sum = sums_for_pie()
     prev_degrees = 0.0
 
-    @norm_data.each do |data_row|
-      @d = @d.stroke current_color
-      @d = @d.fill 'transparent'
-      @d.stroke_width(200.0)
+    # Use full data since we can easily calculate percentages
+    @data.each do |data_row|
+      if data_row[1][0] > 0
+        @d = @d.stroke data_row[DATA_COLOR_INDEX]
+        @d = @d.fill 'transparent'
+        @d.stroke_width(200.0)
 
-      current_degrees = (data_row[1][0] / total_sum) * 360.0
-      #@d = @d.pie_slice(center_x, center_y, radius, 
-      #                  current_percent * 100.0)
-      
-      #@d = @d.arc(top_x, @graph_top, 
-      #            top_x + diameter, @graph_top + diameter,
-      #            prev_degrees, prev_degrees + current_degrees)
-      radius = 100.0
-      @d = @d.ellipse(center_x, center_y, 
+        current_degrees = (data_row[1][0] / total_sum) * 360.0 
+        radius = 100.0
+        @d = @d.ellipse(center_x, center_y, 
                   radius, radius,
-                  prev_degrees, prev_degrees + current_degrees)
+                  prev_degrees, prev_degrees + current_degrees + 0.5) # <= +0.5 'fudge factor' gets rid of the ugly gaps
+                  
+        half_angle = prev_degrees + ((prev_degrees + current_degrees) - prev_degrees) / 2
       
+
+        @d = draw_label(center_x,center_y, 
+                    half_angle, 
+                    radius, 
+                    ((data_row[1][0] / total_sum) * 100).round.to_s + '%     ')
       
-      prev_degrees += current_degrees
-      increment_color()
+        prev_degrees += current_degrees
+      end
     end
 
     @d.draw(@base_image)
@@ -45,14 +48,43 @@ class Gruff::Pie < Gruff::Base
 
 private
 
+  def draw_label(center_x, center_y, angle, radius, amount)
+    r_offset = 130      # The distance out from the center of the pie to get point
+    x_offset = center_x + 15 # 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.deg2rad))
+    y = y_offset + ((radius + r_offset) * Math.sin(angle.deg2rad))
+    
+    # Draw label
+    @d.fill = @marker_color
+    @d.font = @font
+    @d.pointsize = scale_fontsize(20)
+    @d.stroke = 'transparent'
+    @d.font_weight = BoldWeight
+    @d.gravity = CenterGravity
+    @d.annotate_scaled( @base_image, 
+                      0, 0,
+                      x, y, 
+                      amount, @scale)
+  end
+
   def sums_for_pie
     total_sum = 0.0
-    @norm_data.collect {|data_row| total_sum += data_row[1][0] }
+    @data.collect {|data_row| total_sum += data_row[1][0] }
     total_sum
   end
 
 end
 
+
+class Float
+  # Used for degree => radian conversions
+  def deg2rad
+    self * (Math::PI/180.0)
+  end
+end
+
+# From sparklines...not currently used
 class Magick::Draw
   
   def pie_slice(center_x=0.0, center_y=0.0, radius=100.0, percent=0.0, rot_x=0.0)

data/lib/gruff/side_stacked_bar.rb

@@ -74,7 +74,7 @@ class Gruff::SideStackedBar < Gruff::Base
       length = Array.new(@column_count, @graph_left)
 
       @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill current_color
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
 
         data_row[1].each_with_index do |data_point, point_index|
 
@@ -100,7 +100,6 @@ class Gruff::SideStackedBar < Gruff::Base
           draw_label(label_center, point_index)
         end
 
-        increment_color()
       end
 
       @d.draw(@base_image)    

data/lib/gruff/stacked_bar.rb

@@ -20,7 +20,7 @@ class Gruff::StackedBar < Gruff::Base
       height = Array.new(@column_count, 0)
     
       @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill current_color
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
       
         data_row[1].each_with_index do |data_point, point_index|
           # Use incremented x and scaled y
@@ -41,7 +41,6 @@ class Gruff::StackedBar < Gruff::Base
           draw_label(label_center, point_index)
         end
 
-        increment_color()
       end
     
       @d.draw(@base_image)    

data/rakefile

@@ -19,11 +19,13 @@ RUBY_FORGE_PROJECT = "gruff"
 RUBY_FORGE_USER    = "topfunky"
 
 desc "Default Task"
-task :default => [ :test ]
+task :default => [ :clean, :test ]
 
 desc "Clean images generated by tests"
 task :clean do
   rm FileList['test/output/*.png']
+  rm_rf 'pkg'
+  rm_rf 'doc'
 end
 
 # Run the unit tests
@@ -38,7 +40,7 @@ Rake::TestTask.new { |t|
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Gruff -- Beautiful graphs"
-  rdoc.options << '--line-numbers --inline-source --main README --accessor adv_attr_accessor=M'
+#  rdoc.options << '--line-numbers --inline-source --main README --accessor adv_attr_accessor=M'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/gruff.rb')

data/test/bar_test.rb

@@ -33,16 +33,52 @@ class TestGruffBar < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
     g.write("test/output/bar_keynote.png")
         
+    g = Gruff::Bar.new
+    g.title = "Visual Multi-Line Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
     g.theme_rails_keynote
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
     g.write("test/output/bar_rails_keynote.png")
     
+    g = Gruff::Bar.new
+    g.title = "Visual Multi-Line Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
     g.theme_odeo
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
     g.write("test/output/bar_odeo.png")
   end
 
+  def test_bar_graph_set_colors
+    g = Gruff::Bar.new
+    g.title = "Bar Graph With Manual Colors"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:Art, [0, 5, 8, 15], '#990000')
+    g.data(:Philosophy, [10, 3, 2, 8], '#009900')
+    g.data(:Science, [2, 15, 8, 11], '#990099')
+        
+    g.write("test/output/bar_manual_colors.png")
+  end
 
   def test_bar_graph_small
     g = Gruff::Bar.new(400)
@@ -95,6 +131,22 @@ class TestGruffBar < Test::Unit::TestCase
   end
 
 
+  def test_negative
+    g = Gruff::Bar.new
+    g.title = "Pos/Neg Bar Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:apples, [-1, 0, 4, -4])
+    g.data(:peaches, [10, 8, 6, 3])
+
+    g.write("test/output/bar_pos_neg.png")
+  end
+
+
 protected
 
   def setup_basic_graph(size=800)

data/test/line_test.rb

@@ -48,7 +48,6 @@ class TestGruffLine < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
     g.write("test/output/line_small.png")
 
     g = Gruff::Line.new(400)
@@ -56,7 +55,6 @@ class TestGruffLine < Test::Unit::TestCase
     @datasets.each do |data|
       g.data(data[0], data[1])
     end
-
     g.write("test/output/line_small_small.png")
   end
     
@@ -114,7 +112,7 @@ class TestGruffLine < Test::Unit::TestCase
   def test_similar_high_end_values
     g = Gruff::Line.new
     g.title = "Similar High End Values Test"
-    g.data('similar points', %w(29.43 29.459 29.498 29.53 29.548 29.589 29.619 29.66 29.689 29.74 29.769 29.79 29.808 29.828 29.849 29.878).collect {|i| i.to_f} )
+    g.data('similar points', %w(29.43 29.459 29.498 29.53 29.548 29.589 29.619 29.66 29.689 29.849 29.878 29.74 29.769 29.79 29.808 29.828).collect {|i| i.to_f} )
 
     # Default theme
     g.write("test/output/line_similar_high_end_values.png")    
@@ -220,9 +218,13 @@ class TestGruffLine < Test::Unit::TestCase
   def test_no_data
     g = Gruff::Line.new(400)
     g.title = "No Data"
-
     # Default theme
-    g.write("test/output/line_no_data.png")    
+    g.write("test/output/line_no_data.png")
+    
+    g = Gruff::Line.new(400)
+    g.title = "No Data Title"
+    g.no_data_message = 'There is no data'
+    g.write("test/output/line_no_data_msg.png")
   end
 
 
@@ -244,7 +246,8 @@ class TestGruffLine < Test::Unit::TestCase
     @datasets = [
       [:data1, [1, 2, 3, nil, 3, 5, 6]],
       [:data2, [5, nil, nil, nil, nil, nil, 5]],
-      [:data3, [4, nil, 2, 1, 0]]
+      [:data3, [4, nil, 2, 1, 0]],
+      [:data4, [nil, nil, 3, 1, 2]]
       ]
 
     @datasets.each do |data|
@@ -320,6 +323,100 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_wide_graph_small.png")
   end
 
+  def test_negative
+    g = setup_pos_neg(800)
+    g.write("test/output/line_pos_neg.png")
+    
+    g = setup_pos_neg(400)
+    g.title = 'Pos/Neg Line Test Small'
+    g.write("test/output/line_pos_neg_400.png")
+  end
+
+  def test_all_negative
+    g = setup_all_neg(800)
+    g.write("test/output/line_all_neg.png")
+    
+    g = setup_all_neg(400)
+    g.title = 'All Neg Line Test Small'
+    g.write("test/output/line_all_neg_400.png")
+  end
+
+
+  def test_many_numbers    
+    g = Gruff::Line.new('400x170')
+    g.title = "Line Test, Many Numbers"
+
+    data = [
+      { :date => '01',
+        :wpm => 0,
+        :errors => 0,
+        :accuracy => 0 },
+      { :date => '02',
+        :wpm => 10,
+        :errors => 2,
+        :accuracy => 80 },
+      { :date => '03',
+        :wpm => 15,
+        :errors => 0,
+        :accuracy => 100 },
+      { :date => '04',
+        :wpm => 16,
+        :errors => 2,
+        :accuracy => 87 },
+      { :date => '05',
+          :wpm => nil,
+          :errors => nil,
+          :accuracy => nil },
+      { :date => '06',
+        :wpm => 18,
+        :errors => 1,
+        :accuracy => 94 },
+      { :date => '07'},
+      { :date => '08' },
+      { :date => '09',
+         :wpm => 21,
+         :errors => 1,
+         :accuracy => 95 },
+      { :date => '10'},
+      { :date => '11'},
+      { :date => '12'},
+      { :date => '13'},
+      { :date => '14'},
+      { :date => '15'},
+      { :date => '16'},
+      { :date => '17'},
+      { :date => '18'},
+      { :date => '19',
+         :wpm => 28,
+         :errors => 5,
+         :accuracy => 82 },
+      { :date => '20'},
+      { :date => '21'},
+      { :date => '22'},
+      { :date => '23'},
+      { :date => '24'},
+      { :date => '25'},
+      { :date => '26'},     
+      { :date => '27',
+         :wpm => 37,
+         :errors => 3,
+         :accuracy => 92 },
+    ]
+
+    [:wpm, :errors, :accuracy].each do |field|
+      g.data(field.to_s, data.collect {|d| d[field] })
+    end
+
+    labels = Hash.new
+    data.each_with_index do |d, i|
+      labels[i] = d[:date]
+    end
+    g.labels = labels
+
+    g.write('test/output/line_many_numbers.png')
+  end
+
+
 
 protected
 
@@ -360,6 +457,35 @@ protected
     end
     return g
   end
+
+  def setup_pos_neg(size=800)
+    g = Gruff::Line.new(size)
+    g.title = "Pos/Neg Line Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:apples, [-1, 0, 4, -4])
+    g.data(:peaches, [10, 8, 6, 3])
+    return g
+  end
+
+  def setup_all_neg(size=800)
+    g = Gruff::Line.new(size)
+    g.title = "All Neg Line Graph Test"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:apples, [-1, -5, -20, -4])
+    g.data(:peaches, [-10, -8, -6, -3])
+    return g
+  end
+
   
 end
 

data/test/pie_test.rb

@@ -10,14 +10,14 @@ class TestGruffPie < Test::Unit::TestCase
 
   def setup
     @datasets = [
-      [:Jimmy, [25]],
-      [:Charles, [80]],
-      [:Julie, [22]],
-      [:Jane, [95]],
-      [:Philip, [90]],
-      ["Arthur", [5]],
+      [:Darren, [25]],
+      [:Chris, [80]],
+      [:Egbert, [22]],
+      [:Adam, [95]],
+      [:Bill, [90]],
+      ["Frank", [5]],
+      ["Zero", [0]],
       ]
-
   end
   
   def test_pie_graph
@@ -42,44 +42,37 @@ class TestGruffPie < Test::Unit::TestCase
     g.write("test/output/pie_keynote_small.png")
   end
 
+  def test_pie_graph_nearly_equal
+    g = Gruff::Pie.new
+    g.title = "Pie Graph Nearly Equal"
+    
+    g.data(:Blake, [41])
+    g.data(:Aaron, [42])
+#    g.data(:Grouch, [40])
+#    g.data(:Snuffleupagus, [43])
 
-=begin  
-  def test_resize
-    g = Gruff::Pie.new(400)
-    g.title = "Small Size Multi-Pie Graph Test"
-    g.labels = {
-      0 => '5/6', 
-      2 => '5/15', 
-      4 => '5/24', 
-      6 => '5/30', 
-    }
-    @datasets.each do |data|
-      g.data(data[0], data[1])
-    end
+    g.write("test/output/pie_nearly_equal.png")
+  end
 
-    # Default theme
-    g.write("test/output/pie_keynote_small.png")
+  def test_pie_graph_equal
+    g = Gruff::Pie.new
+    g.title = "Pie Graph Equal"
+        
+    g.data(:Bert, [41])
+    g.data(:Adam, [41])
+
+    g.write("test/output/pie_equal.png")
   end
-  
-  def test_pie_graph_tiny
-    g = Gruff::Pie.new(300)
-    g.title = "Pie Test 300px"
-    g.labels = {
-      0 => '5/6', 
-      10 => '5/15', 
-      20 => '5/24', 
-      30 => '5/30', 
-      40 => '6/4', 
-      50 => '6/16'
-    }
-    %w{jimmy jane philip arthur julie bert}.each do |student_name|
-      g.data(student_name, (0..50).collect { |i| rand 100 })
-    end
 
-    # Default theme
-    g.write("test/output/pie_tiny.png")
+  def test_pie_graph_zero
+    g = Gruff::Pie.new
+    g.title = "Pie Graph One Zero"
+        
+    g.data(:Bert, [0])
+    g.data(:Adam, [1])
+
+    g.write("test/output/pie_zero.png")
   end
-=end
 
   def test_wide
     g = setup_basic_graph('800x400')
@@ -87,6 +80,19 @@ class TestGruffPie < Test::Unit::TestCase
     g.write("test/output/pie_wide.png")
   end
 
+  def test_label_size
+    g = setup_basic_graph()
+    g.title = "Pie With Small Legend"
+    g.legend_font_size = 10
+    g.write("test/output/pie_legend.png")
+    
+    g = setup_basic_graph(400)
+    g.title = "Small Pie With Small Legend"
+    g.legend_font_size = 10
+    g.write("test/output/pie_legend_small.png")
+  end
+
+
 protected
 
   def setup_basic_graph(size=800)

data/test/stacked_bar_test.rb

@@ -8,8 +8,6 @@ require 'gruff'
 
 class TestGruffStackedBar < Test::Unit::TestCase
 
-  # TODO Delete old output files once when starting tests
-
   def setup
     @datasets = [
       [:Jimmy, [25, 36, 86, 39]],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.10
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
-date: 2005-12-31 00:00:00 -08:00
+  version: 0.1.0
+date: 2006-02-03
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
-- lib
+  - lib
 email: boss@topfunky.com
 homepage: http://www.topfunky.com
 rubyforge_project: gruff
@@ -18,52 +18,46 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
-- Geoffrey Grosenbach
+  - Geoffrey Grosenbach
 files: 
-- rakefile
-- README
-- CHANGELOG
-- MIT-LICENSE
-- lib/gruff
-- lib/gruff.rb
-- lib/gruff/area.rb
-- lib/gruff/bar.rb
-- lib/gruff/base.rb
-- lib/gruff/line.rb
-- lib/gruff/photo_bar.rb
-- lib/gruff/pie.rb
-- lib/gruff/side_stacked_bar.rb
-- lib/gruff/stacked_bar.rb
-- assets/bubble.png
-- assets/pc306715.jpg
-- assets/plastik
-- test/area_test.rb
-- test/bar_test.rb
-- test/line_test.rb
-- test/output
-- test/photo_test.rb
-- test/pie_test.rb
-- test/sidestacked_bar_test.rb
-- test/stacked_bar_test.rb
+  - rakefile
+  - README
+  - CHANGELOG
+  - MIT-LICENSE
+  - lib/gruff
+  - lib/gruff.rb
+  - lib/gruff/area.rb
+  - lib/gruff/bar.rb
+  - lib/gruff/bar_conversion.rb
+  - lib/gruff/base.rb
+  - lib/gruff/line.rb
+  - lib/gruff/photo_bar.rb
+  - lib/gruff/pie.rb
+  - lib/gruff/side_stacked_bar.rb
+  - lib/gruff/stacked_bar.rb
+  - assets/bubble.png
+  - assets/pc306715.jpg
+  - assets/plastik
+  - test/area_test.rb
+  - test/bar_test.rb
+  - test/line_test.rb
+  - test/output
+  - test/photo_test.rb
+  - test/pie_test.rb
+  - test/sidestacked_bar_test.rb
+  - test/stacked_bar_test.rb
 test_files: []
-
 rdoc_options: []
-
 extra_rdoc_files: []
-
 executables: []
-
 extensions: []
-
 requirements: 
-- none
-dependencies: []
-
+  - none
+dependencies: []