gruff 0.2.4 → 0.2.5

data/lib/gruff/line.rb

@@ -41,12 +41,7 @@ class Gruff::Line < Gruff::Base
     
     # Check to see if more than one datapoint was given. NaN can result otherwise.  
     @x_increment = (@column_count > 1) ? (@graph_width / (@column_count - 1).to_f) : @graph_width
-    
-    circle_radius = clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 2.5), 5.0)
-
-    @d = @d.stroke_opacity 1.0
-    @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
@@ -58,10 +53,8 @@ class Gruff::Line < Gruff::Base
       @d = @d.pop
     end
 
-    @norm_data.each do |data_row|
+    @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]
 
       data_row[1].each_with_index do |data_point, index|
         new_x = @graph_left + (@x_increment * index)
@@ -71,9 +64,16 @@ class Gruff::Line < Gruff::Base
 
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
-        if !@hide_lines and !prev_x.nil? and !prev_y.nil? then
+        # Reset each time to avoid thin-line errors
+        @d = @d.stroke data_row[DATA_COLOR_INDEX]
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
+        @d = @d.stroke_opacity 1.0
+        @d = @d.stroke_width clip_value_if_greater_than(@columns / (@norm_data.first[1].size * 4), 5.0)
+
+        if !@hide_lines and !prev_x.nil? and !prev_y.nil? then          
           @d = @d.line(prev_x, prev_y, new_x, new_y)
         end
+        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) unless @hide_dots
 
         prev_x = new_x
@@ -86,13 +86,9 @@ class Gruff::Line < Gruff::Base
   end
 
   def normalize
-    @maximum_value = max(@maximum_value.to_f, @baseline_value.to_f)
+    @maximum_value = [@maximum_value.to_f, @baseline_value.to_f].max
     super
     @norm_baseline = (@baseline_value.to_f / @maximum_value.to_f) if @baseline_value
   end
   
-  def max(a, b)
-    (a < b ? b : a)
-  end
-
 end

data/lib/gruff/mini/bar.rb

@@ -0,0 +1,32 @@
+##
+#
+# Makes a small bar graph suitable for display at 200px or even smaller.
+#
+module Gruff
+  module Mini
+
+    class Bar < Gruff::Bar
+
+      include Gruff::Mini::Legend
+      
+      def draw
+        @hide_legend = true
+        @hide_title = true
+        @hide_line_numbers = true
+
+        @marker_font_size = 40.0
+        @minimum_value = 0.0
+        @legend_font_size = 60.0
+
+        expand_canvas_for_vertical_legend
+
+        super
+
+        draw_vertical_legend
+        @d.draw(@base_image)
+      end
+
+    end
+  
+  end
+end

data/lib/gruff/mini/legend.rb

@@ -0,0 +1,77 @@
+module Gruff
+  module Mini
+    module Legend
+      
+      ##
+      # The canvas needs to be bigger so we can put the legend beneath it.
+
+      def expand_canvas_for_vertical_legend
+        @original_rows = @raw_rows
+        @rows += @data.length * calculate_caps_height(scale_fontsize(@legend_font_size)) * 1.7
+        render_background
+      end
+      
+      ##
+      # Draw the legend beneath the existing graph.
+
+      def draw_vertical_legend
+                
+        @legend_labels = @data.collect {|item| item[Gruff::Base::DATA_LABEL_INDEX] }
+        
+        legend_square_width = 40.0 # small square with color of this item
+        legend_square_margin = 10.0
+        @legend_left_margin = 40.0
+        legend_top_margin = 40.0
+
+        # May fix legend drawing problem at small sizes
+        @d.font = @font if @font
+        @d.pointsize = @legend_font_size
+
+        current_x_offset = @graph_left + @legend_left_margin
+        current_y_offset = @original_rows + legend_top_margin
+
+        debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
+
+        @legend_labels.each_with_index do |legend_label, index|        
+
+          # Draw label
+          @d.fill = @font_color
+          @d.font = @font if @font
+          @d.pointsize = scale_fontsize(@legend_font_size)
+          @d.stroke = 'transparent'
+          @d.font_weight = Magick::NormalWeight
+          @d.gravity = Magick::WestGravity
+          @d = @d.annotate_scaled( @base_image, 
+                            @raw_columns, 1.0,
+                            current_x_offset + (legend_square_width * 1.7), current_y_offset, 
+                            truncate_legend_label(legend_label), @scale)
+
+          # Now draw box with color of this dataset
+          @d = @d.stroke 'transparent'
+          @d = @d.fill @data[index][Gruff::Base::DATA_COLOR_INDEX]
+          @d = @d.rectangle(current_x_offset, 
+                            current_y_offset - legend_square_width / 2.0, 
+                            current_x_offset + legend_square_width, 
+                            current_y_offset + legend_square_width / 2.0)
+          
+          current_y_offset += calculate_caps_height(@legend_font_size) * 1.7
+        end
+        @color_index = 0
+      end
+
+      ##
+      # Shorten long labels so they will fit on the canvas.
+      #
+      #   Department of Hu...
+      
+      def truncate_legend_label(label)
+        truncated_label = label.to_s
+        while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - Gruff::Base::RIGHT_MARGIN) && (truncated_label.length > 1)
+          truncated_label = truncated_label[0..truncated_label.length-2]
+        end
+        truncated_label + (truncated_label.length < label.to_s.length ? "…" : '')
+      end
+      
+    end
+  end
+end

data/lib/gruff/mini/pie.rb

@@ -0,0 +1,32 @@
+##
+#
+# Makes a small pie graph suitable for display at 200px or even smaller.
+#
+module Gruff
+  module Mini
+
+    class Pie < Gruff::Pie
+
+      include Gruff::Mini::Legend
+
+      def draw
+        @hide_legend = true
+        @hide_title = true
+        @hide_line_numbers = true
+  
+        @marker_font_size = 40.0
+        @legend_font_size = 60.0
+
+        expand_canvas_for_vertical_legend
+        
+        super
+        
+        draw_vertical_legend
+        
+        @d.draw(@base_image)
+      end # def draw
+
+    end # class Pie
+  
+  end
+end

data/lib/gruff/mini/side_bar.rb

@@ -0,0 +1,22 @@
+##
+#
+# Makes a small pie graph suitable for display at 200px or even smaller.
+#
+module Gruff
+  module Mini
+
+    class SideBar < Gruff::Base
+
+      def draw
+        @hide_legend = true
+        @hide_title = true
+        @hide_line_numbers = true
+  
+        @marker_font_size = 40.0    
+        super
+      end
+
+    end
+  
+  end
+end

data/lib/gruff/pie.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/base'
 
 class Gruff::Pie < Gruff::Base
 
+  TEXT_OFFSET_PERCENTAGE = 0.15
+
   def draw
     @hide_line_markers = true
     
@@ -19,13 +21,13 @@ class Gruff::Pie < Gruff::Base
     prev_degrees = 0.0
 
     # Use full data since we can easily calculate percentages
-    @data.each do |data_row|
-      if data_row[1][0] > 0
+    @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] }.each do |data_row|
+      if data_row[DATA_VALUES_INDEX][0] > 0
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill 'transparent'
         @d.stroke_width(radius) # stroke width should be equal to radius. we'll draw centered on (radius / 2)
 
-        current_degrees = (data_row[1][0] / total_sum) * 360.0 
+        current_degrees = (data_row[DATA_VALUES_INDEX][0] / total_sum) * 360.0 
 
         # ellipse will draw the the stroke centered on the first two parameters offset by the second two.
         # therefore, in order to draw a circle of the proper diameter we must center the stroke at
@@ -35,33 +37,42 @@ class Gruff::Pie < Gruff::Base
                   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
-      
 
+        # End the string with %% to escape the single %.
+        # RMagick must use sprintf with the string and % has special significance.
+        label_string = ((data_row[DATA_VALUES_INDEX][0] / total_sum) * 100.0).round.to_s + '%%'
         @d = draw_label(center_x,center_y, 
-                    half_angle, 
-                    radius, 
-                    ((data_row[1][0] / total_sum) * 100).round.to_s + '%     ')
+                    half_angle, radius + (radius * TEXT_OFFSET_PERCENTAGE), 
+                    label_string)
       
         prev_degrees += current_degrees
       end
     end
 
+    # TODO debug a circle where the text is drawn...
+    
     @d.draw(@base_image)
   end
 
 private
 
+  ##
+  # Labels are drawn around a slightly wider ellipse to give room for 
+  # labels on the left and right.
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 30      # 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))
+    # TODO Don't use so many hard-coded numbers
+    r_offset = 5.0      # The distance out from the center of the pie to get point
+    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.10
+    x = x_offset + ((radius_offset + ellipse_factor) * Math.cos(angle.deg2rad))
+    y = y_offset + (radius_offset * Math.sin(angle.deg2rad))
     
     # Draw label
-    @d.fill = @marker_color
+    @d.fill = @font_color
     @d.font = @font if @font
-    @d.pointsize = scale_fontsize(20)
+    @d.pointsize = scale_fontsize(@marker_font_size)
     @d.stroke = 'transparent'
     @d.font_weight = BoldWeight
     @d.gravity = CenterGravity
@@ -73,7 +84,7 @@ private
 
   def sums_for_pie
     total_sum = 0.0
-    @data.collect {|data_row| total_sum += data_row[1][0] }
+    @data.collect {|data_row| total_sum += data_row[DATA_VALUES_INDEX][0] }
     total_sum
   end
 

data/lib/gruff/side_stacked_bar.rb

@@ -59,6 +59,7 @@ class Gruff::SideStackedBar < Gruff::Base
     end
 
     def draw
+      @has_left_labels = true
       get_maximum_by_stack
       super
 

data/test/gruff_test_case.rb

@@ -2,9 +2,54 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'test/unit'
 require 'gruff'
+require 'test_timer'
 
 class GruffTestCase < Test::Unit::TestCase
 
+  def setup
+    @datasets = [
+      [:Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]],
+      [:Charles, [80, 54, 67, 54, 68, 70, 90, 95]],
+      [:Julie, [22, 29, 35, 38, 36, 40, 46, 57]],
+      [:Jane, [95, 95, 95, 90, 85, 80, 88, 100]],
+      [:Philip, [90, 34, 23, 12, 78, 89, 98, 88]],
+      ["Arthur", [5, 10, 13, 11, 6, 16, 22, 32]],
+      ]
+
+    @labels = {
+        0 => '5/6', 
+        1 => '5/15', 
+        2 => '5/24', 
+        3 => '5/30', 
+        4 => '6/4', 
+        5 => '6/12', 
+        6 => '6/21', 
+        7 => '6/28', 
+      }      
+  end
+
+  def setup_single_dataset
+    @datasets = [
+      [:Jimmy, [25, 36, 86]]
+      ]
+
+    @labels = {
+        0 => 'You', 
+        1 => 'Average', 
+        2 => 'Lifetime' 
+      }      
+  end
+
+  def setup_wide_dataset
+    @datasets = [
+      ["Auto", 25],
+      ["Food", 5],
+      ["Entertainment", 15]
+      ]
+
+    @labels = { 0 => 'This Month' }
+  end
+
   def test_dummy
     assert true
   end
@@ -19,12 +64,13 @@ protected
   #     g.data('students', [1, 2, 3, 4])
   #   end
   #
-  def graph_sized(filename, &block)
+  def graph_sized(filename, sizes=['', 400])
     class_name = self.class.name.gsub(/^TestGruff/, '')
-    ['', 400].each do |size|
+    Array(sizes).each do |size|
       g = instance_eval("Gruff::#{class_name}.new #{size}")
-      block.call g
-      write_test_file g, "#{filename}#{size}.png"
+      g.title = "#{class_name} Graph"
+      yield g      
+      write_test_file g, "#{filename}_#{size}.png"
     end
   end
 
@@ -32,4 +78,40 @@ protected
     graph.write(File.dirname(__FILE__) + "/output/#{filename}")
   end
 
+  ##
+  # Example:
+  #
+  #   setup_basic_graph Gruff::Pie, 400
+  #
+  def setup_basic_graph(*args)
+    klass, size = Gruff::Bar, 400
+    # Allow args to be klass, size or just klass or just size.
+    #
+    # TODO Refactor
+    case args.length
+    when 1
+      case args[0]
+      when Fixnum
+        size = args[0]
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+      when String
+        size = args[0]
+        klass = eval("Gruff::#{self.class.name.gsub(/^TestGruff/, '')}") 
+      else
+        klass = args[0]
+      end
+    when 2
+      klass, size = args[0], args[1]
+    end
+    
+    g = klass.new(size)
+    g.title = "My Bar Graph"
+    g.labels = @labels
+
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g
+  end
+
 end

data/test/test_bar.rb

@@ -120,6 +120,32 @@ class TestGruffBar < GruffTestCase
     g.write("test/output/bar_x_y_labels.png")    
   end
 
+  def test_fireball
+    g = Gruff::Bar.new
+    g.hide_title = true
+    g.hide_line_numbers = true
+    
+    running_totals = []
+    new_additions = []
+    
+    (0..19).each do |i|
+      add = rand(10)
+      case i
+      when 0
+        running_totals << 0
+        new_additions  << add
+      else
+        running_totals << new_additions[i-1]
+        new_additions  << running_totals[i-1] + add
+      end
+    end
+    
+    g.data '1', running_totals
+    g.data '2', new_additions
+    
+    g.write("test/output/bar_fireball.png")
+  end
+
 
   def test_wide_graph
     g = setup_basic_graph('800x400')
@@ -221,6 +247,7 @@ class TestGruffBar < GruffTestCase
     g.theme = {
       :colors => %w(#efd250 #666699 #e5573f #9595e2),
       :marker_color => 'white',
+      :font_color => 'blue',
       :background_image => "assets/pc306715.jpg"
     }
     g.labels = {