suranyami-tuftify 0.1.1 → 0.1.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'hoe'
 require 'echoe'
 require 'tuftify'
 
-Echoe.new('tuftify', '0.1.1') do |p|
+Echoe.new('tuftify', '0.1.2') do |p|
   p.description = 'A graphing library.'
   p.url = 'http://github.com/suranyami/tuftify'
   p.author = ["David Parry", "Ingrid Anzola"]
@@ -21,6 +21,6 @@ task :sample do
   (1..10).each {|i| values << [i, rand(100)]}
   g = Tuftify::Graph.new(500, 300, values)
   canvas = g.draw
-  canvas.write('sample.jpg')
+  canvas.write('samples/sample.jpg')
 end
 

data/lib/tuftify/graph.rb

@@ -6,32 +6,72 @@ module Tuftify
   class Graph
     include Magick
     attr_accessor :width, :height, :values
+    attr_accessor :font_size, :resolution
+    attr_accessor :canvas
   
     def initialize(width, height, values = nil)
       @width = width
       @height = height
       @values = values
+      @font_size = 9
+      @resolution = 72.0
+      d = "#{@resolution}x#{@resolution}"
+      
+      @canvas = Magick::Image.new(@width, @height) {
+        self.background_color = 'white'
+        self.density = d
+      }
+
+      @drawing = Magick::Draw.new
+      @drawing.font_family = 'Helvetica'
+      @drawing.fill = 'black'
+      @drawing.pointsize = 12
+      @drawing.gravity = NorthGravity
     end
 
     def draw
-      canvas = Magick::ImageList.new
-      canvas.new_image(@width, @height) { self.background_color = 'white'}
       max_value = @values.collect {|v| v[1]}.max
-    
       barwidth = @width / @values.length
-    
-      upper_left_x = 0
-    
+      x = 0
+      lh = label_height
+      draw_height = @height - lh
       @values.each do |key, value|
-        rect = Magick::Draw.new
-        h = @height / max_value * value
-        rect.fill('white')
-        rect.stroke('black')
-        rect.rectangle(upper_left_x, @height, upper_left_x + barwidth, @height - h)
-        upper_left_x += barwidth
-        rect.draw(canvas)
+        h = draw_height / max_value * value
+        @drawing.fill('black')
+        @drawing.stroke('white')
+        @drawing.rectangle(x, draw_height, x + barwidth, draw_height - h)
+        @drawing.annotate(@canvas, barwidth, lh, x, draw_height, key.to_s)
+        x += barwidth
       end
-      return canvas
+      @drawing.draw(@canvas)
+      return @canvas
+    end
+
+    def label_height
+      h = 0
+      @values.each {|key, value|
+
+        m = @drawing.get_type_metrics(key.to_s)
+        h = m.height if m.height > h
+      }
+      return h
     end
   end
-end
+end
+#
+#
+#        if !@labels[index].nil? && @labels_seen[index].nil?
+#        y_offset = @graph_bottom + LABEL_MARGIN
+#
+#        @d.fill = @font_color
+#        @d.font = @font if @font
+#        @d.stroke('transparent')
+#        @d.font_weight = NormalWeight
+#        @d.pointsize = scale_fontsize(@marker_font_size)
+#        @d.gravity = NorthGravity
+#        @d = @d.annotate_scaled(@base_image,
+#          1.0, 1.0,
+#          x_offset, y_offset,
+#          @labels[index], @scale)
+#        @labels_seen[index] = 1
+#        debug { @d.line 0.0, y_offset, @raw_columns, y_offset }

data/tuftify.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tuftify}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Parry, Ingrid Anzola"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: suranyami-tuftify
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Parry, Ingrid Anzola