plots multiple bar graphs

Author: v0dro

lib/rubyplot/artist/axes.rb

@@ -45,6 +45,10 @@ class Axes < Base
       attr_reader :x_axis
       # Rubyplot::Artist::YAxis object.
       attr_reader :y_axis
+      # Array of X ticks.
+      attr_reader :x_ticks
+      # Number of X ticks.
+      attr_accessor :num_x_ticks
 
       # @param figure [Rubyplot::Figure] Figure object to which this Axes belongs.
       def initialize figure
@@ -85,6 +89,8 @@ def initialize figure
         calculate_xy_axes_origin
         @x_axis = Rubyplot::Artist::XAxis.new(self)
         @y_axis = Rubyplot::Artist::YAxis.new(self)
+        @x_ticks = nil
+        @num_x_ticks = 5
 
         @legend_box_position = :top
       end
@@ -107,12 +113,13 @@ def legend_box_iy
 
       # Write an image to a file by communicating with the backend.
       def draw
-        assign_plot_defaults
+        assign_default_label_colors
         consolidate_plots
         gather_plot_data
         configure_title
         configure_legends
         configure_plotting_data
+        assign_x_ticks
         actually_draw
       end
 
@@ -147,7 +154,7 @@ def dot! *args, &block
       end
 
       def stacked_bar! *args, &block
-        add_plot "StackedBar", *args, &block
+        appdd_plot "StackedBar", *args, &block
       end
 
       def write file_name
@@ -176,7 +183,7 @@ def height
       end
 
       def x_ticks= x_ticks
-        @x_axis.x_ticks = x_ticks
+        @x_ticks = x_ticks
       end
 
       def x_title= x_title
@@ -189,11 +196,7 @@ def y_title= y_title
 
       private
 
-      def assign_plot_defaults
-        assign_label_colors
-      end
-
-      def assign_label_colors
+      def assign_default_label_colors
         @plots.each_with_index do |p, i|
           if p.color == :default
             p.color = @figure.theme_options[:label_colors][
@@ -202,6 +205,26 @@ def assign_label_colors
         end
       end
 
+      def assign_x_ticks
+        unless @x_ticks
+          val_distance = @x_range[1] / @num_x_ticks.to_f
+          @x_ticks = Array.new(@num_x_ticks) { |c| (c*val_distance).to_s }
+        end
+        unless @x_ticks.all? { |t| t.is_a?(Rubyplot::Artist::XTick) }
+          inter_ticks_distance = @x_axis.length / @num_x_ticks
+          @x_ticks.map!.with_index do |tick_label, i|
+            Rubyplot::Artist::XTick.new(
+              self,
+              abs_x: i * inter_ticks_distance + @x_axis.abs_x1,
+              abs_y: @x_axis.abs_y1,
+              label: tick_label,
+              length: 6,
+              label_distance: 10
+            )
+          end
+        end
+      end
+
       def add_plot plot_type, *args, &block
         plot = with_backend plot_type, *args
         yield(plot) if block_given?
@@ -256,6 +279,7 @@ def configure_plotting_data
       # Call the respective draw methods on each of the elements of this Axes.
       def actually_draw
         @x_axis.draw
+        @x_ticks.each(&:draw)
         @y_axis.draw
         @title.draw
         @legend_box.draw

lib/rubyplot/artist/axis/x_axis.rb

@@ -3,8 +3,6 @@
 module Rubyplot
   module Artist
     class XAxis < Axis::Base
-      attr_accessor :x_ticks
-      
       def initialize axes
         super
         @abs_x1 = @axes.origin[0]
@@ -17,10 +15,8 @@ def initialize axes
       end
 
       def draw
-        populate_major_x_ticks
         configure_title
         @line.draw
-        @x_ticks.each(&:draw)
         @title.draw
       end
 
@@ -32,27 +28,6 @@ def configure_axis_line
           stroke_width: @stroke_width)
       end
 
-      # FIXME: refactor the tick population logic.
-      def populate_major_x_ticks
-        value_distance = (@max_val) / @major_ticks_count.to_f
-        if !@x_ticks
-          @x_ticks = Array.new(@major_ticks_count) { |c| (c*value_distance).to_s }
-        end
-        @x_ticks = @x_ticks[0...@major_ticks_count]
-        unless @x_ticks.all? { |x| x.is_a?(XTick) }
-          @x_ticks.map!.with_index do |tick_label, i|
-            Rubyplot::Artist::XTick.new(
-              @axes,
-              abs_x: i * @major_ticks_distance + @abs_x1,
-              abs_y: @abs_y1,
-              label: tick_label,
-              length: 6,
-              label_distance: 10
-            )
-          end
-        end
-      end
-
       def configure_title
         @title = Rubyplot::Artist::Text.new(
           @title,

lib/rubyplot/artist/axis/y_axis.rb

@@ -11,13 +11,11 @@ def initialize(*)
         @length = (@abs_y1 - @abs_y2).abs
         configure_axis_line
         configure_title
-        populate_major_y_ticks
       end
 
       def draw
         @title.draw
         @line.draw
-        #@y_ticks.each(&:draw)
       end
 
       private
@@ -43,10 +41,6 @@ def configure_title
           pointsize: @axes.marker_font_size
         )
       end
-
-      def populate_major_y_ticks
-        
-      end
     end # class YAxis
   end # class Artist
 end # module Rubyplot

lib/rubyplot/artist/legend_box.rb

@@ -23,8 +23,10 @@ def initialize(axes, abs_x:, abs_y:)
       end
 
       def draw
-        @bounding_box.draw
-        @legends.each(&:draw)
+        unless @legends.empty?
+          @bounding_box.draw
+          @legends.each(&:draw)
+        end
       end
 
       def top_margin
@@ -70,14 +72,16 @@ def configure_dimensions
 
       def configure_legends
         @axes.plots.each_with_index do |plot, count|
-          @legends << Rubyplot::Artist::Legend.new(
-            self,
-            @axes,
-            text: plot.label,
-            color: plot.color,
-            abs_x: @abs_x + left_margin,
-            abs_y: @abs_y + count * per_legend_height + top_margin
-          )
+          if plot.label != ""
+            @legends << Rubyplot::Artist::Legend.new(
+              self,
+              @axes,
+              text: plot.label,
+              color: plot.color,
+              abs_x: @abs_x + left_margin,
+              abs_y: @abs_y + count * per_legend_height + top_margin
+            )
+          end
         end
       end
     end # class LegendBox

lib/rubyplot/artist/plot/multi_bars.rb

@@ -18,15 +18,15 @@ def initialize(*args, bar_plots:)
           @y_min = @bar_plots.map(&:y_min).min
           @x_max = @bar_plots.map(&:x_max).max
           @y_max = @bar_plots.map(&:y_max).max
+          configure_plot_geometry_data
+          configure_x_ticks
         end
 
         def normalize
           @bar_plots.each(&:normalize)
         end
 
         def draw
-          configure_plot_geometry_data
-          configure_default_x_ticks if @axes.x_axis.x_ticks.nil?
           @bar_plots.each(&:draw)
         end
 
@@ -45,8 +45,22 @@ def configure_plot_geometry_data
           end
         end
 
-        def configure_default_x_ticks
+        def configure_x_ticks
+          @axes.num_x_ticks = @num_max_slots
           labels = @axes.x_ticks || Array.new(@num_max_slots) { |i| i.to_s }
+          if labels.size != @axes.num_x_ticks
+            labels = labels[0...@axes.num_x_ticks]
+          end
+          @axes.x_ticks = labels.map.with_index do |label, i|
+            Rubyplot::Artist::XTick.new(
+              @axes,
+              abs_x: @axes.abs_x + @axes.y_axis_margin + i * @max_slot_width + @max_slot_width / 2,
+              abs_y: @axes.x_axis.abs_y1,
+              label: label,
+              length: 6,
+              label_distance: 10
+            )
+          end
         end
 
         def set_bar_dims bar_plot, index