gruff 0.1.1 → 0.1.2

data/lib/gruff/pie.rb

@@ -11,7 +11,7 @@ class Gruff::Pie < Gruff::Base
     return unless @has_data
 
     diameter = @graph_height
-    radius = @graph_height / 2.0
+    radius = [@graph_width, @graph_height].min / 2.0 
     top_x = @graph_left + (@graph_width - diameter) / 2.0
     center_x = @graph_left + (@graph_width / 2.0)
     center_y = @graph_top + (@graph_height / 2.0) - 10 # Move graph up a bit
@@ -23,12 +23,15 @@ class Gruff::Pie < Gruff::Base
       if data_row[1][0] > 0
         @d = @d.stroke data_row[DATA_COLOR_INDEX]
         @d = @d.fill 'transparent'
-        @d.stroke_width(200.0)
+        @d.stroke_width(radius) # stroke width should be equal to radius. we'll draw centered on (radius / 2)
 
         current_degrees = (data_row[1][0] / total_sum) * 360.0 
-        radius = 100.0
+
+        # ellipse will draw the the stroke centered on the first two parameters offset by the second two.
+        # therefore, in order to draw a circle of the proper diameter we must center the stroke at
+        # half the radius for both x and y
         @d = @d.ellipse(center_x, center_y, 
-                  radius, radius,
+                  radius / 2.0, radius / 2.0,
                   prev_degrees, prev_degrees + current_degrees + 0.5) # <= +0.5 'fudge factor' gets rid of the ugly gaps
                   
         half_angle = prev_degrees + ((prev_degrees + current_degrees) - prev_degrees) / 2
@@ -49,7 +52,7 @@ class Gruff::Pie < Gruff::Base
 private
 
   def draw_label(center_x, center_y, angle, radius, amount)
-    r_offset = 130      # The distance out from the center of the pie to get point
+    r_offset = 30      # The distance out from the center of the pie to get point
     x_offset = center_x + 15 # The label points need to be tweaked slightly
     y_offset = center_y + 0  # This one doesn't though
     x = x_offset + ((radius + r_offset) * Math.cos(angle.deg2rad))
@@ -83,44 +86,3 @@ class Float
     self * (Math::PI/180.0)
   end
 end
-
-# From sparklines...not currently used
-class Magick::Draw
-  
-  def pie_slice(center_x=0.0, center_y=0.0, radius=100.0, percent=0.0, rot_x=0.0)
-    # Okay, this part is as confusing as hell, so pay attention:
-		# This line determines the horizontal portion of the point on the circle where the X-Axis
-		# should end.  It's caculated by taking the center of the on-image circle and adding that
-		# to the radius multiplied by the formula for determinig the point on a unit circle that a
-		# angle corresponds to.  3.6 * percent gives us that angle, but it's in degrees, so we need to
-		# convert, hence the muliplication by Pi over 180
-		arc_end_x = radius + (radius * Math.cos((3.6 * percent)*(Math::PI/180.0)))
-
-		# The same goes for here, except it's the vertical point instead of the horizontal one
-		arc_end_y = radius + (radius * Math.sin((3.6 * percent)*(Math::PI/180.0)))
-
-		# Because the SVG path format is seriously screwy, we need to set the large-arc-flag to 1
-		# if the angle of an arc is greater than 180 degrees.  I have no idea why this is, but it is.
-		percent > 50 ? large_arc_flag = 1 : large_arc_flag = 0
-
-		# This is also confusing
-		#  M tells us to move to an absolute point on the image.  
-		#   We're moving to the center of the pie
-		#  h tells us to move to a relative point.  
-		#   We're moving to the right edge of the circle.
-		#  A tells us to start an absolute elliptical arc.  
-		#   The first two values are the radii of the ellipse
-		#   The third value is the x-axis-rotation (how to rotate the ellipse)
-		#   The fourth value is our large-arc-flag
-		#   The fifth is the sweep-flag
-		#   The sixth and seventh values are the end point of the arc which we calculated previously
-		# More info on the SVG path string format at: http://www.w3.org/TR/SVG/paths.html
-		#
-		#path = "M#{radius + 2},#{radius + 2} h#{radius} A#{radius},#{radius} #{rot_x} #{large_arc_flag},1 #{arc_end_x},#{arc_end_y} z"
-		path = "M#{radius},#{radius} h#{radius} A#{radius},#{radius} #{rot_x} #{large_arc_flag},1 #{arc_end_x},#{arc_end_y} z"
-    puts "PATH: #{path}"
-
-		self.path(path)
-  end
-  
-end

data/lib/gruff/scene.rb

@@ -0,0 +1,196 @@
+
+require "observer"
+require File.dirname(__FILE__) + '/base'
+
+# EXPERIMENTAL!
+#
+# Started by Geoffrey Grosenbach at Canada on Rails, April 2006.
+#
+# A scene is a non-linear graph that assembles layers together to tell a story.
+# Layers are folders with appropriately named files (see below). You can group 
+# layers and control them together or just set their values individually.
+#
+# Examples:
+#
+# * A city scene that changes with the time of day and the weather conditions.
+# * A traffic map that shows red lines on streets that are crowded and green on free-flowing ones.
+#
+# Usage:
+# 
+#  g = Gruff::Scene.new("500x100", "artwork/city_scene")
+#  g.layers = %w(background haze sky clouds)
+#  g.weather_group = %w(clouds)
+#  g.time_group = %w(background sky)
+#  g.weather = "cloudy"
+#  g.time = Time.now
+#  g.haze = true
+#  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).
+#
+class Gruff::Scene < Gruff::Base
+    
+  # An array listing the foldernames that will be rendered, from back to front.
+  #
+  #  g.layers = %w(sky clouds buildings street people)
+  #
+  attr_accessor :layers
+
+  def initialize(target_width, base_dir)
+    @base_dir = base_dir
+    @groups = {}
+    @layers = []    
+    super target_width
+  end
+
+  def draw
+    # Join all the custom paths and filter out the empty ones
+    image_paths = @layers.map { |layer| layer.path }.select { |path| !path.empty? }
+    images = Magick::ImageList.new(*image_paths)
+    @base_image = images.flatten_images
+  end
+
+  def layers=(ordered_list)
+    ordered_list.each do |layer_name|
+      @layers << Gruff::Layer.new(@base_dir, layer_name)
+    end
+  end
+
+  # Group layers to input values
+  #
+  #  g.weather_group = ["sky", "sea", "clouds"]
+  #
+  # Set input values
+  #
+  #  g.weather = "cloudy"
+  #
+  def method_missing(method_name, *args)
+    case method_name.to_s
+    when /^(\w+)_group=$/
+      add_group $1, *args
+      return
+    when /^(\w+)=$/
+      set_input $1, args.first
+      return
+    end
+    super
+  end
+
+private
+
+  def add_group(input_name, layer_names)
+    @groups[input_name] = Gruff::Group.new(input_name, @layers.select { |layer| layer_names.include?(layer.name) })
+  end
+
+  def set_input(input_name, input_value)
+    if not @groups[input_name].nil?
+      @groups[input_name].send_updates(input_value)
+    else
+      if chosen_layer = @layers.detect { |layer| layer.name == input_name }
+        chosen_layer.update input_value
+      end
+    end
+  end
+  
+end
+
+
+class Gruff::Group
+
+  include Observable
+  attr_reader :name
+
+  def initialize(folder_name, layers)
+    @name = folder_name
+    layers.each do |layer|
+      layer.observe self
+    end
+  end
+  
+  def send_updates(value)
+    changed
+    notify_observers value
+  end
+  
+end
+
+
+class Gruff::Layer
+  
+  attr_reader :name
+  
+  def initialize(base_dir, folder_name)
+    @base_dir = base_dir.to_s
+    @name = folder_name.to_s
+    @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }
+    @selected_filename = select_default
+  end
+  
+  # Register this layer so it receives updates from the group
+  def observe(obj)
+    obj.add_observer self
+  end
+  
+  # Choose the appropriate filename for this layer, based on the input
+  def update(value)
+    @selected_filename =  case value.to_s
+                          when /^(true|false)$/
+                            select_boolean value
+                          when /^(\w|\s)+$/
+                            select_string value
+                          when /^-?(\d+\.)?\d+$/
+                            select_numeric value
+                          when /(\d\d):(\d\d):\d\d/
+                            select_time "#{$1}#{$2}"
+                          else
+                            select_default
+                          end
+  end
+
+  # Returns the full path to the selected image, or a blank string
+  def path
+    unless @selected_filename.nil? || @selected_filename.empty?
+      return File.join(@base_dir, @name, @selected_filename)
+    end
+    ''
+  end
+
+private
+
+  # Match "true.png" or "false.png"
+  def select_boolean(value)
+    file_exists_or_blank value.to_s
+  end
+
+  # Match -5 to _5.png
+  def select_numeric(value)
+    file_exists_or_blank value.to_s.gsub('-', '_')
+  end
+  
+  def select_time(value)
+    times = @filenames.map { |filename| filename.gsub('.png', '') }
+    times.each_with_index do |time, index|
+      if (time > value) && (index > 0)
+        return "#{times[index - 1]}.png"
+      end
+    end
+    return "#{times.last}.png"
+  end
+  
+  # Match "partly cloudy" to "partly_cloudy.png"
+  def select_string(value)
+    file_exists_or_blank value.to_s.gsub(' ', '_')
+  end
+  
+  def select_default
+    file_exists_or_blank "default"
+  end
+
+  # Returns the string "#{filename}.png", if it exists
+  def file_exists_or_blank(filename)
+    @filenames.include?("#{filename}.png") ? "#{filename}.png" : ''
+  end
+  
+end

data/lib/gruff/spider.rb

@@ -0,0 +1,130 @@
+
+require File.dirname(__FILE__) + '/base'
+
+# Experimental!!! See also the Net graph.
+#
+# Submitted by Kevin Clark http://glu.ttono.us/
+class Gruff::Spider < Gruff::Base
+  
+  # Hide all text
+  attr_accessor :hide_text
+  attr_accessor :hide_axes
+  attr_accessor :transparent_background
+  
+  def transparent_background=(value)
+    @transparent_background = value
+    @base_image = render_transparent_background if value
+  end
+
+  def hide_text=(value)
+    @hide_title = @hide_text = value
+  end
+  
+  def initialize(max_value, target_width = 800)
+    super(target_width)
+    @max_value = max_value
+    @hide_legend = true;
+  end
+  
+  def draw
+    @hide_line_markers = true
+    
+    super
+
+    return unless @has_data
+
+    # Setup basic positioning
+    diameter = @graph_height
+    radius = @graph_height / 2.0
+    top_x = @graph_left + (@graph_width - diameter) / 2.0
+    center_x = @graph_left + (@graph_width / 2.0)
+    center_y = @graph_top + (@graph_height / 2.0) - 25 # Move graph up a bit
+    
+    @unit_length = radius / @max_value
+    
+        
+    total_sum = sums_for_spider
+    prev_degrees = 0.0
+    additive_angle = (2 * Math::PI)/ @data.size
+    
+    current_angle = 0.0
+
+    # Draw axes
+    draw_axes(center_x, center_y, radius, additive_angle) unless hide_axes    
+    
+    # Draw polygon
+    draw_polygon(center_x, center_y, additive_angle)
+    
+     
+    @d.draw(@base_image)
+  end
+
+private
+  
+  def normalize_points(value)
+    value * @unit_length
+  end
+  
+  def draw_label(center_x, center_y, angle, radius, amount)
+    r_offset = 50      # The distance out from the center of the pie to get point
+    x_offset = center_x      # The label points need to be tweaked slightly
+    y_offset = center_y + 0  # This one doesn't though
+    x = x_offset + ((radius + r_offset) * Math.cos(angle))
+    y = y_offset + ((radius + r_offset) * Math.sin(angle))
+    
+    # Draw label
+    @d.fill = @marker_color
+    @d.font = @font if @font
+    @d.pointsize = scale_fontsize(legend_font_size)
+    @d.stroke = 'transparent'
+    @d.font_weight = BoldWeight
+    @d.gravity = CenterGravity
+    @d.annotate_scaled( @base_image, 
+                      0, 0,
+                      x, y, 
+                      amount, @scale)
+  end
+  
+  def draw_axes(center_x, center_y, radius, additive_angle, line_color = nil)
+    return if hide_axes
+    
+    current_angle = 0.0
+    
+    @data.each do |data_row|
+      @d.stroke(line_color || data_row[DATA_COLOR_INDEX])
+      @d.stroke_width 5.0
+    
+      x_offset = radius * Math.cos(current_angle)
+      y_offset = radius * Math.sin(current_angle)
+
+      @d.line(center_x, center_y,
+              center_x + x_offset,
+              center_y + y_offset)
+            
+      draw_label(center_x, center_y, current_angle, radius, data_row[0].to_s) unless hide_text
+            
+      current_angle += additive_angle
+    end
+  end
+  
+  def draw_polygon(center_x, center_y, additive_angle, color = nil)
+    points = []
+    current_angle = 0.0
+    @data.each do |data_row|
+      points << center_x + normalize_points(data_row[1][0]) * Math.cos(current_angle)
+      points << center_y + normalize_points(data_row[1][0]) * Math.sin(current_angle)
+      current_angle += additive_angle
+    end
+    
+    @d.stroke_width 1.0
+    @d.stroke(color || @marker_color)
+    @d.fill(color || @marker_color)
+    @d.fill_opacity 0.4
+    @d.polygon(*points)
+  end
+  
+  def sums_for_spider
+    @data.inject(0.0) {|sum, data_row| sum += data_row[1][0]}
+  end
+
+end

data/test/area_test.rb

@@ -1,12 +1,8 @@
 #!/usr/bin/ruby
 
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+require File.dirname(__FILE__) + "/gruff_test_case"
 
-require 'test/unit'
-require 'gruff'
-
-class TestGruffArea < Test::Unit::TestCase
+class TestGruffArea < GruffTestCase
 
   def setup
     @datasets = [

data/test/bar_test.rb

@@ -1,12 +1,8 @@
 #!/usr/bin/ruby
 
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-#$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
+require File.dirname(__FILE__) + "/gruff_test_case"
 
-require 'test/unit'
-require 'gruff'
-
-class TestGruffBar < Test::Unit::TestCase
+class TestGruffBar < GruffTestCase
 
   # TODO Delete old output files once when starting tests
 
@@ -76,6 +72,8 @@ class TestGruffBar < Test::Unit::TestCase
     g.data(:Art, [0, 5, 8, 15], '#990000')
     g.data(:Philosophy, [10, 3, 2, 8], '#009900')
     g.data(:Science, [2, 15, 8, 11], '#990099')
+
+    g.minimum_value = 0
         
     g.write("test/output/bar_manual_colors.png")
   end
@@ -96,22 +94,6 @@ class TestGruffBar < Test::Unit::TestCase
     g.write("test/output/bar_keynote_small.png")
   end
 
-  def test_bar_image_bg
-    g = setup_basic_graph()
-    g.title = "With Image Background"
-    g.theme_image_based
-    g.write("test/output/bar_image.png")
-
-    g = setup_basic_graph(400)
-    g.title = "With Image Background Small"
-    g.theme_image_based
-    g.write("test/output/bar_image_small.png")
-
-    g = setup_basic_graph('800x400')
-    g.title = "With Image Background Small"
-    g.theme_image_based
-    g.write("test/output/bar_image_wide.png")
-  end
 
   def test_nil_font
     g = setup_basic_graph 400
@@ -139,6 +121,19 @@ class TestGruffBar < Test::Unit::TestCase
   end
 
 
+  def test_one_value
+    g = Gruff::Bar.new
+    g.title = "One Value Graph Test"
+    g.labels = {
+      0 => '1', 
+      1 => '2'
+    }
+    g.data('one', [1,1])
+
+    g.write("test/output/bar_one_value.png")
+  end
+
+
   def test_negative
     g = Gruff::Bar.new
     g.title = "Pos/Neg Bar Graph Test"
@@ -155,6 +150,50 @@ class TestGruffBar < Test::Unit::TestCase
   end
 
 
+  def test_nearly_zero
+    g = Gruff::Bar.new
+    g.title = "Nearly Zero Graph"
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:apples, [1, 2, 3, 4])
+    g.data(:peaches, [4, 3, 2, 1])
+    g.minimum_value = 0
+    g.maximum_value = 10
+    g.write("test/output/bar_nearly_zero.png")
+  end
+
+
+  def test_custom_theme
+    g = Gruff::Bar.new
+    g.title = "Custom Theme"
+    g.title_font_size = 60
+    g.legend_font_size = 32
+    g.marker_font_size = 32
+    g.theme = {
+      :colors => %w(#efd250 #666699 #e5573f #9595e2),
+      :marker_color => 'white',
+      :background_image => "assets/pc306715.jpg"
+    }
+    g.labels = {
+      0 => '5/6', 
+      1 => '5/15', 
+      2 => '5/24', 
+      3 => '5/30', 
+    }
+    g.data(:vancouver, [1, 2, 3, 4])
+    g.data(:seattle, [2, 4, 6, 8])
+    g.data(:portland, [3, 1, 7, 3])
+    g.data(:victoria, [4, 3, 5, 7])
+    g.minimum_value = 0
+    g.write("test/output/bar_themed.png")
+  end
+
+
+
 protected
 
   def setup_basic_graph(size=800)
@@ -175,22 +214,3 @@ protected
   
 end
 
-class Gruff::Base
-  # A color scheme from the colors used on the 2005 Rails keynote presentation at RubyConf.
-  def theme_image_based
-    reset_themes()
-    # Colors
-    @green = '#00ff00'
-    @grey = '#333333'
-    @orange = '#ff5d00'
-    @red = '#f61100'
-    @white = 'white'
-    @light_grey = '#999999'
-    @black = 'black'
-    @colors = [@green, @grey, @orange, @red, @white, @light_grey, @black]
-
-    @marker_color = 'white'
-  
-    @base_image = render_image_background('assets/pc306715.jpg')
-  end
-end