port code for bubble plots

Author: v0dro

lib/rubyplot/axes.rb

@@ -68,6 +68,10 @@ def area! *args, &block
       add_plot "Area", *args, &block
     end
 
+    def bubble! *args, &block
+      add_plot "Bubble", *args, &block
+    end
+
     def write file_name
       @plots[0].write file_name
     end

lib/rubyplot/magick_wrapper/artist.rb

@@ -251,7 +251,7 @@ def setup_graph_measurements
         else
           longest_left_label_width = calculate_width(
             @marker_font_size,
-            label(@geometry.maximum_value.to_f, @geometry.increment))
+            label_string(@geometry.maximum_value.to_f, @geometry.increment))
         end
 
         # Shift graph if left line numbers are hidden
@@ -471,7 +471,7 @@ def draw_line_markers!
           @d = @d.scale_annotation(@base_image,
                                    @graph_left - LABEL_MARGIN, 1.0,
                                    0.0, y,
-                                   label(marker_label, @geometry.increment), @scale)
+                                   label_string(marker_label, @geometry.increment), @scale)
         end
         @d = @d.stroke_antialias true
         # string = 'hello' + '.png'
@@ -543,7 +543,7 @@ def draw_label(x_offset, index)
 
       # Return a formatted string representing a number value that should be
       # printed as a label.
-      def label(value, increment)
+      def label_string(value, increment)
         label =
           if increment
             if increment >= 10 || (increment * 1) == (increment * 1).to_i.to_f

lib/rubyplot/magick_wrapper/artist/math_methods.rb

@@ -3,18 +3,28 @@ module MagickWrapper
     class Artist
       module MathMethods
         # Make copy of data with values scaled between 0-100
-        # TODO: Add spec for this method.
+        # norm_data gets populated here.
+        # FIXME: change this method to reflect arch change.
         def normalize
           @geometry.norm_data = []
           #@data.each do |data_row|
           data_row = @data
+          norm_data_points = []
+          data_row[:y_values].each do |data_point|
+            norm_data_points << ((data_point.to_f - @geometry.minimum_value.to_f) / @spread)
+            # Add support for nil values in data etc.
+          end
+          @geometry.norm_data << [data_row[:label], norm_data_points]
+          #end
+          @geometry.norm_data[0] << @data[:color]
+          if @data[:x_values]
             norm_data_points = []
-            data_row[:y_values].each do |data_point|
+            data_row[:x_values].each do |data_point|
               norm_data_points << ((data_point.to_f - @geometry.minimum_value.to_f) / @spread)
               # Add support for nil values in data etc.
             end
-            @geometry.norm_data << [data_row[:label], norm_data_points]
-          #end
+            @geometry.norm_data[0] << norm_data_points
+          end
         end
 
         def clip_value_if_greater_than(value, max_value) # :nodoc:

lib/rubyplot/magick_wrapper/plot.rb

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

lib/rubyplot/magick_wrapper/plot/bubble.rb

@@ -0,0 +1,132 @@
+require_relative 'bubble/geometry'
+
+module Rubyplot
+  module MagickWrapper
+    module Plot
+      class Bubble < MagickWrapper::Plot::Scatter
+        # Rubyplot::Bubble takes the same parameters as the Rubyplot::Bubble graph
+        #
+        # ==== Example
+        # g = Rubyplot::Bubble.new
+        #
+        def initialize(*)
+          super
+          @all_colors_array = Magick.colors
+          @plot_colors = []
+          @z_data = []
+          @geometry = Plot::Bubble::Geometry.new
+        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. Then the Z axis data points refer to the radius of the bubble plots.
+        # The final parameter is the color.
+        #
+        # Can be called multiple times with different datasets for a multi-valued
+        # graph.
+        #
+        # If the color argument is nil, the next color from the default theme will
+        # be used.
+        #
+        # ==== Parameters to data function
+        # name:: String or Symbol containing the name of the dataset.
+        # x_data_points:: An Array of x-axis data points.
+        # y_data_points:: An Array of y-axis data points.
+        # z_data_points:: An Array containing the radius of the data points.
+        # color:: The hex string for the color of the dataset.  Defaults to nil.
+        #
+        #
+        # ==== Examples
+        # plot = Rubyplot::Bubble.new
+        # plot.data(:apples, [-1, 19, -4, -23], [-35, 21, 23, -4], [45, 10, 21, 9])
+        # plot.data(:peaches, [20, 30, -6, -3], [-1, 5, -27, -3], [13, 10, 20, 10])
+        # plot.write('spec/reference_images/bubble_test_1.png')
+        #
+        def data(x_data_points = [], y_data_points = [], z_data_points = [])
+#          name = label == :default ? ' ' : label.to_s
+           #  the existing data routine for the y axis data
+          data_y(y_data_points, z_data_points)
+          # append the x data to the last entry that was just added in the @data member
+          # last_elem = @data.length - 1
+          # @data[last_elem] << x_data_points
+          @data[:x_values] = x_data_points
+
+          if @geometry.maximum_x_value.nil? && @geometry.minimum_x_value.nil?
+            @geometry.maximum_x_value = @geometry.minimum_x_value = x_data_points.first
+          end
+          @z_data << z_data_points
+          x_z_array_sum = [x_data_points, z_data_points].transpose.map { |x| x.reduce(:+) }
+          x_z_array_diff = [x_data_points, z_data_points].transpose.map { |x| x.reduce(:-) }
+
+          @geometry.maximum_x_value = x_z_array_sum.max > @geometry.maximum_x_value ?
+                                        x_z_array_sum.max : @geometry.maximum_x_value
+          @geometry.minimum_x_value = x_z_array_sum.min < @geometry.minimum_x_value ?
+                                        x_z_array_sum.min : @geometry.minimum_x_value
+
+          @geometry.maximum_x_value = x_z_array_diff.max > @geometry.maximum_x_value ?
+                                        x_z_array_diff.max : @geometry.maximum_x_value
+          @geometry.minimum_x_value = x_z_array_diff.min < @geometry.minimum_x_value ?
+                                        x_z_array_diff.min : @geometry.minimum_x_value
+        end
+
+        private
+
+        # Helper function to normalize the data along Y axis.
+        def data_y(data_points = [], z_data_points)
+          data_points = Array(data_points) # make sure it's an array
+          # TODO: Adding an empty color array which can be developed later
+          # to make graphs super customizable with regards to coloring of
+          # individual data points.
+          @data[:y_values] = data_points
+          # Set column count if this is larger than previous column counts
+          @geometry.column_count = data_points.length > @geometry.column_count ?
+                                     data_points.length : @geometry.column_count
+
+          y_z_array_sum = [data_points, z_data_points].transpose.map { |x| x.reduce(:+) }
+          y_z_array_diff = [data_points, z_data_points].transpose.map { |x| x.reduce(:-) }
+          if @geometry.maximum_value.nil? && @geometry.maximum_value.nil?
+            @geometry.maximum_value = @geometry.minimum_value = data_points.first
+          end
+          @geometry.maximum_value = y_z_array_sum.max > @geometry.maximum_value ?
+                                      y_z_array_sum.max : @geometry.maximum_value
+          @geometry.minimum_value = y_z_array_sum.min < @geometry.minimum_value ?
+                                      y_z_array_sum.min : @geometry.minimum_value
+          @geometry.maximum_value = y_z_array_diff.max > @geometry.maximum_value ?
+                                      y_z_array_diff.max : @geometry.maximum_value
+          @geometry.minimum_value = y_z_array_diff.min < @geometry.minimum_value ?
+                                      y_z_array_diff.min : @geometry.minimum_value
+          @geometry.has_data = true
+        end
+
+        def draw
+          super
+          # Check to see if more than one datapoint was given. NaN can result otherwise.
+          @x_increment = @geometry.column_count > 1 ?
+                           (@graph_width / (@geometry.column_count - 1).to_f) : @graph_width
+
+          @geometry.norm_data.each_with_index do |data_row, data_row_index|
+            data_row[DATA_VALUES_INDEX].each_with_index do |data_point, index|
+              @d = @d.fill @plot_colors[data_row_index]
+              x_value = data_row[DATA_VALUES_X_INDEX][index]
+              next if data_point.nil? || x_value.nil?
+
+              new_x = get_x_coord(x_value, @graph_width, @graph_left)
+              new_y = @graph_top + (@graph_height - data_point * @graph_height)
+
+              # Reset each time to avoid thin-line errors
+              @d = @d.stroke_opacity 1.0
+              @d.fill_opacity(0.3)
+              @d.fill_color(@plot_colors[data_row_index])
+              @d = @d.stroke_width @stroke_width ||
+                   clip_value_if_greater_than(@columns /
+                                              (@geometry.norm_data.first[1].size * 4), 5.0)
+              circle_radius = 2 * @z_data[data_row_index][index]
+              @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
+            end
+          end
+          @d.draw(@base_image)
+        end        
+      end # class Bubble
+    end # module Plot
+  end # module MagickWrapper
+end # module Rubyplot

lib/rubyplot/magick_wrapper/plot/bubble/geometry.rb

@@ -0,0 +1,24 @@
+module Rubyplot
+  module MagickWrapper
+    module Plot
+      class Bubble < MagickWrapper::Plot::Scatter
+        class Geometry < MagickWrapper::Plot::Scatter::Geometry
+          attr_accessor :all_colors_array
+          attr_accessor :z_data
+          attr_accessor :plot_colors
+          attr_accessor :maximum_x_value
+          attr_accessor :minimum_x_value
+
+          def initialize
+            super
+            @all_colors_array = Magick.colors
+            @plot_colors = []
+            @z_data = []
+            @maximum_x_value = nil
+            @minimum_x_value = nil
+          end
+        end # class Geometry
+      end # class Bar
+    end # module Plot
+  end # module MagickWrapper
+end # module Rubyplot

lib/rubyplot/magick_wrapper/plot/scatter.rb

@@ -239,7 +239,7 @@ def draw_line_markers!
           @d = @d.stroke_antialias true
         end
 
-        def label(value, increment)
+        def label_string(value, increment)
           if @geometry.y_axis_label_format
             @geometry.y_axis_label_format.call(value)
           else
@@ -251,7 +251,7 @@ def vertical_label(value, increment)
           if @geometry.x_axis_label_format
             @geometry.x_axis_label_format.call(value)
           else
-            label(value, increment)
+            label_string(value, increment)
           end
         end
 

spec/axes_spec.rb

@@ -13,7 +13,50 @@
       ]
     end
 
-    context "#area!", focus: true do
+    context "#bubble!", focus: true do
+      before do 
+        @temp_dir = SPEC_ROOT + "temp/bubble"
+        @fix_dir = SPEC_ROOT + "fixtures/bubble"
+        FileUtils.mkdir_p @temp_dir
+      end
+
+      it "plots a single bubble plot", focus: true do
+        fig = Rubyplot::Figure.new
+        axes = fig.add_subplot 0,0
+        axes.bubble! do |p|
+          p.data [-1, 19, -4, -23], [-35, 21, 23, -4], [45, 10, 21, 9]
+          p.label = "apples"
+          p.color = :blue
+        end
+        axes.title = "simple bubble plot."
+        
+        file = "/#{Rubyplot.backend}_simple_bubble.png"
+        fig.write(@temp_dir + file)
+
+        #expect("temp/bubble" + file).to eq_image("fixtures/bubble" + file)
+      end
+
+      it "plots multiple bubble plots on same axes." do 
+        fig = Rubyplot::Figure.new
+        axes = fig.add_subplot 0,0
+        axes.bubble! do |p|
+          p.data [-1, 19, -4, -23], [-35, 21, 23, -4], [45, 10, 21, 9]
+          p.label = "apples"
+        end
+        axes.bubble! do |p|
+          p.data [20, 30, -6, -3], [-1, 5, -27, -3], [13, 10, 20, 10]
+          p.label = "peaches"
+        end
+        axes.title = "simple bubble plot."
+        
+        file = "/#{Rubyplot.backend}_multiple_bubble.png"
+        fig.write(@temp_dir + file)
+
+        #expect("temp/bubble" + file).to eq_image("fixtures/bubble" + file)       
+      end
+    end
+
+    context "#area!" do
       before do 
         @temp_dir = SPEC_ROOT + "temp/area"
         @fix_dir = SPEC_ROOT + "fixtures/area"