adding support for bubble plots

Author: v0dro

lib/rubyplot/artist/axes.rb

@@ -146,7 +146,9 @@ def area! *args, &block
       end
 
       def bubble! *args, &block
-        add_plot "Bubble", *args, &block
+        plot = Rubyplot::Artist::Plot::Bubble.new self
+        yield(plot) if block_given?
+        @plots << plot
       end
 
       def dot! *args, &block

lib/rubyplot/artist/circle.rb

@@ -2,20 +2,23 @@ module Rubyplot
   module Artist
     class Circle < Base
       def initialize(owner, abs_x:, abs_y:, radius: , stroke_opacity: 0.0,
-                     color: '#000000', stroke_width:)
+                     color: :default, stroke_width:)
         super(owner.backend, abs_x, abs_y)
         @owner = owner
         @radius = radius
         @stroke_width = stroke_width
         @stroke_opacity = stroke_opacity
         @color = color
-        @backend = @owner.backend
       end
 
       def draw
         @backend.draw_circle(
-          x: @abs_x, y: @abs_y, radius: @radius, stroke_opacity: @stroke_opacity,
-          stroke_width: @stroke_width, color: @color
+          x: @abs_x,
+          y: @abs_y,
+          radius: @radius,
+          stroke_opacity: @stroke_opacity,
+          stroke_width: @stroke_width,
+          color: Rubyplot::Color::COLOR_INDEX[@color]
         )
       end
     end # class Circle

lib/rubyplot/artist/plot.rb

@@ -3,3 +3,4 @@
 require_relative 'plot/line'
 require_relative 'plot/bar'
 require_relative 'plot/multi_bars'
+require_relative 'plot/bubble'

lib/rubyplot/artist/plot/bubble.rb

@@ -0,0 +1,42 @@
+module Rubyplot
+  module Artist
+    module Plot
+      class Bubble < Artist::Plot::Base
+        # Width in pixels of the border of each bubble.
+        attr_reader :stroke_width
+        attr_reader :z_max, :z_min
+        
+        def initialize(*)
+          super
+          @bubbles = []
+          @stroke_width = 1.0
+        end
+
+        def data x_values, y_values, z_values
+          super(x_values, y_values)
+          @data[:z_values] = z_values
+          @z_max = @data[:z_values].max
+          @z_min = @data[:z_values].min
+        end
+
+        def draw
+          @normalized_data[:y_values].each_with_index do |iy, idx_y|
+            ix = @normalized_data[:x_values][idx_y]
+            iz = @data[:z_values][idx_y]
+            abs_x = ix * @axes.x_axis.length + @axes.abs_x + @axes.y_axis_margin
+            abs_y = (@axes.y_axis.length - iy * @axes.y_axis.length) + @axes.abs_y
+            @bubbles << Rubyplot::Artist::Circle.new(
+              self,
+              abs_x: abs_x,
+              abs_y: abs_y,
+              radius: iz,
+              color: @data[:color],
+              stroke_width: @stroke_width
+            )
+          end
+          @bubbles.each(&:draw)
+        end
+      end # class Bubble
+    end # module Plot
+  end # module Artist
+end # module Rubyplot