gruff 0.10.0-java → 0.11.0-java

data/lib/gruff/renderer/line.rb

@@ -6,10 +6,18 @@ module Gruff
 
     def initialize(args = {})
       @color = args[:color]
+      @shadow_color = args[:shadow_color]
       @width = args[:width]
     end
 
     def render(start_x, start_y, end_x, end_y)
+      render_line(start_x, start_y, end_x, end_y, @color)
+      render_line(start_x, start_y + 1, end_x, end_y + 1, @shadow_color) if @shadow_color
+    end
+
+  private
+
+    def render_line(start_x, start_y, end_x, end_y, color)
       # FIXME(uwe): Workaround for Issue #66
       #             https://github.com/topfunky/gruff/issues/66
       #             https://github.com/rmagick/rmagick/issues/82
@@ -24,8 +32,8 @@ module Gruff
       draw = Renderer.instance.draw
 
       draw.push
-      draw.stroke(@color)
-      draw.fill(@color)
+      draw.stroke(color)
+      draw.fill(color)
       draw.stroke_width(@width) if @width
       draw.line(start_x, start_y, end_x, end_y)
       draw.pop

data/lib/gruff/renderer/renderer.rb

@@ -7,7 +7,7 @@ module Gruff
   class Renderer
     include Singleton
 
-    attr_accessor :draw, :image, :scale
+    attr_accessor :draw, :image, :scale, :text_renderers
 
     class << self
       def setup(columns, rows, font, scale, theme_options)
@@ -21,6 +21,7 @@ module Gruff
         Renderer.instance.draw  = draw
         Renderer.instance.scale = scale
         Renderer.instance.image = image
+        Renderer.instance.text_renderers = []
       end
 
       def setup_transparent_background(columns, rows)
@@ -42,6 +43,10 @@ module Gruff
         image = Renderer.instance.image
 
         draw.draw(image)
+
+        Renderer.instance.text_renderers.each do |renderer|
+          renderer.render(renderer.width, renderer.height, renderer.x, renderer.y, renderer.gravity)
+        end
       end
 
       def write(file_name)
@@ -102,7 +107,7 @@ module Gruff
 
       if @gradated_background_retry_count < 3
         @gradated_background_retry_count += 1
-        gradated_background(top_color, bottom_color, direct)
+        gradated_background(columns, rows, top_color, bottom_color, direct)
       else
         raise e
       end

data/lib/gruff/renderer/text.rb

@@ -11,6 +11,17 @@ module Gruff
       @rotation = args[:rotation]
     end
 
+    attr_reader :width, :height, :x, :y, :gravity
+    def add_to_render_queue(width, height, x, y, gravity = Magick::NorthGravity)
+      @width = width
+      @height = height
+      @x = x
+      @y = y
+      @gravity = gravity
+
+      Renderer.instance.text_renderers << self
+    end
+
     def render(width, height, x, y, gravity = Magick::NorthGravity)
       draw  = Renderer.instance.draw
       image = Renderer.instance.image

data/lib/gruff/scatter.rb

@@ -13,33 +13,38 @@ require 'gruff/base'
 class Gruff::Scatter < Gruff::Base
   # Maximum X Value. The value will get overwritten by the max in the
   # datasets.
-  attr_accessor :maximum_x_value
+  attr_writer :maximum_x_value
 
   # Minimum X Value. The value will get overwritten by the min in the
   # datasets.
-  attr_accessor :minimum_x_value
+  attr_writer :minimum_x_value
 
   # The number of vertical lines shown for reference.
-  attr_accessor :marker_x_count
+  attr_writer :marker_x_count
 
   # Attributes to allow customising the size of the points.
-  attr_accessor :circle_radius
-  attr_accessor :stroke_width
+  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_accessor :disable_significant_rounding_x_axis
+  attr_writer :disable_significant_rounding_x_axis
 
   # Allow enabling vertical lines. When you have a lot of data, they can work great.
-  attr_accessor :enable_vertical_line_markers
+  attr_writer :enable_vertical_line_markers
 
   # Allow using vertical labels in the X axis (and setting the label margin).
-  attr_accessor :x_label_margin
-  attr_accessor :use_vertical_x_labels
+  attr_writer :x_label_margin
+  attr_writer :use_vertical_x_labels
 
   # Allow passing lambdas to format labels.
-  attr_accessor :y_axis_label_format
-  attr_accessor :x_axis_label_format
+  attr_writer :y_axis_label_format
+  attr_writer :x_axis_label_format
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYData)
+  end
+  private :initialize_store
 
   def initialize_ivars
     super
@@ -56,8 +61,6 @@ class Gruff::Scatter < Gruff::Base
     @x_axis_label_format = nil
     @x_label_margin = nil
     @y_axis_label_format = nil
-
-    @store = Gruff::Store.new(Gruff::Store::XYData)
   end
   private :initialize_ivars
 
@@ -202,7 +205,9 @@ private
       # TODO: Fix the vertical lines, and enable them by default. Not pretty when they don't match up with top y-axis line
       if @enable_vertical_line_markers
         x = @graph_left + @graph_width - index.to_f * increment_x_scaled
-        Gruff::Renderer::Line.new(color: @marker_color).render(x, @graph_top, x, @graph_bottom)
+
+        line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+        line_renderer.render(x, @graph_top, x, @graph_bottom)
       end
 
       unless @hide_line_numbers
@@ -213,7 +218,7 @@ private
         label = vertical_label(marker_label, @x_increment)
         rotation = -90.0 if @use_vertical_x_labels
         text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @marker_font_size, color: @font_color, rotation: rotation)
-        text_renderer.render(1.0, 1.0, x_offset, y_offset)
+        text_renderer.add_to_render_queue(1.0, 1.0, x_offset, y_offset)
       end
     end
   end

data/lib/gruff/side_bar.rb

@@ -22,21 +22,23 @@ require 'gruff/base'
 #
 class Gruff::SideBar < Gruff::Base
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Spacing factor applied between a group of bars belonging to the same label.
-  attr_accessor :group_spacing
+  attr_writer :group_spacing
 
   # Set the number output format for labels using sprintf.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @group_spacing = 10
     @label_formatting = nil
     @show_labels_for_bar_values = false
   end
@@ -56,9 +58,6 @@ private
   def draw_bars
     # Setup spacing.
     #
-    @bar_spacing ||= 0.9
-    @group_spacing ||= 10
-
     bars_width = (@graph_height - calculate_spacing) / column_count.to_f
     bar_width = bars_width / store.length
     height = Array.new(column_count, 0)
@@ -123,13 +122,16 @@ 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(color: @marker_color).render(x, @graph_bottom, x, @graph_top)
+
+      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)
-        text_renderer.render(0, 0, x, @graph_bottom + (LABEL_MARGIN * 2.0), Magick::CenterGravity)
+        text_renderer.add_to_render_queue(0, 0, x, @graph_bottom + LABEL_MARGIN, Magick::CenterGravity)
       end
     end
   end
@@ -142,7 +144,7 @@ private
       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.render(@graph_left - LABEL_MARGIN * 2, 1.0, 0.0, y_offset, Magick::EastGravity)
+      text_renderer.add_to_render_queue(@graph_left - LABEL_MARGIN, 1.0, 0.0, y_offset, Magick::EastGravity)
     end
   end
 

data/lib/gruff/side_stacked_bar.rb

@@ -27,21 +27,23 @@ class Gruff::SideStackedBar < Gruff::SideBar
   include BarValueLabelMixin
 
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Number of pixels between bar segments.
-  attr_accessor :segment_spacing
+  attr_writer :segment_spacing
 
   # Set the number output format for labels using sprintf.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @segment_spacing = 2.0
     @label_formatting = nil
     @show_labels_for_bar_values = false
   end
@@ -59,9 +61,6 @@ private
     # Setup spacing.
     #
     # Columns sit stacked.
-    @bar_spacing ||= 0.9
-    @segment_spacing ||= 2.0
-
     bar_width = @graph_height / column_count.to_f
     height = Array.new(column_count, 0)
     length = Array.new(column_count, @graph_left)

data/lib/gruff/spider.rb

@@ -18,10 +18,8 @@ require 'gruff/base'
 
 class Gruff::Spider < Gruff::Base
   # Hide all text.
-  attr_reader :hide_text
-  attr_accessor :hide_axes
-  attr_reader :transparent_background
-  attr_accessor :rotation
+  attr_writer :hide_axes
+  attr_writer :rotation
 
   def transparent_background=(value)
     Gruff::Renderer.setup_transparent_background(@columns, @rows) if value
@@ -34,9 +32,16 @@ class Gruff::Spider < Gruff::Base
   def initialize(max_value, target_width = 800)
     super(target_width)
     @max_value = max_value
+  end
+
+  def initialize_ivars
+    super
     @hide_legend = true
+    @hide_axes = false
+    @hide_text = false
     @rotation = 0
   end
+  private :initialize_ivars
 
   def draw
     @hide_line_markers = true
@@ -55,7 +60,7 @@ class Gruff::Spider < Gruff::Base
     additive_angle = (2 * Math::PI) / store.length
 
     # Draw axes
-    draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes
+    draw_axes(center_x, center_y, radius, additive_angle) unless @hide_axes
 
     # Draw polygon
     draw_polygon(center_x, center_y, additive_angle)
@@ -77,14 +82,14 @@ private
     y = y_offset + ((radius + r_offset) * Math.sin(angle))
 
     # Draw label
-    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: legend_font_size, color: @marker_color, weight: Magick::BoldWeight)
-    text_renderer.render(0, 0, x, y, Magick::CenterGravity)
+    text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: @legend_font_size, color: @marker_color, weight: Magick::BoldWeight)
+    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
   end
 
   def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
-    return if hide_axes
+    return if @hide_axes
 
-    current_angle = rotation * Math::PI / 180.0
+    current_angle = @rotation * Math::PI / 180.0
 
     store.data.each do |data_row|
       x_offset = radius * Math.cos(current_angle)
@@ -93,7 +98,7 @@ private
       Gruff::Renderer::Line.new(color: line_color || data_row.color, width: 5.0)
                            .render(center_x, center_y, center_x + x_offset, center_y + y_offset)
 
-      draw_label(center_x, center_y, current_angle, radius, data_row.label.to_s) unless hide_text
+      draw_label(center_x, center_y, current_angle, radius, data_row.label.to_s) unless @hide_text
 
       current_angle += additive_angle
     end
@@ -101,7 +106,7 @@ private
 
   def draw_polygon(center_x, center_y, additive_angle, color = nil)
     points = []
-    current_angle = rotation * Math::PI / 180.0
+    current_angle = @rotation * Math::PI / 180.0
 
     store.data.each do |data_row|
       points << center_x + normalize_points(data_row.points.first) * Math.cos(current_angle)

data/lib/gruff/stacked_area.rb

@@ -15,7 +15,13 @@ require 'gruff/helper/stacked_mixin'
 #
 class Gruff::StackedArea < Gruff::Base
   include StackedMixin
-  attr_accessor :last_series_goes_on_bottom
+  attr_writer :last_series_goes_on_bottom
+
+  def initialize_ivars
+    super
+    @last_series_goes_on_bottom = false
+  end
+  private :initialize_ivars
 
   def draw
     calculate_maximum_by_stack
@@ -28,7 +34,7 @@ class Gruff::StackedArea < Gruff::Base
     height = Array.new(column_count, 0)
 
     data_points = nil
-    iterator = last_series_goes_on_bottom ? :reverse_each : :each
+    iterator = @last_series_goes_on_bottom ? :reverse_each : :each
     store.norm_data.public_send(iterator) do |data_row|
       prev_data_points = data_points
       data_points = []

data/lib/gruff/stacked_bar.rb

@@ -19,21 +19,23 @@ class Gruff::StackedBar < Gruff::Base
   include BarValueLabelMixin
 
   # Spacing factor applied between bars.
-  attr_accessor :bar_spacing
+  attr_writer :bar_spacing
 
   # Number of pixels between bar segments.
-  attr_accessor :segment_spacing
+  attr_writer :segment_spacing
 
   # Set the number output format for labels using sprintf.
   # Default is +"%.2f"+.
-  attr_accessor :label_formatting
+  attr_writer :label_formatting
 
   # Output the values for the bars on a bar graph.
   # Default is +false+.
-  attr_accessor :show_labels_for_bar_values
+  attr_writer :show_labels_for_bar_values
 
   def initialize_ivars
     super
+    @bar_spacing = 0.9
+    @segment_spacing = 2
     @label_formatting = nil
     @show_labels_for_bar_values = false
   end
@@ -48,9 +50,6 @@ class Gruff::StackedBar < Gruff::Base
     # Setup spacing.
     #
     # Columns sit stacked.
-    @bar_spacing ||= 0.9
-    @segment_spacing ||= 2
-
     bar_width = @graph_width / column_count.to_f
     padding = (bar_width * (1 - @bar_spacing)) / 2
 

data/lib/gruff/store/base_data.rb

@@ -10,6 +10,10 @@ module Gruff
         self.color = color
       end
 
+      def empty?
+        points.empty?
+      end
+
       def columns
         points.length
       end

data/lib/gruff/store/custom_data.rb

@@ -10,6 +10,10 @@ module Gruff
         self.custom = custom
       end
 
+      def empty?
+        points.empty?
+      end
+
       def columns
         points.length
       end

data/lib/gruff/store/store.rb

@@ -26,7 +26,7 @@ module Gruff
     end
 
     def empty?
-      @data.empty?
+      @data.all?(&:empty?)
     end
 
     def length

data/lib/gruff/store/xy_data.rb

@@ -18,6 +18,10 @@ module Gruff
         x_points.zip(y_points)
       end
 
+      def empty?
+        y_points.empty?
+      end
+
       def columns
         y_points.length
       end

data/lib/gruff/version.rb

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