added specs for line plots

Author: v0dro

lib/rubyplot.rb

@@ -18,4 +18,3 @@ def self.backend
     :magick
   end
 end
-

lib/rubyplot/axes.rb

@@ -9,6 +9,14 @@ class Axes
                   :bounding_box, :x_axis_padding, :y_axis_padding, :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
+
     # Main title for this Axes.
     attr_accessor :title
 
@@ -40,6 +48,7 @@ def initialize figure, position
       @bounding_box = true
       @x_axis_padding = :default
       @y_axis_padding = :default
+      @x_ticks = {}
       @plots = []
     end
 

lib/rubyplot/magick_wrapper/artist.rb

@@ -72,7 +72,6 @@ def initialize_variables
         }
 
         @raw_rows = 800.0 * (@rows / @columns)
-        @labels = {}
         @sort = false
         @title_font = nil
 
@@ -244,11 +243,15 @@ def setup_graph_measurements
         # For now, the labels feature only focuses on the dot graph so it makes sense to only have
         # this as an attribute for this kind of graph and not for others.
         if @geometry.has_left_labels
-          longest_left_label_width = calculate_width(@marker_font_size,
-                                                     labels.values.inject('') { |value, memo| value.to_s.length > memo.to_s.length ? value : memo }) * 1.25
+          longest_left_label_width = calculate_width(
+            @marker_font_size,
+            @axes.x_ticks.values.inject('') { |value, memo|
+              value.to_s.length > memo.to_s.length ? value : memo
+            }) * 1.25
         else
-          longest_left_label_width = calculate_width(@marker_font_size,
-                                                     label(@geometry.maximum_value.to_f, @geometry.increment))
+          longest_left_label_width = calculate_width(
+            @marker_font_size,
+            label(@geometry.maximum_value.to_f, @geometry.increment))
         end
 
         # Shift graph if left line numbers are hidden
@@ -261,9 +264,11 @@ def setup_graph_measurements
                       (@geometry.y_axis_label .nil? ? 0.0 : @marker_caps_height + LABEL_MARGIN * 2)
 
         # Make space for half the width of the rightmost column label.
-        last_label = @labels.keys.max.to_i
-        extra_room_for_long_label = last_label >= (@geometry.column_count - 1) && @geometry.center_labels_over_point ?
-                                      calculate_width(@marker_font_size, @labels[last_label]) / 2.0 : 0
+        last_label = @axes.x_ticks.keys.max.to_i
+        extra_room_for_long_label = last_label >= (@geometry.column_count - 1) &&
+                                    @geometry.center_labels_over_point ?
+                                      calculate_width(@marker_font_size,
+                                                      @axes.x_ticks[last_label]) / 2.0 : 0
 
         # Margins
         @graph_right_margin = @geometry.right_margin + extra_room_for_long_label
@@ -443,9 +448,7 @@ def draw_line_markers!
         (0..@geometry.marker_count).each do |index|
           y = @graph_top + @graph_height - index.to_f * @geometry.increment_scaled
           y_next = @graph_top + @graph_height - (index.to_f + 1) * @geometry.increment_scaled
-
           @d = @d.fill(@marker_color)
-
           @d = @d.line(@graph_left, y, @graph_right, y) if !@geometry.hide_line_markers || (index == 0)
           # If the user specified a marker shadow color, draw a shadow just below it
           unless @marker_shadow_color.nil?
@@ -497,14 +500,14 @@ def render_gradiated_background(top_color, bottom_color, direct = :top_bottom)
 
       # Draws column labels below graph, centered over x_offset
       def draw_label(x_offset, index)
-        if !@labels[index].nil? && @geometry.labels_seen[index].nil?
+        if !@axes.x_ticks[index].nil? && @geometry.labels_seen[index].nil?
           y_offset = @graph_bottom + LABEL_MARGIN
 
           # TESTME
           # TODO: See if index.odd? is the best stragegy
           y_offset += @label_stagger_height if index.odd?
 
-          label_text = labels[index].to_s
+          label_text = @axes.x_ticks[index].to_s
 
           # TESTME
           # FIXME: Consider chart types other than bar

lib/rubyplot/magick_wrapper/artist/attributes.rb

@@ -4,15 +4,7 @@ class Artist
       module Attributes
         # Blank space below the legend
         attr_accessor :legend_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 :labels
-
+        
         # Used internally for horizontal graph types.
         attr_accessor :has_left_labels
 
@@ -23,9 +15,6 @@ module Attributes
 
         attr_accessor :font_color
 
-        # Prevent drawing of the legend
-        attr_accessor :hide_legend
-
         # Prevent drawing of line numbers
         attr_accessor :hide_line_numbers
 

lib/rubyplot/magick_wrapper/artist/geometry.rb

@@ -55,9 +55,6 @@ class Geometry
 
         attr_accessor :font_color
 
-        # Prevent drawing of the legend
-        attr_accessor :hide_legend
-
         # Prevent drawing of line numbers
         attr_accessor :hide_line_numbers
 
@@ -107,7 +104,7 @@ class Geometry
         attr_accessor :legend_at_bottom, :legend_box_size, :legend_margin
 
         # Helper variables to hide geometry objects
-        attr_accessor :hide_line_markers, :hide_legend, :hide_title, :hide_line_numbers
+        attr_accessor :hide_line_markers, :hide_title, :hide_line_numbers
         attr_accessor :show_labels_for_bar_values
         attr_accessor :center_labels_over_point, :label_truncation_style
 
@@ -137,7 +134,7 @@ def initialize(*)
           @label_stagger_height = 0
           @label_truncation_style = :absolute
           @label_max_size = 0
-          @hide_line_markers = @hide_legend = @hide_title = false
+          @hide_line_markers = @hide_title = false
           @hide_line_numbers = @legend_at_bottom = @show_labels_for_bar_values = false
           @center_labels_over_point = true
 

lib/rubyplot/magick_wrapper/plot/bar.rb

@@ -24,7 +24,7 @@ def draw
           # Labels will be centered over the left of the bar if
           # there are more labels than columns. This is basically the same
           # as where it would be for a line graph.
-          @geometry.center_labels_over_point = (@labels.keys.length > @geometry.column_count)
+          @geometry.center_labels_over_point = (@axes.x_ticks.keys.length > @geometry.column_count)
           super
           return unless @geometry.has_data
           draw_bars
@@ -79,7 +79,9 @@ def draw_bars
               @d = @d.fill @plot_colors[row_index]
               # Use incremented x and scaled y
               # x
-              left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index))) + padding
+              left_x = @graph_left + (
+                @bar_width *
+                (row_index + point_index + ((@data.length - 1) * point_index))) + padding
               right_x = left_x + @bar_width * @bar_spacing
               # y
               conv = []
@@ -98,7 +100,8 @@ def draw_bars
                          (@geometry.center_labels_over_point ? @bar_width / 2.0 : 0.0),
                          point_index)
               if @geometry.show_labels_for_bar_values
-                val = (@geometry.label_formatting || '%.2f') % @geometry.norm_data[row_index][3][point_index]
+                val = (@geometry.label_formatting || '%.2f') %
+                      @geometry.norm_data[row_index][3][point_index]
                 draw_value_label(left_x + (right_x - left_x) / 2, conv[0] - 30, val.commify, true)
               end
             end