gruff 0.2.3 → 0.2.4

data/lib/gruff.rb

@@ -10,6 +10,6 @@ require File.dirname(__FILE__) + '/gruff/spider'
 require File.dirname(__FILE__) + '/gruff/net'
 require File.dirname(__FILE__) + '/gruff/stacked_bar'
 require File.dirname(__FILE__) + '/gruff/side_stacked_bar'
-require File.dirname(__FILE__) + '/gruff/photo_bar'
+# require File.dirname(__FILE__) + '/gruff/photo_bar'
 
 require File.dirname(__FILE__) + '/gruff/scene'

data/lib/gruff/bar.rb

@@ -5,6 +5,11 @@ require File.dirname(__FILE__) + '/bar_conversion'
 class Gruff::Bar < Gruff::Base
 
   def draw
+    # Labels will be centered over the left of the bar if
+    # there are more labels than columns. This is basically the same 
+    # as where it would be for a line graph.
+    @center_labels_over_point = (@labels.keys.length > @column_count ? true : false)
+    
     super
     return unless @has_data
 
@@ -21,10 +26,6 @@ class Gruff::Bar < Gruff::Base
     conversion.graph_height = @graph_height
     conversion.graph_top = @graph_top
 
-    # Labels will be centered over the left of the bar if
-    # there are more labels than columns.
-    center_labels_left = (@labels.keys.length > @column_count ? true : false)
-
     # Set up the right mode [1,2,3] see BarConversion for further explanation
     if @minimum_value >= 0 then
       # all bars go from zero to positiv
@@ -44,7 +45,6 @@ class Gruff::Bar < Gruff::Base
 
     # 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
@@ -56,6 +56,7 @@ class Gruff::Bar < Gruff::Base
         conversion.getLeftYRightYscaled( data_point, conv )
 
         # create new bar
+        @d = @d.fill data_row[DATA_COLOR_INDEX]
         @d = @d.rectangle(left_x, conv[0], right_x, conv[1])
 
         # Calculate center based on bar_width and current row
@@ -63,13 +64,13 @@ class Gruff::Bar < Gruff::Base
                       (@data.length * @bar_width * point_index) + 
                       (@data.length * @bar_width / 2.0)
         # Subtract half a bar width to center left if requested
-        draw_label(label_center - (center_labels_left ? @bar_width / 2.0 : 0.0), point_index)
+        draw_label(label_center - (@center_labels_over_point ? @bar_width / 2.0 : 0.0), point_index)
       end
 
     end
 
     # Draw the last label if requested
-    draw_label(@graph_right, @column_count) if center_labels_left
+    draw_label(@graph_right, @column_count) if @center_labels_over_point
 
     @d.draw(@base_image)    
   end

data/lib/gruff/base.rb

@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/deprecated'
 
 module Gruff
   
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   
   class Base
   
@@ -48,6 +48,11 @@ module Gruff
     # Example: 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008
     attr_accessor :labels
 
+    # Used internally for spacing.
+    #
+    # By default, labels are centered over the point they represent.
+    attr_accessor :center_labels_over_point
+
     # A label for the bottom of the graph
     attr_accessor :x_axis_label
     
@@ -70,10 +75,10 @@ module Gruff
     #
     # Tries to find Bitstream Vera (Vera.ttf) in the location specified by
     # ENV['MAGICK_FONT_PATH']. Uses default RMagick font otherwise.
-    attr_accessor :font
+    attr_reader :font
 
     # Hide various elements
-    attr_accessor :hide_line_markers, :hide_legend, :hide_title
+    attr_accessor :hide_line_markers, :hide_legend, :hide_title, :hide_line_numbers
 
     # Message shown when there is no data. Fits up to 20 characters. Defaults to "No Data."
     attr_accessor :no_data_message
@@ -104,7 +109,10 @@ module Gruff
     #
     # If you use this, you must set it after you have given all your data to the graph object.
     attr_accessor :maximum_value
-        
+    
+    # Set to false if you don't want the data to be sorted with largest avg values at the back.
+    attr_accessor :sort
+    
     # Experimental
     attr_accessor :additional_line_values
     
@@ -138,6 +146,8 @@ module Gruff
       @data = Array.new
       @labels = Hash.new
       @labels_seen = Hash.new
+      @sort = true
+      @title = nil
 
       @scale = @columns / @raw_columns
 
@@ -150,31 +160,22 @@ module Gruff
 
       @no_data_message = "No Data"
 
-      @hide_line_markers = @hide_legend = @hide_title = false
+      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = false
+      @center_labels_over_point = true
 
       @additional_line_values = []      
       @additional_line_colors = []
+      
+      @x_axis_label = @y_axis_label = nil
+      @y_axis_increment = nil
+      @stacked = nil
+      @norm_data = nil
 
       reset_themes()
       theme_keynote()
     end
     
-    # Add a color to the list of available colors for lines.
-    #
-    # Example: 
-    #  add_color('#c0e9d3')
-    def add_color(colorname)
-      @colors << colorname
-    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. Also aliased as the colors= setter method.
-    #
-    # Example: 
-    #  replace_colors('#cc99cc', '#d9e043', '#34d8a2')
-    def replace_colors(color_list=[])
-      @colors = color_list
-    end
 
     # You can set a theme manually. Assign a hash to this method before you send your data.
     #
@@ -204,9 +205,9 @@ module Gruff
       @marker_color = options[:marker_color]
       @additional_line_colors = options[:additional_line_colors]
       if not options[:background_colors].nil?
-        @base_image = render_gradiated_background *options[:background_colors]
+        @base_image = render_gradiated_background(*options[:background_colors])
       else
-        @base_image = render_image_background *options[:background_image]
+        @base_image = render_image_background(*options[:background_image])
       end
     end
 
@@ -223,6 +224,7 @@ module Gruff
       @colors << colorname
     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. Also aliased as the colors= setter method.
     #
@@ -231,6 +233,7 @@ module Gruff
     def replace_colors(color_list=[])
       @colors = color_list
     end
+
     
     # A color scheme similar to the popular presentation software.
     def theme_keynote
@@ -375,11 +378,13 @@ protected
       make_stacked if @stacked
       setup_drawing()
       
-      debug { @d.rectangle( LEFT_MARGIN, TOP_MARGIN, 
-                            @raw_columns - RIGHT_MARGIN, @raw_rows - BOTTOM_MARGIN) }
-  
-      # Subclasses will do some drawing here...
-      #@d.draw(@base_image)
+      debug do
+        # Outer margin
+        @d.rectangle( LEFT_MARGIN, TOP_MARGIN, 
+                            @raw_columns - RIGHT_MARGIN, @raw_rows - BOTTOM_MARGIN)
+        # Graph area box
+        @d.rectangle( @graph_left, @graph_top, @graph_right, @graph_bottom)
+      end
     end
 
     # Draws the decorations.
@@ -395,7 +400,7 @@ protected
       
       normalize()
       setup_graph_measurements()
-      sort_norm_data() # Sort norm_data with avg largest values set first (for display)
+      sort_norm_data() if @sort # Sort norm_data with avg largest values set first (for display)
       
       draw_legend()
       draw_line_markers()
@@ -440,15 +445,22 @@ protected
          @graph_right_margin, 
          @graph_bottom_margin) = [LEFT_MARGIN, RIGHT_MARGIN, BOTTOM_MARGIN]
       else
-        @graph_left =           LEFT_MARGIN + 
-                                calculate_width(@marker_font_size, label(@maximum_value.to_f)) + 
-                                LABEL_MARGIN * 2 +
-                                (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+        # Shift graph if left line numbers are hidden
+        line_number_width = @hide_line_numbers ? 
+                              0.0 : 
+                              (calculate_width(@marker_font_size, label(@maximum_value.to_f)) + LABEL_MARGIN * 2)
+
+        @graph_left = LEFT_MARGIN + 
+                      line_number_width + 
+                      (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
         # Make space for half the width of the rightmost column label.
         # Might be greater than the number of columns if between-style bar markers are used.
         last_label = @labels.keys.sort.last.to_i
-        @graph_right_margin =   RIGHT_MARGIN +
-                                (last_label >= (@column_count-1) ? calculate_width(@marker_font_size, @labels[last_label])/2.0 : 0)
+        extra_room_for_long_label = (last_label >= (@column_count-1) && @center_labels_over_point) ?
+          calculate_width(@marker_font_size, @labels[last_label])/2.0 :
+          0
+        @graph_right_margin =   RIGHT_MARGIN + extra_room_for_long_label
+                                
         @graph_bottom_margin =  BOTTOM_MARGIN + 
                                 @marker_caps_height + LABEL_MARGIN
       end
@@ -541,17 +553,19 @@ protected
 
         marker_label = index * @increment + @minimum_value.to_f
 
-        @d.fill = @marker_color
-        @d.font = @font if @font
-        @d.stroke = 'transparent'
-        @d.pointsize = scale_fontsize(@marker_font_size)
-        @d.gravity = EastGravity
+        unless @hide_line_numbers
+          @d.fill = @marker_color
+          @d.font = @font if @font
+          @d.stroke = 'transparent'
+          @d.pointsize = scale_fontsize(@marker_font_size)
+          @d.gravity = EastGravity
         
-        # Vertically center with 1.0 for the height
-        @d = @d.annotate_scaled( @base_image, 
-                          @graph_left - LABEL_MARGIN, 1.0,
-                          0.0, y,
-                          label(marker_label), @scale)
+          # Vertically center with 1.0 for the height
+          @d = @d.annotate_scaled( @base_image, 
+                            @graph_left - LABEL_MARGIN, 1.0,
+                            0.0, y,
+                            label(marker_label), @scale)
+        end
       end
       
       # Submitted by a contibutor...the utility escapes me

data/lib/gruff/line.rb

@@ -31,6 +31,7 @@ class Gruff::Line < Gruff::Base
     
     @hide_dots = @hide_lines = false
     @baseline_color = 'red'
+    @baseline_value = nil
   end
 
   def draw

data/lib/gruff/net.rb

@@ -4,6 +4,15 @@ require File.dirname(__FILE__) + '/base'
 # Experimental!!! See also the Spider graph.
 class Gruff::Net < Gruff::Base
 
+  # Hide parts of the graph to fit more datapoints, or for a different appearance.
+  attr_accessor :hide_dots
+
+  def initialize(*args)
+    super
+    
+    @hide_dots = false
+  end
+
   def draw
 
     super
@@ -121,13 +130,13 @@ private
 
 end
 
-
-class Float
-  # Used for degree => radian conversions
-  def deg2rad
-    self * (Math::PI/180.0)
-  end
-end
+# # This method is already in Float
+# class Float
+#   # Used for degree => radian conversions
+#   def deg2rad
+#     self * (Math::PI/180.0)
+#   end
+# end
 
 
 

data/lib/gruff/photo_bar.rb

@@ -16,7 +16,7 @@ class Gruff::PhotoBar < Gruff::Base
 #
 
   # The name of a pre-packaged photo-based theme.
-  attr_accessor :theme
+  attr_reader :theme
 
 #   def initialize(target_width=800)
 #     super

data/lib/gruff/scene.rb

@@ -33,7 +33,7 @@ class Gruff::Scene < Gruff::Base
   #
   #  g.layers = %w(sky clouds buildings street people)
   #
-  attr_accessor :layers
+  attr_reader :layers
 
   def initialize(target_width, base_dir)
     @base_dir = base_dir

data/lib/gruff/spider.rb

@@ -7,9 +7,9 @@ require File.dirname(__FILE__) + '/base'
 class Gruff::Spider < Gruff::Base
   
   # Hide all text
-  attr_accessor :hide_text
+  attr_reader :hide_text
   attr_accessor :hide_axes
-  attr_accessor :transparent_background
+  attr_reader :transparent_background
   
   def transparent_background=(value)
     @transparent_background = value

data/test/{line_test.rb → test_line.rb}

@@ -58,7 +58,7 @@ class TestGruffLine < GruffTestCase
   end
 
 
-  def test_fix_hang
+  def test_should_not_hang_with_0_0_100
     g = Gruff::Line.new(320)
     g.title = "Hang Value Graph Test"
     g.data('test', [0,0,100])
@@ -66,15 +66,16 @@ class TestGruffLine < GruffTestCase
     g.write("test/output/line_hang_value.png")
   end
 
-#   def test_fix_crash
-#     g = Gruff::Line.new(370)
-#     g.title = "Crash Test"
-#     g.data "ichi", [5]
-#     g.data "ni", [0]
-#     g.data "san", [0]
-#     g.data "shi", [0]
-#     g.write("test/output/line_crash_fix_test.png")
-#   end
+  # TODO
+  # def test_fix_crash
+  #   g = Gruff::Line.new(370)
+  #   g.title = "Crash Test"
+  #   g.data "ichi", [5]
+  #   g.data "ni", [0]
+  #   g.data "san", [0]
+  #   g.data "shi", [0]
+  #   g.write("test/output/line_crash_fix_test.png")
+  # end
 
   
   def test_line_small_values    
@@ -424,6 +425,16 @@ class TestGruffLine < GruffTestCase
     g.write('test/output/line_many_numbers.png')
   end
 
+  def test_no_hide_line_no_labels
+    g = Gruff::Line.new
+    g.title = "No Hide Line No Labels"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g.hide_line_markers = false
+    g.write('test/output/line_no_hide.png')
+  end
+
 protected
 
   # TODO Reset data after each theme

data/test/test_photo.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/ruby
+
+require File.dirname(__FILE__) + "/gruff_test_case"
+
+class TestGruffPhotoBar < GruffTestCase
+
+#   def setup
+#     @datasets = [
+#       [:Jimmy, [25, 36, 86, 39]],
+#       [:Charles, [80, 54, 67, 54]],
+# #      [:Charity, [0, nil, 100, 90]],
+#       ]
+#   end
+# 
+#   def test_bar_graph
+#     bar_graph_sized
+#     bar_graph_sized(400)
+#   end
+# 
+# 
+# protected
+# 
+#   def bar_graph_sized(size=800)
+#     g = Gruff::PhotoBar.new(size)
+#     g.title = "Photo Bar Graph Test #{size}px"
+#     g.labels = {
+#       0 => '5/6', 
+#       1 => '5/15', 
+#       2 => '5/24', 
+#       3 => '5/30', 
+#     }
+#     @datasets.each do |data|
+#       g.data(*data)
+#     end
+# 
+#     g.theme = 'plastik'
+# 
+#     g.write("test/output/photo_plastik_#{size}.png")    
+#   end
+
+end