gruff 0.3.7 → 0.4.0

data/gruff.gemspec

@@ -1,33 +1,36 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'date'
 require 'gruff/version'
 
 Gem::Specification.new do |s|
   s.name = %q{gruff}
   s.version = Gruff::VERSION
-
   # s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ['Geoffrey Grosenbach', 'Uwe Kubosch']
-  # s.date = Date.today.to_s
+  s.date = Date.today.to_s
   s.description = %q{Beautiful graphs for one or multiple datasets. Can be used on websites or in documents.}
   s.email = %q{boss@topfunky.com}
   # s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  # s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "assets/bubble.png", "assets/city_scene/background/0000.png", "assets/city_scene/background/0600.png", "assets/city_scene/background/2000.png", "assets/city_scene/clouds/cloudy.png", "assets/city_scene/clouds/partly_cloudy.png", "assets/city_scene/clouds/stormy.png", "assets/city_scene/grass/default.png", "assets/city_scene/haze/true.png", "assets/city_scene/number_sample/1.png", "assets/city_scene/number_sample/2.png", "assets/city_scene/number_sample/default.png", "assets/city_scene/sky/0000.png", "assets/city_scene/sky/0200.png", "assets/city_scene/sky/0400.png", "assets/city_scene/sky/0600.png", "assets/city_scene/sky/0800.png", "assets/city_scene/sky/1000.png", "assets/city_scene/sky/1200.png", "assets/city_scene/sky/1400.png", "assets/city_scene/sky/1500.png", "assets/city_scene/sky/1700.png", "assets/city_scene/sky/2000.png", "assets/pc306715.jpg", "assets/plastik/blue.png", "assets/plastik/green.png", "assets/plastik/red.png", "init.rb", "lib/gruff.rb", "lib/gruff/accumulator_bar.rb", "lib/gruff/area.rb", "lib/gruff/bar.rb", "lib/gruff/bar_conversion.rb", "lib/gruff/base.rb", "lib/gruff/bullet.rb", "lib/gruff/deprecated.rb", "lib/gruff/dot.rb", "lib/gruff/line.rb", "lib/gruff/mini/bar.rb", "lib/gruff/mini/legend.rb", "lib/gruff/mini/pie.rb", "lib/gruff/mini/side_bar.rb", "lib/gruff/net.rb", "lib/gruff/photo_bar.rb", "lib/gruff/pie.rb", "lib/gruff/scene.rb", "lib/gruff/side_bar.rb", "lib/gruff/side_stacked_bar.rb", "lib/gruff/spider.rb", "lib/gruff/stacked_area.rb", "lib/gruff/stacked_bar.rb", "lib/gruff/stacked_mixin.rb", "rails_generators/gruff/gruff_generator.rb", "rails_generators/gruff/templates/controller.rb", "rails_generators/gruff/templates/functional_test.rb", "test/gruff_test_case.rb", "test/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.rb", "test/test_legend.rb", "test/test_line.rb", "test/test_mini_bar.rb", "test/test_mini_pie.rb", "test/test_mini_side_bar.rb", "test/test_net.rb", "test/test_photo.rb", "test/test_pie.rb", "test/test_scene.rb", "test/test_side_bar.rb", "test/test_sidestacked_bar.rb", "test/test_spider.rb", "test/test_stacked_area.rb", "test/test_stacked_bar.rb"]
   s.files = `git ls-files`.split($/)
   # s.has_rdoc = true
   s.homepage = %q{http://nubyonrails.com/pages/gruff}
   # s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["lib"]
+  s.require_paths = %w(lib)
   # s.rubyforge_project = %q{gruff}
   # s.rubygems_version = %q{1.3.1}
   s.summary = %q{Beautiful graphs for one or multiple datasets.}
   # s.test_files = ["test/test_accumulator_bar.rb", "test/test_area.rb", "test/test_bar.rb", "test/test_base.rb", "test/test_bullet.rb", "test/test_dot.rb", "test/test_legend.rb", "test/test_line.rb", "test/test_mini_bar.rb", "test/test_mini_pie.rb", "test/test_mini_side_bar.rb", "test/test_net.rb", "test/test_photo.rb", "test/test_pie.rb", "test/test_scene.rb", "test/test_side_bar.rb", "test/test_sidestacked_bar.rb", "test/test_spider.rb", "test/test_stacked_area.rb", "test/test_stacked_bar.rb"]
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-
-  s.executables = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-
-  # s.specification_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-  # s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
-  # s.add_dependency(%q<rmagick>, [">= 2.12.2"])
+  s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  s.specification_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+  if defined? JRUBY_VERSION
+    s.platform = 'java'
+    s.add_dependency 'rmagick4j'
+  else
+    s.add_dependency 'rmagick'
+  end
+  s.add_development_dependency('rake')
+  s.license = 'MIT'
 end

data/lib/gruff.rb

@@ -1,17 +1,20 @@
-require "gruff/version"
+require 'gruff/version'
 
 # Extra full path added to fix loading errors on some installations.
 
 %w(
+  themes
   base
   area
   bar
-  line
+  bezier
+  bullet
   dot
-  pie
-  spider
+  line
   net
+  pie
   scatter
+  spider
   stacked_area
   stacked_bar
   side_stacked_bar
@@ -25,7 +28,5 @@ require "gruff/version"
   mini/pie
   mini/side_bar
 ).each do |filename|
-  require File.dirname(__FILE__) + "/gruff/#{filename}"
+  require "gruff/#{filename}"
 end
-
-# TODO bullet

data/lib/gruff/accumulator_bar.rb

@@ -6,22 +6,13 @@ require File.dirname(__FILE__) + '/base'
 # the top bar shows the new value being added to the array.
 
 class Gruff::AccumulatorBar < Gruff::StackedBar
-
   def draw
     raise(Gruff::IncorrectNumberOfDatasetsException) unless @data.length == 1
-    
-    accumulator_array = []
-    index = 0
 
-    increment_array = @data.first[DATA_VALUES_INDEX].inject([]) {|memo, value| 
-        memo << ((index > 0) ? (value + memo.max) : value)
-        accumulator_array << memo[index] - value
-        index += 1
-        memo
-      }
-    data "Accumulator", accumulator_array
-    
+    accum_array = @data.first[DATA_VALUES_INDEX][0..-2].inject([0]) { |a, v| a << a.last + v}
+    data 'Accumulator', accum_array
+    set_colors
+    @data.reverse!
     super
   end
-
 end

data/lib/gruff/area.rb

@@ -2,6 +2,10 @@
 require File.dirname(__FILE__) + '/base'
 
 class Gruff::Area < Gruff::Base
+  def initialize(*)
+    super
+    @sorted_drawing = true
+  end
 
   def draw
     super
@@ -21,19 +25,8 @@ class Gruff::Area < Gruff::Base
         new_x = @graph_left + (@x_increment * index)
         new_y = @graph_top + (@graph_height - data_point * @graph_height)
 
-        if prev_x > 0 and prev_y > 0 then
-          poly_points << new_x
-          poly_points << new_y
-          
-          #@d = @d.polyline(prev_x, prev_y, new_x, new_y)
-        else
-          poly_points << @graph_left
-          poly_points << @graph_bottom - 1
-          poly_points << new_x
-          poly_points << new_y
-          
-          #@d = @d.polyline(@graph_left, @graph_bottom, new_x, new_y)
-        end
+        poly_points << new_x
+        poly_points << new_y
 
         draw_label(new_x, index)
 

data/lib/gruff/bar.rb

@@ -5,7 +5,12 @@ class Gruff::Bar < Gruff::Base
 
   # Spacing factor applied between bars
   attr_accessor :bar_spacing
-  
+
+  def initialize(*args)
+    super
+    @spacing_factor = 0.9
+  end
+
   def draw
     # Labels will be centered over the left of the bar if
     # there are more labels than columns. This is basically the same 
@@ -18,13 +23,24 @@ class Gruff::Bar < Gruff::Base
     draw_bars
   end
 
+  # Can be used to adjust the spaces between the bars.
+  # Accepts values between 0.00 and 1.00 where 0.00 means no spacing at all
+  # and 1 means that each bars' width is nearly 0 (so each bar is a simple
+  # line with no x dimension).
+  #
+  # Default value is 0.9.
+  def spacing_factor=(space_percent)
+    raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' unless (space_percent >= 0 and space_percent <= 1)
+    @spacing_factor = (1 - space_percent)
+  end
+
 protected
 
   def draw_bars
     # Setup spacing.
     #
     # Columns sit side-by-side.
-    @bar_spacing ||= 0.9 # space between the bars
+    @bar_spacing ||= @spacing_factor # space between the bars
     @bar_width = @graph_width / (@column_count * @data.length).to_f
     padding = (@bar_width * (1 - @bar_spacing)) / 2
 
@@ -62,7 +78,7 @@ protected
         right_x = left_x + @bar_width * @bar_spacing
         # y
         conv = []
-        conversion.getLeftYRightYscaled( data_point, conv )
+        conversion.get_left_y_right_y_scaled( data_point, conv )
 
         # create new bar
         @d = @d.fill data_row[DATA_COLOR_INDEX]
@@ -72,8 +88,13 @@ protected
         label_center = @graph_left + 
                       (@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_over_point ? @bar_width / 2.0 : 0.0), point_index)
+        if @show_labels_for_bar_values
+          val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
+          draw_value_label(left_x + (right_x - left_x)/2, conv[0]-30, val.commify, true)
+        end
       end
 
     end

data/lib/gruff/bar_conversion.rb

@@ -10,37 +10,37 @@
 #		3. Bars either go from zero to positive or from zero to negative
 #
 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 )
+  attr_writer :mode
+  attr_writer :zero
+  attr_writer :graph_top
+  attr_writer :graph_height
+  attr_writer :minimum_value
+  attr_writer :spread
+
+  def get_left_y_right_y_scaled(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	
+      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
+        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

@@ -87,6 +87,19 @@ module Gruff
     # Manually set increment of the horizontal marking lines
     attr_accessor :y_axis_increment
 
+    # Height of staggering between labels (Bar graph only)
+    attr_accessor :label_stagger_height
+
+    # Truncates labels if longer than max specified
+    attr_accessor :label_max_size
+
+    # How truncated labels visually appear if they exceed label_max_size
+    # :absolute - does not show trailing dots to indicate truncation. This is
+    #   the default.
+    # :trailing_dots - shows trailing dots to indicate truncation (note
+    #   that label_max_size must be greater than 3).
+    attr_accessor :label_truncation_style
+
     # Get or set the list of colors that will be used to draw the bars or lines.
     attr_accessor :colors
 
@@ -128,14 +141,18 @@ module Gruff
     # Optionally set the size of the font. Based on an 800x600px graph.
     # Default is 20.
     #
-    # Will be scaled down if graph is smaller than 800px wide.
+    # Will be scaled down if the graph is smaller than 800px wide.
     attr_accessor :legend_font_size
 
+    # Display the legend under the graph
+    attr_accessor :legend_at_bottom
+
     # The font size of the labels around the graph
     attr_accessor :marker_font_size
 
     # The color of the auxiliary lines
     attr_accessor :marker_color
+    attr_accessor :marker_shadow_color
 
     # The number of horizontal lines shown for reference
     attr_accessor :marker_count
@@ -153,10 +170,14 @@ module Gruff
     # 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.
+    # Set to true if you want the data sets sorted with largest avg values drawn
+    # first.
     attr_accessor :sort
 
+    # Set to true if you want the data sets drawn with largest avg values drawn
+    # first.  This does not affect the legend.
+    attr_accessor :sorted_drawing
+
     # Experimental
     attr_accessor :additional_line_values
 
@@ -169,6 +190,17 @@ module Gruff
     # Will be scaled down if graph is smaller than 800px wide.
     attr_accessor :legend_box_size
 
+    # Output the values for the bars on a bar graph
+    # Default is false
+    attr_accessor :show_labels_for_bar_values
+
+    # Set the number output format for labels using sprintf
+    # Default is "%.2f"
+    attr_accessor :label_formatting
+
+    # With Side Bars use the data label for the marker value to the left of the bar
+    # Default is false
+    attr_accessor :use_data_label
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
     # according to the given width (800 results in 800x600, 400 gives 400x300,
     # etc.).
@@ -178,19 +210,19 @@ module Gruff
     # Looks for Bitstream Vera as the default font. Expects an environment var
     # of MAGICK_FONT_PATH to be set. (Uses RMagick's default font otherwise.)
     def initialize(target_width=DEFAULT_TARGET_WIDTH)
-      if not Numeric === target_width
+      if Numeric === target_width
+        @columns = target_width.to_f
+        @rows = target_width.to_f * 0.75
+      else
         geometric_width, geometric_height = target_width.split('x')
         @columns = geometric_width.to_f
         @rows = geometric_height.to_f
-      else
-        @columns = target_width.to_f
-        @rows = target_width.to_f * 0.75
       end
 
       initialize_ivars
 
       reset_themes
-      theme_keynote
+      self.theme = Themes::KEYNOTE
     end
 
     # Set instance variables for this object.
@@ -210,7 +242,7 @@ module Gruff
       @data = Array.new
       @labels = Hash.new
       @labels_seen = Hash.new
-      @sort = true
+      @sort = false
       @title = nil
 
       @scale = @columns / @raw_columns
@@ -228,11 +260,14 @@ module Gruff
 
       @legend_box_size = 20.0
 
-      @no_data_message = "No Data"
+      @no_data_message = 'No Data'
 
-      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = false
+      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = @legend_at_bottom = @show_labels_for_bar_values = false
       @center_labels_over_point = true
       @has_left_labels = false
+      @label_stagger_height = 0
+      @label_max_size = 0
+      @label_truncation_style = :absolute
 
       @additional_line_values = []
       @additional_line_colors = []
@@ -288,7 +323,7 @@ module Gruff
     #  graph.theme = {
     #    :colors => %w(orange purple green white red),
     #    :marker_color => 'blue',
-    #    :background_colors => %w(black grey)
+    #    :background_colors => ['black', 'grey', :top_bottom]
     #  }
     #
     # :background_image => 'squirrel.png' is also possible.
@@ -296,146 +331,50 @@ module Gruff
     # (Or hopefully something better looking than that.)
     #
     def theme=(options)
-      reset_themes()
+      reset_themes
 
       defaults = {
-        :colors => ['black', 'white'],
-        :additional_line_colors => [],
-        :marker_color => 'white',
-        :font_color => 'black',
-        :background_colors => nil,
-        :background_image => nil
+          :colors => %w(black white),
+          :additional_line_colors => [],
+          :marker_color => 'white',
+          :marker_shadow_color => nil,
+          :font_color => 'black',
+          :background_colors => nil,
+          :background_image => nil
       }
       @theme_options = defaults.merge options
 
       @colors = @theme_options[:colors]
       @marker_color = @theme_options[:marker_color]
+      @marker_shadow_color = @theme_options[:marker_shadow_color]
       @font_color = @theme_options[:font_color] || @marker_color
       @additional_line_colors = @theme_options[:additional_line_colors]
 
       render_background
     end
 
-    # A color scheme similar to the popular presentation software.
     def theme_keynote
-      # Colors
-      @blue = '#6886B4'
-      @yellow = '#FDD84E'
-      @green = '#72AE6E'
-      @red = '#D1695E'
-      @purple = '#8A6EAF'
-      @orange = '#EFAA43'
-      @white = 'white'
-      @colors = [@yellow, @blue, @green, @red, @purple, @orange, @white]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => 'white',
-        :font_color => 'white',
-        :background_colors => ['black', '#4a465a']
-      }
+      self.theme = Themes::KEYNOTE
     end
 
-    # A color scheme plucked from the colors on the popular usability blog.
     def theme_37signals
-      # Colors
-      @green = '#339933'
-      @purple = '#cc99cc'
-      @blue = '#336699'
-      @yellow = '#FFF804'
-      @red = '#ff0000'
-      @orange = '#cf5910'
-      @black = 'black'
-      @colors = [@yellow, @blue, @green, @red, @purple, @orange, @black]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => 'black',
-        :font_color => 'black',
-        :background_colors => ['#d1edf5', 'white']
-      }
+      self.theme = Themes::THIRTYSEVEN_SIGNALS
     end
 
-    # A color scheme from the colors used on the 2005 Rails keynote
-    # presentation at RubyConf.
     def theme_rails_keynote
-      # Colors
-      @green = '#00ff00'
-      @grey = '#333333'
-      @orange = '#ff5d00'
-      @red = '#f61100'
-      @white = 'white'
-      @light_grey = '#999999'
-      @black = 'black'
-      @colors = [@green, @grey, @orange, @red, @white, @light_grey, @black]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => 'white',
-        :font_color => 'white',
-        :background_colors => ['#0083a3', '#0083a3']
-      }
+      self.theme = Themes::RAILS_KEYNOTE
     end
 
-    # A color scheme similar to that used on the popular podcast site.
     def theme_odeo
-      # Colors
-      @grey = '#202020'
-      @white = 'white'
-      @dark_pink = '#a21764'
-      @green = '#8ab438'
-      @light_grey = '#999999'
-      @dark_blue = '#3a5b87'
-      @black = 'black'
-      @colors = [@grey, @white, @dark_blue, @dark_pink, @green, @light_grey, @black]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => 'white',
-        :font_color => 'white',
-        :background_colors => ['#ff47a4', '#ff1f81']
-      }
+      self.theme = Themes::ODEO
     end
 
-    # A pastel theme
     def theme_pastel
-      # Colors
-      @colors = [
-                 '#a9dada', # blue
-                 '#aedaa9', # green
-                 '#daaea9', # peach
-                 '#dadaa9', # yellow
-                 '#a9a9da', # dk purple
-                 '#daaeda', # purple
-                 '#dadada' # grey
-                ]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => '#aea9a9', # Grey
-        :font_color => 'black',
-        :background_colors => 'white'
-      }
+      self.theme = Themes::PASTEL
     end
 
-    # A greyscale theme
     def theme_greyscale
-      # Colors
-      @colors = [
-                 '#282828', #
-                 '#383838', #
-                 '#686868', #
-                 '#989898', #
-                 '#c8c8c8', #
-                 '#e8e8e8', #
-                ]
-
-      self.theme = {
-        :colors => @colors,
-        :marker_color => '#aea9a9', # Grey
-        :font_color => 'black',
-        :background_colors => 'white'
-      }
+      self.theme = Themes::GREYSCALE
     end
 
     # Parameters are an array where the first element is the name of the dataset
@@ -454,12 +393,12 @@ module Gruff
     #   data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
     def data(name, data_points=[], color=nil)
       data_points = Array(data_points) # make sure it's an array
-      @data << [name, data_points, (color || increment_color)]
-      # Set column count if this is larger than previous counts
+      @data << [name, data_points, color]
+                                       # Set column count if this is larger than previous counts
       @column_count = (data_points.length > @column_count) ? data_points.length : @column_count
 
       # Pre-normalize
-      data_points.each_with_index do |data_point, index|
+      data_points.each do |data_point|
         next if data_point.nil?
 
         # Setup max/min so spread starts at the low end of the data points
@@ -481,59 +420,70 @@ module Gruff
     #
     # Example:
     #   write('graphs/my_pretty_graph.png')
-    def write(filename="graph.png")
-      draw()
+    def write(filename='graph.png')
+      draw
       @base_image.write(filename)
     end
 
     # Return the graph as a rendered binary blob.
     def to_blob(fileformat='PNG')
-      draw()
-      return @base_image.to_blob do
+      draw
+      @base_image.to_blob do
         self.format = fileformat
       end
     end
 
 
-
     protected
 
     # Overridden by subclasses to do the actual plotting of the graph.
     #
     # Subclasses should start by calling super() for this method.
     def draw
-      make_stacked if @stacked
+      # Maybe should be done in one of the following functions for more granularity.
+      unless @has_data
+        draw_no_data
+        return
+      end
+
+      setup_data
       setup_drawing
 
       debug {
         # Outer margin
-        @d.rectangle( @left_margin, @top_margin,
-                      @raw_columns - @right_margin, @raw_rows - @bottom_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)
+        @d.rectangle(@graph_left, @graph_top, @graph_right, @graph_bottom)
       }
+
+      draw_legend
+      draw_line_markers
+      draw_axis_labels
+      draw_title
+    end
+
+    # Perform data manipulation before calculating chart measurements
+    def setup_data # :nodoc:
+      if @y_axis_increment && !@hide_line_markers
+        @maximum_value = [@y_axis_increment, @maximum_value, (@maximum_value.to_f / @y_axis_increment).round * @y_axis_increment].max
+        @minimum_value = [@minimum_value, (@minimum_value.to_f / @y_axis_increment).round * @y_axis_increment].min
+      end
+      make_stacked if @stacked
     end
 
-    # Calculates size of drawable area and draws the decorations.
+    # Calculates size of drawable area and generates normalized data.
     #
     # * line markers
     # * legend
     # * title
     def setup_drawing
-      # Maybe should be done in one of the following functions for more granularity.
-      unless @has_data
-        draw_no_data()
-        return
-      end
-
-      normalize()
-      setup_graph_measurements()
-      sort_norm_data() if @sort # Sort norm_data with avg largest values set first (for display)
-
-      draw_legend()
-      draw_line_markers()
-      draw_axis_labels()
-      draw_title
+      calculate_spread
+      sort_data if @sort # Sort data with avg largest values set first (for display)
+      set_colors
+      normalize
+      setup_graph_measurements
+      sort_norm_data if @sorted_drawing # Sort norm_data with avg largest values set first (for display)
     end
 
     # Make copy of data with values scaled between 0-100
@@ -542,18 +492,20 @@ module Gruff
         @norm_data = []
         return unless @has_data
 
-        calculate_spread
-
         @data.each do |data_row|
           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 - @minimum_value.to_f ) / @spread)
+              norm_data_points << ((data_point.to_f - @minimum_value.to_f) / @spread)
             end
           end
-          @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX]]
+          if @show_labels_for_bar_values
+            @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX], data_row[DATA_VALUES_INDEX]]
+          else
+            @norm_data << [data_row[DATA_LABEL_INDEX], norm_data_points, data_row[DATA_COLOR_INDEX]]
+          end
         end
       end
     end
@@ -568,45 +520,44 @@ module Gruff
 
     def setup_graph_measurements
       @marker_caps_height = @hide_line_markers ? 0 :
-        calculate_caps_height(@marker_font_size)
+          calculate_caps_height(@marker_font_size)
       @title_caps_height = @hide_title ? 0 :
-        calculate_caps_height(@title_font_size)
+          calculate_caps_height(@title_font_size)
       @legend_caps_height = @hide_legend ? 0 :
-        calculate_caps_height(@legend_font_size)
+          calculate_caps_height(@legend_font_size)
 
       if @hide_line_markers
         (@graph_left,
-         @graph_right_margin,
-         @graph_bottom_margin) = [@left_margin, @right_margin, @bottom_margin]
+            @graph_right_margin,
+            @graph_bottom_margin) = [@left_margin, @right_margin, @bottom_margin]
       else
-        longest_left_label_width = 0
         if @has_left_labels
-          longest_left_label_width =  calculate_width(@marker_font_size,
-                                                      labels.values.inject('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }) * 1.25
+          longest_left_label_width = calculate_width(@marker_font_size,
+                                                     labels.values.inject('') { |value, memo| (value.to_s.length > memo.to_s.length) ? value : memo }) * 1.25
         else
           longest_left_label_width = calculate_width(@marker_font_size,
-                                                     label(@maximum_value.to_f))
+                                                     label(@maximum_value.to_f, @increment))
         end
 
         # Shift graph if left line numbers are hidden
         line_number_width = @hide_line_numbers && !@has_left_labels ?
-        0.0 :
-          (longest_left_label_width + LABEL_MARGIN * 2)
+            0.0 :
+            (longest_left_label_width + LABEL_MARGIN * 2)
 
         @graph_left = @left_margin +
-          line_number_width +
-          (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+            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
         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
+            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
+            @marker_caps_height + LABEL_MARGIN
       end
 
       @graph_right = @raw_columns - @graph_right_margin
@@ -614,13 +565,14 @@ module Gruff
 
       # When @hide title, leave a title_margin space for aesthetics.
       # Same with @hide_legend
-      @graph_top = @top_margin +
-        (@hide_title  ? title_margin  : @title_caps_height  + title_margin ) +
-        (@hide_legend ? legend_margin : @legend_caps_height + legend_margin)
+      @graph_top = @legend_at_bottom ? @top_margin : (@top_margin +
+          (@hide_title ? title_margin : @title_caps_height + title_margin) +
+          (@hide_legend ? legend_margin : @legend_caps_height + legend_margin))
 
       x_axis_label_height = @x_axis_label.nil? ? 0.0 :
-        @marker_caps_height + LABEL_MARGIN
-      @graph_bottom = @raw_rows - @graph_bottom_margin - x_axis_label_height
+          @marker_caps_height + LABEL_MARGIN
+      # FIXME: Consider chart types other than bar
+      @graph_bottom = @raw_rows - @graph_bottom_margin - x_axis_label_height - @label_stagger_height
       @graph_height = @graph_bottom - @graph_top
     end
 
@@ -638,22 +590,22 @@ module Gruff
         @d.stroke('transparent')
         @d.pointsize = scale_fontsize(@marker_font_size)
         @d.gravity = NorthGravity
-        @d = @d.annotate_scaled( @base_image,
-                                 @raw_columns, 1.0,
-                                 0.0, x_axis_label_y_coordinate,
-                                 @x_axis_label, @scale)
+        @d = @d.annotate_scaled(@base_image,
+                                @raw_columns, 1.0,
+                                0.0, x_axis_label_y_coordinate,
+                                @x_axis_label, @scale)
         debug { @d.line 0.0, x_axis_label_y_coordinate, @raw_columns, x_axis_label_y_coordinate }
       end
 
       unless @y_axis_label.nil?
         # Y Axis, rotated vertically
-        @d.rotation = 90.0
-        @d.gravity = CenterGravity
-        @d = @d.annotate_scaled( @base_image,
-                                 1.0, @raw_rows,
-                                 @left_margin + @marker_caps_height / 2.0, 0.0,
-                                 @y_axis_label, @scale)
         @d.rotation = -90.0
+        @d.gravity = CenterGravity
+        @d = @d.annotate_scaled(@base_image,
+                                1.0, @raw_rows,
+                                @left_margin + @marker_caps_height / 2.0, 0.0,
+                                @y_axis_label, @scale)
+        @d.rotation = 90.0
       end
     end
 
@@ -676,14 +628,9 @@ module Gruff
           end
           @marker_count ||= 4
         end
-        @increment = (@spread > 0) ? significant(@spread / @marker_count) : 1
+        @increment = (@spread > 0 && @marker_count > 0) ? significant(@spread / @marker_count) : 1
       else
         # TODO Make this work for negative values
-        @maximum_value = [@maximum_value.ceil, @y_axis_increment].max
-        @minimum_value = @minimum_value.floor
-        calculate_spread
-        normalize(true)
-
         @marker_count = (@spread / @y_axis_increment).to_i
         @increment = @y_axis_increment
       end
@@ -694,10 +641,23 @@ module Gruff
         y = @graph_top + @graph_height - index.to_f * @increment_scaled
 
         @d = @d.fill(@marker_color)
+
+        # FIXME(uwe): Workaround for Issue #66
+        #             https://github.com/topfunky/gruff/issues/66
+        #             https://github.com/rmagick/rmagick/issues/82
+        #             Remove if the issue gets fixed.
+        y += 0.001 unless defined?(JRUBY_VERSION)
+        # EMXIF
+
         @d = @d.line(@graph_left, y, @graph_right, y)
+        #If the user specified a marker shadow color, draw a shadow just below it
+        unless @marker_shadow_color.nil?
+          @d = @d.fill(@marker_shadow_color)
+          @d = @d.line(@graph_left, y + 1, @graph_right, y + 1)
+        end
 
         marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) +
-                       BigDecimal(@minimum_value.to_s)
+            BigDecimal(@minimum_value.to_s)
 
         unless @hide_line_numbers
           @d.fill = @font_color
@@ -707,10 +667,10 @@ module Gruff
           @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)
+          @d = @d.annotate_scaled(@base_image,
+                                  @graph_left - LABEL_MARGIN, 1.0,
+                                  0.0, y,
+                                  label(marker_label, @increment), @scale)
         end
       end
 
@@ -763,7 +723,7 @@ module Gruff
     def draw_legend
       return if @hide_legend
 
-      @legend_labels = @data.collect {|item| item[DATA_LABEL_INDEX] }
+      @legend_labels = @data.collect { |item| item[DATA_LABEL_INDEX] }
 
       legend_square_width = @legend_box_size # small square with color of this item
 
@@ -783,9 +743,9 @@ module Gruff
       end
 
       current_x_offset = center(sum(label_widths.first))
-      current_y_offset =  @hide_title ?
-      @top_margin + title_margin :
-        @top_margin + title_margin + @title_caps_height
+      current_y_offset = @legend_at_bottom ? @graph_height + title_margin : (@hide_title ?
+          @top_margin + title_margin :
+          @top_margin + title_margin + @title_caps_height)
 
       @legend_labels.each_with_index do |legend_label, index|
 
@@ -796,10 +756,10 @@ module Gruff
         @d.stroke('transparent')
         @d.font_weight = NormalWeight
         @d.gravity = WestGravity
-        @d = @d.annotate_scaled( @base_image,
-                                 @raw_columns, 1.0,
-                                 current_x_offset + (legend_square_width * 1.7), current_y_offset,
-                                 legend_label.to_s, @scale)
+        @d = @d.annotate_scaled(@base_image,
+                                @raw_columns, 1.0,
+                                current_x_offset + (legend_square_width * 1.7), current_y_offset,
+                                legend_label.to_s, @scale)
 
         # Now draw box with color of this dataset
         @d = @d.stroke('transparent')
@@ -844,10 +804,10 @@ module Gruff
       @d.pointsize = scale_fontsize(@title_font_size)
       @d.font_weight = BoldWeight
       @d.gravity = NorthGravity
-      @d = @d.annotate_scaled( @base_image,
-                               @raw_columns, 1.0,
-                               0, @top_margin,
-                               @title, @scale)
+      @d = @d.annotate_scaled(@base_image,
+                              @raw_columns, 1.0,
+                              0, @top_margin,
+                              @title, @scale)
     end
 
     # Draws column labels below graph, centered over x_offset
@@ -859,21 +819,64 @@ module Gruff
       if !@labels[index].nil? && @labels_seen[index].nil?
         y_offset = @graph_bottom + LABEL_MARGIN
 
-        @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 = NorthGravity
-        @d = @d.annotate_scaled(@base_image,
-                                1.0, 1.0,
-                                x_offset, y_offset,
-                                @labels[index], @scale)
+        # TESTME
+        # FIXME: Consider chart types other than bar
+        # TODO: See if index.odd? is the best stragegy
+        y_offset += @label_stagger_height if index.odd?
+
+        label_text = @labels[index]
+
+        # TESTME
+        # FIXME: Consider chart types other than bar
+        if label_text.size > @label_max_size
+          if @label_truncation_style == :trailing_dots
+            if @label_max_size > 3
+              # 4 because '...' takes up 3 chars
+              label_text = "#{label_text[0 .. (@label_max_size - 4)]}..."
+            end
+          else # @label_truncation_style is :absolute (default)
+            label_text = label_text[0 .. (@label_max_size - 1)]
+          end
+
+        end
+
+        if x_offset >= @graph_left && x_offset <= @graph_right
+          @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 = NorthGravity
+          @d = @d.annotate_scaled(@base_image,
+                                  1.0, 1.0,
+                                  x_offset, y_offset,
+                                  label_text, @scale)
+        end
         @labels_seen[index] = 1
         debug { @d.line 0.0, y_offset, @raw_columns, y_offset }
       end
     end
 
+    # Draws the data value over the data point in bar graphs
+    def draw_value_label(x_offset, y_offset, data_point, bar_value=false)
+      return if @hide_line_markers && !bar_value
+
+      #y_offset = @graph_bottom + LABEL_MARGIN
+
+      @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 = NorthGravity
+      @d = @d.annotate_scaled(@base_image,
+                              1.0, 1.0,
+                              x_offset, y_offset,
+                              data_point.to_s, @scale)
+
+      debug { @d.line 0.0, y_offset, @raw_columns, y_offset }
+    end
+
     # Shows an error message because you have no data.
     def draw_no_data
       @d.fill = @font_color
@@ -882,10 +885,10 @@ module Gruff
       @d.font_weight = NormalWeight
       @d.pointsize = scale_fontsize(80)
       @d.gravity = CenterGravity
-      @d = @d.annotate_scaled( @base_image,
-                               @raw_columns, @raw_rows/2.0,
-                               0, 10,
-                               @no_data_message, @scale)
+      @d = @d.annotate_scaled(@base_image,
+                              @raw_columns, @raw_rows/2.0,
+                              0, 10,
+                              @no_data_message, @scale)
     end
 
     # Finds the best background to render based on the provided theme options.
@@ -894,7 +897,7 @@ module Gruff
     def render_background
       case @theme_options[:background_colors]
       when Array
-        @base_image = render_gradiated_background(*@theme_options[:background_colors])
+        @base_image = render_gradiated_background(@theme_options[:background_colors][0], @theme_options[:background_colors][1], @theme_options[:background_direction])
       when String
         @base_image = render_solid_background(@theme_options[:background_colors])
       else
@@ -910,9 +913,22 @@ module Gruff
     end
 
     # Use with a theme definition method to draw a gradiated background.
-    def render_gradiated_background(top_color, bottom_color)
-      Image.new(@columns, @rows,
-                GradientFill.new(0, 0, 100, 0, top_color, bottom_color))
+    def render_gradiated_background(top_color, bottom_color, direct = :top_bottom)
+      case direct
+      when :bottom_top
+        gradient_fill = GradientFill.new(0, 0, 100, 0, bottom_color, top_color)
+      when :left_right
+        gradient_fill = GradientFill.new(0, 0, 0, 100, top_color, bottom_color)
+      when :right_left
+        gradient_fill = GradientFill.new(0, 0, 0, 100, bottom_color, top_color)
+      when :topleft_bottomright
+        gradient_fill = GradientFill.new(0, 100, 100, 0, top_color, bottom_color)
+      when :topright_bottomleft
+        gradient_fill = GradientFill.new(0, 0, 100, 100, bottom_color, top_color)
+      else
+        gradient_fill = GradientFill.new(0, 0, 100, 0, top_color, bottom_color)
+      end
+      Image.new(@columns, @rows, gradient_fill)
     end
 
     # Use with a theme to use an image (800x600 original) background.
@@ -948,9 +964,7 @@ module Gruff
 
     # Return a comparable fontsize for the current graph.
     def scale_fontsize(value)
-      new_fontsize = value * @scale
-      # return new_fontsize < 10.0 ? 10.0 : new_fontsize
-      return new_fontsize
+      value * @scale
     end
 
     def clip_value_if_greater_than(value, max_value) # :nodoc:
@@ -958,56 +972,51 @@ module Gruff
     end
 
     # Overridden by subclasses such as stacked bar.
-    def larger_than_max?(data_point, index=0) # :nodoc:
+    def larger_than_max?(data_point) # :nodoc:
       data_point > @maximum_value
     end
 
-    def less_than_min?(data_point, index=0) # :nodoc:
+    def less_than_min?(data_point) # :nodoc:
       data_point < @minimum_value
     end
 
-    # Overridden by subclasses that need it.
-    def max(data_point, index) # :nodoc:
-      data_point
-    end
-
-    # Overridden by subclasses that need it.
-    def min(data_point, index) # :nodoc:
-      data_point
-    end
-
     def significant(i) # :nodoc:
       return 1.0 if i == 0 # Keep from going into infinite loop
       inc = BigDecimal(i.to_s)
       factor = BigDecimal('1.0')
-      while (inc < 10)
+      while inc < 10
         inc *= 10
         factor /= 10
       end
 
-      while (inc > 100)
+      while inc > 100
         inc /= 10
         factor *= 10
       end
 
       res = inc.floor * factor
-      if (res.to_i.to_f == res)
+      if res.to_i.to_f == res
         res.to_i
       else
         res
       end
     end
 
+    # Sort with largest overall summed value at front of array.
+    def sort_data
+      @data = @data.sort_by { |a| -a[DATA_VALUES_INDEX].inject(0) { |sum, num| sum + num.to_f } }
+    end
+
+    # Set the color for each data set unless it was gived in the data(...) call.
+    def set_colors
+      @data.each { |a| a[DATA_COLOR_INDEX] ||= increment_color }
+    end
+
     # Sort with largest overall summed value at front of array so it shows up
     # correctly in the drawn graph.
     def sort_norm_data
-      @norm_data.sort! { |a,b| sums(b[DATA_VALUES_INDEX]) <=> sums(a[DATA_VALUES_INDEX]) }
-    end
-
-    def sums(data_set) # :nodoc:
-      total_sum = 0
-      data_set.collect {|num| total_sum += num.to_f }
-      total_sum
+      @norm_data =
+          @norm_data.sort_by { |a| -a[DATA_VALUES_INDEX].inject(0) { |sum, num| sum + num.to_f } }
     end
 
     # Used by StackedBar and child classes.
@@ -1057,21 +1066,35 @@ module Gruff
     # Returns the next color in your color list.
     def increment_color
       @color_index = (@color_index + 1) % @colors.length
-      return @colors[@color_index - 1]
+      @colors[@color_index - 1]
     end
 
     # Return a formatted string representing a number value that should be
     # printed as a label.
-    def label(value)
-      label = if (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
-        value.to_i.to_s
-      elsif @spread > 10.0
-        sprintf("%0i", value)
-      elsif @spread >= 3.0
-        sprintf("%0.2f", value)
-      else
-        value.to_s
-      end
+    def label(value, increment)
+      label = if increment
+                if increment >= 10 || (increment * 1) == (increment * 1).to_i.to_f
+                  sprintf('%0i', value)
+                elsif increment >= 1.0 || (increment * 10) == (increment * 10).to_i.to_f
+                  sprintf('%0.1f', value)
+                elsif increment >= 0.1 || (increment * 100) == (increment * 100).to_i.to_f
+                  sprintf('%0.2f', value)
+                elsif increment >= 0.01 || (increment * 1000) == (increment * 1000).to_i.to_f
+                  sprintf('%0.3f', value)
+                elsif increment >= 0.001 || (increment * 10000) == (increment * 10000).to_i.to_f
+                  sprintf('%0.4f', value)
+                else
+                  value.to_s
+                end
+              elsif (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
+                value.to_i.to_s
+              elsif @spread > 10.0
+                sprintf('%0i', value)
+              elsif @spread >= 3.0
+                sprintf('%0.2f', value)
+              else
+                value.to_s
+              end
 
       parts = label.split('.')
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{THOUSAND_SEPARATOR}")
@@ -1102,7 +1125,8 @@ module Gruff
 
   end # Gruff::Base
 
-  class IncorrectNumberOfDatasetsException < StandardError; end
+  class IncorrectNumberOfDatasetsException < StandardError;
+  end
 
 end # Gruff
 
@@ -1115,12 +1139,31 @@ module Magick
       scaled_width = (width * scale) >= 1 ? (width * scale) : 1
       scaled_height = (height * scale) >= 1 ? (height * scale) : 1
 
-      self.annotate( img,
-                     scaled_width, scaled_height,
-                     x * scale, y * scale,
-                     text)
+      self.annotate(img,
+                    scaled_width, scaled_height,
+                    x * scale, y * scale,
+                    text.gsub('%', '%%'))
+    end
+
+    if defined? JRUBY_VERSION
+      # FIXME(uwe):  We should NOT need to implement this method.
+      #              Remove this method as soon as RMagick4J Issue #16 is fixed.
+      #              https://github.com/Serabe/RMagick4J/issues/16
+      def fill=(fill)
+        fill = {:white => '#FFFFFF'}[fill.to_sym] || fill
+        @draw.fill = Magick4J.ColorDatabase.query_default(fill)
+        self
+      end
+      # EMXIF
     end
 
   end
 
 end # Magick
+
+class String
+  #Taken from http://codesnippets.joyent.com/posts/show/330
+  def commify(delimiter=',')
+    self.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+  end
+end