gruff 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,5 +1,10 @@
 CHANGELOG
 
+== 0.0.3
+
+* Added option to draw line graphs without the lines (points only), thanks to Eric Hodel
+* Removed font-minimum check so graphs look better at 300px width
+
 == 0.0.2
 
 * Fixed to_blob (thanks to Carlos Villela)

data/lib/gruff/base.rb

@@ -15,7 +15,7 @@ end
 
 module Gruff
   
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
   class Base
   
@@ -339,7 +339,7 @@ protected
     
     def scale_fontsize(value)
       new_fontsize = value * @scale
-      return 10 if new_fontsize < 10
+      #return 10 if new_fontsize < 10
       return new_fontsize
     end
 

data/lib/gruff/line.rb

@@ -1,62 +1,79 @@
-
 require 'gruff/base'
 
-module Gruff
-  class Line < Base
-
-    def draw
-      super
-
-      @x_increment = @graph_width / (@column_count - 1).to_f
-      circle_radius = 5.0
-    
-      @d = @d.stroke_opacity 1.0
-      @d = @d.stroke_width 5.0
-    
-      @norm_data.each do |data_row|
-        prev_x = prev_y = 0.0
-        @d = @d.stroke current_color
-        @d = @d.fill current_color
-      
-        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)
-                
-          @d = @d.line(prev_x, prev_y, new_x, new_y) if (prev_x > 0) && (prev_y > 0)
-          @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
-
-          draw_label(new_x, index)
-
-          prev_x = new_x
-          prev_y = new_y
+class Gruff::Line < Gruff::Base
+
+  #
+  # Call with target pixel width of graph (800, 400, 300), and/or 'false' to omit lines (points only).
+  #
+  #  g = Gruff::Line.new(400) # 400px wide with lines
+  #
+  #  g = Gruff::Line.new(400, false) # 400px wide, no lines
+  #
+  #  g = Gruff::Line.new(false) # Defaults to 800px wide, no lines
+  def initialize(*args)
+    raise ArgumentError, "Wrong number of arguments" if args.length > 2
+    if args.empty? or not Numeric === args.first then
+      super()
+    else
+      super args.shift
+    end
+    @lines = args.empty? || args.shift # draw lines by default
+  end
+
+  def draw
+    super
+
+    @x_increment = @graph_width / (@column_count - 1).to_f
+    circle_radius = 5.0
+
+    @d = @d.stroke_opacity 1.0
+    @d = @d.stroke_width 5.0
+
+    @norm_data.each do |data_row|
+      prev_x = prev_y = 0.0
+      @d = @d.stroke current_color
+      @d = @d.fill current_color
+
+      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)
+
+        if @lines and prev_x > 0 and prev_y > 0 then
+          @d = @d.line(prev_x, prev_y, new_x, new_y)
         end
-        
-        increment_color()
+        @d = @d.circle(new_x, new_y, new_x - circle_radius, new_y)
+
+        draw_label(new_x, index)
+
+        prev_x = new_x
+        prev_y = new_y
       end
-    
-      @d.draw(@base_image)    
+
+      increment_color()
     end
 
+    @d.draw(@base_image)
+  end
+
 private
 
-    # Draws column labels below graph
-    def draw_label(x_offset, index)
-      if !@labels[index].nil? && @labels_seen[index].nil?
-        @d.fill = @marker_color
-        @d.font = @font
-        @d.stroke = 'transparent'
-        @d.font_weight = NormalWeight
-        @d.pointsize = scale_fontsize(@marker_pointsize)
-        @d.gravity = CenterGravity
-        @d = @d.annotate_scaled(@base_image,
-                                1, 1,
-                                #150, 30,
-                                x_offset, @raw_rows - 80,
-                                @labels[index], @scale)
-        @labels_seen[index] = 1
-      end
+  ##
+  # Draws column labels below graph
+  def draw_label(x_offset, index)
+    if !@labels[index].nil? && @labels_seen[index].nil?
+      @d.fill = @marker_color
+      @d.font = @font
+      @d.stroke = 'transparent'
+      @d.font_weight = NormalWeight
+      @d.pointsize = scale_fontsize(@marker_pointsize)
+      @d.gravity = CenterGravity
+      @d = @d.annotate_scaled(@base_image,
+                              1, 1,
+                              x_offset, @raw_rows - 80,
+                              @labels[index], @scale)
+      @labels_seen[index] = 1
     end
-
   end
-end
+
+end

data/test/line_test.rb

@@ -166,6 +166,67 @@ class TestGruffLine < Test::Unit::TestCase
     g.write("test/output/line_font.png")
   end
 
+  def test_dots_graph
+    g = Gruff::Line.new(false)
+    g.title = "Dots Test 800px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/line_dots.png")
+  end
+
+
+  def test_dots_graph_small
+    g = Gruff::Line.new(400, false)
+    g.title = "Dots Test 400px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/line_dots_small.png")
+  end
+
+
+  def test_dots_graph_tiny
+    g = Gruff::Line.new(300, false)
+    g.title = "Dots Test 300px"
+    g.labels = {
+      0 => '5/6', 
+      10 => '5/15', 
+      20 => '5/24', 
+      30 => '5/30', 
+      40 => '6/4', 
+      50 => '6/16'
+    }
+    %w{jimmy jane philip arthur julie bert}.each do |student_name|
+      g.data(student_name, (0..50).collect { |i| rand 100 })
+    end
+
+    # Default theme
+    g.write("test/output/line_dots_tiny.png")
+  end
+
+
+
 =begin
   def test_very_small_graphs
     [300, 200, 100].each do |size|

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: gruff
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 date: 2005-10-26 00:00:00 -07:00
 summary: Beautiful graphs for one or multiple datasets.
 require_paths: