gruff 0.10.0-java → 0.13.0-java

data/lib/gruff/scene.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'observer'
-require 'gruff/base'
 
 # A scene is a non-linear graph that assembles layers together to tell a story.
 # Layers are folders with appropriately named files (see below). You can group

data/lib/gruff/side_bar.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # Graph with individual horizontal bars instead of vertical bars.
 #
 # Here's how to set up a Gruff::SideBar.
@@ -22,23 +20,29 @@ require 'gruff/base'
 #
 class Gruff::SideBar < Gruff::Base
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
-  attr_accessor :group_spacing
+  attr_writer :group_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
+
+  # Prevent drawing of column labels left of a side bar graph.  Default is +false+.
+  attr_writer :hide_labels
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -51,20 +55,44 @@ class Gruff::SideBar < Gruff::Base
     draw_bars
   end
 
+  # With Side Bars use the data label for the marker value to the left of the bar.
+  # @deprecated
+  def use_data_label=(_value)
+    warn '#use_data_label is deprecated. It is no longer effective.'
+  end
+
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    hide_labels?
+  end
+
+  def hide_bottom_label_area?
+    @hide_line_markers
+  end
+
 private
 
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
   def draw_bars
     # Setup spacing.
     #
-    @bar_spacing ||= 0.9
-    @group_spacing ||= 10
-
     bars_width = (@graph_height - calculate_spacing) / column_count.to_f
     bar_width = bars_width / store.length
-    height = Array.new(column_count, 0)
-    length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_right, bottom: @graph_left,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
+
     # if we're a side stacked bar then we don't need to draw ourself at all
     # because sometimes (due to different heights/min/max) you can actually
     # see both graphs and it looks like crap
@@ -74,40 +102,27 @@ private
       data_row.points.each_with_index do |data_point, point_index|
         group_spacing = @group_spacing * @scale * point_index
 
-        # Using the original calcs from the stacked bar chart
-        # to get the difference between
-        # part of the bart chart we wish to stack.
-        temp1 = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
-        temp2 = @graph_left + @graph_width - height[point_index]
-        difference = temp2 - temp1
-
-        left_x = length[point_index] - 1
         left_y = @graph_top + (bars_width * point_index) + (bar_width * row_index) + padding + group_spacing
-        right_x = left_x + difference
         right_y = left_y + bar_width * @bar_spacing
 
-        height[point_index] += (data_point * @graph_width)
+        left_x, right_x = conversion.get_top_bottom_scaled(data_point).sort
 
         rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        rect_renderer.render(left_x + AXIS_MARGIN, left_y, right_x + AXIS_MARGIN, right_y)
 
         # Calculate center based on bar_width and current row
+        label_center = left_y + bars_width / 2
 
-        if @use_data_label
-          label_center = left_y + bar_width / 2
-          draw_label(label_center, row_index, store.norm_data[row_index].label)
-        else
-          label_center = left_y + bars_width / 2
-          draw_label(label_center, point_index)
-        end
+        # Subtract half a bar width to center left if requested
+        draw_label(label_center, point_index)
         if @show_labels_for_bar_values
-          val = (@label_formatting || '%.2f') % store.data[row_index].points[point_index]
-          draw_value_label(right_x + 40, right_y - bar_width / 2, val.commify, true)
+          bar_value_label = Gruff::BarValueLabel::SideBar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+          bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
+            draw_value_label(x, y, text, true)
+          end
         end
       end
     end
-
-    Gruff::Renderer.finish
   end
 
   # Instead of base class version, draws vertical background lines and label
@@ -115,7 +130,7 @@ private
     return if @hide_line_markers
 
     # Draw horizontal line markers and annotate with numbers
-    number_of_lines = @marker_count || 5
+    number_of_lines = marker_count
     number_of_lines = 1 if number_of_lines == 0
 
     # TODO: Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
@@ -123,13 +138,16 @@ private
     (0..number_of_lines).each do |index|
       line_diff = (@graph_right - @graph_left) / number_of_lines
       x = @graph_right - (line_diff * index) - 1
-      Gruff::Renderer::Line.new(color: @marker_color).render(x, @graph_bottom, x, @graph_top)
-      diff = index - number_of_lines
-      marker_label = diff.abs * increment + minimum_value
+
+      line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+      line_renderer.render(x, @graph_bottom, x, @graph_top)
 
       unless @hide_line_numbers
-        text_renderer = Gruff::Renderer::Text.new(marker_label, font: @font, size: @marker_font_size, color: @font_color)
-        text_renderer.render(0, 0, x, @graph_bottom + (LABEL_MARGIN * 2.0), Magick::CenterGravity)
+        diff = index - number_of_lines
+        marker_label = BigDecimal(diff.abs.to_s) * BigDecimal(increment.to_s) + BigDecimal(minimum_value.to_s)
+        label = x_axis_label(marker_label, @increment)
+        text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
+        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + LABEL_MARGIN, Magick::CenterGravity)
       end
     end
   end
@@ -137,12 +155,9 @@ private
   ##
   # Draw on the Y axis instead of the X
 
-  def draw_label(y_offset, index, label = nil)
+  def draw_label(y_offset, index)
     draw_unique_label(index) do
-      lbl = @use_data_label ? label : @labels[index]
-
-      text_renderer = Gruff::Renderer::Text.new(lbl, font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.render(@graph_left - LABEL_MARGIN * 2, 1.0, 0.0, y_offset, Magick::EastGravity)
+      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], Magick::EastGravity)
     end
   end
 

data/lib/gruff/side_stacked_bar.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/side_bar'
-require 'gruff/helper/stacked_mixin'
-
 #
 # New gruff graph type added to enable sideways stacking bar charts
 # (basically looks like a x/y flip of a standard stacking bar chart)
@@ -24,26 +21,31 @@ require 'gruff/helper/stacked_mixin'
 #
 class Gruff::SideStackedBar < Gruff::SideBar
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Number of pixels between bar segments.
-  attr_accessor :segment_spacing
+  attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
+
+  # Prevent drawing of column labels left of a side stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @segment_spacing = 2.0
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -53,24 +55,35 @@ class Gruff::SideStackedBar < Gruff::SideBar
     super
   end
 
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    hide_labels?
+  end
+
+  def hide_bottom_label_area?
+    @hide_line_markers
+  end
+
 private
 
   def draw_bars
     # Setup spacing.
     #
     # Columns sit stacked.
-    @bar_spacing ||= 0.9
-    @segment_spacing ||= 2.0
-
     bar_width = @graph_height / column_count.to_f
     height = Array.new(column_count, 0)
     length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
-        ## using the original calcs from the stacked bar chart to get the difference between
+        ## using the original calculations from the stacked bar chart to get the difference between
         ## part of the bart chart we wish to stack.
         temp1 = @graph_left + (@graph_width -
                                   data_point * @graph_width -
@@ -85,8 +98,8 @@ private
         length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[point_index]
+        bar_value_label = Gruff::BarValueLabel::SideBar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+        stack_bar_value_label.add(bar_value_label, point_index)
 
         # if a data point is 0 it can result in weird really thing lines
         # that shouldn't even be there being drawn on top of the existing
@@ -104,11 +117,9 @@ private
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_sidebar_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/spider.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 # Experimental!!! See also the Net graph.
 #
 # Here's how to set up a Gruff::Spider.
@@ -15,13 +13,11 @@ require 'gruff/base'
 #   g.data :Wisdom, [10]
 #   g.data 'Charisma', [16]
 #   g.write("spider.png")
-
+#
 class Gruff::Spider < Gruff::Base
   # Hide all text.
-  attr_reader :hide_text
-  attr_accessor :hide_axes
-  attr_reader :transparent_background
-  attr_accessor :rotation
+  attr_writer :hide_axes
+  attr_writer :rotation
 
   def transparent_background=(value)
     Gruff::Renderer.setup_transparent_background(@columns, @rows) if value
@@ -34,9 +30,16 @@ class Gruff::Spider < Gruff::Base
   def initialize(max_value, target_width = 800)
     super(target_width)
     @max_value = max_value
+  end
+
+  def initialize_ivars
+    super
     @hide_legend = true
+    @hide_axes = false
+    @hide_text = false
     @rotation = 0
   end
+  private :initialize_ivars
 
   def draw
     @hide_line_markers = true
@@ -55,12 +58,10 @@ class Gruff::Spider < Gruff::Base
     additive_angle = (2 * Math::PI) / store.length
 
     # Draw axes
-    draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes
+    draw_axes(center_x, center_y, radius, additive_angle) unless @hide_axes
 
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
-
-    Gruff::Renderer.finish
   end
 
 private
@@ -77,14 +78,14 @@ private
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
     # Draw label
-    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: legend_font_size, color: @marker_color, weight: Magick::BoldWeight)
-    text_renderer.render(0, 0, x, y, Magick::CenterGravity)
+    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: @legend_font_size, color: @marker_color, weight: Magick::BoldWeight)
+    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
-    return if hide_axes
+    return if @hide_axes
 
-    current_angle = rotation * Math::PI / 180.0
+    current_angle = @rotation * Math::PI / 180.0
 
     store.data.each do |data_row|
       x_offset = radius * Math.cos(current_angle)
@@ -93,7 +94,7 @@ private
       Gruff::Renderer::Line.new(color: line_color || data_row.color, width: 5.0)
                            .render(center_x, center_y, center_x + x_offset, center_y + y_offset)
 
-      draw_label(center_x, center_y, current_angle, radius, data_row.label.to_s) unless hide_text
+      draw_label(center_x, center_y, current_angle, radius, data_row.label.to_s) unless @hide_text
 
       current_angle += additive_angle
     end
@@ -101,7 +102,7 @@ private
 
   def draw_polygon(center_x, center_y, additive_angle, color = nil)
     points = []
-    current_angle = rotation * Math::PI / 180.0
+    current_angle = @rotation * Math::PI / 180.0
 
     store.data.each do |data_row|
       points << center_x + normalize_points(data_row.points.first) * Math.cos(current_angle)
@@ -113,6 +114,6 @@ private
   end
 
   def sums_for_spider
-    store.data.reduce(0.0) { |sum, data_row| sum + data_row.points.first }
+    store.data.sum { |data_row| data_row.points.first }
   end
 end

data/lib/gruff/stacked_area.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-
 #
 # Here's how to set up a Gruff::StackedArea.
 #
@@ -15,7 +12,13 @@ require 'gruff/helper/stacked_mixin'
 #
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
-  attr_accessor :last_series_goes_on_bottom
+  attr_writer :last_series_goes_on_bottom
+
+  def initialize_ivars
+    super
+    @last_series_goes_on_bottom = false
+  end
+  private :initialize_ivars
 
   def draw
     calculate_maximum_by_stack
@@ -28,7 +31,7 @@ class Gruff::StackedArea < Gruff::Base
     height = Array.new(column_count, 0)
 
     data_points = nil
-    iterator = last_series_goes_on_bottom ? :reverse_each : :each
+    iterator = @last_series_goes_on_bottom ? :reverse_each : :each
     store.norm_data.public_send(iterator) do |data_row|
       prev_data_points = data_points
       data_points = []
@@ -63,7 +66,5 @@ class Gruff::StackedArea < Gruff::Base
 
       Gruff::Renderer::Polygon.new(color: data_row.color).render(poly_points)
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/helper/stacked_mixin'
-require 'gruff/helper/bar_value_label_mixin'
-
 #
 # Here's how to set up a Gruff::StackedBar.
 #
@@ -16,26 +12,31 @@ require 'gruff/helper/bar_value_label_mixin'
 #
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Number of pixels between bar segments.
-  attr_accessor :segment_spacing
+  attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
+
+  # Prevent drawing of column labels below a stacked bar graph.  Default is +false+.
+  attr_writer :hide_labels
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @segment_spacing = 2
     @label_formatting = nil
     @show_labels_for_bar_values = false
+    @hide_labels = false
   end
   private :initialize_ivars
 
@@ -48,14 +49,11 @@ class Gruff::StackedBar < Gruff::Base
     # Setup spacing.
     #
     # Columns sit stacked.
-    @bar_spacing ||= 0.9
-    @segment_spacing ||= 2
-
     bar_width = @graph_width / column_count.to_f
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     height = Array.new(column_count, 0)
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
 
     store.norm_data.each_with_index do |data_row, row_index|
       data_row.points.each_with_index do |data_point, point_index|
@@ -79,17 +77,29 @@ class Gruff::StackedBar < Gruff::Base
         label_center = left_x + bar_width * @bar_spacing / 2.0
         draw_label(label_center, point_index)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[point_index]
+        bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+        stack_bar_value_label.add(bar_value_label, point_index)
       end
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end
+  end
+
+protected
+
+  def hide_labels?
+    @hide_labels
+  end
+
+  def hide_left_label_area?
+    @hide_line_markers
+  end
 
-    Gruff::Renderer.finish
+  def hide_bottom_label_area?
+    hide_labels?
   end
 end