gruff 0.13.0-java → 0.14.0-java

data/lib/gruff/renderer/ellipse.rb

@@ -3,20 +3,19 @@
 module Gruff
   # @private
   class Renderer::Ellipse
-    def initialize(color:, width: 1.0)
+    def initialize(renderer, color:, width: 1.0)
+      @renderer = renderer
       @color = color
       @width = width
     end
 
     def render(origin_x, origin_y, width, height, arc_start, arc_end)
-      draw = Renderer.instance.draw
-
-      draw.push
-      draw.stroke_width(@width)
-      draw.stroke(@color)
-      draw.fill('transparent')
-      draw.ellipse(origin_x, origin_y, width, height, arc_start, arc_end)
-      draw.pop
+      @renderer.draw.push
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill('transparent')
+      @renderer.draw.ellipse(origin_x, origin_y, width, height, arc_start, arc_end)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/line.rb

@@ -5,7 +5,8 @@ module Gruff
   class Renderer::Line
     EPSILON = 0.001
 
-    def initialize(color:, width: nil, shadow_color: nil)
+    def initialize(renderer, color:, width: nil, shadow_color: nil)
+      @renderer = renderer
       @color = color
       @width = width
       @shadow_color = shadow_color
@@ -30,14 +31,12 @@ module Gruff
         end_y += EPSILON
       end
 
-      draw = Renderer.instance.draw
-
-      draw.push
-      draw.stroke(color)
-      draw.fill(color)
-      draw.stroke_width(@width) if @width
-      draw.line(start_x, start_y, end_x, end_y)
-      draw.pop
+      @renderer.draw.push
+      @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
   end
 end

data/lib/gruff/renderer/polygon.rb

@@ -3,22 +3,21 @@
 module Gruff
   # @private
   class Renderer::Polygon
-    def initialize(color:, width: 1.0, opacity: 1.0)
+    def initialize(renderer, color:, width: 1.0, opacity: 1.0)
+      @renderer = renderer
       @color = color
       @width = width
       @opacity = opacity
     end
 
     def render(points)
-      draw = Renderer.instance.draw
-
-      draw.push
-      draw.stroke_width(@width)
-      draw.stroke(@color)
-      draw.fill(@color)
-      draw.fill_opacity(@opacity)
-      draw.polygon(*points)
-      draw.pop
+      @renderer.draw.push
+      @renderer.draw.stroke_width(@width)
+      @renderer.draw.stroke(@color)
+      @renderer.draw.fill(@color)
+      @renderer.draw.fill_opacity(@opacity)
+      @renderer.draw.polygon(*points)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/polyline.rb

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

data/lib/gruff/renderer/rectangle.rb

@@ -3,18 +3,17 @@
 module Gruff
   # @private
   class Renderer::Rectangle
-    def initialize(color: nil)
+    def initialize(renderer, color: nil)
+      @renderer = renderer
       @color = color
     end
 
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
-      draw = Renderer.instance.draw
-
-      draw.push
-      draw.stroke('transparent')
-      draw.fill(@color) if @color
-      draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
-      draw.pop
+      @renderer.draw.push
+      @renderer.draw.stroke('transparent')
+      @renderer.draw.fill(@color) if @color
+      @renderer.draw.rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      @renderer.draw.pop
     end
   end
 end

data/lib/gruff/renderer/renderer.rb

@@ -1,53 +1,32 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 module Gruff
   # @private
   class Renderer
-    include Singleton
-
-    attr_accessor :draw, :image, :scale, :text_renderers
-
-    def self.setup(columns, rows, font, scale, theme_options)
-      draw = Magick::Draw.new
-      draw.font = font if font
-      # Scale down from 800x600 used to calculate drawing.
-      draw.scale(scale, scale)
-
-      image = Renderer.instance.background(columns, rows, scale, theme_options)
+    attr_accessor :text_renderers
+    attr_reader :draw, :image, :scale
 
-      Renderer.instance.draw  = draw
-      Renderer.instance.scale = scale
-      Renderer.instance.image = image
-      Renderer.instance.text_renderers = []
-    end
-
-    def self.setup_transparent_background(columns, rows)
-      image = Renderer.instance.render_transparent_background(columns, rows)
-      Renderer.instance.image = image
-    end
+    def initialize(columns, rows, scale, theme_options)
+      @draw = Magick::Draw.new
+      @text_renderers = []
 
-    def self.background_image=(image)
-      Renderer.instance.image = image
+      @scale = scale
+      @draw.scale(scale, scale)
+      @image = background(columns, rows, scale, theme_options)
     end
 
-    def self.font=(font)
-      draw = Renderer.instance.draw
-      draw.font = font if font
-    end
+    def finish
+      @draw.draw(@image)
 
-    def self.finish
-      draw  = Renderer.instance.draw
-      image = Renderer.instance.image
-
-      draw.draw(image)
-
-      Renderer.instance.text_renderers.each do |renderer|
+      @text_renderers.each do |renderer|
         renderer.render(renderer.width, renderer.height, renderer.x, renderer.y, renderer.gravity)
       end
     end
 
+    def background_image=(image)
+      @image = image
+    end
+
     def background(columns, rows, scale, theme_options)
       case theme_options[:background_colors]
       when Array
@@ -59,6 +38,10 @@ module Gruff
       end
     end
 
+    def transparent_background(columns, rows)
+      @image = render_transparent_background(columns, rows)
+    end
+
     # Make a new image at the current size with a solid +color+.
     def solid_background(columns, rows, color)
       Magick::Image.new(columns, rows) do
@@ -101,6 +84,8 @@ module Gruff
       end
     end
 
+  private
+
     # Use with a theme to use an image (800x600 original) background.
     def image_background(scale, image_path)
       image = Magick::Image.read(image_path)

data/lib/gruff/renderer/text.rb

@@ -5,12 +5,10 @@ module Gruff
   class Renderer::Text
     using Magick::GruffAnnotate
 
-    def initialize(text, font:, size:, color:, weight: Magick::NormalWeight, rotation: nil)
+    def initialize(renderer, text, font:, rotation: nil)
+      @renderer = renderer
       @text = text.to_s
       @font = font
-      @font_size = size
-      @font_color = color
-      @font_weight = weight
       @rotation = rotation
     end
 
@@ -23,50 +21,36 @@ module Gruff
       @y = y
       @gravity = gravity
 
-      Renderer.instance.text_renderers << self
+      @renderer.text_renderers << self
     end
 
     def render(width, height, x, y, gravity = Magick::NorthGravity)
-      draw  = Renderer.instance.draw
-      image = Renderer.instance.image
-      scale = Renderer.instance.scale
-
-      draw.rotation = @rotation if @rotation
-      draw.fill = @font_color
-      draw.stroke = 'transparent'
-      draw.font = @font || Renderer::Text.default_font(@font_weight)
-      draw.font_weight = @font_weight
-      draw.pointsize = @font_size * scale
-      draw.gravity = gravity
-      draw.annotate_scaled(image,
-                           width, height,
-                           x, y,
-                           @text, scale)
-      draw.rotation = -@rotation if @rotation
+      @renderer.draw.rotation = @rotation if @rotation
+      @renderer.draw.fill = @font.color
+      @renderer.draw.stroke = 'transparent'
+      @renderer.draw.font = @font.file_path
+      @renderer.draw.font_weight = @font.weight
+      @renderer.draw.pointsize = @font.size * @renderer.scale
+      @renderer.draw.gravity = gravity
+      @renderer.draw.annotate_scaled(@renderer.image,
+                                     width, height,
+                                     x, y,
+                                     @text, @renderer.scale)
+      @renderer.draw.rotation = -@rotation if @rotation
     end
 
-    def self.metrics(text, font, size, font_weight = Magick::NormalWeight)
-      draw  = Renderer.instance.draw
-      image = Renderer.instance.image
-
-      draw.font = font || Renderer::Text.default_font(font_weight)
-      draw.font_weight = font_weight
-      draw.pointsize = size
+    def metrics
+      @renderer.draw.font = @font.file_path
+      @renderer.draw.font_weight = @font.weight
+      @renderer.draw.pointsize = @font.size
 
       # The old ImageMagick causes SEGV with string which has '%' + alphabet (eg. '%S').
       # This format is used to embed value into a string using image properties.
       # However, gruff use plain image as canvas which does not have any property.
       # So, in here, it just escape % in order to avoid SEGV.
-      text = text.to_s.gsub(/(%+)/) { ('%' * Regexp.last_match(1).size * 2).to_s }
-
-      draw.get_type_metrics(image, text)
-    end
-
-    FONT_BOLD = File.expand_path(File.join(__FILE__, '../../../../assets/fonts/Roboto-Bold.ttf'))
-    FONT_REGULAR = File.expand_path(File.join(__FILE__, '../../../../assets/fonts/Roboto-Regular.ttf'))
+      text = @text.to_s.gsub(/(%+)/) { ('%' * Regexp.last_match(1).size * 2).to_s }
 
-    def self.default_font(font_weight)
-      (font_weight == Magick::BoldWeight) ? FONT_BOLD : FONT_REGULAR
+      @renderer.draw.get_type_metrics(@renderer.image, text)
     end
   end
 end

data/lib/gruff/scatter.rb

@@ -35,27 +35,6 @@ class Gruff::Scatter < Gruff::Base
   attr_writer :x_label_margin
   attr_writer :use_vertical_x_labels
 
-  def initialize_store
-    @store = Gruff::Store.new(Gruff::Store::XYData)
-  end
-  private :initialize_store
-
-  def initialize_ivars
-    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
-  private :initialize_ivars
-
   # Allow enabling vertical lines. When you have a lot of data, they can work great.
   # @deprecated Please use +show_vertical_markers+ attribute instead.
   def enable_vertical_line_markers=(value)
@@ -63,28 +42,6 @@ class Gruff::Scatter < Gruff::Base
     @show_vertical_markers = value
   end
 
-  def draw
-    super
-    return unless data_given?
-
-    # Check to see if more than one datapoint was given. NaN can result otherwise.
-    @x_increment = (@x_spread > 1) ? (@graph_width / (@x_spread - 1).to_f) : @graph_width
-
-    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(color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
-      end
-    end
-  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.
@@ -138,6 +95,44 @@ class Gruff::Scatter < Gruff::Base
 
 private
 
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYData)
+  end
+
+  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
+    # Check to see if more than one datapoint was given. NaN can result otherwise.
+    @x_increment = (@x_spread > 1) ? (@graph_width / (@x_spread - 1).to_f) : @graph_width
+
+    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
+  end
+
   def setup_data
     # Update the global min/max values for the x data
     @maximum_x_value ||= store.max_x
@@ -187,7 +182,7 @@ private
       end
     else
       # TODO: Make this work for negative values
-      @maximum_x_value = [maximum_value.ceil, @x_axis_increment].max
+      @maximum_x_value = [@maximum_x_value.ceil, @x_axis_increment].max
       @minimum_x_value = @minimum_x_value.floor
       calculate_spread
       normalize
@@ -203,7 +198,7 @@ private
       if @show_vertical_markers
         x = @graph_left + @graph_width - index.to_f * increment_x_scaled
 
-        line_renderer = Gruff::Renderer::Line.new(color: @marker_color, shadow_color: @marker_shadow_color)
+        line_renderer = Gruff::Renderer::Line.new(renderer, color: @marker_color, shadow_color: @marker_shadow_color)
         line_renderer.render(x, @graph_top, x, @graph_bottom)
       end
 
@@ -214,7 +209,7 @@ private
 
         label = x_axis_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 = 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)
       end
     end