configuring proper tick labels for bar plots

Author: v0dro

lib/rubyplot/artist/axes.rb

@@ -12,10 +12,6 @@ class Axes < Base
 
       # FIXME: most of the below accessors should just be name= methods which
       # will access the required Artist and set the variable in there directly.
-      # Title of the X axis
-      attr_accessor :x_title
-      # Title of the Y axis.
-      attr_accessor :y_title
       # Range of X axis.
       attr_accessor :x_range
       # Range of Y axis.
@@ -60,8 +56,7 @@ def initialize figure
         @y_axis_margin = 40.0
         @x_range = [nil, nil]
         @y_range = [nil, nil]
-        
-        @origin = [nil, nil]
+
         @title = ""
         @title_shift = 0
         @title_margin = TITLE_MARGIN
@@ -86,8 +81,10 @@ def initialize figure
         @legends = []
         @lines = []
         @texts = []
-        @x_axis = nil
-        @y_axis = nil
+        @origin = [nil, nil]
+        calculate_xy_axes_origin
+        @x_axis = Rubyplot::Artist::XAxis.new(self)
+        @y_axis = Rubyplot::Artist::YAxis.new(self)
 
         @legend_box_position = :top
       end
@@ -114,8 +111,6 @@ def draw
         consolidate_plots
         gather_plot_data
         configure_title
-        calculate_xy_axes_origin
-        configure_xy_axes
         configure_legends
         configure_plotting_data
         actually_draw
@@ -180,10 +175,18 @@ def height
         (1 - (@figure.top_spacing + @figure.bottom_spacing)) * @figure.height
       end
 
-      def x_ticks= ticks_hash
-        @x_ticks = ticks_hash
+      def x_ticks= x_ticks
+        @x_axis.x_ticks = x_ticks
       end
 
+      def x_title= x_title
+        @x_axis.title = x_title
+      end
+
+      def y_title= y_title
+        @y_axis.title = y_title
+      end
+      
       private
 
       def assign_plot_defaults
@@ -236,14 +239,6 @@ def calculate_xy_axes_origin
         @origin[1] = abs_y + height - @y_axis_margin
       end
 
-      # Figure out co-ordinatees of the XAxis and YAxis
-      def configure_xy_axes
-        @x_axis = Rubyplot::Artist::XAxis.new(
-          self, @x_title, @x_range[0], @x_range[1])
-        @y_axis = Rubyplot::Artist::YAxis.new(
-          self, @y_title, @y_range[0], @y_range[1])
-      end
-
       # Figure out co-ordinates of the legends
       def configure_legends
         @legend_box = Rubyplot::Artist::LegendBox.new(
@@ -310,6 +305,7 @@ def consolidate_plots
         end
       end
 
+      # FIXME: replace x_range and y_range with XAxis::max/min_value and YAxis::max/min_value.
       def gather_plot_data
         set_xrange
         set_yrange
@@ -320,13 +316,17 @@ def set_xrange
           @x_range[0] = @plots.map { |p| p.x_min }.min
           @x_range[1] = @plots.map { |p| p.x_max }.max
         end
+        @x_axis.min_val = @x_range[0]
+        @x_axis.max_val = @x_range[1]
       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
+        @y_axis.min_val = @y_range[0]
+        @y_axis.max_val = @y_range[1]
       end
     end # class Axes
   end # moudle Artist

lib/rubyplot/artist/axis/base.rb

@@ -5,18 +5,20 @@ class Base
         # Length in pixels of the arrow after the last major tick.
         FINISH_ARROW_LENGTH = 10.0
 
-        attr_reader :label, :ticks, :major_ticks_count, :min_val, :max_val, :title
+        attr_reader :label, :ticks, :major_ticks_count
         attr_reader :abs_x1, :abs_x2, :abs_y1, :abs_y2, :backend, :length
         attr_reader :stroke_width, :major_ticks
+        attr_accessor :title, :min_val, :max_val
 
-        def initialize axes, title, min_val, max_val
+        def initialize axes
           @axes = axes
-          @title = title
-          @min_val = min_val
-          @max_val = max_val
+          @title = ""
+          @min_val = nil
+          @max_val = nil
           @stroke_width = 1.0
           @backend = @axes.backend
-          @major_ticks = []
+          @major_ticks_count = 5
+          @x_ticks = nil
         end
       end # class Base
     end # class Axis

lib/rubyplot/artist/axis/x_axis.rb

@@ -3,23 +3,24 @@
 module Rubyplot
   module Artist
     class XAxis < Axis::Base
-      def initialize(*)
+      attr_accessor :x_ticks
+      
+      def initialize axes
         super
         @abs_x1 = @axes.origin[0]
         @abs_y1 = @axes.origin[1]
         @abs_x2 = @axes.abs_x + @axes.width - @axes.y_axis_margin
         @abs_y2 = @axes.origin[1]
-        @major_ticks_count = 5
         @major_ticks_distance = (@abs_x2 - @abs_x1) / @major_ticks_count
         @length = (@abs_x2 - @abs_x1).abs
         configure_axis_line
-        populate_major_x_ticks
-        configure_title
       end
 
       def draw
+        populate_major_x_ticks
+        configure_title
         @line.draw
-        @major_ticks.each(&:draw)
+        @x_ticks.each(&:draw)
         @title.draw
       end
 
@@ -30,19 +31,25 @@ def configure_axis_line
           self, abs_x1: @abs_x1, abs_y1: @abs_y1, abs_x2: @abs_x2, abs_y2: @abs_y2,
           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
-        @major_ticks_count.times do |count|
-          count += 1
-          @major_ticks << Rubyplot::Artist::XTick.new(
-            @axes,
-            abs_x: count * @major_ticks_distance + @abs_x1,
-            abs_y: @abs_y1,
-            label: (count * value_distance),
-            length: 6,
-            label_distance: 10
-          )
+        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
 

lib/rubyplot/artist/plot/multi_bars.rb

@@ -26,7 +26,7 @@ def normalize
 
         def draw
           configure_plot_geometry_data
-          #configure_x_ticks
+          configure_default_x_ticks if @axes.x_axis.x_ticks.nil?
           @bar_plots.each(&:draw)
         end
 
@@ -45,12 +45,8 @@ def configure_plot_geometry_data
           end
         end
 
-        def configure_x_ticks
-          if @axes.x_ticks # user supplied ticks
-            
-          else # default ticks
-            
-          end
+        def configure_default_x_ticks
+          labels = @axes.x_ticks || Array.new(@num_max_slots) { |i| i.to_s }
         end
 
         def set_bar_dims bar_plot, index

lib/rubyplot/artist/tick/base.rb

@@ -1,7 +1,7 @@
 module Rubyplot
   module Artist
     class Tick
-      class Base
+      class Base < Artist::Base
         # Distance between tick mark and number.
         attr_reader :label_distance
         # Label of this Tick
@@ -18,15 +18,13 @@ class Base
         # @param tick_opacity [Float] Number describing the opacity of the tick drawn. 0-1.0.
         def initialize(owner,abs_x:,abs_y:,length:,label:,label_distance:,
                        tick_opacity: 0.0,tick_width: 1.0)
+          super(owner.backend, abs_x, abs_y)
           @owner = owner
-          @abs_x = abs_x
-          @abs_y = abs_y
           @length = length
-          @label_text = Rubyplot::Utils.format_label label
+          @label_text = label #Rubyplot::Utils.format_label label
           @label_distance = label_distance
           @tick_opacity = tick_opacity
           @tick_width = tick_width
-          @backend = @owner.backend
         end
       end # class Base
     end # class Tick

lib/rubyplot/artist/tick/x_tick.rb

@@ -19,6 +19,6 @@ def draw
           stroke_width: @tick_width)
         @label.draw
       end
-    end
+    end # class XTick
   end # class Artist
 end # module Rubyplot

spec/axes_spec.rb

@@ -457,6 +457,7 @@
           p.label = "data"
           p.color = :yellow
         end
+        axes.x_ticks = ["five", "twelve", "nine", "six", "seven"]
         axes.title = "Random bar numbers"
 
         file = "/#{Rubyplot.backend}_simple_bar.png"