gruff 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,5 +1,15 @@
 CHANGELOG
 
+== 0.2.6
+
+* Fixed missing side_bar.rb in Manifest.txt
+
+== 0.2.5
+
+* New mini graph types (Experimental)
+* Marker lines can be different color than text labels
+* Theme definition cleanup
+
 == 0.2.4
 
 * Added option to hide line numbers

data/Manifest.txt

@@ -18,6 +18,7 @@ lib/gruff/scene.rb
 lib/gruff/side_stacked_bar.rb
 lib/gruff/spider.rb
 lib/gruff/stacked_bar.rb
+lib/gruff/side_bar.rb
 
 lib/gruff/mini/bar.rb
 lib/gruff/mini/pie.rb

data/lib/gruff/base.rb

@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/deprecated'
 
 module Gruff
   
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   
   class Base
   

data/lib/gruff/mini/side_bar.rb

@@ -12,8 +12,9 @@ module Gruff
         @hide_title = true
         @hide_line_numbers = true
   
-        @marker_font_size = 40.0    
+        @marker_font_size = 40.0
         super
+        
       end
 
     end

data/lib/gruff/side_bar.rb

@@ -0,0 +1,111 @@
+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.
+class Gruff::SideBar < Gruff::Base
+
+  # Instead of base class version, draws vertical background lines and label
+  def draw_line_markers
+
+    return if @hide_line_markers
+
+    # Draw horizontal line markers and annotate with numbers
+    @d = @d.stroke(@marker_color)
+    @d = @d.stroke_width 1
+    number_of_lines = 5
+
+    # 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|
+
+      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)
+
+      diff = index - number_of_lines
+      marker_label = diff.abs * increment
+
+      @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)
+
+    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
+
+  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/test/gruff_test_case.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'test/unit'
 require 'gruff'
-require 'test_timer'
+# require 'test_timer'
 
 class GruffTestCase < Test::Unit::TestCase
 

data/test/test_mini_bar.rb

@@ -9,10 +9,24 @@ class TestMiniBar < GruffTestCase
     write_test_file g, 'mini_bar.png'
   end
 
-  def test_simple_bar_wide_dataset
-    setup_wide_dataset
-    g = setup_basic_graph(Gruff::Mini::Bar, 200)
-    write_test_file g, 'mini_bar_wide_data.png'
-  end
+  # def test_simple_bar_wide_dataset
+  #   setup_wide_dataset
+  #   g = setup_basic_graph(Gruff::Mini::Bar, 200)
+  #   write_test_file g, 'mini_bar_wide_data.png'
+  # end
+  # 
+  # def test_code_sample
+  #   g = Gruff::Mini::Bar.new(200)
+  #   g.data "Jim", [200, 500, 400]
+  #   g.labels = { 0 => 'This Month', 1 => 'Average', 2 => 'Overall'}
+  #   g.write "mini_bar_one_color.png"
+  #   
+  #   g = Gruff::Mini::Bar.new(200)
+  #   g.data "Car", 200
+  #   g.data "Food", 500
+  #   g.data "Art", 1000
+  #   g.data "Music", 16
+  #   g.write "mini_bar_many_colors.png"
+  # end
 
 end

data/test/test_mini_pie.rb

@@ -8,4 +8,13 @@ class TestMiniPie < GruffTestCase
     write_test_file g, 'mini_pie.png'
   end
 
+  # def test_code_sample    
+  #   g = Gruff::Mini::Pie.new(200)
+  #   g.data "Car", 200
+  #   g.data "Food", 500
+  #   g.data "Art", 1000
+  #   g.data "Music", 16
+  #   g.write "mini_pie.png"    
+  # end
+
 end

data/test/test_mini_side_bar.rb

@@ -4,7 +4,6 @@ require File.dirname(__FILE__) + "/gruff_test_case"
 class TestSimpleSideBar < GruffTestCase
     
   def test_simple_side_bar
-    @datasets = (1..5).map {|n| ['Auto', rand(11)]}
     g = setup_basic_graph(Gruff::Mini::SideBar, 200)
     write_test_file g, 'mini_side_bar.png'    
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 date: 2006-10-26 00:00:00 -07:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: 
@@ -49,6 +49,7 @@ files:
 - lib/gruff/side_stacked_bar.rb
 - lib/gruff/spider.rb
 - lib/gruff/stacked_bar.rb
+- lib/gruff/side_bar.rb
 - lib/gruff/mini/bar.rb
 - lib/gruff/mini/pie.rb
 - lib/gruff/mini/side_bar.rb