gruff 0.10.0-java → 0.13.0-java

data/lib/gruff/renderer/circle.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Circle
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
     end
 
     def render(origin_x, origin_y, perim_x, perim_y)

data/lib/gruff/renderer/dash_line.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::DashLine
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width]
+    def initialize(color:, width:)
+      @color = color
+      @width = width
     end
 
     def render(start_x, start_y, end_x, end_y)

data/lib/gruff/renderer/dot.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Dot
-    def initialize(style, config)
+    def initialize(style, color:, width: 1.0)
       @style = style
-      @color = config[:color]
-      @width = config[:width] || 1.0
+      @color = color
+      @width = width
     end
 
     def render(new_x, new_y, circle_radius)

data/lib/gruff/renderer/ellipse.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Ellipse
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
+    def initialize(color:, width: 1.0)
+      @color = color
+      @width = width
     end
 
     def render(origin_x, origin_y, width, height, arc_start, arc_end)

data/lib/gruff/renderer/line.rb

@@ -1,15 +1,24 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Line
     EPSILON = 0.001
 
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width]
+    def initialize(color:, width: nil, shadow_color: nil)
+      @color = color
+      @width = width
+      @shadow_color = shadow_color
     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 +33,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/polygon.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Polygon
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width] || 1.0
-      @opacity = args[:opacity] || 1.0
+    def initialize(color:, width: 1.0, opacity: 1.0)
+      @color = color
+      @width = width
+      @opacity = opacity
     end
 
     def render(points)

data/lib/gruff/renderer/polyline.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Polyline
-    def initialize(args = {})
-      @color = args[:color]
-      @width = args[:width]
+    def initialize(color:, width:)
+      @color = color
+      @width = width
     end
 
     def render(points)

data/lib/gruff/renderer/rectangle.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Rectangle
-    def initialize(args = {})
-      @color = args[:color]
+    def initialize(color: nil)
+      @color = color
     end
 
     def render(upper_left_x, upper_left_y, lower_right_x, lower_right_y)

data/lib/gruff/renderer/renderer.rb

@@ -7,58 +7,51 @@ 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)
-        draw = Magick::Draw.new
-        draw.font = font if font
-        # Scale down from 800x600 used to calculate drawing.
-        draw.scale(scale, scale)
+    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)
+      image = Renderer.instance.background(columns, rows, scale, theme_options)
 
-        Renderer.instance.draw  = draw
-        Renderer.instance.scale = scale
-        Renderer.instance.image = image
-      end
-
-      def setup_transparent_background(columns, rows)
-        image = Renderer.instance.render_transparent_background(columns, rows)
-        Renderer.instance.image = image
-      end
+      Renderer.instance.draw  = draw
+      Renderer.instance.scale = scale
+      Renderer.instance.image = image
+      Renderer.instance.text_renderers = []
+    end
 
-      def background_image=(image)
-        Renderer.instance.image = image
-      end
+    def self.setup_transparent_background(columns, rows)
+      image = Renderer.instance.render_transparent_background(columns, rows)
+      Renderer.instance.image = image
+    end
 
-      def font=(font)
-        draw = Renderer.instance.draw
-        draw.font = font if font
-      end
+    def self.background_image=(image)
+      Renderer.instance.image = image
+    end
 
-      def finish
-        draw  = Renderer.instance.draw
-        image = Renderer.instance.image
+    def self.font=(font)
+      draw = Renderer.instance.draw
+      draw.font = font if font
+    end
 
-        draw.draw(image)
-      end
+    def self.finish
+      draw  = Renderer.instance.draw
+      image = Renderer.instance.image
 
-      def write(file_name)
-        Renderer.instance.image.write(file_name)
-      end
+      draw.draw(image)
 
-      def to_blob(file_format)
-        Renderer.instance.image.to_blob do
-          self.format = file_format
-        end
+      Renderer.instance.text_renderers.each do |renderer|
+        renderer.render(renderer.width, renderer.height, renderer.x, renderer.y, renderer.gravity)
       end
     end
 
     def background(columns, rows, scale, theme_options)
       case theme_options[:background_colors]
       when Array
-        gradated_background(columns, rows, theme_options[:background_colors][0], theme_options[:background_colors][1], theme_options[:background_direction])
+        gradated_background(columns, rows, *theme_options[:background_colors][0..1], theme_options[:background_direction])
       when String
         solid_background(columns, rows, theme_options[:background_colors])
       else
@@ -102,7 +95,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

@@ -1,14 +1,29 @@
 # frozen_string_literal: true
 
 module Gruff
+  # @private
   class Renderer::Text
-    def initialize(text, args = {})
+    using Magick::GruffAnnotate
+
+    def initialize(text, font:, size:, color:, weight: Magick::NormalWeight, rotation: nil)
       @text = text.to_s
-      @font = args[:font]
-      @font_size = args[:size]
-      @font_color = args[:color]
-      @font_weight = args[:weight] || Magick::NormalWeight
-      @rotation = args[:rotation]
+      @font = font
+      @font_size = size
+      @font_color = color
+      @font_weight = weight
+      @rotation = 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)
@@ -19,7 +34,7 @@ module Gruff
       draw.rotation = @rotation if @rotation
       draw.fill = @font_color
       draw.stroke = 'transparent'
-      draw.font = @font if @font
+      draw.font = @font || Renderer::Text.default_font(@font_weight)
       draw.font_weight = @font_weight
       draw.pointsize = @font_size * scale
       draw.gravity = gravity
@@ -30,13 +45,28 @@ module Gruff
       draw.rotation = -@rotation if @rotation
     end
 
-    def self.metrics(text, size, font_weight = Magick::NormalWeight)
+    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
-      draw.get_type_metrics(image, text.to_s)
+
+      # 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'))
+
+    def self.default_font(font_weight)
+      (font_weight == Magick::BoldWeight) ? FONT_BOLD : FONT_REGULAR
     end
   end
 end

data/lib/gruff/scatter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'gruff/base'
-
 #
 # Here's how to set up a Gruff::Scatter.
 #
@@ -13,33 +11,34 @@ 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
+  # Allow for vertical marker lines.
+  attr_writer :show_vertical_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
+  def initialize_store
+    @store = Gruff::Store.new(Gruff::Store::XYData)
+  end
+  private :initialize_store
 
   def initialize_ivars
     super
@@ -48,19 +47,22 @@ class Gruff::Scatter < Gruff::Base
     @baseline_x_value = @baseline_y_value = nil
     @circle_radius = nil
     @disable_significant_rounding_x_axis = false
-    @enable_vertical_line_markers = 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_axis_label_format = nil
     @x_label_margin = nil
-    @y_axis_label_format = nil
-
-    @store = Gruff::Store.new(Gruff::Store::XYData)
   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)
+    warn '#enable_vertical_line_markers= is deprecated. Please use `show_vertical_markers` attribute instead'
+    @show_vertical_markers = value
+  end
+
   def draw
     super
     return unless data_given?
@@ -81,8 +83,6 @@ class Gruff::Scatter < Gruff::Base
         Gruff::Renderer::Circle.new(color: data_row.color, width: stroke_width).render(new_x, new_y, new_x - circle_radius, new_y)
       end
     end
-
-    Gruff::Renderer.finish
   end
 
   # The first parameter is the name of the dataset.  The next two are the
@@ -192,7 +192,7 @@ private
       calculate_spread
       normalize
 
-      @marker_count = (@x_spread / @x_axis_increment).to_i
+      @marker_x_count = (@x_spread / @x_axis_increment).to_i
       @x_increment = @x_axis_increment
     end
     increment_x_scaled = @graph_width.to_f / (@x_spread / @x_increment)
@@ -200,40 +200,26 @@ private
     # 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 @enable_vertical_line_markers
+      if @show_vertical_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
-        marker_label = index * @x_increment + @minimum_x_value.to_f
+        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.to_f, increment_x_scaled, @graph_left)
 
-        label = vertical_label(marker_label, @x_increment)
+        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.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
 
-  def label(value, increment)
-    if @y_axis_label_format
-      @y_axis_label_format.call(value)
-    else
-      super
-    end
-  end
-
-  def vertical_label(value, increment)
-    if @x_axis_label_format
-      @x_axis_label_format.call(value)
-    else
-      label(value, increment)
-    end
-  end
-
   def get_x_coord(x_data_point, width, offset) #:nodoc:
     x_data_point * width + offset
   end