gruff 0.16.0-java → 0.19.0-java

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.
 #
@@ -42,6 +44,15 @@ private
     @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
     calculate_maximum_by_stack
     super
@@ -52,8 +63,6 @@ private
     return if @hide_line_markers
 
     if @show_labels_for_bar_values
-      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
-
       if maximum_value >= 0
         _, metrics = Gruff::BarValueLabel.metrics(maximum_value, @label_formatting, proc_text_metrics)
         @graph_top += metrics.height
@@ -69,46 +78,41 @@ private
     #
     # Columns sit stacked.
     bar_width = @graph_width / column_count
-    padding = (bar_width * (1 - @bar_spacing)) / 2
-
-    height = Array.new(column_count, 0)
-    length = Array.new(column_count, @graph_bottom)
-    stack_bar_value_labels = 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|
-        temp1 = @graph_top + (@graph_height - (data_point * @graph_height) - height[point_index])
-        temp2 = @graph_top + @graph_height - height[point_index]
-        difference = temp2 - temp1
-        difference = 0 if difference < 0
-
-        # Use incremented x and scaled y
-        left_x = @graph_left + (bar_width * point_index) + padding
-        left_y = length[point_index] - difference
-        right_x = left_x + (bar_width * @bar_spacing)
-        right_y = length[point_index]
-        right_y -= @segment_spacing if row_index != store.columns - 1
-
-        # update the total height of the current stacked bar
-        length[point_index] -= difference
-        height[point_index] += (data_point * @graph_height)
-
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_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_labels.add(bar_value_label, point_index)
+    padding = (bar_width * (1 - @bar_spacing)) / 2.0
+
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_top, bottom: @graph_bottom,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
+
+    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)
+
+      top_y = 0
+      stacked_bars.each do |bar|
+        next if bar.point == 0
+
+        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: bar.color)
+        rect_renderer.render(left_x, bottom_y, right_x, top_y)
+
+        total += bar.point
       end
-    end
 
-    if @show_labels_for_bar_values
-      proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
-      stack_bar_value_labels.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)
+      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
@@ -124,4 +128,8 @@ private
   def hide_bottom_label_area?
     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.16.0'
+  VERSION = '0.19.0'
 end

data/lib/gruff.rb

@@ -21,15 +21,13 @@ 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 :BoxPlot, Gruff.libpath('box_plot')
+  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')
@@ -63,6 +61,7 @@ module Gruff
   class Store
     autoload :BasicData, Gruff.libpath('store/basic_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.16.0
+  version: 0.19.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-08-21 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
@@ -102,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/ci.yml"
@@ -123,12 +124,14 @@ files:
 - lib/gruff/bar.rb
 - lib/gruff/base.rb
 - lib/gruff/bezier.rb
-- lib/gruff/box_plot.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
@@ -161,6 +164,7 @@ files:
 - lib/gruff/store/basic_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