gruff 0.15.0-java → 0.18.0-java

data/lib/gruff/base.rb

@@ -45,22 +45,15 @@ module Gruff
     # Blank space below the legend. Default is +20+.
     attr_writer :legend_margin
 
-    # 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.
-    #
-    # @example
-    #   { 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008 }
-    attr_writer :labels
+    # Truncates labels if longer than max specified.
+    attr_writer :label_max_size
 
-    # Used internally for spacing.
+    # How truncated labels visually appear if they exceed {#label_max_size=}.
     #
-    # By default, labels are centered over the point they represent.
-    attr_writer :center_labels_over_point
-
-    # Used internally for horizontal graph types. Default is +false+.
-    attr_writer :has_left_labels
+    # - +: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_writer :label_truncation_style
 
     # Set a label for the bottom of the graph.
     attr_writer :x_axis_label
@@ -68,31 +61,21 @@ module Gruff
     # Set a label for the left side of the graph.
     attr_writer :y_axis_label
 
+    # Allow passing lambda to format labels for x axis.
+    attr_writer :x_axis_label_format
+
+    # Allow passing lambda to format labels for y axis.
+    attr_writer :y_axis_label_format
+
     # Set increment of the vertical marking lines.
     attr_writer :x_axis_increment
 
     # Set increment of the horizontal marking lines.
     attr_writer :y_axis_increment
 
-    # Height of staggering between labels (Bar graph only).
-    attr_writer :label_stagger_height
-
-    # Truncates labels if longer than max specified.
-    attr_writer :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_writer :label_truncation_style
-
     # Get or set the list of colors that will be used to draw the bars or lines.
     attr_accessor :colors
 
-    # Set the large title of the graph displayed at the top.
-    attr_writer :title
-
     # Prevent drawing of line markers. Default is +false+.
     attr_writer :hide_line_markers
 
@@ -109,9 +92,6 @@ module Gruff
     # to +"No Data."+.
     attr_writer :no_data_message
 
-    # Display the legend under the graph. Default is +false+.
-    attr_writer :legend_at_bottom
-
     # Set the color of the auxiliary lines.
     attr_writer :marker_color
 
@@ -129,18 +109,15 @@ module Gruff
     # first. This does not affect the legend. Default is +false+.
     attr_writer :sorted_drawing
 
+    # Display the legend under the graph. Default is +false+.
+    attr_writer :legend_at_bottom
+
     # Optionally set the size of the colored box by each item in the legend.
     # Default is +20.0+.
     #
     # Will be scaled down if graph is smaller than 800px wide.
     attr_writer :legend_box_size
 
-    # Allow passing lambdas to format labels for x axis.
-    attr_writer :x_axis_label_format
-
-    # Allow passing lambdas to format labels for y axis.
-    attr_writer :y_axis_label_format
-
     # 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.).
@@ -159,6 +136,9 @@ module Gruff
       @columns.freeze
       @rows.freeze
 
+      @has_left_labels = false
+      @center_labels_over_point = true
+
       initialize_graph_scale
       initialize_attributes
       initialize_store
@@ -209,11 +189,9 @@ module Gruff
       @no_data_message = 'No Data'
 
       @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = @legend_at_bottom = false
-      @center_labels_over_point = true
-      @has_left_labels = false
-      @label_stagger_height = 0
       @label_max_size = 0
       @label_truncation_style = :absolute
+      @label_rotation = 0
 
       @x_axis_increment = nil
       @x_axis_label = @y_axis_label = nil
@@ -224,6 +202,67 @@ module Gruff
     end
     protected :initialize_attributes
 
+    # 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 with hash.
+    #
+    # Or, an array corresponding to the data values.
+    #
+    # @param labels [Hash, Array] the labels.
+    #
+    # @example
+    #   g = Gruff::Bar.new
+    #   g.labels = { 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008 }
+    #
+    #   g = Gruff::Bar.new
+    #   g.labels = ['2005', nil, nil, '2006', nil, nil, '2007', nil, nil, '2008'] # same labels for columns
+    def labels=(labels)
+      if labels.is_a?(Array)
+        labels = labels.each_with_index.each_with_object({}) do |(label, index), hash|
+          hash[index] = label
+        end
+      end
+
+      @labels = labels
+    end
+
+    # Set a rotation for labels. You can use  Default is +0+.
+    # You can use a rotation between +0.0+ and +45.0+, or between +0.0+ and +-45.0+.
+    #
+    # @param rotation [Numeric] the rotation.
+    #
+    def label_rotation=(rotation)
+      raise ArgumentError, 'rotation must be between 0.0 and 45.0 or between 0.0 and -45.0' if rotation > 45.0 || rotation < -45.0
+
+      @label_rotation = rotation.to_f
+    end
+
+    # Height of staggering between labels.
+    # @deprecated
+    def label_stagger_height=(_value)
+      warn '#label_stagger_height= is deprecated. It is no longer effective.'
+    end
+
+    # Set the large title of the graph displayed at the top.
+    # You can draw a multi-line title by putting a line break in the string
+    # or by setting an array as argument.
+    #
+    # @param title [String, Array] the title.
+    #
+    # @example
+    #   g = Gruff::Bar.new
+    #   g.title = "The graph title"
+    #
+    #   g = Gruff::Bar.new
+    #   g.title = ['The first line of title', 'The second line of title']
+    def title=(title)
+      if title.is_a?(Array)
+        title = title.join("\n")
+      end
+
+      @title = title
+    end
+
     # Sets the top, bottom, left and right margins to +margin+.
     #
     # @param margin [Numeric] The margin size.
@@ -327,7 +366,8 @@ module Gruff
     # You can set a theme manually. Assign a hash to this method before you
     # send your data.
     #
-    #   graph.theme = {
+    #   g = Gruff::Bar.new
+    #   g.theme = {
     #     colors: %w(orange purple green white red),
     #     marker_color: 'blue',
     #     background_colors: ['black', 'grey'],
@@ -364,7 +404,7 @@ module Gruff
       self.marker_color = @theme_options[:marker_color]
       self.font_color = @theme_options[:font_color] || @marker_color
 
-      @colors = @theme_options[:colors]
+      @colors = @theme_options[:colors].dup
       @marker_shadow_color = @theme_options[:marker_shadow_color]
 
       @renderer = Gruff::Renderer.new(@columns, @rows, @scale, @theme_options)
@@ -429,7 +469,7 @@ module Gruff
     #
     # Set it after you have given all your data to the graph object.
     def minimum_value
-      @minimum_value || store.min
+      (@minimum_value || store.min).to_f
     end
     attr_writer :minimum_value
 
@@ -439,7 +479,7 @@ module Gruff
     # If you use this, you must set it after you have given all your data to
     # the graph object.
     def maximum_value
-      @maximum_value || store.max
+      (@maximum_value || store.max).to_f
     end
     attr_writer :maximum_value
 
@@ -510,11 +550,13 @@ module Gruff
     attr_reader :renderer
 
     # Perform data manipulation before calculating chart measurements
-    def setup_data # :nodoc:
+    def setup_data
       if @y_axis_increment && !@hide_line_markers
-        self.maximum_value = [@y_axis_increment, maximum_value, (maximum_value.to_f / @y_axis_increment).round * @y_axis_increment].max
-        self.minimum_value = [minimum_value, (minimum_value.to_f / @y_axis_increment).round * @y_axis_increment].min
+        self.maximum_value = [@y_axis_increment, maximum_value, (maximum_value / @y_axis_increment).round * @y_axis_increment].max
+        self.minimum_value = [minimum_value, (minimum_value / @y_axis_increment).round * @y_axis_increment].min
       end
+
+      sort_data if @sort # Sort data with avg largest values set first (for display)
     end
 
     # Calculates size of drawable area and generates normalized data.
@@ -525,7 +567,6 @@ module Gruff
     def setup_drawing
       calculate_spread
       calculate_increment
-      sort_data if @sort # Sort data with avg largest values set first (for display)
       set_colors
       normalize
       setup_graph_measurements
@@ -552,7 +593,7 @@ module Gruff
       @marker_count ||= begin
         count = nil
         (3..7).each do |lines|
-          if @spread.to_f % lines == 0.0
+          if @spread % lines == 0.0
             count = lines and break
           end
         end
@@ -565,9 +606,9 @@ module Gruff
       store.normalize(minimum: minimum_value, spread: @spread)
     end
 
-    def calculate_spread # :nodoc:
+    def calculate_spread
       @spread = maximum_value.to_f - minimum_value.to_f
-      @spread = @spread > 0 ? @spread : 1
+      @spread = @spread > 0 ? @spread : 1.0
     end
 
     def hide_title?
@@ -579,28 +620,23 @@ module Gruff
     end
 
     def hide_left_label_area?
-      @hide_line_markers
+      @hide_line_markers && @y_axis_label.nil?
     end
 
     def hide_bottom_label_area?
-      @hide_line_markers
+      @hide_line_markers && @x_axis_label.nil?
     end
 
     ##
     # Calculates size of drawable area, general font dimensions, etc.
 
     def setup_graph_measurements
-      @marker_caps_height = setup_marker_caps_height
-      @title_caps_height = setup_title_caps_height
-      @legend_caps_height = setup_legend_caps_height
-
-      margin_on_right = graph_right_margin
-      @graph_right = @raw_columns - margin_on_right
+      @graph_right = setup_right_margin
       @graph_left = setup_left_margin
       @graph_top = setup_top_margin
       @graph_bottom = setup_bottom_margin
 
-      @graph_width = @raw_columns - @graph_left - margin_on_right
+      @graph_width = @graph_right - @graph_left
       @graph_height = @graph_bottom - @graph_top
     end
 
@@ -610,9 +646,8 @@ module Gruff
         # X Axis
         # Centered vertically and horizontally by setting the
         # height to 1.0 and the width to the width of the graph.
-        x_axis_label_y_coordinate = @graph_bottom + LABEL_MARGIN + @marker_caps_height
+        x_axis_label_y_coordinate = @graph_bottom + (LABEL_MARGIN * 2) + labels_caps_height
 
-        # TODO: Center between graph area
         text_renderer = Gruff::Renderer::Text.new(renderer, @x_axis_label, font: @marker_font)
         text_renderer.add_to_render_queue(@raw_columns, 1.0, 0.0, x_axis_label_y_coordinate)
       end
@@ -620,7 +655,7 @@ module Gruff
       if @y_axis_label
         # Y Axis, rotated vertically
         text_renderer = Gruff::Renderer::Text.new(renderer, @y_axis_label, font: @marker_font, rotation: -90)
-        text_renderer.add_to_render_queue(1.0, @raw_rows, @left_margin + @marker_caps_height / 2.0, 0.0, Magick::CenterGravity)
+        text_renderer.add_to_render_queue(1.0, @raw_rows, @left_margin + (marker_caps_height / 2.0), 0.0, Magick::CenterGravity)
       end
     end
 
@@ -628,17 +663,15 @@ module Gruff
     def draw_line_markers
       return if @hide_line_markers
 
-      increment_scaled = @graph_height.to_f / (@spread / @increment)
+      increment_scaled = (@graph_height / (@spread / @increment)).to_f
 
       # Draw horizontal line markers and annotate with numbers
       (0..marker_count).each do |index|
-        y = @graph_top + @graph_height - index.to_f * increment_scaled
-
-        line_renderer = Gruff::Renderer::Line.new(renderer, color: @marker_color, shadow_color: @marker_shadow_color)
-        line_renderer.render(@graph_left, y, @graph_right, y)
+        y = @graph_top + @graph_height - (index * increment_scaled)
+        draw_marker_horizontal_line(y)
 
         unless @hide_line_numbers
-          marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
+          marker_label = (BigDecimal(index.to_s) * BigDecimal(@increment.to_s)) + BigDecimal(minimum_value.to_s)
           label = y_axis_label(marker_label, @increment)
           text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font)
           text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y, Magick::EastGravity)
@@ -646,6 +679,25 @@ module Gruff
       end
     end
 
+    def draw_marker_horizontal_line(y)
+      Gruff::Renderer::Line.new(renderer, color: @marker_color).render(@graph_left, y, @graph_right, y)
+      Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(@graph_left, y + 1, @graph_right, y + 1) if @marker_shadow_color
+    end
+
+    def draw_marker_vertical_line(x, tick_mark_mode: false)
+      if tick_mark_mode
+        Gruff::Renderer::Line.new(renderer, color: @marker_color).render(x, @graph_bottom, x, @graph_bottom + 5)
+        if @marker_shadow_color
+          Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(x + 1, @graph_bottom, x + 1, @graph_bottom + 5)
+        end
+      else
+        Gruff::Renderer::Line.new(renderer, color: @marker_color).render(x, @graph_bottom, x, @graph_top)
+        if @marker_shadow_color
+          Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(x + 1, @graph_bottom, x + 1, @graph_top)
+        end
+      end
+    end
+
     # Return a calculation of center
     def center(size)
       (@raw_columns - size) / 2
@@ -658,45 +710,46 @@ module Gruff
 
       legend_labels = store.data.map(&:label)
       legend_square_width = @legend_box_size # small square with color of this item
-      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      legend_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
+      line_height = [legend_caps_height, legend_square_width].max + @legend_margin
 
-      current_x_offset = center(label_widths.first.sum)
       current_y_offset = begin
         if @legend_at_bottom
-          @graph_bottom + @legend_margin + @legend_caps_height + LABEL_MARGIN
+          @graph_bottom + @legend_margin + labels_caps_height + LABEL_MARGIN + (@x_axis_label ? (LABEL_MARGIN * 2) + marker_caps_height : 0)
         else
-          hide_title? ? @top_margin + @title_margin : @top_margin + @title_margin + @title_caps_height
+          hide_title? ? @top_margin + @title_margin : @top_margin + @title_margin + title_caps_height
         end
       end
 
-      legend_labels.each_with_index do |legend_label, index|
-        next if legend_label.empty?
-
-        # Draw label
-        text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
-        text_renderer.add_to_render_queue(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
-
-        # Now draw box with color of this dataset
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: store.data[index].color)
-        rect_renderer.render(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)
-
-        width = calculate_width(@legend_font, legend_label)
-        current_x_offset += width + (legend_square_width * 2.7)
-        label_widths.first.shift
-
-        # Handle wrapping
-        if label_widths.first.empty?
-          label_widths.shift
-          current_x_offset = center(label_widths.first.sum) unless label_widths.empty?
-          line_height = [@legend_caps_height, legend_square_width].max + @legend_margin
-          unless label_widths.empty?
-            # Wrap to next line and shrink available graph dimensions
-            current_y_offset += line_height
+      index = 0
+      legend_label_lines.each do |(legend_labels_width, legend_labels_line)|
+        current_x_offset = center(legend_labels_width)
+
+        legend_labels_line.each do |legend_label|
+          unless legend_label.empty?
+            legend_label_width = calculate_width(@legend_font, legend_label)
+
+            # Draw label
+            text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
+            text_renderer.add_to_render_queue(legend_label_width,
+                                              legend_square_width,
+                                              current_x_offset + (legend_square_width * 1.7),
+                                              current_y_offset,
+                                              Magick::CenterGravity)
+
+            # Now draw box with color of this dataset
+            rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: store.data[index].color)
+            rect_renderer.render(current_x_offset,
+                                 current_y_offset,
+                                 current_x_offset + legend_square_width,
+                                 current_y_offset + legend_square_width)
+
+            current_x_offset += legend_label_width + (legend_square_width * 2.7)
           end
+          index += 1
         end
+
+        current_y_offset += line_height
       end
     end
 
@@ -704,7 +757,7 @@ module Gruff
     def draw_title
       return if hide_title?
 
-      metrics = Gruff::Renderer::Text.new(renderer, @title, font: @title_font).metrics
+      metrics = text_metrics(@title_font, @title)
       if metrics.width > @raw_columns
         @title_font.size = @title_font.size * (@raw_columns / metrics.width) * 0.95
       end
@@ -713,20 +766,15 @@ module Gruff
       text_renderer.add_to_render_queue(@raw_columns, 1.0, 0, @top_margin)
     end
 
-    # Draws column labels below graph, centered over x_offset
-    #--
-    # TODO Allow WestGravity as an option
-    def draw_label(x_offset, index, gravity = Magick::NorthGravity)
+    # Draws column labels below graph, centered over x
+    def draw_label(x, index, gravity = Magick::NorthGravity, &block)
       draw_unique_label(index) do
-        y_offset = @graph_bottom + LABEL_MARGIN
-
-        # TESTME
-        # FIXME: Consider chart types other than bar
-        # TODO: See if index.odd? is the best strategy
-        y_offset += @label_stagger_height if index.odd?
+        if x >= @graph_left && x <= @graph_right
+          y = @graph_bottom
+          x_offset, y_offset = calculate_label_offset(@marker_font, @labels[index], LABEL_MARGIN, @label_rotation)
 
-        if x_offset >= @graph_left && x_offset <= @graph_right
-          draw_label_at(1.0, 1.0, x_offset, y_offset, @labels[index], gravity)
+          draw_label_at(1.0, 1.0, x + x_offset, y + y_offset, @labels[index], gravity: gravity, rotation: @label_rotation)
+          yield if block
         end
       end
     end
@@ -741,18 +789,17 @@ module Gruff
       end
     end
 
-    def draw_label_at(width, height, x, y, text, gravity = Magick::NorthGravity)
+    def draw_label_at(width, height, x, y, text, gravity: Magick::NorthGravity, rotation: 0)
       label_text = truncate_label_text(text)
-      text_renderer = Gruff::Renderer::Text.new(renderer, label_text, font: @marker_font)
+      text_renderer = Gruff::Renderer::Text.new(renderer, label_text, font: @marker_font, rotation: rotation)
       text_renderer.add_to_render_queue(width, height, x, y, gravity)
     end
 
     # Draws the data value over the data point in bar graphs
-    def draw_value_label(x_offset, y_offset, data_point)
+    def draw_value_label(width, height, x_offset, y_offset, data_point, gravity: Magick::CenterGravity)
       return if @hide_line_markers
 
-      text_renderer = Gruff::Renderer::Text.new(renderer, data_point, font: @marker_font)
-      text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
+      draw_label_at(width, height, x_offset, y_offset, data_point, gravity: gravity)
     end
 
     # Shows an error message because you have no data.
@@ -773,20 +820,11 @@ module Gruff
       @theme_options = {}
     end
 
-    def scale(value) # :nodoc:
-      value * @scale
-    end
-
-    # Return a comparable fontsize for the current graph.
-    def scale_fontsize(value)
-      value * @scale
-    end
-
-    def clip_value_if_greater_than(value, max_value) # :nodoc:
+    def clip_value_if_greater_than(value, max_value)
       value > max_value ? max_value : value
     end
 
-    def significant(i) # :nodoc:
+    def significant(i)
       return 1.0 if i == 0 # Keep from going into infinite loop
 
       inc = BigDecimal(i.to_s)
@@ -829,27 +867,20 @@ module Gruff
 
   private
 
-    def setup_marker_caps_height
+    def marker_caps_height
       hide_bottom_label_area? ? 0 : calculate_caps_height(@marker_font)
     end
 
-    def setup_title_caps_height
-      hide_title? ? 0 : calculate_caps_height(@title_font) * @title.lines.to_a.size
+    def labels_caps_height
+      hide_bottom_label_area? ? 0 : calculate_labels_height(@marker_font)
     end
 
-    def setup_legend_caps_height
-      @hide_legend ? 0 : calculate_caps_height(@legend_font)
-    end
-
-    def graph_right_margin
-      @hide_line_markers ? @right_margin : @right_margin + extra_room_for_long_label
+    def title_caps_height
+      hide_title? ? 0 : calculate_caps_height(@title_font) * @title.lines.to_a.size
     end
 
-    def extra_room_for_long_label
-      # 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.max.to_i
-      last_label >= (column_count - 1) && @center_labels_over_point ? calculate_width(@marker_font, @labels[last_label]) / 2.0 : 0
+    def legend_caps_height
+      @hide_legend ? 0 : calculate_caps_height(@legend_font)
     end
 
     def setup_left_margin
@@ -859,33 +890,83 @@ module Gruff
         if @has_left_labels
           @labels.values.reduce('') { |value, memo| value.to_s.length > memo.to_s.length ? value : memo }
         else
-          y_axis_label(maximum_value.to_f, @increment)
+          y_axis_label(maximum_value, @increment)
         end
       end
       longest_left_label_width = calculate_width(@marker_font, truncate_label_text(text))
-      longest_left_label_width *= 1.25 if @has_left_labels
 
-      # 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)
+      line_number_width = begin
+        if !@has_left_labels && (@hide_line_markers || @hide_line_numbers)
+          0.0
+        else
+          longest_left_label_width + LABEL_MARGIN
+        end
+      end
+      y_axis_label_width = @y_axis_label.nil? ? 0.0 : marker_caps_height + (LABEL_MARGIN * 2)
 
-      @left_margin + line_number_width + (@y_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
+      bottom_label_width = extra_left_room_for_long_label
+
+      margin = line_number_width + y_axis_label_width
+      @left_margin + (margin > bottom_label_width ? margin : bottom_label_width)
+    end
+
+    def setup_right_margin
+      @raw_columns - (@hide_line_markers ? @right_margin : @right_margin + extra_right_room_for_long_label)
+    end
+
+    def extra_left_room_for_long_label
+      if require_extra_side_margin?
+        width = calculate_width(@marker_font, truncate_label_text(@labels[0]), rotation: @label_rotation)
+        case @label_rotation
+        when 0
+          width / 2.0
+        when 0..45
+          0
+        when -45..0
+          width
+        end
+      else
+        0
+      end
+    end
+
+    def extra_right_room_for_long_label
+      # 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.max.to_i
+      if last_label >= (column_count - 1) && require_extra_side_margin?
+        width = calculate_width(@marker_font, truncate_label_text(@labels[last_label]), rotation: @label_rotation)
+        case @label_rotation
+        when 0
+          width / 2.0
+        when 0..45
+          width
+        when -45..0
+          0
+        end
+      else
+        0
+      end
+    end
+
+    def require_extra_side_margin?
+      !hide_bottom_label_area? && @center_labels_over_point
     end
 
     def setup_top_margin
       # When @hide title, leave a title_margin space for aesthetics.
       # Same with @hide_legend
       @top_margin +
-        (hide_title? ? @title_margin : @title_caps_height + @title_margin) +
+        (hide_title? ? @title_margin : title_caps_height + @title_margin) +
         (@hide_legend || @legend_at_bottom ? @legend_margin : calculate_legend_height + @legend_margin)
     end
 
     def setup_bottom_margin
-      graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + @marker_caps_height + LABEL_MARGIN
+      graph_bottom_margin = hide_bottom_label_area? ? @bottom_margin : @bottom_margin + labels_caps_height + LABEL_MARGIN
       graph_bottom_margin += (calculate_legend_height + @legend_margin) if @legend_at_bottom
 
-      x_axis_label_height = @x_axis_label.nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN
-      # FIXME: Consider chart types other than bar
-      @raw_rows - graph_bottom_margin - x_axis_label_height - @label_stagger_height
+      x_axis_label_height = @x_axis_label.nil? ? 0.0 : marker_caps_height + (LABEL_MARGIN * 2)
+      @raw_rows - graph_bottom_margin - x_axis_label_height
     end
 
     def truncate_label_text(text)
@@ -919,7 +1000,7 @@ module Gruff
           else
             value.to_s
           end
-        elsif (@spread.to_f % (marker_count.to_f == 0 ? 1 : marker_count.to_f) == 0) || !@y_axis_increment.nil?
+        elsif (@spread % (marker_count == 0 ? 1 : marker_count) == 0) || !@y_axis_increment.nil?
           value.to_i.to_s
         elsif @spread > 10.0
           sprintf('%0i', value)
@@ -952,44 +1033,31 @@ module Gruff
     end
 
     def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
-      # May fix legend drawing problem at small sizes
-      label_widths = [[]] # Used to calculate line wrap
+      label_widths = [[]]
+      label_lines = [[]]
       legend_labels.each do |label|
         width = calculate_width(@legend_font, label)
-        label_width = width + legend_square_width * 2.7
+        label_width = width + (legend_square_width * 2.7)
         label_widths.last.push label_width
+        label_lines.last.push label
 
         if label_widths.last.sum > (@raw_columns * 0.9)
           label_widths.push [label_widths.last.pop]
+          label_lines.push [label_lines.last.pop]
         end
       end
 
-      label_widths
+      label_widths.map(&:sum).zip(label_lines)
     end
 
     def calculate_legend_height
       return 0.0 if @hide_legend
 
       legend_labels = store.data.map(&:label)
-      legend_square_width = @legend_box_size
-      label_widths = calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
-      legend_height = 0.0
-
-      legend_labels.each_with_index do |legend_label, _index|
-        next if legend_label.empty?
-
-        label_widths.first.shift
-        if label_widths.first.empty?
-          label_widths.shift
-          line_height = [@legend_caps_height, legend_square_width].max + @legend_margin
-          unless label_widths.empty?
-            # Wrap to next line and shrink available graph dimensions
-            legend_height += line_height
-          end
-        end
-      end
+      legend_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, @legend_box_size)
+      line_height = [legend_caps_height, @legend_box_size].max
 
-      legend_height + @legend_caps_height
+      (line_height * legend_label_lines.count) + (@legend_margin * (legend_label_lines.count - 1))
     end
 
     # Returns the height of the capital letter 'X' for the current font and
@@ -998,20 +1066,41 @@ module Gruff
     # Not scaled since it deals with dimensions that the regular scaling will
     # handle.
     def calculate_caps_height(font)
-      metrics = Gruff::Renderer::Text.new(renderer, 'X', font: font).metrics
-      metrics.height
+      calculate_height(font, 'X')
+    end
+
+    def calculate_labels_height(font)
+      @labels.values.map { |label| calculate_height(font, label, rotation: @label_rotation) }.max || marker_caps_height
+    end
+
+    # Returns the height of a string at this point size.
+    #
+    # Not scaled since it deals with dimensions that the regular scaling will
+    # handle.
+    def calculate_height(font, text, rotation: 0)
+      text = text.to_s
+      return 0 if text.empty?
+
+      metrics = text_metrics(font, text, rotation: rotation)
+      # Calculate manually because it does not return the height after rotation.
+      (metrics.width * Math.sin(deg2rad(rotation))).abs + (metrics.height * Math.cos(deg2rad(rotation))).abs
     end
 
     # Returns the width of a string at this point size.
     #
     # Not scaled since it deals with dimensions that the regular
     # scaling will handle.
-    def calculate_width(font, text)
+    def calculate_width(font, text, rotation: 0)
       text = text.to_s
       return 0 if text.empty?
 
-      metrics = Gruff::Renderer::Text.new(renderer, text, font: font).metrics
-      metrics.width
+      metrics = text_metrics(font, text, rotation: rotation)
+      # Calculate manually because it does not return the width after rotation.
+      (metrics.width * Math.cos(deg2rad(rotation))).abs - (metrics.height * Math.sin(deg2rad(rotation))).abs
+    end
+
+    def text_metrics(font, text, rotation: 0)
+      Gruff::Renderer::Text.new(renderer, text, font: font, rotation: rotation).metrics
     end
 
     def calculate_increment
@@ -1019,17 +1108,39 @@ module Gruff
         # Try to use a number of horizontal lines that will come out even.
         #
         # TODO Do the same for larger numbers...100, 75, 50, 25
-        @increment = @spread > 0 && marker_count > 0 ? significant(@spread / marker_count) : 1
+        @increment = @spread > 0 && marker_count > 0 ? significant(@spread / marker_count) : 1.0
       else
         # TODO: Make this work for negative values
         self.marker_count = (@spread / @y_axis_increment).to_i
-        @increment = @y_axis_increment
+        @increment = @y_axis_increment.to_f
       end
     end
 
-    # Used for degree => radian conversions
+    def calculate_label_offset(font, label, margin, rotation)
+      width = calculate_width(font, label, rotation: rotation)
+      height = calculate_height(font, label, rotation: rotation)
+      x_offset = begin
+        case rotation
+        when 0
+          0
+        when 0..45
+          width / 2.0
+        when -45..0
+          -(width / 2.0)
+        end
+      end
+      y_offset = (height / 2.0) > margin ? (height / 2.0) : margin
+
+      [x_offset, y_offset]
+    end
+
+    # Used for degree <=> radian conversions
     def deg2rad(angle)
-      angle * (Math::PI / 180.0)
+      (angle * Math::PI) / 180.0
+    end
+
+    def rad2deg(angle)
+      (angle / Math::PI) * 180.0
     end
   end