chords 0.4.1 → 0.4.2

data/lib/chords/fretboard.rb

@@ -108,24 +108,36 @@ module Chords
       tuning_part = fid.sub(fingering_part, '')
       
       fretboard = Fretboard.new_by_string(tuning_part, 50, formatter_class)
-      over_tens = fingering_part.size - fretboard.open_notes.size
       
-      i=0
-      positions = []
+      max_fret_distance, positions = parse_positions(fingering_part, 
+                                                     fretboard.open_notes.size)
+                                                     
+      fretboard.formatter.print('', [Fingering.new(fretboard, positions)],
+                                opts.merge(:max_fret_distance => max_fret_distance))
+    end
+    
+    # parse positions from a string, for example '022100'
+    # returns [max_fret_distance, positions], where max_fret_distance has
+    # a minimum of 2
+    def self.parse_positions(position_str, no_of_strings)
+      position_str.downcase!
+      positions = position_str.scan(/./).map{|pos| pos == 'x' ? nil : pos.to_i}
+      over_tens = positions.size - no_of_strings
       
-      while i < fingering_part.size
-        fp = fingering_part[i,1]
-        fp == 'x' ? pos = nil : pos = fp.to_i
-        if over_tens > 0 and pos and pos < 4
-          over_tens -= 1
-          i += 2
-          pos = "#{pos}#{fingering_part[i+1,1]}".to_i
-        else
-          i += 1
+      while over_tens > 0
+        idx = positions.index{|p| !p.nil? and p > 0 and p < 3}
+        if idx
+          positions[idx] = "#{positions[idx]}#{positions[idx+1]}".to_i
+          positions.delete_at(idx+1)
         end
-        positions << pos
+        over_tens -= 1
       end
-      fretboard.formatter.print('', [Fingering.new(fretboard, positions)], opts)
+      max_fret_distance = 2
+      tmp = positions.select{|pos| !pos.nil? and pos > 0}
+      max_fret_distance = tmp.max - tmp.min unless tmp.empty?
+      max_fret_distance = 2 if max_fret_distance < 2
+      
+      [max_fret_distance, positions]
     end
     
   end

data/lib/chords/html_formatter.rb

@@ -1,7 +1,4 @@
-require 'rvg/rvg' # rmagick's RVG (Ruby Vector Graphics) 
-require 'base64'
-
-Magick::RVG::dpi = 72
+require 'chords/png_formatter'
 
 module Chords
   
@@ -16,15 +13,15 @@ module Chords
     def initialize(fretboard, cache=NonCache.new)
       @fretboard = fretboard
       @cache = cache
+      @png_formatter = PNGFormatter.new(@fretboard)
     end
     
     # TODO: accept a separator element in opts
     def print(title, fingerings, opts={})
-      @max_dist = opts[:max_fret_distance] || Fingering::DEFAULT_MAX_FRET_DISTANCE
       html = "<h2>#{title}</h2>\n"
       
       fingerings.each do |fingering|
-        html += get_element(fingering)
+        html += get_element(fingering, opts)
       end
       
       if opts[:inline]
@@ -39,46 +36,10 @@ module Chords
     
     private
     
-    def get_element(fingering)
-      
+    def get_element(fingering, opts)
       @cache.fetch(fingering.fid) do
-        rvg = Magick::RVG.new(5.cm, 5.cm).viewbox(0,0,270,250) do |canvas|
-          canvas.background_fill = 'white'
-          x_div = @fretboard.open_notes.size - 1
-          
-          y_diff = 215 / (@max_dist + 1)
-          
-          (@max_dist+2).times do |n|
-            canvas.line(20, n*y_diff+20, 250, n*y_diff+20)
-          end
-          
-          @fretboard.open_notes.each_with_index do |note, i|
-            canvas.line(i*(230/x_div)+20, 20, i*(230/x_div)+20, 230)
-            
-            unless [0,nil].include?(fingering[i])
-              canvas.circle(15, i*(230/x_div)+20, 
-                            fingering.relative(@max_dist)[i]*y_diff - 5)
-            end
-            
-            canvas.text(i*(230/x_div)+20, 15) do |txt| 
-              txt.tspan((fingering[i] || 'x').to_s).styles(
-                                           :text_anchor => 'middle',
-                                           :font_size => 20, 
-                                           :font_family => 'helvetica',
-                                           :fill => 'black')
-            end
-            canvas.text(i*(230/x_div)+20, 249) do |txt| 
-              txt.tspan(note.title).styles(:text_anchor => 'middle',
-                                           :font_size => 18, 
-                                           :font_family => 'helvetica',
-                                           :fill => 'black')
-            end
-          end
-          
-        end
-        img = rvg.draw
-        img.format = 'PNG'
-        "<img src=\"data:image/png;base64,#{Base64.encode64(img.to_blob)}\" />\n"
+        png_data = @png_formatter.print(nil, [fingering], opts)
+        "<img src=\"data:image/png;base64,#{Base64.encode64(png_data)}\" />\n"
       end
     end
     

data/lib/chords/png_formatter.rb

@@ -0,0 +1,68 @@
+require 'rvg/rvg' # rmagick's RVG (Ruby Vector Graphics) 
+
+Magick::RVG::dpi = 72
+
+module Chords
+  
+  # Formats a single fingering as png data
+  class PNGFormatter
+    
+    def initialize(fretboard)
+      @fretboard = fretboard
+    end
+    
+    def print(title, fingerings, opts={})
+      # title omitted
+      raise "Please provide only one fingering" if fingerings.size != 1
+      
+      @max_dist = opts[:max_fret_distance] || Fingering::DEFAULT_MAX_FRET_DISTANCE
+      
+      get_png_data(fingerings.first)
+    end
+    
+    private
+    
+    def get_png_data(fingering)
+      rvg = Magick::RVG.new(5.cm, 5.cm).viewbox(0,0,270,250) do |canvas|
+        canvas.background_fill = 'white'
+        x_div = @fretboard.open_notes.size - 1
+        
+        y_diff = 215 / (@max_dist + 1)
+        
+        (@max_dist+2).times do |n|
+          canvas.line(20, n*y_diff+20, 250, n*y_diff+20)
+        end
+        
+        @fretboard.open_notes.each_with_index do |note, i|
+          canvas.line(i*(230/x_div)+20, 20, i*(230/x_div)+20, 230)
+          
+          unless [0,nil].include?(fingering[i])
+            canvas.circle(15, i*(230/x_div)+20, 
+                          fingering.relative(@max_dist)[i]*y_diff - 5)
+          end
+          
+          canvas.text(i*(230/x_div)+20, 15) do |txt| 
+            txt.tspan((fingering[i] || 'x').to_s).styles(
+                                         :text_anchor => 'middle',
+                                         :font_size => 20, 
+                                         :font_family => 'helvetica',
+                                         :fill => 'black')
+          end
+          canvas.text(i*(230/x_div)+20, 249) do |txt| 
+            txt.tspan(note.title).styles(:text_anchor => 'middle',
+                                         :font_size => 18, 
+                                         :font_family => 'helvetica',
+                                         :fill => 'black')
+          end
+        end
+        
+      end
+      img = rvg.draw
+      img.format = 'PNG'
+      img.to_blob
+    end
+  end
+  
+end
+
+# TODO: change pdf and png formatter to be

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chords
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Antti Hakala
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +03:00
+date: 2010-08-11 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/chords/html_formatter.rb
 - lib/chords/note.rb
 - lib/chords/pdf_formatter.rb
+- lib/chords/png_formatter.rb
 - lib/chords/text_formatter.rb
 - lib/chords.rb
 has_rdoc: true