gruff 0.17.0-java → 0.18.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bee4569b7c7780fa68a3ae0273b921bf4e374ec207cd6381cd7feeb0ae8fd22
-  data.tar.gz: 3ceff033fcb2543ea8852fb11c4d56a5a1cf7dbd9dbf1bb62974602edd11b974
+  metadata.gz: a00db2218eaaafaa261ece0433671849fae44f4eccbf7e53fdb28767f11022ea
+  data.tar.gz: 904fe6ad5c4694308b20740e12adde7483b11f16eb7eea75061af57935a6c285
 SHA512:
-  metadata.gz: c4e5834e0d3efa6bf619591f009d4e63d22c26e0e3223bdb7861662a89ae2985f62d98141584d3c493fc29ad13af8597bb36466a5df956ae2feb159c4179ca6b
-  data.tar.gz: 80599d2b8eb034218d9af18fbc7f7c01ba2c66d7b17a16de36a9417171376c6fadf794e69011b34ec777c249604d1cfb48087eee97f3e6cdb1c0f84ad51bc22c
+  metadata.gz: 2e33b0cfbbe2f1c99d8bca06a9914ce0e53b060d3b01434f2a3c15a49795fc2ba2b8dc94964c99cd548a8d466de865d92430f39d863f040ffa6d68ab8aadb28c
+  data.tar.gz: 7d6673cf33d50a250e9f1cde7d7caa23b2a0edcf9a780e0feb784f24dbac36eb768dee29409291e7968ca445a38ba06caea52c210678e50c429cfb1a39c635f4

data/.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
       matrix:
         ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
         imagemagick-version:
-          - { full: 7.1.0-35, major-minor: '7.0' }
+          - { full: 7.1.0-39, major-minor: '7.0' }
     name: Ruby ${{ matrix.ruby-version }}
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.18.0
+- Add Gruff::Bubble (#604)
+- Rename Gruff::BoxPlot to Gruff::Box (#603)
+- Mark Gruff::Scatter#disable_significant_rounding_x_axis= as deprecated (#602)
+- Mark Gruff::Scatter#x_label_margin= as deprecated (#601)
+- Mark Gruff::Scatter#use_vertical_x_labels= as deprecated (#600)
+
 ## 0.17.0
 - Add Gruff::Base#label_rotation= method to rotate bottom label (#599)
 - Mark #label_stagger_height= as deprecated (#598)

data/README.md

@@ -126,14 +126,18 @@ In progress!
 
 ![Histogram chart](https://raw.github.com/topfunky/gruff/master/test/expected/histogram.png)
 
-### Box plot
+### Box chart
 
-![Box plot](https://raw.github.com/topfunky/gruff/master/test/expected/box_plot.png)
+![Box chart](https://raw.github.com/topfunky/gruff/master/test/expected/box.png)
 
 ### Candlestick
 
 ![Candlestick](https://raw.github.com/topfunky/gruff/master/test/expected/candlestick.png)
 
+### Bubble chart
+
+![Bubble chart](https://raw.github.com/topfunky/gruff/master/test/expected/bubble.png)
+
 ## Documentation
 
 http://www.rubydoc.info/github/topfunky/gruff/frames

data/lib/gruff/area.rb

@@ -30,7 +30,7 @@ private
   end
 
   def draw_graph
-    x_increment = @graph_width / (column_count - 1)
+    x_increment = (@graph_width / (column_count - 1)).to_f
 
     store.norm_data.each do |data_row|
       next if data_row.points.empty?

data/lib/gruff/bar.rb

@@ -114,7 +114,6 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    group_spacing = @group_spacing * @scale
     group_left_x = @graph_left
 
     normalized_group_bars.each_with_index do |group_bars, group_index|
@@ -140,7 +139,7 @@ private
       label_center = group_left_x + ((right_x - group_left_x) / 2.0)
       draw_label(label_center, group_index)
 
-      group_left_x = right_x + padding + group_spacing
+      group_left_x = right_x + padding + @group_spacing
     end
 
     # Draw the last label if requested
@@ -148,7 +147,7 @@ private
   end
 
   def calculate_spacing
-    @scale * @group_spacing * (column_count - 1)
+    @group_spacing * (column_count - 1)
   end
 
   def proc_text_metrics

data/lib/gruff/base.rb

@@ -607,8 +607,8 @@ module Gruff
     end
 
     def calculate_spread
-      @spread = maximum_value - minimum_value
-      @spread = @spread > 0 ? @spread : 1
+      @spread = maximum_value.to_f - minimum_value.to_f
+      @spread = @spread > 0 ? @spread : 1.0
     end
 
     def hide_title?
@@ -663,7 +663,7 @@ module Gruff
     def draw_line_markers
       return if @hide_line_markers
 
-      increment_scaled = @graph_height / (@spread / @increment)
+      increment_scaled = (@graph_height / (@spread / @increment)).to_f
 
       # Draw horizontal line markers and annotate with numbers
       (0..marker_count).each do |index|
@@ -766,25 +766,14 @@ module Gruff
       text_renderer.add_to_render_queue(@raw_columns, 1.0, 0, @top_margin)
     end
 
-    # Draws column labels below graph, centered over x_offset
-    def draw_label(x_offset, index, gravity = Magick::NorthGravity, &block)
+    # Draws column labels below graph, centered over x
+    def draw_label(x, index, gravity = Magick::NorthGravity, &block)
       draw_unique_label(index) do
-        y_offset = @graph_bottom
-
-        if x_offset >= @graph_left && x_offset <= @graph_right
-          width = calculate_width(@marker_font, @labels[index], rotation: @label_rotation)
-          height = calculate_height(@marker_font, @labels[index], rotation: @label_rotation)
-          case @label_rotation
-          when 0
-            x_offset
-          when 0..45
-            x_offset += (width / 2.0)
-          when -45..0
-            x_offset -= (width / 2.0)
-          end
-          y_offset += (height / 2.0) > LABEL_MARGIN ? (height / 2.0) : LABEL_MARGIN
+        if x >= @graph_left && x <= @graph_right
+          y = @graph_bottom
+          x_offset, y_offset = calculate_label_offset(@marker_font, @labels[index], LABEL_MARGIN, @label_rotation)
 
-          draw_label_at(1.0, 1.0, x_offset, y_offset, @labels[index], gravity: gravity, rotation: @label_rotation)
+          draw_label_at(1.0, 1.0, x + x_offset, y + y_offset, @labels[index], gravity: gravity, rotation: @label_rotation)
           yield if block
         end
       end
@@ -831,10 +820,6 @@ module Gruff
       @theme_options = {}
     end
 
-    def scale(value)
-      value * @scale
-    end
-
     def clip_value_if_greater_than(value, max_value)
       value > max_value ? max_value : value
     end
@@ -1123,14 +1108,32 @@ module Gruff
         # Try to use a number of horizontal lines that will come out even.
         #
         # TODO Do the same for larger numbers...100, 75, 50, 25
-        @increment = @spread > 0 && marker_count > 0 ? significant(@spread / marker_count) : 1
+        @increment = @spread > 0 && marker_count > 0 ? significant(@spread / marker_count) : 1.0
       else
         # TODO: Make this work for negative values
         self.marker_count = (@spread / @y_axis_increment).to_i
-        @increment = @y_axis_increment
+        @increment = @y_axis_increment.to_f
       end
     end
 
+    def calculate_label_offset(font, label, margin, rotation)
+      width = calculate_width(font, label, rotation: rotation)
+      height = calculate_height(font, label, rotation: rotation)
+      x_offset = begin
+        case rotation
+        when 0
+          0
+        when 0..45
+          width / 2.0
+        when -45..0
+          -(width / 2.0)
+        end
+      end
+      y_offset = (height / 2.0) > margin ? (height / 2.0) : margin
+
+      [x_offset, y_offset]
+    end
+
     # Used for degree <=> radian conversions
     def deg2rad(angle)
       (angle * Math::PI) / 180.0

data/lib/gruff/bezier.rb

@@ -22,7 +22,7 @@ class Gruff::Bezier < Gruff::Base
 private
 
   def draw_graph
-    x_increment = @graph_width / (column_count - 1)
+    x_increment = (@graph_width / (column_count - 1)).to_f
 
     store.norm_data.each do |data_row|
       next if data_row[1].empty?

data/lib/gruff/{box_plot.rb → box.rb}

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 #
-# Here's how to set up a Gruff::BoxPlot.
+# Here's how to set up a Gruff::Box.
 #
-#   g = Gruff::BoxPlot.new
+#   g = Gruff::Box.new
 #   g.data "A", [2, 3, 5, 6, 8, 10, 11, 15, 17, 20, 28, 29, 33, 34, 45, 46, 49, 61]
 #   g.data "B", [3, 4, 34, 35, 38, 39, 45, 60, 61, 69, 80, 130]
 #   g.data "C", [4, 40, 41, 46, 57, 64, 77, 76, 79, 78, 99, 153]
 #   g.write("box_plot.png")
 #
-class Gruff::BoxPlot < Gruff::Base
+class Gruff::Box < Gruff::Base
   # Specifies the filling opacity in area graph. Default is +0.2+.
   attr_writer :fill_opacity
 
@@ -90,7 +90,7 @@ private
   end
 
   def normalized_boxes
-    @normalized_boxes ||= store.norm_data.map { |data| Gruff::BoxPlot::BoxData.new(data.label, data.points, data.color) }
+    @normalized_boxes ||= store.norm_data.map { |data| Gruff::Box::BoxData.new(data.label, data.points, data.color) }
   end
 
   def column_count
@@ -98,7 +98,7 @@ private
   end
 
   def calculate_spacing
-    @scale * (column_count - 1)
+    column_count - 1
   end
 
   # @private

data/lib/gruff/bubble.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+#
+# Here's how to set up a Gruff::Bubble.
+#
+#   g = Gruff::Bubble.new
+#   g.title = 'Bubble plot'
+#   g.write('bubble.png')
+#
+class Gruff::Bubble < Gruff::Scatter
+  # Specifies the filling opacity in area graph. Default is +0.6+.
+  attr_writer :fill_opacity
+
+  # Specifies the stroke width in line. Default is +1.0+.
+  attr_writer :stroke_width
+
+  # The first parameter is the name of the dataset.  The next two are the
+  # x and y axis data points contain in their own array in that respective
+  # order. The 4th argument represents sizes of points.
+  # The final parameter is the color.
+  #
+  # Can be called multiple times with different datasets for a multi-valued
+  # graph.
+  #
+  # If the color argument is nil, the next color from the default theme will
+  # be used.
+  #
+  # @note If you want to use a preset theme, you must set it before calling {#data}.
+  #
+  # @param name [String, Symbol] containing the name of the dataset.
+  # @param x_data_points [Array] An Array of x-axis data points.
+  # @param y_data_points [Array] An Array of y-axis data points.
+  # @param point_sizes   [Array] An Array of sizes for points.
+  # @param color [String] The hex string for the color of the dataset. Defaults to nil.
+  #
+  # @raise [ArgumentError] Data points contain nil values.
+  #   This error will get raised if either the x or y axis data points array
+  #   contains a +nil+ value.  The graph will not make an assumption
+  #   as how to graph +nil+.
+  # @raise [ArgumentError] +x_data_points+ is empty.
+  #   This error is raised when the array for the x-axis points are empty
+  # @raise [ArgumentError] +y_data_points+ is empty.
+  #   This error is raised when the array for the y-axis points are empty.
+  # @raise [ArgumentError] +point_sizes+ is empty.
+  #   This error is raised when the array for the point_sizes are empty
+  # @raise [ArgumentError] +x_data_points.length != y_data_points.length+.
+  #   Error means that the x and y axis point arrays do not match in length.
+  # @raise [ArgumentError] +x_data_points.length != point_sizes.length+.
+  #   Error means that the x and point_sizes arrays do not match in length.
+  #
+  # @example
+  #   g = Gruff::Bubble.new
+  #   g.title = "Bubble Graph"
+  #   g.data :A, [-1, 19, -4, -23], [-35, 21, 23, -4], [4.5, 1.0, 2.1, 0.9]
+  #
+  def data(name, x_data_points = [], y_data_points = [], point_sizes = [], color = nil)
+    # make sure it's an array
+    x_data_points = Array(x_data_points)
+    y_data_points = Array(y_data_points)
+    point_sizes   = Array(point_sizes)
+
+    raise ArgumentError, 'Data Points contain nil Value!' if x_data_points.include?(nil) || y_data_points.include?(nil)
+    raise ArgumentError, 'x_data_points is empty!' if x_data_points.empty?
+    raise ArgumentError, 'y_data_points is empty!' if y_data_points.empty?
+    raise ArgumentError, 'point_sizes is empty!'   if point_sizes.empty?
+    raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
+    raise ArgumentError, 'x_data_points.length != point_sizes.length!'   if x_data_points.length != point_sizes.length
+
+    store.add(name, x_data_points, y_data_points, point_sizes, color)
+  end
+
+private
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYPointsizeData)
+  end
+
+  def initialize_attributes
+    super
+
+    @fill_opacity = 0.6
+    @stroke_width = 1.0
+  end
+
+  def draw_graph
+    store.norm_data.each do |data_row|
+      data_row.coordinate_and_pointsizes.each do |x_value, y_value, point_size|
+        next if y_value.nil? || x_value.nil?
+
+        new_x = @graph_left + (x_value * @graph_width)
+        new_y = @graph_bottom - (y_value * @graph_height)
+        diameter = @graph_width / (@marker_count * x_increment) * point_size.to_f
+
+        Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: @stroke_width, opacity: @fill_opacity)
+                               .render(new_x, new_y, new_x - (diameter / 2.0), new_y)
+      end
+    end
+  end
+end

data/lib/gruff/candlestick.rb

@@ -107,7 +107,7 @@ private
   end
 
   def calculate_spacing
-    @scale * (column_count - 1)
+    column_count - 1
   end
 
   def show_marker_vertical_line?

data/lib/gruff/histogram.rb

@@ -40,7 +40,6 @@ private
     @minimum_bin = nil
     @maximum_bin = nil
   end
-  private :initialize_attributes
 
   def setup_data
     @data.each do |(name, data_points, color)|

data/lib/gruff/line.rb

@@ -81,6 +81,30 @@ class Gruff::Line < Gruff::Base
     @reference_lines[:baseline][:color] = new_value
   end
 
+  # Input the data in the graph.
+  #
+  # Parameters are an array where the first element is the name of the dataset
+  # and the value is an array of values to plot.
+  #
+  # Can be called multiple times with different datasets for a multi-valued
+  # graph.
+  #
+  # If the color argument is nil, the next color from the default theme will
+  # be used.
+  #
+  # @param name [String, Symbol] The name of the dataset.
+  # @param data_points [Array] The array of dataset.
+  # @param color [String] The color for drawing graph of dataset.
+  #
+  # @note
+  #   If you want to use a preset theme, you must set it before calling {#data}.
+  #
+  # @example
+  #   data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
+  def data(name, data_points = [], color = nil)
+    store.add(name, nil, data_points, color)
+  end
+
   # This method allows one to plot a dataset with both X and Y data.
   #
   # @overload dataxy(name, x_data_points = [], y_data_points = [], color = nil)
@@ -131,7 +155,7 @@ class Gruff::Line < Gruff::Base
     raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
 
     # call the existing data routine for the x/y data.
-    store.add(name, y_data_points, color, x_data_points)
+    store.add(name, x_data_points, y_data_points, color)
   end
 
 private
@@ -177,6 +201,7 @@ private
   def draw_graph
     # Check to see if more than one datapoint was given. NaN can result otherwise.
     @x_increment = column_count > 1 ? @graph_width / (column_count - 1) : @graph_width
+    @x_increment = @x_increment.to_f
 
     @reference_lines.each_value do |curr_reference_line|
       draw_horizontal_reference_line(curr_reference_line) if curr_reference_line.key?(:norm_value)
@@ -194,7 +219,7 @@ private
             # use the old method: equally spaced points along the x-axis
             @graph_left + (@x_increment * index)
           else
-            get_x_coord(x_data, @graph_width, @graph_left)
+            @graph_left + (x_data * @graph_width)
           end
         end
         draw_label_for_x_data(x_data, new_x, index)
@@ -287,10 +312,6 @@ private
     end
   end
 
-  def get_x_coord(x_data_point, width, offset)
-    (x_data_point * width) + offset
-  end
-
   def contains_one_point_only?(data_row)
     data_row.y_points.compact.count == 1
   end

data/lib/gruff/mini/legend.rb

@@ -101,6 +101,10 @@ module Gruff
         end
         truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
       end
+
+      def scale(value)
+        value * @scale
+      end
     end
   end
 end

data/lib/gruff/pie.rb

@@ -38,7 +38,7 @@ class Gruff::Pie < Gruff::Base
 
   # Can be used to make the pie start cutting slices at the top (-90.0)
   # or at another angle. Default is +-90.0+, which starts at 3 o'clock.
-  # @deprecated Please use +start_degree+ attribute instead.
+  # @deprecated Please use {#start_degree=} instead.
   def zero_degree=(value)
     warn '#zero_degree= is deprecated. Please use `start_degree` attribute instead'
     @start_degree = value

data/lib/gruff/renderer/circle.rb

@@ -3,15 +3,17 @@
 module Gruff
   # @private
   class Renderer::Circle
-    def initialize(renderer, color:, width: 1.0)
+    def initialize(renderer, color:, width: 1.0, opacity: 1.0)
       @renderer = renderer
       @color = color
       @width = width
+      @opacity = opacity
     end
 
     def render(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.push
       @renderer.draw.fill(@color)
+      @renderer.draw.fill_opacity(@opacity)
       @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
       @renderer.draw.circle(origin_x, origin_y, perim_x, perim_y)

data/lib/gruff/scatter.rb

@@ -24,24 +24,35 @@ class Gruff::Scatter < Gruff::Base
   attr_writer :circle_radius
   attr_writer :stroke_width
 
-  # Allow disabling the significant rounding when labeling the X axis.
-  # This is useful when working with a small range of high values (for example, a date range of months, while seconds as units).
-  attr_writer :disable_significant_rounding_x_axis
-
   # Allow for vertical marker lines.
   attr_writer :show_vertical_markers
 
-  # Allow using vertical labels in the X axis (and setting the label margin).
-  attr_writer :x_label_margin
-  attr_writer :use_vertical_x_labels
-
   # Allow enabling vertical lines. When you have a lot of data, they can work great.
-  # @deprecated Please use +show_vertical_markers+ attribute instead.
+  # @deprecated Please use {#show_vertical_markers=} instead.
   def enable_vertical_line_markers=(value)
     warn '#enable_vertical_line_markers= is deprecated. Please use `show_vertical_markers` attribute instead'
     @show_vertical_markers = value
   end
 
+  # Allow using vertical labels in the X axis.
+  # @deprecated Please use {Gruff::Base#label_rotation=} instead.
+  def use_vertical_x_labels=(_value)
+    warn '#use_vertical_x_labels= is deprecated. It is no longer effective. Please use `#label_rotation=` instead'
+  end
+
+  # Allow using vertical labels in the X axis (and setting the label margin).
+  # @deprecated
+  def x_label_margin=(_value)
+    warn '#x_label_margin= is deprecated. It is no longer effective.'
+  end
+
+  # Allow disabling the significant rounding when labeling the X axis.
+  # This is useful when working with a small range of high values (for example, a date range of months, while seconds as units).
+  # @deprecated
+  def disable_significant_rounding_x_axis=(_value)
+    warn '#disable_significant_rounding_x_axis= is deprecated. It is no longer effective.'
+  end
+
   # The first parameter is the name of the dataset.  The next two are the
   # x and y axis data points contain in their own array in that respective
   # order.  The final parameter is the color.
@@ -55,11 +66,10 @@ class Gruff::Scatter < Gruff::Base
   # @note If you want to use a preset theme, you must set it before calling {#data}.
   #
   # @param name [String, Symbol] containing the name of the dataset.
-  # @param x_data_points [Array] An Array of of x-axis data points.
-  # @param y_data_points [Array] An Array of of y-axis data points.
+  # @param x_data_points [Array] An Array of x-axis data points.
+  # @param y_data_points [Array] An Array of y-axis data points.
   # @param color [String] The hex string for the color of the dataset. Defaults to nil.
   #
-  #
   # @raise [ArgumentError] Data points contain nil values.
   #   This error will get raised if either the x or y axis data points array
   #   contains a +nil+ value.  The graph will not make an assumption
@@ -88,7 +98,7 @@ class Gruff::Scatter < Gruff::Base
     raise ArgumentError, 'x_data_points.length != y_data_points.length!' if x_data_points.length != y_data_points.length
 
     # Call the existing data routine for the x/y axis data
-    store.add(name, y_data_points, color, x_data_points)
+    store.add(name, x_data_points, y_data_points, color)
   end
 
   alias dataxy data
@@ -102,16 +112,11 @@ private
   def initialize_attributes
     super
 
-    @baseline_x_color = @baseline_y_color = 'red'
-    @baseline_x_value = @baseline_y_value = nil
     @circle_radius = nil
-    @disable_significant_rounding_x_axis = false
     @show_vertical_markers = false
     @marker_x_count = nil
     @maximum_x_value = @minimum_x_value = nil
     @stroke_width = nil
-    @use_vertical_x_labels = false
-    @x_label_margin = nil
   end
 
   def setup_drawing
@@ -141,11 +146,11 @@ private
       data_row.coordinates.each do |x_value, y_value|
         next if y_value.nil? || x_value.nil?
 
-        new_x = get_x_coord(x_value, @graph_width, @graph_left)
-        new_y = @graph_top + (@graph_height - (y_value * @graph_height))
+        new_x = @graph_left + (x_value * @graph_width)
+        new_y = @graph_bottom - (y_value * @graph_height)
 
         # Reset each time to avoid thin-line errors
-        stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4), 5.0)
+        stroke_width  = @stroke_width  || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 4.0), 5.0)
         circle_radius = @circle_radius || clip_value_if_greater_than(@columns / (store.norm_data.first[1].size * 2.5), 5.0)
         Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
       end
@@ -155,7 +160,7 @@ private
   def calculate_spread
     super
     @x_spread = @maximum_x_value.to_f - @minimum_x_value.to_f
-    @x_spread = @x_spread > 0 ? @x_spread : 1
+    @x_spread = @x_spread > 0 ? @x_spread : 1.0
   end
 
   def normalize
@@ -169,32 +174,27 @@ private
     super
     return if @hide_line_markers
 
-    increment_x_scaled = @graph_width / (@x_spread / x_increment)
+    increment_x_scaled = (@graph_width / (@x_spread / x_increment)).to_f
 
     # Draw vertical line markers and annotate with numbers
     (0..marker_x_count).each do |index|
       # TODO: Fix the vertical lines, and enable them by default. Not pretty when they don't match up with top y-axis line
       if @show_vertical_markers
-        draw_marker_vertical_line(@graph_left + @graph_width - (index * increment_x_scaled))
+        draw_marker_vertical_line(@graph_left + (index * increment_x_scaled))
       end
 
       unless @hide_line_numbers
         marker_label = (BigDecimal(index.to_s) * BigDecimal(x_increment.to_s)) + BigDecimal(@minimum_x_value.to_s)
-        y_offset = @graph_bottom + (@x_label_margin || LABEL_MARGIN)
-        x_offset = get_x_coord(index, increment_x_scaled, @graph_left)
-
         label = x_axis_label(marker_label, x_increment)
-        rotation = -90.0 if @use_vertical_x_labels
-        text_renderer = Gruff::Renderer::Text.new(renderer, label, font: @marker_font, rotation: rotation)
-        text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
+        x = @graph_left + (increment_x_scaled * index)
+        y = @graph_bottom
+        x_offset, y_offset = calculate_label_offset(@marker_font, label, LABEL_MARGIN, @label_rotation)
+
+        draw_label_at(1.0, 1.0, x + x_offset, y + y_offset, label, rotation: @label_rotation)
       end
     end
   end
 
-  def get_x_coord(x_data_point, width, offset)
-    (x_data_point * width) + offset
-  end
-
   def marker_x_count
     # TODO: Do the same for larger numbers...100, 75, 50, 25
     @marker_x_count ||= begin
@@ -215,15 +215,10 @@ private
   def x_increment
     @x_increment ||= begin
       if @x_axis_increment.nil?
-        increment = @x_spread > 0 ? (@x_spread / marker_x_count) : 1
-        unless @disable_significant_rounding_x_axis
-          increment = significant(increment)
-        end
+        @x_spread > 0 ? significant(@x_spread / marker_x_count) : 1.0
       else
-        increment = @x_axis_increment
+        @x_axis_increment.to_f
       end
-
-      increment
     end
   end
 end

data/lib/gruff/side_bar.rb

@@ -111,7 +111,6 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    group_spacing = @group_spacing * @scale
     group_left_y = @graph_top
 
     normalized_group_bars.each_with_index do |group_bars, group_index|
@@ -137,7 +136,7 @@ private
       label_center = group_left_y + (bars_width / 2.0)
       draw_label(label_center, group_index)
 
-      group_left_y = right_y + padding + group_spacing
+      group_left_y = right_y + padding + @group_spacing
     end
   end
 
@@ -176,7 +175,7 @@ private
   end
 
   def calculate_spacing
-    @scale * @group_spacing * (column_count - 1)
+    @group_spacing * (column_count - 1)
   end
 
   def proc_text_metrics

data/lib/gruff/stacked_area.rb

@@ -33,7 +33,7 @@ private
   end
 
   def draw_graph
-    x_increment = @graph_width / (column_count - 1)
+    x_increment = (@graph_width / (column_count - 1)).to_f
 
     height = Array.new(column_count, 0)
 

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.17.0'
+  VERSION = '0.18.0'
 end

data/lib/gruff.rb

@@ -26,7 +26,8 @@ module Gruff
   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')
@@ -60,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.17.0
+  version: 0.18.0
 platform: java
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,8 @@ 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
@@ -162,6 +163,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