Added dimension calculation for bar plots

Author: v0dro

lib/rubyplot/artist/axes.rb

@@ -295,9 +295,9 @@ def label_string(value, increment)
       end
 
       def consolidate_plots
-        bars = @plots.map { |p| p.is_a?(Rubyplot::Artist::Plot::Bar) }
+        bars = @plots.grep(Rubyplot::Artist::Plot::Bar)
         @plots.delete_if { |p| p.is_a?(Rubyplot::Artist::Plot::Bar) }
-        @plots << Rubyplot::Artist::Plot::MultiBars.new(self, bars)
+        @plots << Rubyplot::Artist::Plot::MultiBars.new(self, bar_plots: bars)
       end
     end # class Axes
   end # moudle Artist

lib/rubyplot/artist/axis/x_axis.rb

@@ -18,7 +18,7 @@ def initialize(*)
 
       def draw
         @line.draw
-        @x_ticks.each(&:draw)
+        @major_ticks.each(&:draw)
         @title.draw
       end
 
@@ -31,6 +31,7 @@ def configure_axis_line
       end
 
       def populate_major_x_ticks
+        puts "max_val #{@max_val} #{@major_ticks_count}"
         value_distance = (@max_val) / @major_ticks_count.to_f
         @major_ticks_count.times do |count|
           count += 1

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,12 +4,19 @@ module Plot
       class Bar < Artist::Plot::Base
         # Space between the columns.
         attr_accessor :bar_spacing
-        # Width of each bar.
+        # Width of each bar in pixels.
         attr_accessor :bar_width
+        # Height of each bar in pixels.
+        attr_accessor :bar_height
         # 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).
+        # Denotes the total left + right side space.
         attr_reader :spacing_ratio
+        # X co-ordinate of the lower left corner of the bar.
+        attr_accessor :abs_x_left
+        # Y co-ordinate of the lower left corner of the bar.
+        attr_accessor :abs_y_left
         def initialize(*)
           super
           @spacing_ratio = 0.1
@@ -24,8 +31,7 @@ def spacing_ratio= sf
 
         # Set Bar plot data.
         def data y_values
-          @data[:y_values] = y_values
-          set_yrange
+          super(Array.new(y_values.size) { |i| i}, y_values)
         end
 
         # Number of bars in this Bar plot
@@ -34,22 +40,14 @@ def num_bars
         end
 
         def draw
-          super
           return unless @axes.geometry.has_data
-          configure_bars
+          setup_bar_heights
         end
 
         private
 
-        # FIXME: handle positive and negative bars.
-        def configure_bars
-          x_axis_length = @axes.x_axis.abs_x2 - @axes.x_axis.abs_x1
-          @bar_width = coords_width / @data[:y_values].to_f
-          padding = @bar_width * @spacing_ratio / 2
-          @normalized_data[:y_values].each_with_index do |iy, index|
-            ix = @normalized_data[:x_values][index]
-            left_x = ix * x_axis_length 
-          end
+        def setup_bar_heights
+          
         end
       end # class Bar
     end # module Plot

lib/rubyplot/artist/plot/base.rb

@@ -9,7 +9,7 @@ def initialize axes
           @axes = axes
           @backend = @axes.backend
           @data = {
-            label: :default,
+            label: "",
             color: :default
           }
           @normalized_data = {
@@ -33,7 +33,7 @@ def label= label
         end
 
         def color= color
-          @data[:color] = Rubyplot::Color::COLOR_INDEX[color]
+          @data[:color] = color
         end
 
         def data x_values, y_values

lib/rubyplot/artist/plot/multi_bars.rb

@@ -2,32 +2,41 @@ module Rubyplot
   module Artist
     module Plot
       # Class for holding multiple Bar plot objects.
+      # Terminoligies used:
+      #
+      # * A 'bar' is a single bar of a single bar plot.
+      # * A 'slot' is a box within which multiple bars can be plotted.
+      # * 'padding' is the total whitespace on the left and right of a slot.
       class MultiBars < Artist::Plot::Base
         # The max. width that each bar can occupy.
         attr_reader :max_bar_width
 
-        def initialize(*, bar_plots:)
-          super
+        def initialize(*args, bar_plots:)
+          super(args[0])
           @bar_plots = bar_plots
         end
 
         def draw
           configure_plot_geometry_data
-          configure_x_ticks
-          broadcast_to_bar_plots
+          #configure_x_ticks
           @bar_plots.each(&:draw)
         end
 
         private
 
         def configure_plot_geometry_data
-          max_bars = @bar_plots.map { |bar| bar.num_bars }.max
-          @max_bar_width = (@axes.x_axis.abs_x2 - @axes.x_axis.abs_x1).abs
-          @bar_plots.each do |bar|
-            set_bar_coords bar
+          @num_max_slots = @bar_plots.map { |bar| bar.num_bars }.max
+          @max_slot_width = (@axes.x_axis.abs_x2 - @axes.x_axis.abs_x1).abs / @num_max_slots
+          # FIXME: figure out a way to specify inter-box space somehow.
+          @spacing_ratio = @bar_plots[0].spacing_ratio
+          @padding = @spacing_ratio * @max_slot_width
+          @max_bars_width = @max_slot_width - @padding
+          @bars_per_slot = @bar_plots.size
+          @bar_plots.each_with_index do |bar, index|
+            set_bar_dims bar, index
           end
         end
-         
+
         def configure_x_ticks
           if @axes.x_ticks # user supplied ticks
 
@@ -36,8 +45,10 @@ def configure_x_ticks
           end
         end
 
-        def set_bar_coords bar_plot
-          
+        def set_bar_dims bar_plot, index
+          bar_plot.bar_width = @max_bars_width / @bars_per_slot
+          bar_plot.abs_x_left = @padding / 2 + index * bar_plot.bar_width
+          bar_plot.abs_y_left = @axes.x_axis.abs_y1
         end
       end # class MultiBars
     end # module Plot

lib/rubyplot/artist/rectangle.rb

@@ -7,8 +7,8 @@ def initialize(owner,abs_x:,abs_y:,width:,height:,border_color:,fill_color: nil)
         super(owner.backend, abs_x, abs_y)
         @height = height
         @width = width
-        @border_color = border_color
-        @fill_color = fill_color
+        @border_color = Rubyplot::Color::COLOR_INDEX[border_color]
+        @fill_color = Rubyplot::Color::COLOR_INDEX[fill_color] if fill_color
       end
 
       def draw

spec/axes_spec.rb

@@ -275,7 +275,7 @@
 
       end
 
-      it "makes a simple line plot", focus: true do
+      it "makes a simple line plot", focus: false do
         fig = Rubyplot::Figure.new
         axes = fig.add_subplot 0,0
         axes.line! do |p|
@@ -650,7 +650,7 @@
 #        FileUtils.rm_rf SPEC_ROOT + "temp/scatter"
       end
 
-      it "adds a simple scatter plot.", focus: true do
+      it "adds a simple scatter plot.", focus: false do
         fig = Rubyplot::Figure.new
         axes = fig.add_subplot 0,0
         axes.scatter!(400) do |p|