gruff 0.16.0-java → 0.19.0-java

data/lib/gruff/renderer/bezier.rb

@@ -11,8 +11,8 @@ module Gruff
 
     def render(points)
       @renderer.draw.push
-      @renderer.draw.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
       @renderer.draw.fill_opacity(0.0)
       @renderer.draw.bezier(*points)
       @renderer.draw.pop

data/lib/gruff/renderer/circle.rb

@@ -3,17 +3,19 @@
 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.stroke(@color)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.circle(origin_x, origin_y, perim_x, perim_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dash_line.rb

@@ -13,9 +13,9 @@ module Gruff
     def render(start_x, start_y, end_x, end_y)
       @renderer.draw.push
       @renderer.draw.stroke_color(@color)
-      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.stroke_dasharray(*@dasharray)
       @renderer.draw.stroke_width(@width)
+      @renderer.draw.fill_opacity(0.0)
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/dot.rb

@@ -11,31 +11,42 @@ module Gruff
       @opacity = opacity
     end
 
-    def render(new_x, new_y, circle_radius)
-      # @renderer.draw.push # TODO
+    def render(new_x, new_y, radius)
+      @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
-      if @style.to_s == 'square'
-        square(new_x, new_y, circle_radius)
+      @renderer.draw.fill(@color)
+      case @style.to_sym
+      when :square
+        square(new_x, new_y, radius)
+      when :diamond
+        diamond(new_x, new_y, radius)
       else
-        circle(new_x, new_y, circle_radius)
+        circle(new_x, new_y, radius)
       end
-      # @renderer.draw.pop # TODO
+      @renderer.draw.pop
     end
 
-    def circle(new_x, new_y, circle_radius)
-      @renderer.draw.circle(new_x, new_y, new_x - circle_radius, new_y)
+    def circle(new_x, new_y, radius)
+      @renderer.draw.circle(new_x, new_y, new_x - radius, new_y)
     end
 
-    def square(new_x, new_y, circle_radius)
-      offset = (circle_radius * 0.8).to_i
-      corner1 = new_x - offset
-      corner2 = new_y - offset
-      corner3 = new_x + offset
-      corner4 = new_y + offset
+    def square(new_x, new_y, radius)
+      corner1 = new_x - radius
+      corner2 = new_y - radius
+      corner3 = new_x + radius
+      corner4 = new_y + radius
       @renderer.draw.rectangle(corner1, corner2, corner3, corner4)
     end
+
+    def diamond(new_x, new_y, radius)
+      polygon = []
+      polygon += [new_x - radius, new_y]
+      polygon += [new_x, new_y + radius]
+      polygon += [new_x + radius, new_y]
+      polygon += [new_x, new_y - radius]
+      @renderer.draw.polygon(*polygon)
+    end
   end
 end

data/lib/gruff/renderer/line.rb

@@ -30,9 +30,9 @@ module Gruff
       end
 
       @renderer.draw.push
+      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.stroke(color)
       @renderer.draw.fill(color)
-      @renderer.draw.stroke_width(@width) if @width
       @renderer.draw.line(start_x, start_y, end_x, end_y)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polygon.rb

@@ -14,8 +14,8 @@ module Gruff
       @renderer.draw.push
       @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
-      @renderer.draw.fill(@color)
       @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.fill(@color)
       @renderer.draw.polygon(*points)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/polyline.rb

@@ -3,17 +3,19 @@
 module Gruff
   # @private
   class Renderer::Polyline
-    def initialize(renderer, color:, width:)
+    def initialize(renderer, color:, width: 1.0, linejoin: 'bevel')
       @renderer = renderer
       @color = color
       @width = width
+      @linejoin = linejoin
     end
 
     def render(points)
       @renderer.draw.push
+      @renderer.draw.stroke_linejoin(@linejoin)
+      @renderer.draw.stroke_width(@width)
       @renderer.draw.stroke(@color)
       @renderer.draw.fill('transparent')
-      @renderer.draw.stroke_width(@width)
       @renderer.draw.polyline(*points)
       @renderer.draw.pop
     end

data/lib/gruff/renderer/renderer.rb

@@ -23,10 +23,6 @@ module Gruff
       end
     end
 
-    def background_image=(image)
-      @image = image
-    end
-
     def background(columns, rows, scale, theme_options)
       case theme_options[:background_colors]
       when Array

data/lib/gruff/renderer/text.rb

@@ -25,6 +25,7 @@ module Gruff
     end
 
     def render(width, height, x, y, gravity = Magick::NorthGravity)
+      @renderer.draw.push
       @renderer.draw.rotation = @rotation if @rotation
       @renderer.draw.fill = @font.color
       @renderer.draw.stroke = 'transparent'
@@ -37,9 +38,11 @@ module Gruff
                                      x, y,
                                      @text, @renderer.scale)
       @renderer.draw.rotation = -@rotation if @rotation
+      @renderer.draw.pop
     end
 
     def metrics
+      @renderer.draw.push
       @renderer.draw.font = @font.file_path
       @renderer.draw.font_weight = @font.weight
       @renderer.draw.pointsize = @font.size
@@ -50,7 +53,10 @@ module Gruff
       # So, in here, it just escape % in order to avoid SEGV.
       text = @text.to_s.gsub(/(%+)/) { ('%' * Regexp.last_match(1).size * 2).to_s }
 
-      @renderer.draw.get_type_metrics(@renderer.image, text)
+      metrics = @renderer.draw.get_type_metrics(@renderer.image, text)
+      @renderer.draw.pop
+
+      metrics
     end
   end
 end

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,32 +112,16 @@ 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 draw_graph
-    store.norm_data.each do |data_row|
-      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))
-
-        # 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)
-        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
-    end
+  def setup_drawing
+    @center_labels_over_point = false
+    super
   end
 
   def setup_data
@@ -147,10 +141,26 @@ private
     super
   end
 
+  def draw_graph
+    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)
+
+    store.norm_data.each do |data_row|
+      data_row.coordinates.each do |x_value, y_value|
+        next if y_value.nil? || x_value.nil?
+
+        new_x = @graph_left + (x_value * @graph_width)
+        new_y = @graph_bottom - (y_value * @graph_height)
+
+        Gruff::Renderer::Circle.new(renderer, color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
+      end
+    end
+  end
+
   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
@@ -164,35 +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
-        x = @graph_left + @graph_width - (index * increment_x_scaled)
-
-        Gruff::Renderer::Line.new(renderer, color: @marker_color).render(x, @graph_top, x, @graph_bottom)
-        Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(x, @graph_top + 1, x, @graph_bottom + 1) if @marker_shadow_color
+        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
@@ -213,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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'helper/bar_mixin'
+
 # Graph with individual horizontal bars instead of vertical bars.
 #
 # Here's how to set up a Gruff::SideBar.
@@ -19,6 +21,8 @@
 #   g.write('sidebar.png')
 #
 class Gruff::SideBar < Gruff::Base
+  include BarMixin
+
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
@@ -79,8 +83,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_right -= metrics.width
@@ -109,32 +111,32 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+    group_left_y = @graph_top
 
-    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
-
-        left_y = @graph_top + (bars_width * point_index) + (bar_width * row_index) + padding + group_spacing
+    normalized_group_bars.each_with_index do |group_bars, group_index|
+      right_y = 0
+      group_bars.each_with_index do |bar, index|
+        left_y = group_left_y + (bar_width * index) + padding
         right_y = left_y + (bar_width * @bar_spacing)
 
-        left_x, right_x = conversion.get_top_bottom_scaled(data_point).sort
-
-        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: data_row.color)
-        rect_renderer.render(left_x + AXIS_MARGIN, left_y, right_x + AXIS_MARGIN, right_y)
-
-        # Calculate center based on bar_width and current row
-        label_center = left_y + (bars_width / 2.0)
+        bottom_x, top_x = conversion.get_top_bottom_scaled(bar.point).sort
+        if bar.point != 0
+          rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
+          rect_renderer.render(bottom_x + AXIS_MARGIN, left_y, top_x, right_y)
+        end
 
-        # Subtract half a bar width to center left if requested
-        draw_label(label_center, point_index)
-        if @show_labels_for_bar_values
-          bar_value_label = Gruff::BarValueLabel::SideBar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+        if @show_labels_for_bar_values && bar.value
+          bar_value_label = Gruff::BarValueLabel::SideBar.new([bottom_x, left_y, top_x, right_y], bar.value)
           bar_value_label.prepare_rendering(@label_formatting, proc_text_metrics) do |x, y, text, text_width, _text_height|
             draw_value_label(text_width, bar_width * @bar_spacing, x, y, text)
           end
         end
       end
+
+      label_center = group_left_y + (bars_width / 2.0)
+      draw_label(label_center, group_index)
+
+      group_left_y = right_y + padding + @group_spacing
     end
   end
 
@@ -151,9 +153,7 @@ private
     (0..number_of_lines).each do |index|
       line_diff = (@graph_right - @graph_left) / number_of_lines
       x = @graph_right - (line_diff * index) - 1
-
-      Gruff::Renderer::Line.new(renderer, color: @marker_color).render(x, @graph_bottom, x, @graph_top)
-      Gruff::Renderer::Line.new(renderer, color: @marker_shadow_color).render(x, @graph_bottom + 1, x, @graph_top + 1) if @marker_shadow_color
+      draw_marker_vertical_line(x)
 
       unless @hide_line_numbers
         diff = index - number_of_lines
@@ -170,11 +170,15 @@ private
 
   def draw_label(y_offset, index)
     draw_unique_label(index) do
-      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], Magick::EastGravity)
+      draw_label_at(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)
     end
   end
 
   def calculate_spacing
-    @scale * @group_spacing * (column_count - 1)
+    @group_spacing * (column_count - 1)
+  end
+
+  def proc_text_metrics
+    ->(text) { text_metrics(@marker_font, text) }
   end
 end

data/lib/gruff/side_stacked_bar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '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)
@@ -66,50 +68,43 @@ private
     #
     # Columns sit stacked.
     bar_width = @graph_height / column_count
-    height = Array.new(column_count, 0)
-    length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
-    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|
-        ## using the original calculations from the stacked bar chart to get the difference between
-        ## part of the bart chart we wish to stack.
-        temp1 = @graph_left + (@graph_width - (data_point * @graph_width) - height[point_index])
-        temp2 = @graph_left + @graph_width - height[point_index]
-        difference = temp2 - temp1
-        difference = 0 if difference < 0
-
-        left_x = length[point_index]
-        left_y = @graph_top + (bar_width * point_index) + padding
-        right_x = left_x + difference
-        right_x -= @segment_spacing if row_index != store.columns - 1
-        right_y = left_y + (bar_width * @bar_spacing)
-        length[point_index] += difference
-        height[point_index] += (data_point * @graph_width)
-
-        bar_value_label = Gruff::BarValueLabel::SideBar.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)
-
-        # 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
-          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
-        end
-        # we still need to draw the labels
-        # Calculate center based on bar_width and current row
-        label_center = left_y + (bar_width / 2.0)
-        draw_label(label_center, point_index)
+
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_right, bottom: @graph_left,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
+
+    proc_text_metrics = ->(text) { text_metrics(@marker_font, text) }
+
+    normalized_stacked_bars.each_with_index do |stacked_bars, stacked_index|
+      total = 0
+      left_y = @graph_top + (bar_width * stacked_index) + padding
+      right_y = left_y + (bar_width * @bar_spacing)
+
+      top_x = 0
+      stacked_bars.each do |bar|
+        next if bar.point == 0
+
+        bottom_x, = conversion.get_top_bottom_scaled(total)
+        bottom_x += @segment_spacing
+        top_x, = conversion.get_top_bottom_scaled(total + bar.point)
+
+        rect_renderer = Gruff::Renderer::Rectangle.new(renderer, color: bar.color)
+        rect_renderer.render(bottom_x, left_y, top_x, right_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(text_width, bar_width * @bar_spacing, x, y, text)
+      label_center = left_y + (bar_width / 2.0)
+      draw_label(label_center, stacked_index)
+
+      if @show_labels_for_bar_values
+        bar_value_label = Gruff::BarValueLabel::SideBar.new([@graph_left, left_y, top_x, right_y], 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(text_width, bar_width * @bar_spacing, x, y, text)
+        end
       end
     end
   end

data/lib/gruff/spider.rb

@@ -46,6 +46,11 @@ private
     @hide_line_markers.freeze
   end
 
+  def setup_drawing
+    @center_labels_over_point = false
+    super
+  end
+
   def setup_graph_measurements
     super
 
@@ -82,7 +87,7 @@ 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)
@@ -107,7 +112,7 @@ private
     x = x_offset + ((radius + r_offset) * Math.cos(angle))
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
-    draw_label_at(metrics.width, metrics.height, 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)

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.
 #
@@ -31,13 +33,14 @@ 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_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|
@@ -69,6 +72,8 @@ private
       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