Merge branch 'integration' into branch_two

Author: arzoo14

lib/rubyplot/artist/axes.rb

@@ -20,26 +20,15 @@ class Axes < Base
       attr_accessor :x_range
       # Range of Y axis.
       attr_accessor :y_range,
-                    :x_tick_count, :y_tick_count, :text_font, :grid,
-                    :bounding_box, :x_axis_padding, :y_axis_padding, :origin,
+                    :text_font, :grid,
+                    :bounding_box, :origin,
                     :title_shift, :title_margin
-
-      # A hash of names for the individual columns, where the key is the array
-      # index for the column this label represents.
-      #
-      # Not all columns need to be named.
-      #
-      # Example: 0 => 2005, 3 => 2006, 5 => 2007, 7 => 2008
-      attr_accessor :x_ticks
-      attr_accessor :y_ticks
       # Main title for this Axes.
       attr_accessor :title
       # Rubyplot::Figure object to which this Axes belongs.
       attr_reader :figure
       # Array of plots contained in this Axes.
       attr_reader :plots
-      # data variables for something
-      attr_reader :raw_rows
 
       attr_reader :geometry, :font, :marker_font_size, :legend_font_size,
                   :title_font_size, :scale, :font_color, :marker_color, :axes,
@@ -71,8 +60,6 @@ def initialize figure
         @y_axis_margin = 40.0
         @x_range = [nil, nil]
         @y_range = [nil, nil]
-        @x_tick_count = :default
-        @y_tick_count = :default
 
         @origin = [nil, nil]
         @title = ""
@@ -81,7 +68,6 @@ def initialize figure
         @text_font = :default
         @grid = true
         @bounding_box = true
-        @x_ticks = {}
         @plots = []
 
         @raw_rows = width * (height/width)
@@ -124,6 +110,9 @@ def legend_box_iy
 
       # Write an image to a file by communicating with the backend.
       def draw
+        assign_plot_defaults
+        consolidate_plots
+        gather_plot_data
         configure_title
         calculate_xy_axes_origin
         configure_xy_axes
@@ -191,8 +180,25 @@ def height
         (1 - (@figure.top_spacing + @figure.bottom_spacing)) * @figure.height
       end
 
+      def x_ticks= ticks_hash
+        @x_ticks = ticks_hash
+      end
+
       private
 
+      def assign_plot_defaults
+        assign_label_colors
+      end
+
+      def assign_label_colors
+        @plots.each_with_index do |p, i|
+          if p.color == :default
+            p.color = @figure.theme_options[:label_colors][
+              i % @figure.theme_options[:label_colors].size]
+          end
+        end
+      end
+
       def add_plot plot_type, *args, &block
         plot = with_backend plot_type, *args
         yield(plot) if block_given?
@@ -211,11 +217,6 @@ def with_backend plot_type, *args
         plot
       end
 
-      def prepare_legend
-        @legends = @plots.map(&:create_legend)
-        @legends.each { |l| l.draw }
-      end
-
       # Figure out the co-ordinates of the title text w.r.t Axes.
       def configure_title
         @title = Rubyplot::Artist::Text.new(
@@ -300,6 +301,33 @@ def label_string(value, increment)
         parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{THOUSAND_SEPARATOR}")
         parts.join('.')
       end
+
+      def consolidate_plots
+        bars = @plots.grep(Rubyplot::Artist::Plot::Bar)
+        if !bars.empty?
+          @plots.delete_if { |p| p.is_a?(Rubyplot::Artist::Plot::Bar) }
+          @plots << Rubyplot::Artist::Plot::MultiBars.new(self, bar_plots: bars)
+        end
+      end
+
+      def gather_plot_data
+        set_xrange
+        set_yrange
+      end
+
+      def set_xrange
+        if @x_range[0].nil? && @x_range[1].nil?
+          @x_range[0] = @plots.map { |p| p.x_min }.min
+          @x_range[1] = @plots.map { |p| p.x_max }.max
+        end
+      end
+
+      def set_yrange
+        if @y_range[0].nil? && @y_range[1].nil?
+          @y_range[0] = @plots.map { |p| p.y_min }.min
+          @y_range[1] = @plots.map { |p| p.y_max }.max
+        end
+      end
     end # class Axes
   end # moudle Artist
 end # module Rubyplot

lib/rubyplot/artist/axis/base.rb

@@ -6,8 +6,8 @@ class Base
         FINISH_ARROW_LENGTH = 10.0
 
         attr_reader :label, :ticks, :major_ticks_count, :min_val, :max_val, :title
-        attr_reader :abs_x1, :abs_x2, :abs_y1, :abs_y2, :backend
-        attr_reader :stroke_width
+        attr_reader :abs_x1, :abs_x2, :abs_y1, :abs_y2, :backend, :length
+        attr_reader :stroke_width, :major_ticks
 
         def initialize axes, title, min_val, max_val
           @axes = axes
@@ -16,6 +16,7 @@ def initialize axes, title, min_val, max_val
           @max_val = max_val
           @stroke_width = 1.0
           @backend = @axes.backend
+          @major_ticks = []
         end
       end # class Base
     end # class Axis

lib/rubyplot/artist/axis/x_axis.rb

@@ -11,31 +11,31 @@ def initialize(*)
         @abs_y2 = @axes.origin[1]
         @major_ticks_count = 5
         @major_ticks_distance = (@abs_x2 - @abs_x1) / @major_ticks_count
-        @x_ticks = []
+        @length = (@abs_x2 - @abs_x1).abs
         configure_axis_line
         populate_major_x_ticks
         configure_title
       end
 
       def draw
         @line.draw
-        @x_ticks.each(&:draw)
+        @major_ticks.each(&:draw)
         @title.draw
       end
 
       private
 
       def configure_axis_line
         @line = Rubyplot::Artist::Line2D.new(
-          self, abs_x1: @abs_x1, abs_y1: @abs_y1, abs_x2: @abs_x2, abs_y2: @abs_y2)
-        #stroke_width: @stroke_width)
+          self, abs_x1: @abs_x1, abs_y1: @abs_y1, abs_x2: @abs_x2, abs_y2: @abs_y2,
+          stroke_width: @stroke_width)
       end
 
       def populate_major_x_ticks
         value_distance = (@max_val) / @major_ticks_count.to_f
         @major_ticks_count.times do |count|
           count += 1
-          @x_ticks << Rubyplot::Artist::XTick.new(
+          @major_ticks << Rubyplot::Artist::XTick.new(
             @axes,
             abs_x: count * @major_ticks_distance + @abs_x1,
             abs_y: @abs_y1,

lib/rubyplot/artist/axis/y_axis.rb

@@ -8,6 +8,7 @@ def initialize(*)
         @abs_x2 = @axes.origin[0]
         @abs_y2 = @axes.origin[1] - (@axes.height - @axes.x_axis_margin)
         @y_ticks = []
+        @length = (@abs_y1 - @abs_y2).abs
         configure_axis_line
         configure_title
         populate_major_y_ticks

lib/rubyplot/artist/figure.rb

@@ -28,13 +28,17 @@ class Figure < Artist::Base
       attr_reader :theme_options
       attr_reader :marker_color
       attr_reader :font_color
-      def initialize
+      
+      # Initialize a Rubyplot::Artist::Figure object.
+      # @param height [Integer] nil Height in pixels of the complete Figure.
+      # @param width [Integer] nil Width in pixels of the complete Figure.
+      def initialize(height: nil, width: nil)
         @title = ''
         @nrows = 1
         @ncols = 1
         @backend = Rubyplot::Backend::MagickWrapper.new
-        @width = DEFAULT_TARGET_WIDTH
-        @height = @width * 0.75
+        @width = width || DEFAULT_TARGET_WIDTH
+        @height = height || @width * 0.75
         @abs_x = 0
         @abs_y = 0
         @top_spacing = 0.05
@@ -58,6 +62,8 @@ def write file_name
         @backend.write(file_name)
       end
 
+      private
+
       def setup_default_theme
         defaults = {
           marker_color: 'white',

lib/rubyplot/artist/legend_box.rb

@@ -15,7 +15,7 @@ class LegendBox < Base
       def initialize(axes, abs_x:, abs_y:)
         super(axes.backend, abs_x, abs_y)
         @axes = axes
-        @border_color = "#000000"
+        @border_color = :black
         @legends = []
         configure_dimensions
         configure_legends

lib/rubyplot/artist/plot.rb

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

lib/rubyplot/artist/plot/bar.rb

@@ -4,25 +4,64 @@ module Plot
       class Bar < Artist::Plot::Base
         # Space between the columns.
         attr_accessor :bar_spacing
+        # Width of each bar in pixels.
+        attr_accessor :bar_width
         # Number between 0 and 1.0 denoting spacing between the bars.
         # 0.0 means no spacing at all 1.0 means that each bars' width
         # is nearly 0 (so each bar is a simple line with no X dimension).
-        attr_reader :spacing_factor
+        # Denotes the total left + right side space.
+        attr_reader :spacing_ratio
+        # X co-ordinates of the lower left corner of the bar.
+        attr_accessor :abs_x_left
+        # Y co-ordinates of the lower left corner of the bar.
+        attr_accessor :abs_y_left
+        
         def initialize(*)
           super
-          @spacing_factor = 0.9
+          @spacing_ratio = 0.1
+          @abs_x_left = []
+          @abs_y_left = []
+          @rectangles = []
         end
 
         # Set the spacing factor for this bar plot.
-        def spacing_factor= sf
-          raise ValueError, '@spacing_factor must be between 0.00 and 1.00' unless
+        def spacing_ratio= sf
+          raise ValueError, '@spacing_ratio must be between 0.00 and 1.00' unless
             (sf >= 0) && (sf <= 1)
-          @spacing_factor = sf
+          @spacing_ratio = sf
         end
-        
+
+        # Set Bar plot data.
+        def data y_values
+          super(Array.new(y_values.size) { |i| i}, y_values)
+        end
+
+        # Number of bars in this Bar plot
+        def num_bars
+          @data[:y_values].size
+        end
+
         def draw
-          super
           return unless @axes.geometry.has_data
+          setup_bar_rectangles
+          @rectangles.each(&:draw)
+        end
+
+        private
+
+        def setup_bar_rectangles
+          @normalized_data[:y_values].each_with_index do |iy, i|
+            height = iy * @axes.y_axis.length
+            @rectangles << Rubyplot::Artist::Rectangle.new(
+              self,
+              abs_x: @abs_x_left[i],
+              abs_y: @abs_y_left[i] - height,
+              width: @bar_width,
+              height: height,
+              border_color: @data[:color],
+              fill_color: @data[:color]
+            )
+          end
         end
       end # class Bar
     end # module Plot

lib/rubyplot/artist/plot/base.rb

@@ -2,14 +2,16 @@ module Rubyplot
   module Artist
     module Plot
       class Base < Artist::Base
-        attr_reader :axes, :data
+        attr_reader :axes, :data, :x_max, :x_min, :y_min,
+                    :y_max
         attr_writer :stroke_width, :stroke_opacity
 
         def initialize axes
+          super(axes.backend, axes.abs_x, axes.abs_y)
           @axes = axes
           @backend = @axes.backend
           @data = {
-            label: :default,
+            label: "",
             color: :default
           }
           @normalized_data = {
@@ -33,38 +35,34 @@ def label= label
         end
 
         def color= color
-          @data[:color] = Rubyplot::Color::COLOR_INDEX[color]
+          @data[:color] = color
         end
 
         def data x_values, y_values
           @data[:x_values] = x_values
           @data[:y_values] = y_values
           # Set column count if this is larger than previous column counts
           @axes.geometry.column_count = y_values.length > @axes.geometry.column_count ?
-                                     y_values.length : @axes.geometry.column_count
-          if @axes.y_range[0].nil? && @axes.y_range[1].nil?
-            @axes.y_range[0] = y_values.min
-            @axes.y_range[1] = y_values.max
-          end
-          if @axes.x_range[1].nil? && @axes.x_range[0].nil?
-            @axes.x_range[0] = x_values.min
-            @axes.x_range[1] = x_values.max
-          end
+                                          y_values.length : @axes.geometry.column_count
+          @y_min = @data[:y_values].min
+          @y_max = @data[:y_values].max
+          @x_min = @data[:x_values].min
+          @x_max = @data[:x_values].max
+
           @axes.geometry.has_data = true
         end
 
-        # Normalize original data to values between 0-100.
+        # Normalize original data to values between 0-1. Used for obtaining relative
+        # values of the data.
         def normalize
-          x_min = @axes.x_range[0] < 0 ? @axes.x_range[0] : 0
-          y_min = @axes.y_range[0] < 0 ? @axes.y_range[0] : 0
-          x_spread = @axes.x_range[1] - x_min
-          y_spread = @axes.y_range[1] - y_min
+          x_spread = @axes.x_range[1] - @axes.x_range[0]
+          y_spread = @axes.y_range[1] - @axes.y_range[0]
           @normalized_data[:x_values] = @data[:x_values].map do |x|
-            (x.to_f - x_min) / x_spread 
-          end
+            (x.to_f - @axes.x_range[0]) / x_spread 
+          end if @data[:x_values]
           @normalized_data[:y_values] = @data[:y_values].map do |y|
-            (y.to_f - y_min) / y_spread
-          end
+            (y.to_f - @axes.y_range[0]) / y_spread
+          end if @data[:y_values]
         end
       end # class Base
     end # module Plot