ruby_marks 0.2.9 → 0.3.0

data/lib/ruby_marks/config.rb

@@ -7,7 +7,7 @@ module RubyMarks
                   :default_mark_width, :default_mark_height, :scan_timeout,
                   :default_mark_width_tolerance, :default_mark_height_tolerance,
                   :default_distance_between_marks, :default_expected_lines,
-                  :default_block_width_tolerance, :default_block_height_tolerance
+                  :default_block_width_tolerance, :default_block_height_tolerance, :scan_mode
 
     
     def initialize(recognizer)

data/lib/ruby_marks/recognizer.rb

@@ -135,8 +135,12 @@ module RubyMarks
         block = find_block_marks(file_str, group_center[:x], group_center[:y], group)
         if block
           group.coordinates = {x1: block[:x1], x2: block[:x2], y1: block[:y1], y2: block[:y2]}
-         
-          marks_blocks = find_marks(original_file_str, group)
+          
+          if @config.scan_mode == :grid
+            marks_blocks = find_marks_grid(group)
+          else
+            marks_blocks = find_marks(original_file_str, group)
+          end
           marks_blocks.sort!{ |a,b| a[:y1] <=> b[:y1] }
           mark_ant = nil
           marks_blocks.each do |mark|
@@ -294,6 +298,26 @@ module RubyMarks
       end
     end
 
+    def find_marks_grid(group)
+      block = group.coordinates
+      blocks = []
+      blocks.tap do |blocks|
+        block_width  = RubyMarks::ImageUtils.calc_width(block[:x1], block[:x2])
+        block_height = RubyMarks::ImageUtils.calc_height(block[:y1], block[:y2])
+        lines  = @config.default_expected_lines
+        columns = @config.default_marks_options.size
+        distance_lin = block_height / lines
+        distance_col = block_width / columns
+        lines.times do |lin|
+          columns.times do |col|
+            blocks << { :x1 => block[:x1] + (col * distance_col), 
+                        :y1 => block[:y1] + (lin * distance_lin), 
+                        :x2 => block[:x1] + (col * distance_col) + distance_col,
+                        :y2 => block[:y1] + (lin * distance_lin) + distance_col }
+          end
+        end
+      end    
+    end
 
     def find_marks(image, group)
       block = group.coordinates

data/lib/ruby_marks/version.rb

@@ -1,3 +1,3 @@
 module RubyMarks
-  VERSION = "0.2.9".freeze
+  VERSION = "0.3.0".freeze
 end

data/test/ruby_marks/recognizer_grid_test.rb

@@ -0,0 +1,97 @@
+require "test_helper"
+
+class RubyMarks::RecognizerGridTest < Test::Unit::TestCase
+  
+  def setup 
+    @file = 'assets/sheet_demo_grid.png'
+    @recognizer = RubyMarks::Recognizer.new
+    @positions = {}
+    @positions[:marked_position] = {x: 161, y: 794}
+    @positions[:unmarked_position] = {x: 161, y: 994}
+
+    @recognizer.configure do |config|  
+    
+      config.scan_mode = :grid
+      config.default_expected_lines = 5
+      config.intensity_percentual = 25
+      
+      config.define_group :um do |group|
+        group.expected_coordinates = {x1: 100, y1: 200, x2: 250, y2: 350}
+      end
+
+      config.define_group :dois do |group|
+        group.expected_coordinates = {x1: 350, y1: 200, x2: 500, y2: 350}
+      end
+
+      config.define_group :tres do |group|
+        group.expected_coordinates = {x1: 570, y1: 200, x2: 720, y2: 350}
+      end
+
+      config.define_group :quatro do |group|
+        group.expected_coordinates = {x1: 790, y1: 200, x2: 940, y2: 350}
+      end
+
+      config.define_group :cinco do |group|
+        group.expected_coordinates = {x1: 1010, y1: 200, x2: 1160, y2: 350}
+      end
+    end
+
+    @recognizer.file = @file
+
+  end
+
+  def test_should_return_the_recognizer_with_all_marks_flagged
+    flagged_recognizer = @recognizer.flag_all_marks
+    assert_equal Magick::Image, flagged_recognizer.class
+
+    temp_filename = "sheet_demo_grid2.png"
+    File.delete(temp_filename) if File.exist?(temp_filename)
+    flagged_recognizer.write(temp_filename)    
+  end
+
+  def test_should_scan_the_recognizer_and_get_a_hash_of_marked_marks
+    expected_hash = { 
+      um: {  
+        1 => ['B'],
+        2 => ['B'],
+        3 => ['A'],
+        4 => ['B'],
+        5 => ['A']
+      },
+      dois: {  
+        1 => ['D'],
+        2 => ['A'],
+        3 => ['C'],
+        4 => ['A'],
+        5 => ['D']
+      },
+      tres: {  
+        1 => ['B'],
+        2 => ['A'],
+        3 => ['A'],
+        4 => ['A'],       
+        5 => ['B']
+      },
+      quatro: {  
+        1 => ['B'],
+        2 => ['C'],
+        3 => ['A'],
+        4 => ['C'],       
+        5 => ['E']
+      },
+      cinco: {  
+        1 => ['A'],
+        2 => ['B'],
+        3 => ['A'],
+        4 => ['A'],      
+        5 => ['C']
+      }
+    }
+    result = @recognizer.scan
+    result.each_pair do |group, lines|
+      lines.delete_if { |line, value| value.empty? }
+    end
+    result.delete_if { |group, lines| lines.empty? }
+    assert_equal expected_hash, result 
+  end
+end

data/test/ruby_marks/recognizer_test.rb

@@ -10,6 +10,7 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
     @positions[:unmarked_position] = {x: 161, y: 994}
 
     @recognizer.configure do |config|  
+      config.scan_mode = :grid
       config.define_group :first  do |group|
         group.expected_coordinates = {x1: 145, y1: 780, x2: 270, y2: 1290}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_marks
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,19 +37,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/ruby_marks/config.rb
-- lib/ruby_marks/group.rb
-- lib/ruby_marks/image_utils.rb
-- lib/ruby_marks/mark.rb
-- lib/ruby_marks/recognizer.rb
-- lib/ruby_marks/support.rb
+- lib/ruby_marks.rb
 - lib/ruby_marks/version.rb
+- lib/ruby_marks/support.rb
+- lib/ruby_marks/mark.rb
+- lib/ruby_marks/group.rb
 - lib/ruby_marks/watcher.rb
-- lib/ruby_marks.rb
-- test/ruby_marks/image_utils_test.rb
+- lib/ruby_marks/recognizer.rb
+- lib/ruby_marks/config.rb
+- lib/ruby_marks/image_utils.rb
+- test/test_helper.rb
 - test/ruby_marks/recognizer_test.rb
+- test/ruby_marks/recognizer_grid_test.rb
 - test/ruby_marks/watcher_test.rb
-- test/test_helper.rb
+- test/ruby_marks/image_utils_test.rb
 homepage: https://github.com/andrerpbts/ruby_marks.git
 licenses:
 - MIT
@@ -77,12 +78,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby_marks
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple OMR tool
 test_files:
-- test/ruby_marks/image_utils_test.rb
+- test/test_helper.rb
 - test/ruby_marks/recognizer_test.rb
+- test/ruby_marks/recognizer_grid_test.rb
 - test/ruby_marks/watcher_test.rb
-- test/test_helper.rb
+- test/ruby_marks/image_utils_test.rb