gruff 0.2.8 → 0.2.9

data/lib/gruff/line.rb

@@ -1,6 +1,17 @@
 
 require File.dirname(__FILE__) + '/base'
 
+##
+# Here's how to make a Line graph:
+#
+#   g = Gruff::Line.new
+#   g.title = "A Line Graph"
+#   g.data 'Fries', [20, 23, 19, 8]
+#   g.data 'Hamburgers', [50, 19, 99, 29]
+#   g.write("test/output/line.png")
+#
+# There are also other options described below, such as #baseline_value, #baseline_color, #hide_dots, and #hide_lines.
+
 class Gruff::Line < Gruff::Base
 
   # Draw a dashed line at the given value

data/lib/gruff/mini/legend.rb

@@ -20,14 +20,14 @@ module Gruff
         
         legend_square_width = 40.0 # small square with color of this item
         legend_square_margin = 10.0
-        @legend_left_margin = 40.0
+        @legend_left_margin = 100.0
         legend_top_margin = 40.0
 
         # May fix legend drawing problem at small sizes
         @d.font = @font if @font
         @d.pointsize = @legend_font_size
 
-        current_x_offset = @graph_left + @legend_left_margin
+        current_x_offset = @legend_left_margin
         current_y_offset = @original_rows + legend_top_margin
 
         debug { @d.line 0.0, current_y_offset, @raw_columns, current_y_offset }
@@ -66,7 +66,7 @@ module Gruff
       
       def truncate_legend_label(label)
         truncated_label = label.to_s
-        while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - Gruff::Base::RIGHT_MARGIN) && (truncated_label.length > 1)
+        while calculate_width(scale_fontsize(@legend_font_size), truncated_label) > (@columns - @legend_left_margin - @right_margin) && (truncated_label.length > 1)
           truncated_label = truncated_label[0..truncated_label.length-2]
         end
         truncated_label + (truncated_label.length < label.to_s.length ? "…" : '')

data/lib/gruff/mini/side_bar.rb

@@ -7,6 +7,8 @@ module Gruff
 
     class SideBar < Gruff::SideBar
 
+      include Gruff::Mini::Legend
+      
       def initialize_ivars
         super
         @hide_legend = true
@@ -14,6 +16,17 @@ module Gruff
         @hide_line_numbers = true
 
         @marker_font_size = 50.0
+        @legend_font_size = 50.0
+      end
+      
+      def draw
+        expand_canvas_for_vertical_legend
+        
+        super
+        
+        draw_vertical_legend
+        
+        @d.draw(@base_image)
       end
       
     end

data/lib/gruff/pie.rb

@@ -1,6 +1,16 @@
-
 require File.dirname(__FILE__) + '/base'
 
+##
+# Here's how to make a Pie graph:
+#
+#   g = Gruff::Pie.new
+#   g.title = "Visual Pie Graph Test"
+#   g.data 'Fries', 20
+#   g.data 'Hamburgers', 50
+#   g.write("test/output/pie_keynote.png")
+#
+# To control where the pie chart starts creating slices, use #zero_degree.
+
 class Gruff::Pie < Gruff::Base
 
   TEXT_OFFSET_PERCENTAGE = 0.15
@@ -8,7 +18,7 @@ class Gruff::Pie < Gruff::Base
   # Can be used to make the pie start cutting slices at the top (-90.0)
   # or at another angle. Default is 0.0, which starts at 3 o'clock.
   attr_accessor :zero_degree
-  
+
   def initialize_ivars
     super
     @zero_degree = 0.0
@@ -30,7 +40,8 @@ class Gruff::Pie < Gruff::Base
     prev_degrees = @zero_degree
 
     # Use full data since we can easily calculate percentages
-    @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] }.each do |data_row|
+    data = (@sort ? @data.sort{ |a, b| a[DATA_VALUES_INDEX][0] <=> b[DATA_VALUES_INDEX][0] } : @data)
+    data.each do |data_row|
       if data_row[DATA_VALUES_INDEX][0] > 0
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill 'transparent'
@@ -47,13 +58,16 @@ class Gruff::Pie < Gruff::Base
                   
         half_angle = prev_degrees + ((prev_degrees + current_degrees) - prev_degrees) / 2
 
-        # End the string with %% to escape the single %.
-        # RMagick must use sprintf with the string and % has special significance.
-        label_string = ((data_row[DATA_VALUES_INDEX][0] / total_sum) * 100.0).round.to_s + '%%'
-        @d = draw_label(center_x,center_y, 
-                    half_angle, radius + (radius * TEXT_OFFSET_PERCENTAGE), 
-                    label_string)
-      
+        unless @hide_line_markers then
+          # End the string with %% to escape the single %.
+          # RMagick must use sprintf with the string and % has special significance.
+          label_string = ((data_row[DATA_VALUES_INDEX][0] / total_sum) *
+                          100.0).round.to_s + '%%'
+          @d = draw_label(center_x,center_y, half_angle,
+                          radius + (radius * TEXT_OFFSET_PERCENTAGE),
+                          label_string)
+        end
+
         prev_degrees += current_degrees
       end
     end
@@ -99,10 +113,10 @@ private
 
 end
 
-
 class Float
   # Used for degree => radian conversions
   def deg2rad
     self * (Math::PI/180.0)
   end
 end
+

data/lib/gruff/scene.rb

@@ -14,19 +14,31 @@ require File.dirname(__FILE__) + '/base'
 #
 # Usage:
 # 
-#  g = Gruff::Scene.new("500x100", "artwork/city_scene")
+#  g = Gruff::Scene.new("500x100", "path/to/city_scene_directory")
+#
+#  # Define order of layers, back to front
 #  g.layers = %w(background haze sky clouds)
+#
+#  # Define groups that will be controlled by the same input
 #  g.weather_group = %w(clouds)
 #  g.time_group = %w(background sky)
+#
+#  # Set values for the layers or groups
 #  g.weather = "cloudy"
 #  g.time = Time.now
 #  g.haze = true
-#  g.write "hazy_daytime_city_scene.png"
 #
+#  # Write the final graph to disk
+#  g.write "hazy_daytime_city_scene.png"
 #
 #
-# If there is a file named 'default.png', it will be selected (unless other values are provided to override it).
+# There are several rules that will magically select a layer when possible.
 #
+# * Numbered files will be selected according to the closest value that is less than the input value.
+# * 'true.png' and 'false.png' will be used as booleans.
+# * Other named files will be used if the input matches the filename (without the filetype extension).
+# * If there is a file named 'default.png', it will be used unless other input values are set for the corresponding layer.
+
 class Gruff::Scene < Gruff::Base
     
   # An array listing the foldernames that will be rendered, from back to front.

data/lib/gruff/side_bar.rb

@@ -1,21 +1,66 @@
 require File.dirname(__FILE__) + '/base'
 
 ##
-# EXPERIMENTAL
-#
-# Graph with horizontal bars instead of vertical.
-#
-# TODO SideStackedBar should probably inherit from this 
-# to consolidate the line marker drawing.
+# Graph with individual horizontal bars instead of vertical bars.
+
 class Gruff::SideBar < Gruff::Base
 
+  def draw
+    @has_left_labels = true
+    super
+
+    return unless @has_data
+
+    # Setup spacing.
+    #
+    spacing_factor = 0.9
+
+    @bars_width = @graph_height / @column_count.to_f
+    @bar_width = @bars_width * spacing_factor / @norm_data.size
+    @d         = @d.stroke_opacity 0.0
+    height     = Array.new(@column_count, 0)
+    length     = Array.new(@column_count, @graph_left)
+
+    @norm_data.each_with_index do |data_row, row_index|
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
+
+      data_row[1].each_with_index do |data_point, point_index|
+
+        # Using the original calcs from the stacked bar chart
+        # to get the difference between
+        # part of the bart chart we wish to stack.
+        temp1      = @graph_left + (@graph_width - data_point * @graph_width - height[point_index])
+        temp2      = @graph_left + @graph_width - height[point_index]
+        difference = temp2 - temp1
+
+        left_x     = length[point_index] - 1
+        left_y     = @graph_top + (@bars_width * point_index) + (@bar_width * row_index)
+        right_x    = left_x + difference
+        right_y    = left_y + @bar_width
+
+        height[point_index] += (data_point * @graph_width)
+
+        @d           = @d.rectangle(left_x, left_y, right_x, right_y)
+
+        # Calculate center based on bar_width and current row
+        label_center = @graph_top + (@bars_width * point_index + @bars_width / 2)
+        draw_label(label_center, point_index)
+      end
+
+    end
+
+    @d.draw(@base_image)
+  end
+
+protected
+
   # Instead of base class version, draws vertical background lines and label
   def draw_line_markers
 
     return if @hide_line_markers
 
     @d = @d.stroke_antialias false
-      
+
     # Draw horizontal line markers and annotate with numbers
     @d = @d.stroke(@marker_color)
     @d = @d.stroke_width 1
@@ -36,10 +81,11 @@ class Gruff::SideBar < Gruff::Base
         @d.font      = @font if @font
         @d.stroke    = 'transparent'
         @d.pointsize = scale_fontsize(@marker_font_size)
-        # @d.gravity = NorthGravity
-        @d           = @d.annotate_scaled( @base_image, 
-                          100, 20,
-                          x - (@marker_font_size/1.5), @graph_bottom + 40, 
+        @d.gravity   = CenterGravity
+        # TODO Center text over line
+        @d           = @d.annotate_scaled( @base_image,
+                          0, 0, # Width of box to draw text in
+                          x, @graph_bottom + (LABEL_MARGIN * 2.0), # Coordinates of text
                           marker_label.to_s, @scale)
       end # unless
       @d = @d.stroke_antialias true
@@ -48,7 +94,7 @@ class Gruff::SideBar < Gruff::Base
 
   ##
   # Draw on the Y axis instead of the X
-  
+
   def draw_label(y_offset, index)
     if !@labels[index].nil? && @labels_seen[index].nil?
       @d.fill             = @font_color
@@ -65,53 +111,4 @@ class Gruff::SideBar < Gruff::Base
     end
   end
 
-  def draw
-    @has_left_labels = true
-    super
-
-    return unless @has_data
-
-    # Setup spacing.
-    #
-    # Columns sit stacked.
-    spacing_factor = 0.9
-
-    @bar_width = @graph_height / @column_count.to_f
-    @d         = @d.stroke_opacity 0.0
-    height     = Array.new(@column_count, 0)
-    length     = Array.new(@column_count, @graph_left)
-
-    @norm_data.each_with_index do |data_row, row_index|
-      @d = @d.fill data_row[DATA_COLOR_INDEX]
-
-      data_row[1].each_with_index do |data_point, point_index|
-
-    	  # Using the original calcs from the stacked bar chart 
-    	  # to get the difference between
-    	  # part of the bart chart we wish to stack.
-        temp1      = @graph_left + (@graph_width -
-                                data_point * @graph_width - 
-                                height[point_index]) + 1
-        temp2      = @graph_left + @graph_width - height[point_index] - 1
-        difference = temp2 - temp1
-
-        left_x                = length[point_index] #+ 1
-        left_y                = @graph_top + (@bar_width * point_index)
-        right_x               = left_x + difference
-        right_y               = left_y + @bar_width * spacing_factor
-        length[point_index] += difference
-        height[point_index] += (data_point * @graph_width - 2)
-
-        @d                    = @d.rectangle(left_x, left_y, right_x, right_y)
-
-        # Calculate center based on bar_width and current row
-        label_center          = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
-        draw_label(label_center, point_index)
-      end
-
-    end
-
-    @d.draw(@base_image)    
-  end
-
 end

data/lib/gruff/side_stacked_bar.rb

@@ -1,121 +1,73 @@
+require File.dirname(__FILE__) + '/base'
+require File.dirname(__FILE__) + '/side_bar'
+require File.dirname(__FILE__) + '/stacked_mixin'
+
 ##
-# New gruff graph type added to enable sideways stacking bar charts (basically looks like a x/y
-# flip of a standard stacking bar chart)
+# New gruff graph type added to enable sideways stacking bar charts 
+# (basically looks like a x/y flip of a standard stacking bar chart)
 #
 # alun.eyre@googlemail.com 
-#
-require File.dirname(__FILE__) + '/base'
-
-class Gruff::SideStackedBar < Gruff::Base
-
-    # instead of base class version, draws vertical background lines and label
-    def draw_line_markers
 
-      return if @hide_line_markers
+class Gruff::SideStackedBar < Gruff::SideBar
+  include StackedMixin
 
-      # Draw horizontal line markers and annotate with numbers
-      @d = @d.stroke(@marker_color)
-      @d = @d.stroke_width 1
-      number_of_lines = 5
+  def draw
+    @has_left_labels = true
+    get_maximum_by_stack
+    super
 
-      # TODO Round maximum marker value to a round number like 100, 0.1, 0.5, etc.
-      increment = significant(@maximum_value.to_f / number_of_lines)
-      (0..number_of_lines).each do |index|
+    return unless @has_data
 
-        line_diff = (@graph_right - @graph_left) / number_of_lines
-        x = @graph_right - (line_diff * index) - 1
-        @d = @d.line(x, @graph_bottom, x, @graph_top)
+    # Setup spacing.
+    #
+    # Columns sit stacked.
+    spacing_factor = 0.9
 
-        diff = index - number_of_lines
-        marker_label = diff.abs * increment
+    @bar_width = @graph_height / @column_count.to_f
+    @d = @d.stroke_opacity 0.0
+    height = Array.new(@column_count, 0)
+    length = Array.new(@column_count, @graph_left)
 
-        @d.fill = @marker_color
-        @d.font = @font if @font
-        @d.stroke = 'transparent'
-        @d.pointsize = scale_fontsize(@marker_font_size)
-#        @d.gravity = NorthGravity
-        @d = @d.annotate_scaled( @base_image, 
-                          100, 20,
-                          x - (@marker_font_size/1.5), @graph_bottom + 40, 
-                          marker_label.to_s, @scale)
+    @norm_data.each_with_index do |data_row, row_index|
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
 
-      end
-    end
-
-    # instead of base class version, modified to enable us to draw on the Y axis instead of X
-    def draw_label(y_offset, index)
-      if !@labels[index].nil? && @labels_seen[index].nil?
-        @d.fill = @marker_color
-        @d.font = @font if @font
-        @d.stroke = 'transparent'
-        @d.font_weight = NormalWeight
-        @d.pointsize = scale_fontsize(@marker_font_size)
-        @d.gravity = CenterGravity
-        @d = @d.annotate_scaled(@base_image,
-                                1, 1,
-                                @graph_left / 2, y_offset,
-                                @labels[index], @scale)
-        @labels_seen[index] = 1
-      end
-    end
+      data_row[1].each_with_index do |data_point, point_index|
 
-    def draw
-      @has_left_labels = true
-      get_maximum_by_stack
-      super
+    	  ## using the original calcs from the stacked bar chart to get the difference between
+    	  ## part of the bart chart we wish to stack.
+    	  temp1 = @graph_left + (@graph_width -
+                                    data_point * @graph_width - 
+                                    height[point_index]) + 1
+    	  temp2 = @graph_left + @graph_width - height[point_index] - 1
+    	  difference = temp2 - temp1
 
-      return unless @has_data
+    	  left_x = length[point_index] #+ 1
+              left_y = @graph_top + (@bar_width * point_index)
+    	  right_x = left_x + difference
+              right_y = left_y + @bar_width * spacing_factor
+    	  length[point_index] += difference
+        height[point_index] += (data_point * @graph_width - 2)
 
-      # Setup spacing.
-      #
-      # Columns sit stacked.
-      spacing_factor = 0.9
-
-      @bar_width = @graph_height / @column_count.to_f
-      @d = @d.stroke_opacity 0.0
-      height = Array.new(@column_count, 0)
-      length = Array.new(@column_count, @graph_left)
-
-      @norm_data.each_with_index do |data_row, row_index|
-        @d = @d.fill data_row[DATA_COLOR_INDEX]
-
-        data_row[1].each_with_index do |data_point, point_index|
-
-      	  ## using the original calcs from the stacked bar chart to get the difference between
-      	  ## part of the bart chart we wish to stack.
-      	  temp1 = @graph_left + (@graph_width -
-                                      data_point * @graph_width - 
-                                      height[point_index]) + 1
-      	  temp2 = @graph_left + @graph_width - height[point_index] - 1
-      	  difference = temp2 - temp1
-
-      	  left_x = length[point_index] #+ 1
-                left_y = @graph_top + (@bar_width * point_index)
-      	  right_x = left_x + difference
-                right_y = left_y + @bar_width * spacing_factor
-      	  length[point_index] += difference
-          height[point_index] += (data_point * @graph_width - 2)
-
-          @d = @d.rectangle(left_x, left_y, right_x, right_y)
-
-          # Calculate center based on bar_width and current row
-          label_center = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
-          draw_label(label_center, point_index)
-        end
+        @d = @d.rectangle(left_x, left_y, right_x, right_y)
 
+        # Calculate center based on bar_width and current row
+        label_center = @graph_top + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
+        draw_label(label_center, point_index)
       end
 
-      @d.draw(@base_image)    
     end
 
-    protected
+    @d.draw(@base_image)    
+  end
 
-    def larger_than_max?(data_point, index=0)
-      max(data_point, index) > @maximum_value
-    end
+  protected
 
-    def max(data_point, index)
-      @data.inject(0) {|sum, item| sum + item[1][index]}
-    end
+  def larger_than_max?(data_point, index=0)
+    max(data_point, index) > @maximum_value
+  end
+
+  def max(data_point, index)
+    @data.inject(0) {|sum, item| sum + item[1][index]}
+  end
 
 end