gruff 0.12.2 → 0.13.0

data/lib/gruff/side_bar.rb

@@ -19,15 +19,13 @@
 #   g.write('sidebar.png')
 #
 class Gruff::SideBar < Gruff::Base
-  using String::GruffCommify
-
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
   attr_writer :group_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -57,6 +55,12 @@ class Gruff::SideBar < Gruff::Base
     draw_bars
   end
 
+  # With Side Bars use the data label for the marker value to the left of the bar.
+  # @deprecated
+  def use_data_label=(_value)
+    warn '#use_data_label is deprecated. It is no longer effective.'
+  end
+
 protected
 
   def hide_labels?
@@ -73,15 +77,22 @@ protected
 
 private
 
+  # Value to avoid completely overwriting the coordinate axis
+  AXIS_MARGIN = 0.5
+
   def draw_bars
     # Setup spacing.
     #
     bars_width = (@graph_height - calculate_spacing) / column_count.to_f
     bar_width = bars_width / store.length
-    height = Array.new(column_count, 0)
-    length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
+    # Setup the BarConversion Object
+    conversion = Gruff::BarConversion.new(
+      top: @graph_right, bottom: @graph_left,
+      minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
+    )
+
     # if we're a side stacked bar then we don't need to draw ourself at all
     # because sometimes (due to different heights/min/max) you can actually
     # see both graphs and it looks like crap
@@ -91,35 +102,24 @@ private
       data_row.points.each_with_index do |data_point, point_index|
         group_spacing = @group_spacing * @scale * 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
-
-        left_x = length[point_index] - 1
         left_y = @graph_top + (bars_width * point_index) + (bar_width * row_index) + padding + group_spacing
-        right_x = left_x + difference
         right_y = left_y + bar_width * @bar_spacing
 
-        height[point_index] += (data_point * @graph_width)
+        left_x, right_x = conversion.get_top_bottom_scaled(data_point).sort
 
         rect_renderer = Gruff::Renderer::Rectangle.new(color: data_row.color)
-        rect_renderer.render(left_x, left_y, right_x, right_y)
+        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
 
-        if @use_data_label
-          label_center = left_y + bar_width / 2
-          draw_label(label_center, row_index, store.norm_data[row_index].label)
-        else
-          label_center = left_y + bars_width / 2
-          draw_label(label_center, point_index)
-        end
+        # Subtract half a bar width to center left if requested
+        draw_label(label_center, point_index)
         if @show_labels_for_bar_values
-          val = (@label_formatting || '%.2f') % store.data[row_index].points[point_index]
-          draw_value_label(right_x + 40, right_y - bar_width / 2, val.commify, true)
+          bar_value_label = Gruff::BarValueLabel::SideBar.new([left_x, left_y, right_x, right_y], store.data[row_index].points[point_index])
+          bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
+            draw_value_label(x, y, text, true)
+          end
         end
       end
     end
@@ -142,11 +142,11 @@ private
       line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
       line_renderer.render(x, @graph_bottom, x, @graph_top)
 
-      diff = index - number_of_lines
-      marker_label = diff.abs * increment + minimum_value
-
       unless @hide_line_numbers
-        text_renderer = Gruff::Renderer::Text.new(marker_label, font: @font, size: @marker_font_size, color: @font_color)
+        diff = index - number_of_lines
+        marker_label = BigDecimal(diff.abs.to_s) * BigDecimal(increment.to_s) + BigDecimal(minimum_value.to_s)
+        label = x_axis_label(marker_label, @increment)
+        text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color)
         text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + LABEL_MARGIN, Magick::CenterGravity)
       end
     end
@@ -155,12 +155,9 @@ private
   ##
   # Draw on the Y axis instead of the X
 
-  def draw_label(y_offset, index, label = nil)
+  def draw_label(y_offset, index)
     draw_unique_label(index) do
-      lbl = @use_data_label ? label : @labels[index]
-
-      text_renderer = Gruff::Renderer::Text.new(lbl, font: @font, size: @marker_font_size, color: @font_color)
-      text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 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
 

data/lib/gruff/side_stacked_bar.rb

@@ -21,7 +21,6 @@
 #
 class Gruff::SideStackedBar < Gruff::SideBar
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -29,7 +28,7 @@ class Gruff::SideStackedBar < Gruff::SideBar
   # Number of pixels between bar segments.
   attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -80,7 +79,7 @@ private
     height = Array.new(column_count, 0)
     length = Array.new(column_count, @graph_left)
     padding = (bar_width * (1 - @bar_spacing)) / 2
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = 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|
@@ -99,8 +98,8 @@ private
         length[point_index] += difference
         height[point_index] += (data_point * @graph_width - 2)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[point_index]
+        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_label.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
@@ -118,7 +117,7 @@ private
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_sidebar_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end

data/lib/gruff/stacked_bar.rb

@@ -12,7 +12,6 @@
 #
 class Gruff::StackedBar < Gruff::Base
   include StackedMixin
-  include BarValueLabelMixin
 
   # Spacing factor applied between bars.
   attr_writer :bar_spacing
@@ -20,7 +19,7 @@ class Gruff::StackedBar < Gruff::Base
   # Number of pixels between bar segments.
   attr_writer :segment_spacing
 
-  # Set the number output format for labels using sprintf.
+  # Set the number output format string or lambda.
   # Default is +"%.2f"+.
   attr_writer :label_formatting
 
@@ -54,7 +53,7 @@ class Gruff::StackedBar < Gruff::Base
     padding = (bar_width * (1 - @bar_spacing)) / 2
 
     height = Array.new(column_count, 0)
-    bar_value_label = BarValueLabel.new(column_count, bar_width)
+    stack_bar_value_label = 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|
@@ -78,13 +77,13 @@ class Gruff::StackedBar < Gruff::Base
         label_center = left_x + bar_width * @bar_spacing / 2.0
         draw_label(label_center, point_index)
 
-        bar_value_label.coordinates[point_index] = [left_x, left_y, right_x, right_y]
-        bar_value_label.values[point_index] += store.data[row_index].points[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)
       end
     end
 
     if @show_labels_for_bar_values
-      bar_value_label.prepare_rendering(@label_formatting) do |x, y, text|
+      stack_bar_value_label.prepare_rendering(@label_formatting, bar_width) do |x, y, text|
         draw_value_label(x, y, text, true)
       end
     end

data/lib/gruff/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gruff
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Geoffrey Grosenbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: histogram
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +155,9 @@ files:
 - Gemfile
 - MIT-LICENSE
 - README.md
+- assets/fonts/LICENSE.txt
+- assets/fonts/Roboto-Bold.ttf
+- assets/fonts/Roboto-Regular.ttf
 - assets/plastik/blue.png
 - assets/plastik/green.png
 - assets/plastik/red.png
@@ -155,7 +172,7 @@ files:
 - lib/gruff/bullet.rb
 - lib/gruff/dot.rb
 - lib/gruff/helper/bar_conversion.rb
-- lib/gruff/helper/bar_value_label_mixin.rb
+- lib/gruff/helper/bar_value_label.rb
 - lib/gruff/helper/stacked_mixin.rb
 - lib/gruff/histogram.rb
 - lib/gruff/line.rb

data/lib/gruff/helper/bar_value_label_mixin.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-# @private
-module Gruff::Base::BarValueLabelMixin
-  using String::GruffCommify
-
-  # @private
-  class BarValueLabel
-    attr_accessor :coordinates, :values
-
-    def initialize(size, bar_width)
-      @coordinates = Array.new(size)
-      @values = Hash.new(0)
-      @bar_width = bar_width
-    end
-
-    def prepare_rendering(format)
-      @coordinates.each_with_index do |(left_x, left_y, right_x, _right_y), index|
-        value = @values[index]
-        val = (format || '%.2f') % value
-        y = value >= 0 ? left_y - 30 : left_y + 12
-        yield left_x + (right_x - left_x) / 2, y, val.commify
-      end
-    end
-
-    def prepare_sidebar_rendering(format)
-      @coordinates.each_with_index do |(_left_x, _left_y, right_x, right_y), index|
-        val = (format || '%.2f') % @values[index]
-        yield right_x + 40, right_y - @bar_width / 2, val.commify
-      end
-    end
-  end
-end