gruff 0.2.8 → 0.2.9

data/lib/gruff/stacked_area.rb

@@ -0,0 +1,66 @@
+
+require File.dirname(__FILE__) + '/base'
+require File.dirname(__FILE__) + '/stacked_mixin'
+
+class Gruff::StackedArea < Gruff::Base
+  include StackedMixin
+  attr_accessor :last_series_goes_on_bottom
+  
+  def draw
+    super
+
+    return unless @has_data
+
+    @x_increment = @graph_width / (@column_count - 1).to_f
+    @d = @d.stroke 'transparent'
+
+    height = Array.new(@column_count, 0)
+
+    data_points = nil
+    iterator = last_series_goes_on_bottom ? :reverse_each : :each
+    @norm_data.send(iterator) do |data_row|
+      prev_data_points = data_points
+      data_points = Array.new
+        
+      @d = @d.fill data_row[DATA_COLOR_INDEX]
+
+      data_row[1].each_with_index do |data_point, index|
+        # Use incremented x and scaled y
+        new_x = @graph_left + (@x_increment * index)
+        new_y = @graph_top + (@graph_height - data_point * @graph_height - height[index])
+
+        height[index] += (data_point * @graph_height)
+        
+        data_points << new_x
+        data_points << new_y
+          
+        draw_label(new_x, index)
+
+      end
+
+      if prev_data_points
+        poly_points = data_points.dup
+        (prev_data_points.length/2 - 1).downto(0) do |i|
+          poly_points << prev_data_points[2*i] 
+          poly_points << prev_data_points[2*i+1]
+        end
+        poly_points << data_points[0] 
+        poly_points << data_points[1] 
+      else
+        poly_points = data_points.dup
+        poly_points << @graph_right
+        poly_points << @graph_bottom - 1
+        poly_points << @graph_left
+        poly_points << @graph_bottom - 1
+        poly_points << data_points[0] 
+        poly_points << data_points[1] 
+      end
+      @d = @d.polyline(*poly_points)
+
+    end
+
+    @d.draw(@base_image)
+  end
+   
+ 
+end

data/lib/gruff/stacked_bar.rb

@@ -1,7 +1,9 @@
 
 require File.dirname(__FILE__) + '/base'
+require File.dirname(__FILE__) + '/stacked_mixin'
 
 class Gruff::StackedBar < Gruff::Base
+    include StackedMixin
 
     # Draws a bar graph, but multiple sets are stacked on top of each other.
     def draw
@@ -23,6 +25,11 @@ class Gruff::StackedBar < Gruff::Base
         @d = @d.fill data_row[DATA_COLOR_INDEX]
       
         data_row[1].each_with_index do |data_point, point_index|
+          # Calculate center based on bar_width and current row
+          label_center = @graph_left + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
+          draw_label(label_center, point_index)
+
+          next if (data_point == 0)
           # Use incremented x and scaled y
           left_x = @graph_left + (@bar_width * point_index)
           left_y = @graph_top + (@graph_height -
@@ -32,13 +39,10 @@ class Gruff::StackedBar < Gruff::Base
           right_y = @graph_top + @graph_height - height[point_index] - 1
           
           # update the total height of the current stacked bar
-          height[point_index] += (data_point * @graph_height - 2)
+          height[point_index] += (data_point * @graph_height ) 
           
           @d = @d.rectangle(left_x, left_y, right_x, right_y)
           
-          # Calculate center based on bar_width and current row
-          label_center = @graph_left + (@bar_width * point_index) + (@bar_width * spacing_factor / 2.0)
-          draw_label(label_center, point_index)
         end
 
       end

data/lib/gruff/stacked_mixin.rb

@@ -0,0 +1,23 @@
+
+module Gruff::Base::StackedMixin
+  # Used by StackedBar and child classes.
+  #
+  # tsal: moved from Base 03 FEB 2007
+  DATA_VALUES_INDEX = Gruff::Base::DATA_VALUES_INDEX
+  def get_maximum_by_stack
+    # Get sum of each stack
+    max_hash = {}
+    @data.each do |data_set|
+      data_set[DATA_VALUES_INDEX].each_with_index do |data_point, i|
+        max_hash[i] = 0.0 unless max_hash[i]
+        max_hash[i] += data_point.to_f
+      end
+    end
+  
+    # @maximum_value = 0
+    max_hash.keys.each do |key|
+      @maximum_value = max_hash[key] if max_hash[key] > @maximum_value
+    end
+    @minimum_value = 0
+  end
+end

data/test/gruff_test_case.rb

@@ -1,4 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
+# require 'rubygems'
 
 require 'test/unit'
 require 'gruff'

data/test/test_pie.rb

@@ -27,6 +27,31 @@ class TestGruffPie < GruffTestCase
     g.write("test/output/pie_keynote.png")
   end
 
+  def test_pie_graph_greyscale
+    g = Gruff::Pie.new
+    g.title = "Greyscale Pie Graph Test"
+    g.theme_greyscale
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/pie_grey.png")
+  end
+
+  def test_pie_graph_pastel
+    g = Gruff::Pie.new
+    g.theme_pastel
+    g.title = "Pastel Pie Graph Test"
+    @datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+
+    # Default theme
+    g.write("test/output/pie_pastel.png")
+  end
+
+
   def test_pie_graph_small
     g = Gruff::Pie.new(400)
     g.title = "Visual Pie Graph Test Small"

metadata

@@ -3,12 +3,11 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
-date: 2006-11-06 00:00:00 -08:00
+  version: 0.2.9
+date: 2007-11-07 00:00:00 -08:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
 - lib
-- test
 email: boss@topfunky.com
 homepage: http://nubyonrails.com/pages/gruff
 rubyforge_project: gruff
@@ -31,11 +30,11 @@ authors:
 - Geoffrey Grosenbach
 files: 
 - CHANGELOG
-- Manifest.txt
 - MIT-LICENSE
-- Rakefile
+- Manifest.txt
 - README.txt
-- assets/pc306715.jpg
+- Rakefile
+- assets/bubble.png
 - assets/city_scene/background/0000.png
 - assets/city_scene/background/0600.png
 - assets/city_scene/background/2000.png
@@ -58,14 +57,22 @@ files:
 - assets/city_scene/sky/1500.png
 - assets/city_scene/sky/1700.png
 - assets/city_scene/sky/2000.png
+- assets/pc306715.jpg
+- assets/plastik/blue.png
+- assets/plastik/green.png
+- assets/plastik/red.png
 - lib/gruff.rb
+- lib/gruff/accumulator_bar.rb
 - lib/gruff/area.rb
 - lib/gruff/bar.rb
 - lib/gruff/bar_conversion.rb
-- lib/gruff/accumulator_bar.rb
 - lib/gruff/base.rb
 - lib/gruff/deprecated.rb
 - lib/gruff/line.rb
+- lib/gruff/mini/bar.rb
+- lib/gruff/mini/legend.rb
+- lib/gruff/mini/pie.rb
+- lib/gruff/mini/side_bar.rb
 - lib/gruff/net.rb
 - lib/gruff/photo_bar.rb
 - lib/gruff/pie.rb
@@ -73,15 +80,30 @@ files:
 - lib/gruff/side_bar.rb
 - lib/gruff/side_stacked_bar.rb
 - lib/gruff/spider.rb
+- lib/gruff/stacked_area.rb
 - lib/gruff/stacked_bar.rb
-- lib/gruff/mini/bar.rb
-- lib/gruff/mini/legend.rb
-- lib/gruff/mini/pie.rb
-- lib/gruff/mini/side_bar.rb
+- lib/gruff/stacked_mixin.rb
 - test/gruff_test_case.rb
-- test/output
+- test/test_accumulator_bar.rb
 - test/test_area.rb
+- test/test_bar.rb
+- test/test_base.rb
+- test/test_legend.rb
+- test/test_line.rb
+- test/test_mini_bar.rb
+- test/test_mini_pie.rb
+- test/test_mini_side_bar.rb
+- test/test_net.rb
+- test/test_photo.rb
+- test/test_pie.rb
+- test/test_scene.rb
+- test/test_side_bar.rb
+- test/test_sidestacked_bar.rb
+- test/test_spider.rb
+- test/test_stacked_bar.rb
+test_files: 
 - test/test_accumulator_bar.rb
+- test/test_area.rb
 - test/test_bar.rb
 - test/test_base.rb
 - test/test_legend.rb
@@ -97,12 +119,12 @@ files:
 - test/test_sidestacked_bar.rb
 - test/test_spider.rb
 - test/test_stacked_bar.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -117,5 +139,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 1.3.0
     version: