ruby_marks 0.1.4 → 0.1.5

data/lib/ruby_marks/clock_mark.rb

@@ -15,7 +15,10 @@ module RubyMarks
 
       return false if !self.recognizer.config.clock_width_tolerance_range.include?(self.width)   ||
                       !self.recognizer.config.clock_height_tolerance_range.include?(self.height)
-      
+
+
+      self.recognizer.export_file_to_str if self.recognizer.file_str.nil?  
+
       x_pos = coordinates[:x1]..coordinates[:x2]
       y_pos = coordinates[:y1]..coordinates[:y2]
 
@@ -23,9 +26,9 @@ module RubyMarks
 
       y_pos.each do |y|
         x_pos.each do |x|
-          color = self.recognizer.file.pixel_color(x, y)
-          color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
-          color = recognizer.config.recognition_colors.include?(color) ? "." : " "
+
+          color = self.recognizer.file_str[y][x]
+
           colors << color
         end
       end

data/lib/ruby_marks/recognizer.rb

@@ -3,7 +3,7 @@ module RubyMarks
   
   class Recognizer
     
-    attr_reader   :file, :raised_watchers, :groups, :watchers
+    attr_reader   :file, :raised_watchers, :groups, :watchers, :file_str
 
     attr_accessor :current_position, :clock_marks, :config
 
@@ -16,8 +16,9 @@ module RubyMarks
     def file=(file)
       self.reset_document
       @file = nil
+      @file_str = nil
       @file = Magick::Image.read(file).first
-      @file = @file.threshold(@config.calculated_threshold_level)
+      @file = @file.threshold(@config.calculated_threshold_level)       
     end
 
     def reset_document
@@ -64,6 +65,8 @@ module RubyMarks
 
     def marked?(expected_width, expected_height)
       raise IOError, "There's a invalid or missing file" if @file.nil?
+
+      self.export_file_to_str if self.file_str.nil?  
       
       if self.current_position
 
@@ -72,11 +75,10 @@ module RubyMarks
 
         neighborhood_y.each do |current_y|
           neighborhood_x.each do |current_x|
+            position = self.file_str[current_y][current_x]
+            
+            if position == "."
 
-            color = @file.pixel_color(current_x, current_y)
-            color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)            
-
-            if @config.recognition_colors.include?(color)
               stack = flood_scan(current_x, current_y)
 
               x_elements = []
@@ -125,6 +127,7 @@ module RubyMarks
               if (current_width  >= expected_width  - 4 && current_width  <= expected_width  + 4) &&
                  (current_height >= expected_height - 4 && current_height <= expected_height + 4) 
 
+
                 colors = []
 
                 x_pos = x1..x2
@@ -132,9 +135,7 @@ module RubyMarks
 
                 y_pos.each do |y|
                   x_pos.each do |x|
-                    color = @file.pixel_color(x, y)
-                    color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
-                    color = @config.recognition_colors.include?(color) ? "." : " "
+                    color = self.file_str[y][x]
                     colors << color
                   end
                 end
@@ -158,6 +159,8 @@ module RubyMarks
     def scan
       raise IOError, "There's a invalid or missing file" if @file.nil?
 
+      self.export_file_to_str if self.file_str.nil?  
+
       unmarked_group_found  = false
       multiple_marked_found = false
 
@@ -211,6 +214,8 @@ module RubyMarks
     def flag_all_marks
 
       raise IOError, "There's a invalid or missing file" if @file.nil?
+      
+      self.export_file_to_str if self.file_str.nil?  
 
       file = @file.dup
 
@@ -252,6 +257,8 @@ module RubyMarks
 
       raise IOError, "There's a invalid or missing file" if @file.nil?
 
+      self.export_file_to_str if self.file_str.nil?  
+
       @clock_marks = []
       x = @config.clock_marks_scan_x
       total_width = @file && @file.page.width || 0
@@ -261,12 +268,11 @@ module RubyMarks
         current_y = 0
         loop do 
 
-          break if current_y > total_height
+          break if current_y >= total_height
 
-          color = @file.pixel_color(x, current_y)
-          color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
+          position = @file_str[current_y][x]
           
-          if @config.recognition_colors.include?(color)
+          if position == "."
             stack = flood_scan(x, current_y)
 
             x_elements = []
@@ -343,20 +349,23 @@ module RubyMarks
     end
 
     def flood_scan(x, y)
+
       result_mask =  Hash.new { |hash, key| hash[key] = [] }
       result_mask.tap do |result_mask|
         process_queue =  Hash.new { |hash, key| hash[key] = [] }
         process_line = true
         
         loop do
+
+          break if y > self.file_str.size - 1
           reset_process = false
 
           if process_line
             current_x = x.to_i
             loop do
-              color = self.file.pixel_color(current_x, y)
-              color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
-              break if !self.config.recognition_colors.include?(color) || current_x - 1 <= 0         
+              position = self.file_str[y][current_x]
+              
+              break if position != "." || current_x - 1 <= 0         
               process_queue[y] << current_x unless process_queue[y].include?(current_x) || result_mask[y].include?(current_x) 
               result_mask[y] << current_x unless result_mask[y].include?(current_x)            
               current_x = current_x - 1
@@ -364,10 +373,9 @@ module RubyMarks
 
             current_x = x.to_i
             loop do
-              color = self.file.pixel_color(current_x, y)
-              color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
+              position = self.file_str[y][current_x]
 
-              break if !self.config.recognition_colors.include?(color) || current_x + 1 >= self.file.page.width            
+              break if position != "." || current_x + 1 >= self.file.page.width            
               process_queue[y] << current_x unless process_queue[y].include?(current_x) || result_mask[y].include?(current_x)              
               result_mask[y] << current_x unless result_mask[y].include?(current_x)
               current_x = current_x + 1
@@ -377,13 +385,19 @@ module RubyMarks
             process_queue[y] = process_queue[y].sort
           end
 
+          if process_queue[y].size > 50
+            process_queue =  Hash.new { |hash, key| hash[key] = [] }
+            y = y + 1
+            next
+          end
+
           process_line = true
 
           process_queue[y].each do |element|
             if y - 1 >= 0
-              color = self.file.pixel_color(element.to_i, y-1)
-              color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)     
-              if self.config.recognition_colors.include?(color) && !result_mask[y-1].include?(element)
+              position = self.file_str[y-1][element]
+  
+              if position == "." && !result_mask[y-1].include?(element)
                 x = element
                 y = y - 1
                 reset_process = true
@@ -396,9 +410,9 @@ module RubyMarks
 
           process_queue[y].each do |element|         
             if y + 1 <= self.file.page.height
-              color = self.file.pixel_color(element.to_i, y+1)
-              color = RubyMarks::ImageUtils.to_hex(color.red, color.green, color.blue)
-              if self.config.recognition_colors.include?(color) && !result_mask[y+1].include?(element)
+              position = self.file_str[y+1][element]
+
+              if position == "." && !result_mask[y+1].include?(element)
                 x = element
                 y = y + 1
                 reset_process = true
@@ -423,6 +437,14 @@ module RubyMarks
       end
     end
 
+    def export_file_to_str
+      @file_str = @file.export_pixels_to_str
+      @file_str = @file_str.gsub!(Regexp.new('\xFF\xFF\xFF', nil, 'n'), " ,")
+      @file_str = @file_str.gsub!(Regexp.new('\x00\x00\x00', nil, 'n'), ".,")
+      @file_str = @file_str.split(',')
+      @file_str = @file_str.each_slice(@file.page.width).to_a   
+    end
+
     private
     def add_mark(file)
       dr = Magick::Draw.new
@@ -440,8 +462,6 @@ module RubyMarks
       dr.draw(file)
     end
 
- 
-
   end
 
 end

data/lib/ruby_marks/version.rb

@@ -1,3 +1,3 @@
 module RubyMarks
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

data/test/ruby_marks/clock_mark_test.rb

@@ -8,7 +8,7 @@ class RubyMarks::ClockMarkTest < Test::Unit::TestCase
     @recognizer.file = @file
     @positions = {}    
     @positions[:first_clock_position] = {x1: 49, x2: 74, y1: 790, y2: 801}
-    @positions[:not_a_clock] = {x1: 62, x2:63, y1: 859, y2: 860}
+    @positions[:not_a_clock] = {x1: 62, x2: 63, y1: 859, y2: 860}
   end
 
   def test_should_obtain_the_clock_mark_width

data/test/ruby_marks/recognizer_test.rb

@@ -75,12 +75,12 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
 
   def test_should_return_a_file_with_a_position_flagged
     @recognizer.current_position = @positions[:invalid_clock]
-    flagged_recognizer = @recognizer.flag_position
-    assert_equal Magick::Image, flagged_recognizer.class
+    flagged_document = @recognizer.flag_position
+    assert_equal Magick::Image, flagged_document.class
 
     # temp_filename = "temp_sheet_demo1.png"
     # File.delete(temp_filename) if File.exist?(temp_filename)
-    # flagged_recognizer.write(temp_filename)
+    # flagged_document.write(temp_filename)
   end
 
   def test_should_recognize_marked_position

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_marks
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors: