gruff 0.8.0-java → 0.9.0-java

data/lib/gruff/side_bar.rb

@@ -1,45 +1,62 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
 
-##
-# Graph with individual horizontal bars instead of vertical bars.
+require 'gruff/base'
 
+# Graph with individual horizontal bars instead of vertical bars.
 class Gruff::SideBar < Gruff::Base
-
-  # Spacing factor applied between bars
+  # Spacing factor applied between bars.
   attr_accessor :bar_spacing
 
+  # Spacing factor applied between a group of bars belonging to the same label.
+  attr_accessor :group_spacing
+
+  # Set the number output format for labels using sprintf.
+  # Default is +"%.2f"+.
+  attr_accessor :label_formatting
+
+  # Output the values for the bars on a bar graph.
+  # Default is +false+.
+  attr_accessor :show_labels_for_bar_values
+
+  def initialize_ivars
+    super
+    @label_formatting = nil
+    @show_labels_for_bar_values = false
+  end
+  private :initialize_ivars
+
   def draw
     @has_left_labels = true
     super
 
-    return unless @has_data
+    return unless data_given?
 
     draw_bars
   end
 
-protected
+private
 
   def draw_bars
     # Setup spacing.
     #
     @bar_spacing ||= 0.9
+    @group_spacing ||= 10
 
-    @bars_width = @graph_height / @column_count.to_f
-    @bar_width = @bars_width / @norm_data.size
-    @d = @d.stroke_opacity 0.0
-    height = Array.new(@column_count, 0)
-    length = Array.new(@column_count, @graph_left)
-    padding = (@bar_width * (1 - @bar_spacing)) / 2
+    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
 
     # 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
-    return if self.is_a?(Gruff::SideStackedBar)
+    return if is_a?(Gruff::SideStackedBar)
 
-    @norm_data.each_with_index do |data_row, row_index|
-      @d = @d.fill data_row[DATA_COLOR_INDEX]
+    store.norm_data.each_with_index do |data_row, row_index|
+      data_row.points.each_with_index do |data_point, point_index|
+        group_spacing = @group_spacing * @scale * point_index
 
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, 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.
@@ -48,67 +65,55 @@ protected
         difference = temp2 - temp1
 
         left_x = length[point_index] - 1
-        left_y = @graph_top + (@bars_width * point_index) + (@bar_width * row_index) + padding
+        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
+        right_y = left_y + bar_width * @bar_spacing
 
         height[point_index] += (data_point * @graph_width)
 
-        @d = @d.rectangle(left_x, left_y, right_x, right_y)
+        rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
+        rect_renderer.render(left_x, left_y, right_x, right_y)
 
         # Calculate center based on bar_width and current row
 
         if @use_data_label
-          label_center = @graph_top + (@bar_width * (row_index + point_index) + @bar_width / 2)
-          draw_label(label_center, row_index, @norm_data[row_index][DATA_LABEL_INDEX])
+          label_center = left_y + bar_width / 2
+          draw_label(label_center, row_index, store.norm_data[row_index].label)
         else
-          label_center = @graph_top + (@bars_width * point_index + @bars_width / 2)
+          label_center = left_y + bars_width / 2
           draw_label(label_center, point_index)
         end
         if @show_labels_for_bar_values
-          val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
-          draw_value_label(right_x + 40, (@graph_top + (((row_index + point_index + 1) * @bar_width) - (@bar_width / 2))) - 12, val.commify, true)
+          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)
         end
       end
     end
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
 
   # Instead of base class version, draws vertical background lines and label
   def draw_line_markers
     return if @hide_line_markers
 
-    @d = @d.stroke_antialias false
-
     # Draw horizontal line markers and annotate with numbers
-    @d = @d.stroke(@marker_color)
-    @d = @d.stroke_width 1
     number_of_lines = @marker_count || 5
     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.
+    # TODO: Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
     increment = significant(@spread.to_f / number_of_lines)
     (0..number_of_lines).each do |index|
       line_diff = (@graph_right - @graph_left) / number_of_lines
       x = @graph_right - (line_diff * index) - 1
-      @d = @d.line(x, @graph_bottom, x, @graph_top)
+      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
+      marker_label = diff.abs * increment + minimum_value
 
       unless @hide_line_numbers
-        @d.fill = @font_color
-        @d.font = @font if @font
-        @d.stroke = 'transparent'
-        @d.pointsize = scale_fontsize(@marker_font_size)
-        @d.gravity = CenterGravity
-        # TODO Center text over line
-        @d = @d.annotate_scaled(@base_image,
-                                0, 0, # Width of box to draw text in
-                                x, @graph_bottom + (LABEL_MARGIN * 2.0), # Coordinates of text
-                                marker_label.to_s, @scale)
-      end # unless
-      @d = @d.stroke_antialias true
+        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)
+      end
     end
   end
 
@@ -116,20 +121,19 @@ protected
   # Draw on the Y axis instead of the X
 
   def draw_label(y_offset, index, label = nil)
-    if !@labels[index].nil? && @labels_seen[index].nil?
-      lbl = (@use_data_label) ? label : @labels[index]
-      @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 = EastGravity
-      @d = @d.annotate_scaled(@base_image,
-                              1, 1,
-                              -@graph_left + LABEL_MARGIN * 2.0, y_offset,
-                              lbl, @scale)
-      @labels_seen[index] = 1
+    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)
+      if RUBY_PLATFORM == 'java'
+        text_renderer.render(1, 1, @graph_left - LABEL_MARGIN * 2.0, y_offset, Magick::EastGravity)
+      else
+        text_renderer.render(1, 1, -@graph_left + LABEL_MARGIN * 2.0, y_offset, Magick::EastGravity)
+      end
     end
   end
 
+  def calculate_spacing
+    @scale * @group_spacing * (column_count - 1)
+  end
 end

data/lib/gruff/side_stacked_bar.rb

@@ -1,44 +1,60 @@
-require File.dirname(__FILE__) + '/base'
-require File.dirname(__FILE__) + '/side_bar'
-require File.dirname(__FILE__) + '/stacked_mixin'
+# 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)
 #
 # alun.eyre@googlemail.com
-
 class Gruff::SideStackedBar < Gruff::SideBar
   include StackedMixin
+  include BarValueLabelMixin
 
-  # Spacing factor applied between bars
+  # Spacing factor applied between bars.
   attr_accessor :bar_spacing
 
+  # Number of pixels between bar segments.
+  attr_accessor :segment_spacing
+
+  # Set the number output format for labels using sprintf.
+  # Default is +"%.2f"+.
+  attr_accessor :label_formatting
+
+  # Output the values for the bars on a bar graph.
+  # Default is +false+.
+  attr_accessor :show_labels_for_bar_values
+
+  def initialize_ivars
+    super
+    @label_formatting = nil
+    @show_labels_for_bar_values = false
+  end
+  private :initialize_ivars
+
   def draw
     @has_left_labels = true
     get_maximum_by_stack
     super
   end
 
-protected
+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
-    @d = @d.stroke_opacity 0.0
-    height = Array.new(@column_count, 0)
-    length = Array.new(@column_count, @graph_left)
-    padding = (@bar_width * (1 - @bar_spacing)) / 2
-    if @show_labels_for_bar_values
-      label_values = Array.new
-      0.upto(@column_count - 1) { |i| label_values[i] = { value: 0, right_x: 0 } }
-    end
-    @norm_data.each_with_index do |data_row, row_index|
-      data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+    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)
+
+    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
         ## part of the bart chart we wish to stack.
         temp1 = @graph_left + (@graph_width -
@@ -47,49 +63,37 @@ protected
         temp2 = @graph_left + @graph_width - height[point_index] - 1
         difference = temp2 - temp1
 
-        @d = @d.fill data_row[DATA_COLOR_INDEX]
-
-        left_x = length[point_index] #+ 1
-        left_y = @graph_top + (@bar_width * point_index) + padding
-        right_x = left_x + difference
-        right_y = left_y + @bar_width * @bar_spacing
+        left_x = length[point_index]
+        left_y = @graph_top + (bar_width * point_index) + padding
+        right_x = left_x + difference - @segment_spacing
+        right_y = left_y + bar_width * @bar_spacing
         length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
 
-        if @show_labels_for_bar_values
-          label_values[point_index][:value] += @norm_data[row_index][3][point_index]
-          label_values[point_index][:right_x] = right_x
-        end
+        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]
 
         # 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
         # bar - this is bad
         if data_point != 0
-          @d = @d.rectangle(left_x, left_y, right_x, right_y)
+          rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
+          rect_renderer.render(left_x, left_y, right_x, right_y)
           # Calculate center based on bar_width and current row
         end
         # we still need to draw the labels
         # Calculate center based on bar_width and current row
-        label_center = @graph_top + (@bar_width * point_index) + (@bar_width * @bar_spacing / 2.0)
+        label_center = left_y + bar_width / 2
         draw_label(label_center, point_index)
       end
     end
+
     if @show_labels_for_bar_values
-      label_values.each_with_index do |data, i|
-        val = (@label_formatting || "%.2f") % data[:value]
-        draw_value_label(data[:right_x] + 40, (@graph_top + (((i + 1) * @bar_width) - (@bar_width / 2))) - 12, val.commify, true)
+      bar_value_label.prepare_sidebar_rendering(@label_formatting) do |x, y, text|
+        draw_value_label(x, y, text, true)
       end
     end
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
-
-  def larger_than_max?(data_point, index = 0)
-    max(data_point, index) > @maximum_value
-  end
-
-  def max(data_point, index)
-    @data.inject(0) { |sum, item| sum + item[DATA_VALUES_INDEX][index] }
-  end
-
 end

data/lib/gruff/spider.rb

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/base'
+# frozen_string_literal: true
+
+require 'gruff/base'
 
 # Experimental!!! See also the Net graph.
 #
 # Submitted by Kevin Clark http://glu.ttono.us/
 class Gruff::Spider < Gruff::Base
-
-  # Hide all text
+  # Hide all text.
   attr_reader :hide_text
   attr_accessor :hide_axes
   attr_reader :transparent_background
   attr_accessor :rotation
 
   def transparent_background=(value)
-    @transparent_background = value
-    @base_image = render_transparent_background if value
+    Gruff::Renderer.setup_transparent_background(@columns, @rows) if value
   end
 
   def hide_text=(value)
@@ -32,7 +32,7 @@ class Gruff::Spider < Gruff::Base
 
     super
 
-    return unless @has_data
+    return unless data_given?
 
     # Setup basic positioning
     radius = @graph_height / 2.0
@@ -41,7 +41,7 @@ class Gruff::Spider < Gruff::Base
 
     @unit_length = radius / @max_value
 
-    additive_angle = (2 * Math::PI) / @data.size
+    additive_angle = (2 * Math::PI) / store.length
 
     # Draw axes
     draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes
@@ -49,7 +49,7 @@ class Gruff::Spider < Gruff::Base
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
 
-    @d.draw(@base_image)
+    Gruff::Renderer.finish
   end
 
 private
@@ -66,16 +66,8 @@ private
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
     # Draw label
-    @d.fill = @marker_color
-    @d.font = @font if @font
-    @d.pointsize = scale_fontsize(legend_font_size)
-    @d.stroke = 'transparent'
-    @d.font_weight = BoldWeight
-    @d.gravity = CenterGravity
-    @d.annotate_scaled(@base_image,
-                       0, 0,
-                       x, y,
-                       amount, @scale)
+    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)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
@@ -83,18 +75,14 @@ private
 
     current_angle = rotation * Math::PI / 180.0
 
-    @data.each do |data_row|
-      @d.stroke(line_color || data_row[DATA_COLOR_INDEX])
-      @d.stroke_width 5.0
-
+    store.data.each do |data_row|
       x_offset = radius * Math.cos(current_angle)
       y_offset = radius * Math.sin(current_angle)
 
-      @d.line(center_x, center_y,
-              center_x + x_offset,
-              center_y + y_offset)
+      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[DATA_LABEL_INDEX].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
@@ -104,21 +92,16 @@ private
     points = []
     current_angle = rotation * Math::PI / 180.0
 
-    @data.each do |data_row|
-      points << center_x + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.cos(current_angle)
-      points << center_y + normalize_points(data_row[DATA_VALUES_INDEX].first) * Math.sin(current_angle)
+    store.data.each do |data_row|
+      points << center_x + normalize_points(data_row.points.first) * Math.cos(current_angle)
+      points << center_y + normalize_points(data_row.points.first) * Math.sin(current_angle)
       current_angle += additive_angle
     end
 
-    @d.stroke_width 1.0
-    @d.stroke(color || @marker_color)
-    @d.fill(color || @marker_color)
-    @d.fill_opacity 0.4
-    @d.polygon(*points)
+    Gruff::Renderer::Polygon.new(color: color || @marker_color, opacity: 0.4).render(points)
   end
 
   def sums_for_spider
-    @data.inject(0.0) { |sum, data_row| sum + data_row[DATA_VALUES_INDEX].first }
+    store.data.reduce(0.0) { |sum, data_row| sum + data_row.points.first }
   end
-
 end