Floating legend

Author: Watson1978

lib/gruff/bar.rb

@@ -90,11 +90,6 @@ def hide_left_label_area?
     @hide_line_markers && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def setup_graph_measurements
     super

lib/gruff/base.rb

@@ -23,7 +23,7 @@ module Gruff
   # A common base class inherited from class of drawing a graph.
   class Base
     # Space around text elements. Mostly used for vertical spacing.
-    LEGEND_MARGIN = 20.0
+    LEGEND_MARGIN = 10.0
     TITLE_MARGIN = 20.0
     LABEL_MARGIN = 15.0
     DEFAULT_MARGIN = 20.0
@@ -48,9 +48,6 @@ class Base
     # Blank space below the title. Default is +20+.
     attr_writer :title_margin #: Float | Integer
 
-    # Blank space below the legend. Default is +20+.
-    attr_writer :legend_margin #: Float | Integer
-
     # Truncates labels if longer than max specified.
     attr_writer :label_max_size #: Float | Integer
 
@@ -115,13 +112,16 @@ class Base
     # first. This does not affect the legend. Default is +false+.
     attr_writer :sorted_drawing #: bool
 
-    # Display the legend under the graph. Default is +false+.
-    attr_writer :legend_at_bottom #: bool
+    # Blank space below the legend. Default is +20+.
+    attr_writer :legend_margin #: Float | Integer
+
+    # Set the vertical spacing between individual legend items. Default is +5.0+.
+    attr_writer :legend_spacing #: Float | Integer
 
-    # 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.
+    # Set the inner padding between the legend frame and its contents. Default is +7.0+.
+    attr_writer :legend_padding #: Float | Integer
+
+    # Optionally set the size of the colored box by each item in the legend. Default is +20.0+.
     attr_writer :legend_box_size #: Float | Integer
 
     # If one numerical argument is given, the graph is drawn at 4/3 ratio
@@ -190,19 +190,21 @@ def initialize_attributes
 
       @title_font = Gruff::Font.new(size: 36.0, bold: true)
       @marker_font = Gruff::Font.new(size: 21.0)
-      @legend_font = Gruff::Font.new(size: 20.0)
+      @legend_font = Gruff::Font.new(size: 12.0)
       @no_data_font = Gruff::Font.new(size: 80.0)
 
       @label_margin = LABEL_MARGIN
       @top_margin = @bottom_margin = @left_margin = @right_margin = DEFAULT_MARGIN
-      @legend_margin = LEGEND_MARGIN
       @title_margin = TITLE_MARGIN
 
-      @legend_box_size = 20.0
+      @legend_margin = LEGEND_MARGIN
+      @legend_spacing = 5.0
+      @legend_padding = 7.0
+      @legend_box_size = 10.0
 
       @no_data_message = 'No Data'
 
-      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = @legend_at_bottom = false
+      @hide_line_markers = @hide_legend = @hide_title = @hide_line_numbers = false
       @label_max_size = 0
       @label_truncation_style = :absolute
       @label_rotation = 0
@@ -262,6 +264,13 @@ def label_stagger_height=(_value)
       warn '#label_stagger_height= is deprecated. It is no longer effective.'
     end
 
+    # Set the legend position to the bottom of the graph.
+    # @deprecated
+    # @rbs return: void
+    def legend_at_bottom=(_value)
+      warn '#legend_at_bottom= 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.
@@ -629,11 +638,11 @@ def draw
 
       setup_drawing
 
-      draw_legend
       draw_line_markers
       draw_axis_labels
       draw_title
       draw_graph
+      draw_legend
     end
 
   protected
@@ -822,46 +831,42 @@ def center(size)
     def draw_legend
       return if @hide_legend
 
-      legend_labels = store.data.map(&:label)
-      legend_square_width = @legend_box_size # small square with color of this item
-      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
+      legend_labels = store.data.map(&:label).reject(&:empty?)
+      return if legend_labels.empty?
 
-      current_y_offset = begin
-        if @legend_at_bottom
-          @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
-        end
-      end
+      line_height = [legend_caps_height, @legend_box_size].max + @legend_spacing
 
-      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
+      # Draw legend inside graph area, top-right corner, stacked vertically
+      max_legend_label_width = legend_labels.map { |l| calculate_width(@legend_font, l) }.max || 0.0
+      current_x_offset = @graph_right - @legend_margin - (@legend_box_size * 1.5) - max_legend_label_width
+      current_y_offset = @graph_top + @legend_margin + @legend_spacing
+      last_item_y_offset = current_y_offset + (line_height * (legend_labels.size - 1))
+
+      legend_items_end_x = @graph_right - @legend_margin
+      legend_items_end_y = last_item_y_offset + @legend_box_size
+
+      # Draw legend frame around all items
+      frame_renderer = Gruff::Renderer::Rectangle.new(renderer, color: @marker_color, width: 1.1, opacity: 0.2, round: true)
+      frame_renderer.render(current_x_offset - @legend_padding,
+                            current_y_offset - @legend_padding,
+                            legend_items_end_x + @legend_padding,
+                            legend_items_end_y + @legend_padding)
+
+      legend_labels.each_with_index do |legend_label, index|
+        legend_label_width = calculate_width(@legend_font, legend_label)
+
+        text_renderer = Gruff::Renderer::Text.new(renderer, legend_label, font: @legend_font)
+        text_renderer.add_to_render_queue(legend_label_width,
+                                          @legend_box_size,
+                                          current_x_offset + (@legend_box_size * 1.5),
+                                          current_y_offset,
+                                          Magick::CenterGravity)
+
+        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_box_size,
+                             current_y_offset + @legend_box_size)
 
         current_y_offset += line_height
       end
@@ -1123,14 +1128,12 @@ 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_legend || @legend_at_bottom ? @legend_margin : calculate_legend_height + @legend_margin)
+        (hide_title? ? @title_margin : title_caps_height + @title_margin)
     end
 
     # @rbs return: Float
     def setup_bottom_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 * 2)
       @raw_rows - graph_bottom_margin - x_axis_label_height
@@ -1211,42 +1214,6 @@ def y_axis_label(value, increment)
       end
     end
 
-    # @rbs legend_labels: Array[String]
-    # @rbs legend_square_width: Float | Integer
-    # @rbs return: Array[Array[Float | Integer]]
-    def calculate_legend_label_widths_for_each_line(legend_labels, legend_square_width)
-      label_widths = [[]]
-      label_lines = [[]]
-      legend_labels.each do |label|
-        if label.empty?
-          label_width = 0.0
-        else
-          width = calculate_width(@legend_font, label)
-          label_width = width + (legend_square_width * 2.7)
-        end
-        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.map(&:sum).zip(label_lines)
-    end
-
-    # @rbs return: Float
-    def calculate_legend_height
-      return 0.0 if @hide_legend
-
-      legend_labels = store.data.map(&:label)
-      legend_label_lines = calculate_legend_label_widths_for_each_line(legend_labels, @legend_box_size)
-      line_height = [legend_caps_height, @legend_box_size].max
-
-      (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
     # size.
     #

lib/gruff/dot.rb

@@ -45,11 +45,6 @@ def hide_left_label_area?
     hide_labels? && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def draw_graph
     # Setup spacing.

lib/gruff/renderer/rectangle.rb

@@ -9,12 +9,14 @@ class Renderer::Rectangle
     # @rbs color: String
     # @rbs width: Float | Integer
     # @rbs opacity: Float | Integer
+    # @rbs round: bool
     # @rbs return: void
-    def initialize(renderer, color: nil, width: 1.0, opacity: 1.0)
+    def initialize(renderer, color: nil, width: 1.0, opacity: 1.0, round: false)
       @renderer = renderer
       @color = color
       @width = width
       @opacity = opacity
+      @round = round
     end
 
     # @rbs upper_left_x: Float | Integer
@@ -25,10 +27,17 @@ def initialize(renderer, color: nil, width: 1.0, opacity: 1.0)
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
-      @renderer.draw.stroke(@color) if @color && @width > 1.0
-      @renderer.draw.fill_opacity(@opacity)
-      @renderer.draw.fill(@color) if @color
-      @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      if @color
+        @renderer.draw.stroke(@color) if @width > 1.0
+        @renderer.draw.fill_opacity(@opacity)
+        @renderer.draw.fill(@color)
+      end
+
+      if @round
+        @renderer.draw.roundrectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y, 5, 5)
+      else
+        @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      end
       @renderer.draw.pop
     end
   end

lib/gruff/side_bar.rb

@@ -83,11 +83,6 @@ def hide_left_label_area?
     hide_labels? && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: void
   def setup_graph_measurements
     super

lib/gruff/stacked_bar.rb

@@ -134,11 +134,6 @@ def hide_left_label_area?
     @hide_line_markers && @y_axis_label.nil?
   end
 
-  # @rbs return: bool
-  def hide_bottom_label_area?
-    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
-  end
-
   # @rbs return: Proc
   def proc_text_metrics
     ->(text) { text_metrics(@marker_font, text) }

sig/generated/gruff/bar.rbs

@@ -62,9 +62,6 @@ class Gruff::Bar < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: void
   def setup_graph_measurements: () -> void
 

sig/generated/gruff/base.rbs

@@ -112,15 +112,20 @@ module Gruff
     # first. This does not affect the legend. Default is +false+.
     attr_writer sorted_drawing: bool
 
-    # Display the legend under the graph. Default is +false+.
-    attr_writer legend_at_bottom: bool
-
     # 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: Float | Integer
 
+    # Set the vertical spacing between individual legend items.
+    # Default is +5.0+.
+    attr_writer legend_spacing: Float | Integer
+
+    # Set the inner padding between the legend frame and its contents.
+    # Default is +7.0+.
+    attr_writer legend_padding: Float | Integer
+
     # 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.).
@@ -181,6 +186,11 @@ module Gruff
     # @rbs return: void
     def label_stagger_height=: (untyped _value) -> void
 
+    # Set the legend position to the bottom of the graph.
+    # @deprecated
+    # @rbs return: void
+    def legend_at_bottom=: (untyped _value) -> void
+
     # 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.
@@ -657,14 +667,6 @@ module Gruff
     # @rbs return: String
     def y_axis_label: (Float | Integer | BigDecimal value, Float | Integer increment) -> String
 
-    # @rbs legend_labels: Array[String]
-    # @rbs legend_square_width: Float | Integer
-    # @rbs return: Array[Array[Float | Integer]]
-    def calculate_legend_label_widths_for_each_line: (Array[String] legend_labels, Float | Integer legend_square_width) -> Array[Array[Float | Integer]]
-
-    # @rbs return: Float
-    def calculate_legend_height: () -> Float
-
     # Returns the height of the capital letter 'X' for the current font and
     # size.
     #

sig/generated/gruff/dot.rbs

@@ -31,9 +31,6 @@ class Gruff::Dot < Gruff::Base
   # @rbs return: bool
   def hide_left_label_area?: () -> bool
 
-  # @rbs return: bool
-  def hide_bottom_label_area?: () -> bool
-
   # @rbs return: void
   def draw_graph: () -> void