gruff 0.10.0-java → 0.13.0-java

data/lib/gruff/bezier.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Gruff::Bezier is a special line graph that have
 # the bezier curve.
@@ -55,7 +53,5 @@ class Gruff::Bezier < Gruff::Base
         Gruff::Renderer::Bezier.new(color: data_row.color, width: stroke_width).render(poly_points)
       end
     end
-
-    Gruff::Renderer.finish
   end
 end

data/lib/gruff/bullet.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-require 'gruff/themes'
-
 #
 # A bullet graph is a variation of a bar graph.
 # http://en.wikipedia.org/wiki/Bullet_graph
@@ -16,10 +13,10 @@ require 'gruff/themes'
 #
 class Gruff::Bullet < Gruff::Base
   def initialize(target_width = '400x40')
+    super
+
     if target_width.is_a?(String)
-      geometric_width, geometric_height = target_width.split('x')
-      @columns = geometric_width.to_f
-      @rows = geometric_height.to_f
+      @columns, @rows = target_width.split('x').map(&:to_f)
     else
       @columns = target_width.to_f
       @rows = target_width.to_f / 5.0
@@ -27,12 +24,15 @@ class Gruff::Bullet < Gruff::Base
     @columns.freeze
     @rows.freeze
 
-    initialize_ivars
-
-    reset_themes
     self.theme = Gruff::Themes::GREYSCALE
+  end
+
+  def initialize_ivars
+    super
+
     @title_font_size = 20
   end
+  private :initialize_ivars
 
   def data(value, maximum_value, options = {})
     @value = value.to_f
@@ -55,7 +55,7 @@ class Gruff::Bullet < Gruff::Base
     margin       = 30.0
     thickness    = @raw_rows / 6.0
     right_margin = margin
-    graph_left   = (@title && (title_width * 1.3)) || margin
+    graph_left   = [title_width * 1.3, margin].max
     graph_width  = @raw_columns - graph_left - right_margin
     graph_height = thickness * 3.0
 
@@ -83,18 +83,16 @@ class Gruff::Bullet < Gruff::Base
     # Value
     rect_renderer = Gruff::Renderer::Rectangle.new(color: @font_color)
     rect_renderer.render(graph_left, thickness, graph_left + graph_width * (@value / maximum_value), thickness * 2)
-
-    Gruff::Renderer.finish
   end
 
 private
 
   def draw_title
-    return unless @title
+    return if hide_title?
 
     font_height = calculate_caps_height(scale_fontsize(@title_font_size))
 
     text_renderer = Gruff::Renderer::Text.new(@title, font: @font, size: @title_font_size, color: @font_color)
-    text_renderer.render(1.0, 1.0, font_height / 2, font_height / 2, Magick::NorthWestGravity)
+    text_renderer.add_to_render_queue(1.0, 1.0, font_height / 2, font_height / 2, Magick::NorthWestGravity)
   end
 end

data/lib/gruff/dot.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Graph with dots and labels along a vertical access.
 # see: 'Creating More Effective Graphs' by Robbins
@@ -44,8 +42,6 @@ class Gruff::Dot < Gruff::Base
         draw_label(y_pos, point_index)
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 protected
@@ -54,37 +50,17 @@ protected
   def draw_line_markers
     return if @hide_line_markers
 
-    # Draw horizontal line markers and annotate with numbers
-    if @y_axis_increment
-      increment = @y_axis_increment
-      number_of_lines = (@spread / @y_axis_increment).to_i
-    else
-      # Try to use a number of horizontal lines that will come out even.
-      #
-      # TODO Do the same for larger numbers...100, 75, 50, 25
-      if @marker_count.nil?
-        (3..7).each do |lines|
-          if @spread % lines == 0.0
-            @marker_count = lines
-            break
-          end
-        end
-        @marker_count ||= 5
-      end
-      # TODO: Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
-      increment = (@spread > 0 && @marker_count > 0) ? significant(@spread / @marker_count) : 1
-      number_of_lines = @marker_count
-    end
-
-    (0..number_of_lines).each do |index|
-      marker_label = minimum_value + index * increment
+    (0..marker_count).each do |index|
+      marker_label = BigDecimal(index.to_s) * BigDecimal(@increment.to_s) + BigDecimal(minimum_value.to_s)
       x = @graph_left + (marker_label - minimum_value) * @graph_width / @spread
-      Gruff::Renderer::Line.new(color: @marker_color).render(x, @graph_bottom, x, @graph_bottom + 0.5 * LABEL_MARGIN)
+
+      line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+      line_renderer.render(x, @graph_bottom, x, @graph_bottom + 5)
 
       unless @hide_line_numbers
-        label = label(marker_label, increment)
+        label = y_axis_label(marker_label, @increment)
         text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
-        text_renderer.render(0, 0, x, @graph_bottom + (LABEL_MARGIN * 2.0), Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + (LABEL_MARGIN * 1.5), Magick::CenterGravity)
       end
     end
   end
@@ -94,8 +70,7 @@ protected
 
   def draw_label(y_offset, index)
     draw_unique_label(index) do
-      text_renderer = Gruff::Renderer::Text.new(@labels[index], 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
 end

data/lib/gruff/helper/bar_conversion.rb

@@ -3,7 +3,7 @@
 ##
 # Original Author: David Stokar
 #
-#   This class perfoms the y coordinats conversion for the bar class.
+#   This class performs the y coordinates conversion for the bar class.
 #
 #   There are three cases:
 #
@@ -14,29 +14,44 @@
 # @private
 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 get_left_y_right_y_scaled(data_point)
+  def initialize(top:, bottom:, minimum_value:, maximum_value:, spread:)
+    @graph_top = top
+    @graph_height = bottom - top
+    @spread = spread
+    @minimum_value = minimum_value
+    @maximum_value = maximum_value
+
+    if minimum_value >= 0
+      # all bars go from zero to positive
+      @mode = 1
+    elsif maximum_value <= 0
+      # all bars go from 0 to negative
+      @mode = 2
+    else
+      # bars either go from zero to negative or to positive
+      @mode = 3
+      @zero = -minimum_value / @spread
+    end
+  end
+
+  def get_top_bottom_scaled(data_point)
     result = []
 
     case @mode
-    when 1 then # Case one
-                # minimum value >= 0 ( only positive values )
-      result[0] = @graph_top + @graph_height * (1 - data_point) + 1
-      result[1] = @graph_top + @graph_height - 1
-    when 2 then # Case two
-                # only negative values
-      result[0] = @graph_top + 1
-      result[1] = @graph_top + @graph_height * (1 - data_point) - 1
-    when 3 then # Case three
-                # positive and negative values
+    when 1
+      # minimum value >= 0 ( only positive values )
+      result[0] = @graph_top + @graph_height * (1 - data_point)
+      result[1] = @graph_top + @graph_height
+    when 2
+      # only negative values
+      result[0] = @graph_top
+      result[1] = @graph_top + @graph_height * (1 - data_point)
+    when 3
+      # positive and negative values
       val = data_point - @minimum_value / @spread
-      result[0] = @graph_top + @graph_height * (1 - (val - @zero)) + 1
-      result[1] = @graph_top + @graph_height * (1 - @zero) - 1
+      result[0] = @graph_top + @graph_height * (1 - (val - @zero))
+      result[1] = @graph_top + @graph_height * (1 - @zero)
     else
       result[0] = 0.0
       result[1] = 0.0

data/lib/gruff/helper/bar_value_label.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# @private
+module Gruff::BarValueLabel
+  using String::GruffCommify
+
+  # @private
+  class Base
+    attr_reader :coordinate, :value
+
+    def initialize(coordinate, value)
+      @coordinate = coordinate
+      @value = value
+    end
+  end
+
+  # @private
+  class Bar < Base
+    def prepare_rendering(format, _bar_width = 0)
+      left_x, left_y, right_x, _right_y = @coordinate
+      if format.is_a?(Proc)
+        val = format.call(@value)
+      else
+        val = sprintf(format || '%.2f', @value).commify
+      end
+
+      y = @value >= 0 ? left_y - 30 : left_y + 12
+      yield left_x + (right_x - left_x) / 2, y, val
+    end
+  end
+
+  # @private
+  class SideBar < Base
+    def prepare_rendering(format, bar_width = 0)
+      left_x, _left_y, right_x, right_y = @coordinate
+      if format.is_a?(Proc)
+        val = format.call(@value)
+      else
+        val = sprintf(format || '%.2f', @value).commify
+      end
+
+      x = @value >= 0 ? right_x + 40 : left_x - 40
+      yield x, right_y - bar_width / 2, val
+    end
+  end
+
+  # @private
+  class StackedBar
+    def initialize
+      @bars = []
+    end
+
+    def add(bar, index)
+      bars = @bars[index] || []
+      bars << bar
+      @bars[index] = bars
+    end
+
+    def prepare_rendering(format, bar_width = 0, &block)
+      @bars.each do |bars|
+        value = bars.sum(&:value)
+        bar = bars.last
+        bar_value_label = bar.class.new(bar.coordinate, value)
+        bar_value_label.prepare_rendering(format, bar_width, &block)
+      end
+    end
+  end
+end

data/lib/gruff/histogram.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'histogram'
-require 'gruff/base'
 
 #
 # Here's how to set up a Gruff::Histogram.
@@ -15,6 +14,20 @@ require 'gruff/base'
 #   g.write('histogram.png')
 #
 class Gruff::Histogram < Gruff::Bar
+  # Specifies interpolation between the min and max of the set. Default is +10+.
+  attr_writer :bin_width
+
+  # Specifies minimum value for bin.
+  attr_writer :minimum_bin
+
+  # Specifies maximum value for bin.
+  attr_writer :maximum_bin
+
+  def initialize(*)
+    super
+    @data = []
+  end
+
   def initialize_ivars
     super
     @bin_width = 10
@@ -23,33 +36,20 @@ class Gruff::Histogram < Gruff::Bar
   end
   private :initialize_ivars
 
-  # Specifies interpolation between the min and max of the set. Default is +10+.
-  def bin_width=(width)
-    raise 'bin_width= should be called before set the data.' unless store.empty?
-
-    @bin_width = width
-  end
-
-  # Specifies minimum value for bin.
-  def minimum_bin=(min)
-    raise 'minimum_bin= should be called before set the data.' unless store.empty?
-
-    @minimum_bin = min
-  end
-
-  # Specifies maximum value for bin.
-  def maximum_bin=(max)
-    raise 'maximum_bin= should be called before set the data.' unless store.empty?
-
-    @maximum_bin = max
+  def data(name, data_points = [], color = nil)
+    @data << [name, data_points, color]
   end
 
-  def data(name, data_points = [], color = nil)
-    bins, freqs = HistogramArray.new(data_points).histogram(bin_width: @bin_width, min: @minimum_bin, max: @maximum_bin)
-    bins.each_with_index do |bin, index|
-      labels[index] = bin
+  def draw
+    @data.each do |(name, data_points, color)|
+      bins, freqs = HistogramArray.new(data_points).histogram(bin_width: @bin_width, min: @minimum_bin, max: @maximum_bin)
+      bins.each_with_index do |bin, index|
+        @labels[index] = bin
+      end
+      store.add(name, freqs, color)
     end
-    store.add(name, freqs, color)
+
+    super
   end
 
   # @private

data/lib/gruff/line.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to make a Gruff::Line.
 #
@@ -12,32 +10,32 @@ require 'gruff/base'
 #   g.write("line.png")
 #
 # There are also other options described below, such as {#baseline_value}, {#baseline_color},
-# {#hide_dots}, and {#hide_lines}.
+# {#hide_dots=}, and {#hide_lines=}.
 #
 class Gruff::Line < Gruff::Base
   # Allow for reference lines ( which are like baseline ... just allowing for more & on both axes ).
   attr_accessor :reference_lines
-  attr_accessor :reference_line_default_color
-  attr_accessor :reference_line_default_width
+  attr_writer :reference_line_default_color
+  attr_writer :reference_line_default_width
 
   # Allow for vertical marker lines.
-  attr_accessor :show_vertical_markers
+  attr_writer :show_vertical_markers
 
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified.
-  attr_accessor :line_width
-  attr_accessor :dot_radius
+  attr_writer :line_width
+  attr_writer :dot_radius
 
   # default is +'circle'+, other options include square.
-  attr_accessor :dot_style
+  attr_writer :dot_style
 
-  # Hide parts of the graph to fit more datapoints, or for a different appearance.
-  attr_accessor :hide_dots, :hide_lines
+  # Hide parts of the graph to fit more data points, or for a different appearance.
+  attr_writer :hide_dots, :hide_lines
 
   # accessors for support of xy data.
-  attr_accessor :minimum_x_value
+  attr_writer :minimum_x_value
 
   # accessors for support of xy data.
-  attr_accessor :maximum_x_value
+  attr_writer :maximum_x_value
 
   # Get the value if somebody has defined it.
   def baseline_value
@@ -69,7 +67,7 @@ class Gruff::Line < Gruff::Base
   #   g = Gruff::Line.new(400, false) # 400px wide, no lines (for backwards compatibility)
   #   g = Gruff::Line.new(false) # Defaults to 800px wide, no lines (for backwards compatibility)
   #
-  # The preferred way is to call {#hide_dots} or {#hide_lines} instead.
+  # The preferred way is to call {#hide_dots=} or {#hide_lines=} instead.
   def initialize(*args)
     raise ArgumentError, 'Wrong number of arguments' if args.length > 2
 
@@ -78,7 +76,15 @@ class Gruff::Line < Gruff::Base
     else
       super args.shift
     end
+  end
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYData)
+  end
+  private :initialize_store
 
+  def initialize_ivars
+    super
     @reference_lines = {}
     @reference_line_default_color = 'red'
     @reference_line_default_width = 5
@@ -87,12 +93,13 @@ class Gruff::Line < Gruff::Base
     @maximum_x_value = nil
     @minimum_x_value = nil
 
+    @line_width = nil
+    @dot_radius = nil
     @dot_style = 'circle'
 
     @show_vertical_markers = false
-
-    @store = Gruff::Store.new(Gruff::Store::XYData)
   end
+  private :initialize_ivars
 
   # This method allows one to plot a dataset with both X and Y data.
   #
@@ -125,7 +132,7 @@ class Gruff::Line < Gruff::Base
   #   g.data("Capples", [1, 1, 2, 2, 3, 3])
   #
   #   # labels will be drawn at the x locations of the keys passed in.
-  #   In this example the lables are drawn at x positions 2, 4, and 6:
+  #   In this example the labels are drawn at x positions 2, 4, and 6:
   #   g.labels = {0 => '2003', 2 => '2004', 4 => '2005', 6 => '2006'}
   #   # The 0 => '2003' label will be ignored since it is outside the chart range.
   def dataxy(name, x_data_points = [], y_data_points = [], color = nil)
@@ -146,11 +153,9 @@ class Gruff::Line < Gruff::Base
   end
 
   def draw_reference_line(reference_line, left, right, top, bottom)
-    config = {
-      color: reference_line[:color] || @reference_line_default_color,
-      width: reference_line[:width] || @reference_line_default_width
-    }
-    Gruff::Renderer::DashLine.new(config).render(left, top, right, bottom)
+    color = reference_line[:color] || @reference_line_default_color
+    width = reference_line[:width] || @reference_line_default_width
+    Gruff::Renderer::DashLine.new(color: color, width: width).render(left, top, right, bottom)
   end
 
   def draw_horizontal_reference_line(reference_line)
@@ -212,8 +217,8 @@ class Gruff::Line < Gruff::Base
         new_y = @graph_top + (@graph_height - y_data * @graph_height)
 
         # Reset each time to avoid thin-line errors
-        stroke_width  = line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
-        circle_radius = dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
+        stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
+        circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
 
         if !@hide_lines && prev_x && prev_y
           Gruff::Renderer::Line.new(color: data_row.color, width: stroke_width)
@@ -228,8 +233,6 @@ class Gruff::Line < Gruff::Base
         prev_y = new_y
       end
     end
-
-    Gruff::Renderer.finish
   end
 
 private