gruff 0.10.0 → 0.11.0

data/lib/gruff/bullet.rb

@@ -17,9 +17,7 @@ require 'gruff/themes'
 class Gruff::Bullet < Gruff::Base
   def initialize(target_width = '400x40')
     if target_width.is_a?(String)
-      geometric_width, geometric_height = target_width.split('x')
-      @columns = geometric_width.to_f
-      @rows = geometric_height.to_f
+      @columns, @rows = target_width.split('x').map(&:to_f)
     else
       @columns = target_width.to_f
       @rows = target_width.to_f / 5.0
@@ -27,12 +25,19 @@ class Gruff::Bullet < Gruff::Base
     @columns.freeze
     @rows.freeze
 
+    initialize_graph_scale
     initialize_ivars
+    initialize_store
 
-    reset_themes
     self.theme = Gruff::Themes::GREYSCALE
+  end
+
+  def initialize_ivars
+    super
+
     @title_font_size = 20
   end
+  private :initialize_ivars
 
   def data(value, maximum_value, options = {})
     @value = value.to_f
@@ -55,7 +60,7 @@ class Gruff::Bullet < Gruff::Base
     margin       = 30.0
     thickness    = @raw_rows / 6.0
     right_margin = margin
-    graph_left   = (@title && (title_width * 1.3)) || margin
+    graph_left   = [title_width * 1.3, margin].max
     graph_width  = @raw_columns - graph_left - right_margin
     graph_height = thickness * 3.0
 
@@ -90,11 +95,11 @@ class Gruff::Bullet < Gruff::Base
 private
 
   def draw_title
-    return unless @title
+    return if hide_title?
 
     font_height = calculate_caps_height(scale_fontsize(@title_font_size))
 
     text_renderer = Gruff::Renderer::Text.new(@title, font: @font, size: @title_font_size, color: @font_color)
-    text_renderer.render(1.0, 1.0, font_height / 2, font_height / 2, Magick::NorthWestGravity)
+    text_renderer.add_to_render_queue(1.0, 1.0, font_height / 2, font_height / 2, Magick::NorthWestGravity)
   end
 end

data/lib/gruff/dot.rb

@@ -54,37 +54,17 @@ protected
   def draw_line_markers
     return if @hide_line_markers
 
-    # Draw horizontal line markers and annotate with numbers
-    if @y_axis_increment
-      increment = @y_axis_increment
-      number_of_lines = (@spread / @y_axis_increment).to_i
-    else
-      # Try to use a number of horizontal lines that will come out even.
-      #
-      # TODO Do the same for larger numbers...100, 75, 50, 25
-      if @marker_count.nil?
-        (3..7).each do |lines|
-          if @spread % lines == 0.0
-            @marker_count = lines
-            break
-          end
-        end
-        @marker_count ||= 5
-      end
-      # TODO: Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
-      increment = (@spread > 0 && @marker_count > 0) ? significant(@spread / @marker_count) : 1
-      number_of_lines = @marker_count
-    end
-
-    (0..number_of_lines).each do |index|
-      marker_label = minimum_value + index * increment
+    (0..@marker_count).each do |index|
+      marker_label = minimum_value + index * @increment
       x = @graph_left + (marker_label - minimum_value) * @graph_width / @spread
-      Gruff::Renderer::Line.new(color: @marker_color).render(x, @graph_bottom, x, @graph_bottom + 0.5 * LABEL_MARGIN)
+
+      line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+      line_renderer.render(x, @graph_bottom, x, @graph_bottom + 5)
 
       unless @hide_line_numbers
-        label = label(marker_label, increment)
+        label = label(marker_label, @increment)
         text_renderer = Gruff::Renderer::Text.new(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 * 1.5), Magick::CenterGravity)
       end
     end
   end
@@ -95,7 +75,7 @@ protected
   def draw_label(y_offset, index)
     draw_unique_label(index) do
       text_renderer = Gruff::Renderer::Text.new(@labels[index], 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
 end

data/lib/gruff/helper/bar_conversion.rb

@@ -24,16 +24,16 @@ class Gruff::BarConversion
     result = []
 
     case @mode
-    when 1 then # Case one
-                # minimum value >= 0 ( only positive values )
+    when 1
+      # minimum value >= 0 ( only positive values )
       result[0] = @graph_top + @graph_height * (1 - data_point) + 1
       result[1] = @graph_top + @graph_height - 1
-    when 2 then # Case two
-                # only negative values
+    when 2
+      # only negative values
       result[0] = @graph_top + 1
       result[1] = @graph_top + @graph_height * (1 - data_point) - 1
-    when 3 then # Case three
-                # positive and negative values
+    when 3
+      # positive and negative values
       val = data_point - @minimum_value / @spread
       result[0] = @graph_top + @graph_height * (1 - (val - @zero)) + 1
       result[1] = @graph_top + @graph_height * (1 - @zero) - 1

data/lib/gruff/histogram.rb

@@ -15,6 +15,20 @@ require 'gruff/base'
 #   g.write('histogram.png')
 #
 class Gruff::Histogram < Gruff::Bar
+  # Specifies interpolation between the min and max of the set. Default is +10+.
+  attr_writer :bin_width
+
+  # Specifies minimum value for bin.
+  attr_writer :minimum_bin
+
+  # Specifies maximum value for bin.
+  attr_writer :maximum_bin
+
+  def initialize(*)
+    super
+    @data = []
+  end
+
   def initialize_ivars
     super
     @bin_width = 10
@@ -23,33 +37,20 @@ class Gruff::Histogram < Gruff::Bar
   end
   private :initialize_ivars
 
-  # Specifies interpolation between the min and max of the set. Default is +10+.
-  def bin_width=(width)
-    raise 'bin_width= should be called before set the data.' unless store.empty?
-
-    @bin_width = width
-  end
-
-  # Specifies minimum value for bin.
-  def minimum_bin=(min)
-    raise 'minimum_bin= should be called before set the data.' unless store.empty?
-
-    @minimum_bin = min
-  end
-
-  # Specifies maximum value for bin.
-  def maximum_bin=(max)
-    raise 'maximum_bin= should be called before set the data.' unless store.empty?
-
-    @maximum_bin = max
+  def data(name, data_points = [], color = nil)
+    @data << [name, data_points, color]
   end
 
-  def data(name, data_points = [], color = nil)
-    bins, freqs = HistogramArray.new(data_points).histogram(bin_width: @bin_width, min: @minimum_bin, max: @maximum_bin)
-    bins.each_with_index do |bin, index|
-      labels[index] = bin
+  def draw
+    @data.each do |(name, data_points, color)|
+      bins, freqs = HistogramArray.new(data_points).histogram(bin_width: @bin_width, min: @minimum_bin, max: @maximum_bin)
+      bins.each_with_index do |bin, index|
+        @labels[index] = bin
+      end
+      store.add(name, freqs, color)
     end
-    store.add(name, freqs, color)
+
+    super
   end
 
   # @private

data/lib/gruff/line.rb

@@ -12,32 +12,32 @@ require 'gruff/base'
 #   g.write("line.png")
 #
 # There are also other options described below, such as {#baseline_value}, {#baseline_color},
-# {#hide_dots}, and {#hide_lines}.
+# {#hide_dots=}, and {#hide_lines=}.
 #
 class Gruff::Line < Gruff::Base
   # Allow for reference lines ( which are like baseline ... just allowing for more & on both axes ).
   attr_accessor :reference_lines
-  attr_accessor :reference_line_default_color
-  attr_accessor :reference_line_default_width
+  attr_writer :reference_line_default_color
+  attr_writer :reference_line_default_width
 
   # Allow for vertical marker lines.
-  attr_accessor :show_vertical_markers
+  attr_writer :show_vertical_markers
 
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified.
-  attr_accessor :line_width
-  attr_accessor :dot_radius
+  attr_writer :line_width
+  attr_writer :dot_radius
 
   # default is +'circle'+, other options include square.
-  attr_accessor :dot_style
+  attr_writer :dot_style
 
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
-  attr_accessor :hide_dots, :hide_lines
+  attr_writer :hide_dots, :hide_lines
 
   # accessors for support of xy data.
-  attr_accessor :minimum_x_value
+  attr_writer :minimum_x_value
 
   # accessors for support of xy data.
-  attr_accessor :maximum_x_value
+  attr_writer :maximum_x_value
 
   # Get the value if somebody has defined it.
   def baseline_value
@@ -69,7 +69,7 @@ class Gruff::Line < Gruff::Base
   #   g = Gruff::Line.new(400, false) # 400px wide, no lines (for backwards compatibility)
   #   g = Gruff::Line.new(false) # Defaults to 800px wide, no lines (for backwards compatibility)
   #
-  # The preferred way is to call {#hide_dots} or {#hide_lines} instead.
+  # The preferred way is to call {#hide_dots=} or {#hide_lines=} instead.
   def initialize(*args)
     raise ArgumentError, 'Wrong number of arguments' if args.length > 2
 
@@ -78,7 +78,15 @@ class Gruff::Line < Gruff::Base
     else
       super args.shift
     end
+  end
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYData)
+  end
+  private :initialize_store
 
+  def initialize_ivars
+    super
     @reference_lines = {}
     @reference_line_default_color = 'red'
     @reference_line_default_width = 5
@@ -87,12 +95,13 @@ class Gruff::Line < Gruff::Base
     @maximum_x_value = nil
     @minimum_x_value = nil
 
+    @line_width = nil
+    @dot_radius = nil
     @dot_style = 'circle'
 
     @show_vertical_markers = false
-
-    @store = Gruff::Store.new(Gruff::Store::XYData)
   end
+  private :initialize_ivars
 
   # This method allows one to plot a dataset with both X and Y data.
   #
@@ -212,8 +221,8 @@ class Gruff::Line < Gruff::Base
         new_y = @graph_top + (@graph_height - y_data * @graph_height)
 
         # Reset each time to avoid thin-line errors
-        stroke_width  = line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
-        circle_radius = dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
+        stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4), 5.0)
+        circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
 
         if !@hide_lines && prev_x && prev_y
           Gruff::Renderer::Line.new(color: data_row.color, width: stroke_width)

data/lib/gruff/mini/legend.rb

@@ -67,7 +67,7 @@ module Gruff
           # Draw label
           label = truncate_legend_label(legend_label)
           text_renderer = Gruff::Renderer::Text.new(label, font: @font, size: @legend_font_size, color: @font_color)
-          text_renderer.render(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
+          text_renderer.add_to_render_queue(@raw_columns, 1.0, current_x_offset + (legend_square_width * 1.7), current_y_offset, Magick::WestGravity)
 
           # Now draw box with color of this dataset
           rect_renderer = Gruff::Renderer::Rectangle.new(color: store.data[index].color)

data/lib/gruff/net.rb

@@ -26,16 +26,18 @@ require 'gruff/base'
 #
 class Gruff::Net < Gruff::Base
   # Hide parts of the graph to fit more datapoints, or for a different appearance.
-  attr_accessor :hide_dots
+  attr_writer :hide_dots
 
   # Dimensions of lines and dots; calculated based on dataset size if left unspecified.
-  attr_accessor :line_width
-  attr_accessor :dot_radius
+  attr_writer :line_width
+  attr_writer :dot_radius
 
   def initialize_ivars
     super
 
     @hide_dots = false
+    @line_width = nil
+    @dot_radius = nil
     @hide_line_numbers = true
     @sorted_drawing = true
   end
@@ -46,9 +48,6 @@ class Gruff::Net < Gruff::Base
 
     return unless data_given?
 
-    stroke_width = line_width  || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 4), 5.0)
-    circle_radius = dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 2.5), 5.0)
-
     store.norm_data.each do |data_row|
       data_row.points.each_with_index do |data_point, index|
         next if data_point.nil?
@@ -65,9 +64,9 @@ class Gruff::Net < Gruff::Base
         end_x = @center_x + Math.sin(next_rad_pos) * next_point_distance
         end_y = @center_y - Math.cos(next_rad_pos) * next_point_distance
 
-        Gruff::Renderer::Line.new(color: data_row.color, width: stroke_width).render(start_x, start_y, end_x, end_y)
+        Gruff::Renderer::Line.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, end_x, end_y)
 
-        Gruff::Renderer::Circle.new(color: data_row.color, width: stroke_width).render(start_x, start_y, start_x - circle_radius, start_y) unless @hide_dots
+        Gruff::Renderer::Circle.new(color: data_row.color, width: @stroke_width).render(start_x, start_y, start_x - @circle_radius, start_y) unless @hide_dots
       end
     end
 
@@ -80,8 +79,10 @@ private
     super
 
     @radius = @graph_height / 2.0
+    @circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 2.5), 5.0)
+    @stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.points.size * 4), 5.0)
     @center_x = @graph_left + (@graph_width / 2.0)
-    @center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
+    @center_y = @graph_top + (@graph_height / 2.0) + 10
   end
 
   # the lines connecting in the center, with the first line vertical
@@ -95,20 +96,19 @@ private
       Gruff::Renderer::Line.new(color: @marker_color)
                            .render(@center_x, @center_y, @center_x + Math.sin(rad_pos) * @radius, @center_y - Math.cos(rad_pos) * @radius)
 
-      marker_label = labels[index] ? labels[index].to_s : '000'
-      draw_label(@center_x, @center_y, rad_pos * 360 / (2 * Math::PI), @radius, marker_label)
+      marker_label = @labels[index] ? @labels[index].to_s : '000'
+      draw_label(@center_x, @center_y, rad_pos * 360 / (2 * Math::PI), @radius + @circle_radius, marker_label)
     end
   end
 
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 1.1
     x_offset = center_x # + 15 # The label points need to be tweaked slightly
     y_offset = center_y # + 0  # This one doesn't though
-    x = x_offset + (radius * r_offset * Math.sin(deg2rad(angle)))
-    y = y_offset - (radius * r_offset * Math.cos(deg2rad(angle)))
+    x = x_offset + (radius + LABEL_MARGIN) * Math.sin(deg2rad(angle))
+    y = y_offset - (radius + LABEL_MARGIN) * Math.cos(deg2rad(angle))
 
     # Draw label
     text_renderer = Gruff::Renderer::Text.new(amount, font: @font, size: 20, color: @marker_color, weight: Magick::BoldWeight)
-    text_renderer.render(0, 0, x, y, Magick::CenterGravity)
+    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
   end
 end

data/lib/gruff/photo_bar.rb

@@ -7,22 +7,22 @@ require 'gruff/base'
 # Doesn't work yet.
 #
 class Gruff::PhotoBar < Gruff::Base
-# TODO
-#
-# define base and cap in yml
-# allow for image directory to be located elsewhere
-# more exact measurements for bar heights (go all the way to the bottom of the graph)
-# option to tile images instead of use a single image
-# drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
-#
+  # TODO
+  #
+  # define base and cap in yml
+  # allow for image directory to be located elsewhere
+  # more exact measurements for bar heights (go all the way to the bottom of the graph)
+  # option to tile images instead of use a single image
+  # drop base label a few px lower so photo bar graphs can have a base dropping over the lower marker line
+  #
 
   # The name of a pre-packaged photo-based theme.
   attr_reader :theme
 
-#   def initialize(target_width=800)
-#     super
-#     init_photo_bar_graphics()
-#   end
+  # def initialize(target_width=800)
+  #   super
+  #   init_photo_bar_graphics()
+  # end
 
   def draw
     super

data/lib/gruff/pie.rb

@@ -29,35 +29,28 @@ class Gruff::Pie < Gruff::Base
   attr_writer :text_offset_percentage
 
   ## Use values instead of percentages.
-  attr_accessor :show_values_as_labels
+  attr_writer :show_values_as_labels
+
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::CustomData)
+  end
+  private :initialize_store
 
   def initialize_ivars
     super
-
+    @zero_degree = 0.0
+    @hide_labels_less_than = 0.0
+    @text_offset_percentage = DEFAULT_TEXT_OFFSET_PERCENTAGE
     @show_values_as_labels = false
-
-    @store = Gruff::Store.new(Gruff::Store::CustomData)
   end
   private :initialize_ivars
 
-  def zero_degree
-    @zero_degree ||= 0.0
-  end
-
-  def hide_labels_less_than
-    @hide_labels_less_than ||= 0.0
-  end
-
-  def text_offset_percentage
-    @text_offset_percentage ||= DEFAULT_TEXT_OFFSET_PERCENTAGE
-  end
-
   def options
     {
-      zero_degree: zero_degree,
-      hide_labels_less_than: hide_labels_less_than,
-      text_offset_percentage: text_offset_percentage,
-      show_values_as_labels: show_values_as_labels
+      zero_degree: @zero_degree,
+      hide_labels_less_than: @hide_labels_less_than,
+      text_offset_percentage: @text_offset_percentage,
+      show_values_as_labels: @show_values_as_labels
     }
   end
 
@@ -110,7 +103,7 @@ private
   # Spatial Value-Related Methods
 
   def chart_degrees
-    @chart_degrees ||= zero_degree
+    @chart_degrees ||= @zero_degree
   end
 
   attr_reader :graph_height
@@ -146,17 +139,17 @@ private
   end
 
   def radius_offset
-    radius + (radius * text_offset_percentage) + distance_from_center
+    radius + (radius * @text_offset_percentage) + distance_from_center
   end
 
   def ellipse_factor
-    radius_offset * text_offset_percentage
+    radius_offset * @text_offset_percentage
   end
 
   # Label-Related Methods
 
   def process_label_for(slice)
-    if slice.percentage >= hide_labels_less_than
+    if slice.percentage >= @hide_labels_less_than
       x, y = label_coordinates_for slice
 
       draw_label(x, y, slice.label)
@@ -181,7 +174,7 @@ private
 
   def draw_label(x, y, value)
     text_renderer = Gruff::Renderer::Text.new(value, font: @font, size: @marker_font_size, color: @font_color, weight: Magick::BoldWeight)
-    text_renderer.render(0, 0, x, y, Magick::CenterGravity)
+    text_renderer.add_to_render_queue(0, 0, x, y, Magick::CenterGravity)
   end
 
   # Helper Classes