gruff 0.15.0-java → 0.18.0-java

data/lib/gruff/spider.rb

@@ -19,6 +19,11 @@ class Gruff::Spider < Gruff::Base
   attr_writer :hide_axes
   attr_writer :rotation
 
+  def initialize(max_value, target_width = 800)
+    super(target_width)
+    @max_value = max_value
+  end
+
   def transparent_background=(value)
     renderer.transparent_background(@columns, @rows) if value
   end
@@ -27,11 +32,6 @@ class Gruff::Spider < Gruff::Base
     @hide_title = @hide_text = value
   end
 
-  def initialize(max_value, target_width = 800)
-    super(target_width)
-    @max_value = max_value
-  end
-
 private
 
   def initialize_attributes
@@ -46,6 +46,29 @@ private
     @hide_line_markers.freeze
   end
 
+  def setup_drawing
+    @center_labels_over_point = false
+    super
+  end
+
+  def setup_graph_measurements
+    super
+
+    @graph_left += LABEL_MARGIN
+    @graph_top += LABEL_MARGIN
+    @graph_right -= LABEL_MARGIN
+    @graph_bottom -= LABEL_MARGIN
+
+    @graph_width = @graph_right - @graph_left
+    @graph_height = @graph_bottom - @graph_top
+  end
+
+  def setup_data
+    raise(Gruff::IncorrectNumberOfDatasetsException, 'Requires 3 or more data sets') if store.length < 3
+
+    super
+  end
+
   def draw_graph
     # Setup basic positioning
     radius = @graph_height / 2.0
@@ -64,23 +87,38 @@ private
   end
 
   def normalize_points(value)
-    value * @unit_length
+    value.to_f * @unit_length
   end
 
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 50            # The distance out from the center of the pie to get point
-    x_offset = center_x      # The label points need to be tweaked slightly
-    y_offset = center_y + 0  # This one doesn't though
+    degree = rad2deg(angle)
+    metrics = text_metrics(@marker_font, amount)
+
+    r_offset = LABEL_MARGIN # The distance out from the center of the pie to get point
+    x_offset = center_x # The label points need to be tweaked slightly
+
+    x_offset -= begin
+      case degree
+      when 0..45, 315..360
+        0
+      when 135..225
+        metrics.width
+      else
+        metrics.width / 2
+      end
+    end
+
+    y_offset = center_y - (metrics.height / 2.0) # This one doesn't though
     x = x_offset + ((radius + r_offset) * Math.cos(angle))
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
-    draw_label_at(1.0, 1.0, x, y, amount, Magick::CenterGravity)
+    draw_label_at(metrics.width, metrics.height, x, y, amount, gravity: Magick::CenterGravity)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
     return if @hide_axes
 
-    current_angle = @rotation * Math::PI / 180.0
+    current_angle = deg2rad(@rotation)
 
     store.data.each do |data_row|
       x_offset = radius * Math.cos(current_angle)
@@ -97,11 +135,11 @@ private
 
   def draw_polygon(center_x, center_y, additive_angle, color = nil)
     points = []
-    current_angle = @rotation * Math::PI / 180.0
+    current_angle = deg2rad(@rotation)
 
     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)
+      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
 

data/lib/gruff/stacked_area.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'helper/stacked_mixin'
+
 #
 # Here's how to set up a Gruff::StackedArea.
 #
@@ -20,25 +22,31 @@ class Gruff::StackedArea < Gruff::Base
 
 private
 
+  def initialize_attributes
+    super
+    @minimum_value = 0.0
+  end
+
   def setup_data
     calculate_maximum_by_stack
     super
   end
 
   def draw_graph
-    x_increment = @graph_width / (column_count - 1).to_f
+    x_increment = (@graph_width / (column_count - 1)).to_f
 
     height = Array.new(column_count, 0)
 
-    data_points = nil
+    prev_data_points = nil
     store.norm_data.each do |data_row|
-      prev_data_points = data_points
+      next if data_row.points.empty?
+
       data_points = []
 
       data_row.points.each_with_index do |data_point, index|
         # Use incremented x and scaled y
         new_x = @graph_left + (x_increment * index)
-        new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])
+        new_y = @graph_top + (@graph_height - (data_point * @graph_height) - height[index])
 
         height[index] += (data_point * @graph_height)
 
@@ -50,20 +58,22 @@ private
 
       poly_points = data_points.dup
       if prev_data_points
-        (prev_data_points.length / 2 - 1).downto(0) do |i|
+        ((prev_data_points.length / 2) - 1).downto(0) do |i|
           poly_points << prev_data_points[2 * i]
-          poly_points << prev_data_points[2 * i + 1]
+          poly_points << prev_data_points[(2 * i) + 1]
         end
       else
         poly_points << @graph_right
-        poly_points << @graph_bottom - 1
+        poly_points << (@graph_bottom - 1)
         poly_points << @graph_left
-        poly_points << @graph_bottom - 1
+        poly_points << (@graph_bottom - 1)
       end
       poly_points << data_points[0]
       poly_points << data_points[1]
 
       Gruff::Renderer::Polygon.new(renderer, color: data_row.color).render(poly_points)
+
+      prev_data_points = data_points
     end
   end
 end

data/lib/gruff/stacked_bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'helper/stacked_mixin'
+
 #
 # Here's how to set up a Gruff::StackedBar.
 #
@@ -39,6 +41,16 @@ private
     @label_formatting = nil
     @show_labels_for_bar_values = false
     @hide_labels = false
+    @minimum_value = 0.0
+  end
+
+  def setup_drawing
+    # Labels will be centered over the left of the bar if
+    # there are more labels than columns. This is basically the same
+    # as where it would be for a line graph.
+    @center_labels_over_point = (@labels.keys.length > column_count)
+
+    super
   end
 
   def setup_data
@@ -46,47 +58,61 @@ private
     super
   end
 
+  def setup_graph_measurements
+    super
+    return if @hide_line_markers
+
+    if @show_labels_for_bar_values
+      if maximum_value >= 0
+        _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
+        @graph_top += metrics.height
+      end
+
+      @graph_height = @graph_bottom - @graph_top
+    end
+  end
+
   # Draws a bar graph, but multiple sets are stacked on top of each other.
   def draw_graph
     # Setup spacing.
     #
     # Columns sit stacked.
-    bar_width = @graph_width / column_count.to_f
+    bar_width = @graph_width / column_count
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
-    height = Array.new(column_count, 0)
-    stack_bar_value_label = Gruff::BarValueLabel::StackedBar.new
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_top, bottom: @graph_bottom,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
 
-    store.norm_data.each_with_index do |data_row, row_index|
-      data_row.points.each_with_index do |data_point, point_index|
-        next if data_point == 0
+    normalized_stacked_bars.each_with_index do |stacked_bars, stacked_index|
+      total = 0
+      left_x = @graph_left + (bar_width * stacked_index) + padding
+      right_x = left_x + (bar_width * @bar_spacing)
 
-        # Use incremented x and scaled y
-        left_x = @graph_left + (bar_width * point_index) + padding
-        left_y = @graph_top + (@graph_height -
-                               data_point * @graph_height -
-                               height[point_index]) + @segment_spacing
-        right_x = left_x + bar_width * @bar_spacing
-        right_y = @graph_top + @graph_height - height[point_index]
+      top_y = 0
+      stacked_bars.each do |bar|
+        next if bar.point == 0
 
-        # update the total height of the current stacked bar
-        height[point_index] += (data_point * @graph_height)
+        bottom_y, = conversion.get_top_bottom_scaled(total)
+        bottom_y -= @segment_spacing
+        top_y, = conversion.get_top_bottom_scaled(total + bar.point)
 
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
+        rect_renderer.render(left_x, bottom_y, right_x, top_y)
 
-        # Calculate center based on bar_width and current row
-        label_center = left_x + bar_width * @bar_spacing / 2.0
-        draw_label(label_center, 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)
+        total += bar.point
       end
-    end
 
-    if @show_labels_for_bar_values
-      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
-        draw_value_label(x, y, text)
+      label_center = left_x + (bar_width * @bar_spacing / 2.0)
+      draw_label(label_center, stacked_index)
+
+      if @show_labels_for_bar_values
+        bar_value_label = Gruff::BarValueLabel::Bar.new([left_x, top_y, right_x, @graph_bottom], stacked_bars.sum(&:value))
+        bar_value_label.prepare_rendering(@label_formatting, proc_text_metrics) do |x, y, text, _text_width, text_height|
+          draw_value_label(bar_width * @bar_spacing, text_height, x, y, text)
+        end
       end
     end
   end
@@ -96,10 +122,14 @@ private
   end
 
   def hide_left_label_area?
-    @hide_line_markers
+    @hide_line_markers && @y_axis_label.nil?
   end
 
   def hide_bottom_label_area?
-    hide_labels?
+    hide_labels? && @x_axis_label.nil? && @legend_at_bottom == false
+  end
+
+  def proc_text_metrics
+    ->(text) { text_metrics(@marker_font, text) }
   end
 end

data/lib/gruff/store/xy_data.rb

@@ -3,18 +3,17 @@
 module Gruff
   class Store
     # @private
-    class XYData < Struct.new(:label, :y_points, :color, :x_points)
-      def initialize(label, y_points, color, x_points = nil)
-        x_points = Array(x_points) if x_points
-        super(label.to_s, Array(y_points), color, x_points)
+    class XYData < Struct.new(:label, :x_points, :y_points, :color)
+      def initialize(label, x_points, y_points, color)
+        y_points = Array(y_points)
+        x_points = x_points ? Array(x_points) : Array.new(y_points.length)
+        raise ArgumentError, 'x_points.length != y_points.length!' if x_points.length != y_points.length
+
+        super(label.to_s, x_points, y_points, color)
       end
 
       alias points y_points
 
-      def x_points
-        self[:x_points] || Array.new(y_points.length)
-      end
-
       def coordinates
         x_points.zip(y_points)
       end
@@ -53,7 +52,7 @@ module Gruff
           y.nil? ? nil : (y.to_f - minimum_y.to_f) / spread_y
         end
 
-        self.class.new(label, norm_y_points, color, norm_x_points)
+        self.class.new(label, norm_x_points, norm_y_points, color)
       end
     end
   end

data/lib/gruff/store/xy_pointsizes_data.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Gruff
+  class Store
+    # @private
+    class XYPointsizeData < Struct.new(:label, :x_points, :y_points, :point_sizes, :color)
+      def initialize(label, x_points, y_points, point_sizes, color)
+        y_points = Array(y_points)
+        x_points = x_points ? Array(x_points) : Array.new(y_points.length)
+        raise ArgumentError, 'x_points.length != y_points.length!'    if x_points.length != y_points.length
+        raise ArgumentError, 'x_points.length != point_sizes.length!' if x_points.length != point_sizes.length
+
+        super(label.to_s, x_points, y_points, point_sizes, color)
+      end
+
+      alias points y_points
+
+      def coordinate_and_pointsizes
+        x_points.zip(y_points, point_sizes)
+      end
+
+      def empty?
+        y_points.empty?
+      end
+
+      def columns
+        y_points.length
+      end
+
+      def min
+        y_points.compact.min
+      end
+      alias min_y min
+
+      def max
+        y_points.compact.max
+      end
+      alias max_y max
+
+      def min_x
+        x_points.compact.min
+      end
+
+      def max_x
+        x_points.compact.max
+      end
+
+      def normalize(minimum_x:, minimum_y:, spread_x:, spread_y:)
+        norm_x_points = x_points.map do |x|
+          x.nil? ? nil : (x.to_f - minimum_x.to_f) / spread_x
+        end
+        norm_y_points = y_points.map do |y|
+          y.nil? ? nil : (y.to_f - minimum_y.to_f) / spread_y
+        end
+
+        self.class.new(label, norm_x_points, norm_y_points, point_sizes, color)
+      end
+    end
+  end
+end

data/lib/gruff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gruff
-  VERSION = '0.15.0'
+  VERSION = '0.18.0'
 end

data/lib/gruff.rb

@@ -2,13 +2,13 @@
 
 require 'rmagick'
 
-require 'gruff/patch/rmagick'
-require 'gruff/patch/string'
-require 'gruff/renderer/renderer'
-require 'gruff/store/store'
-require 'gruff/font'
-require 'gruff/base'
-require 'gruff/version'
+require_relative 'gruff/patch/rmagick'
+require_relative 'gruff/patch/string'
+require_relative 'gruff/renderer/renderer'
+require_relative 'gruff/store/store'
+require_relative 'gruff/font'
+require_relative 'gruff/base'
+require_relative 'gruff/version'
 
 ##
 # = Gruff. Graphs.
@@ -21,22 +21,21 @@ module Gruff
 
   autoload :BarConversion, Gruff.libpath('helper/bar_conversion')
   autoload :BarValueLabel, Gruff.libpath('helper/bar_value_label')
-  class Base
-    autoload :StackedMixin, Gruff.libpath('helper/stacked_mixin')
-  end
 
   autoload :AccumulatorBar, Gruff.libpath('accumulator_bar')
   autoload :Area, Gruff.libpath('area')
   autoload :Bar, Gruff.libpath('bar')
   autoload :Bezier, Gruff.libpath('bezier')
+  autoload :Box, Gruff.libpath('box')
+  autoload :Bubble, Gruff.libpath('bubble')
   autoload :Bullet, Gruff.libpath('bullet')
+  autoload :Candlestick, Gruff.libpath('candlestick')
   autoload :Dot, Gruff.libpath('dot')
   autoload :Histogram, Gruff.libpath('histogram')
   autoload :Line, Gruff.libpath('line')
   autoload :Net, Gruff.libpath('net')
   autoload :Pie, Gruff.libpath('pie')
   autoload :Scatter, Gruff.libpath('scatter')
-  autoload :Scene, Gruff.libpath('scene')
   autoload :SideBar, Gruff.libpath('side_bar')
   autoload :SideStackedBar, Gruff.libpath('side_stacked_bar')
   autoload :Spider, Gruff.libpath('spider')
@@ -61,8 +60,8 @@ module Gruff
 
   class Store
     autoload :BasicData, Gruff.libpath('store/basic_data')
-    autoload :CustomData, Gruff.libpath('store/custom_data')
     autoload :XYData, Gruff.libpath('store/xy_data')
+    autoload :XYPointsizeData, Gruff.libpath('store/xy_pointsizes_data')
   end
 
   module Mini

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.28
   name: yard
   prerelease: false
   type: :development
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.28
 description: Beautiful graphs for one or multiple datasets. Can be used on websites
   or in documents.
 email: boss@topfunky.com
@@ -123,10 +123,14 @@ files:
 - lib/gruff/bar.rb
 - lib/gruff/base.rb
 - lib/gruff/bezier.rb
+- lib/gruff/box.rb
+- lib/gruff/bubble.rb
 - lib/gruff/bullet.rb
+- lib/gruff/candlestick.rb
 - lib/gruff/dot.rb
 - lib/gruff/font.rb
 - lib/gruff/helper/bar_conversion.rb
+- lib/gruff/helper/bar_mixin.rb
 - lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
@@ -151,16 +155,15 @@ files:
 - lib/gruff/renderer/renderer.rb
 - lib/gruff/renderer/text.rb
 - lib/gruff/scatter.rb
-- lib/gruff/scene.rb
 - lib/gruff/side_bar.rb
 - lib/gruff/side_stacked_bar.rb
 - lib/gruff/spider.rb
 - lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
 - lib/gruff/store/basic_data.rb
-- lib/gruff/store/custom_data.rb
 - lib/gruff/store/store.rb
 - lib/gruff/store/xy_data.rb
+- lib/gruff/store/xy_pointsizes_data.rb
 - lib/gruff/themes.rb
 - lib/gruff/version.rb
 - rails_generators/gruff/gruff_generator.rb