ruby_marks 0.1.5 → 0.2.0

data/lib/ruby_marks/scan_area.rb

@@ -0,0 +1,11 @@
+module RubyMarks
+
+  class ScanArea
+    attr_accessor :coordinates, :file
+
+    def initialize(coordinates)
+      @coordinates = coordinates
+    end
+  end
+
+end

data/lib/ruby_marks/version.rb

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

data/lib/ruby_marks.rb

@@ -5,26 +5,20 @@ require 'ruby_marks/support'
 
 
 module RubyMarks
+  mattr_accessor :edge_level
+  @@edge_level = 4
+
   mattr_accessor :threshold_level
   @@threshold_level = 60
 
-  mattr_accessor :clock_mark_size_tolerance
-  @@clock_mark_size_tolerance = 2
-
-  mattr_accessor :expected_clocks_count
-  @@expected_clocks_count = 0
-
-  mattr_accessor :clock_marks_scan_x
-  @@clock_marks_scan_x = 62
-
-  mattr_accessor :clock_width
-  @@clock_width = 26
+  mattr_accessor :adjust_inconsistent_bubbles
+  @@adjust_inconsistent_bubbles = true
 
-  mattr_accessor :recognition_colors
-  @@recognition_colors = ["#000000"]
+  mattr_accessor :default_mark_width_tolerance
+  @@default_mark_width_tolerance = 4
 
-  mattr_accessor :clock_height
-  @@clock_height = 12
+  mattr_accessor :default_mark_height_tolerance
+  @@default_mark_height_tolerance = 4
 
   mattr_accessor :default_mark_width
   @@default_mark_width = 20
@@ -41,20 +35,35 @@ module RubyMarks
   mattr_accessor :default_distance_between_marks
   @@default_distance_between_marks = 25
 
-  COLORS = %w{ #d80000 #00d8d8 #d8006c #d86c00 #006cd8 #00d86c #d8d800 #00d86c #6c00d8 #a5a500
-               #a27b18 #18a236 #df4f27 }
+  mattr_accessor :default_expected_lines
+  @@default_expected_lines = 20
+
+  COLORS = %w{ #d80000 
+               #00d8d8 
+               #d8006c 
+               #d86c00 
+               #006cd8 
+               #00d86c 
+               #d8d800 
+               #00d86c 
+               #6c00d8 
+               #a5a500
+               #a27b18 
+               #18a236 
+               #df4f27 }
 
   AVAILABLE_WATCHERS = [
     :scan_mark_watcher,
     :scan_unmarked_watcher,
     :scan_multiple_marked_watcher,
-    :clock_mark_difference_watcher
+    :incorrect_group_watcher
   ]
 end
 
-require 'ruby_marks/clock_mark'
 require 'ruby_marks/config'
 require 'ruby_marks/group'
 require 'ruby_marks/image_utils'
+require 'ruby_marks/mark'
 require 'ruby_marks/recognizer'
+require 'ruby_marks/scan_area'
 require 'ruby_marks/watcher'

data/test/ruby_marks/image_utils_test.rb

@@ -1,7 +1,23 @@
 require "test_helper"
 
 class RubyMarks::ImageUtilsTest < Test::Unit::TestCase
-  
+
+  def test_should_calculate_the_correct_width_of_given_coordinates
+    assert_equal 11, RubyMarks::ImageUtils.calc_width(10, 20)
+  end
+
+  def test_should_calculate_the_correct_height_of_given_coordinates
+    assert_equal 11, RubyMarks::ImageUtils.calc_height(10, 20)
+  end
+
+  def test_should_calculate_the_correct_middle_horizontal_of_given_coordinates
+    assert_equal 15, RubyMarks::ImageUtils.calc_middle_horizontal(10, 11)
+  end
+
+  def test_should_calculate_the_correct_middle_vertical_of_given_coordinates
+    assert_equal 15, RubyMarks::ImageUtils.calc_middle_vertical(10, 11)
+  end
+
   def test_should_return_the_white_color_in_hexa_receiving_8bits
     color = RubyMarks::ImageUtils.to_hex(255, 255, 255)
     assert_equal "#FFFFFF", color

data/test/ruby_marks/recognizer_test.rb

@@ -8,38 +8,37 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
     @positions = {}
     @positions[:marked_position] = {x: 161, y: 794}
     @positions[:unmarked_position] = {x: 161, y: 994}
-    @positions[:first_clock_position] = {x: 62, y: 794}
-    @positions[:invalid_clock] = {x: 62, y: 1032}
 
-    @recognizer.configure do |config|
-      config.expected_clocks_count = 20
+    @recognizer.configure do |config|  
       config.define_group :first  do |group|
-        group.clocks_range = 1..20 
-        group.x_distance_from_clock = 87
+        group.expected_coordinates = {x1: 145, y1: 780, x2: 270, y2: 1290}
       end
 
       config.define_group :second do |group| 
-        group.clocks_range = 1..20         
-        group.x_distance_from_clock = 310
+        group.expected_coordinates = {x1: 370, y1: 780, x2: 500, y2: 1290}
       end
 
       config.define_group :third  do |group| 
-        group.clocks_range = 1..20 
-        group.x_distance_from_clock = 535
+        group.expected_coordinates = {x1: 595, y1: 780, x2: 720, y2: 1290}
       end
 
       config.define_group :fourth do |group| 
-        group.clocks_range = 1..20 
-        group.x_distance_from_clock = 760
+        group.expected_coordinates = {x1: 820, y1: 780, x2: 950, y2: 1290}
       end
 
       config.define_group :fifth  do |group| 
-        group.clocks_range = 1..20 
-        group.x_distance_from_clock = 985
+        group.expected_coordinates = {x1: 1045, y1: 780, x2: 1170, y2: 1290}
       end
+
     end
 
     @recognizer.file = @file
+
+    # file = @recognizer.file
+    # temp_filename = "ttemp_sheet_demo1.png"
+    # File.delete(temp_filename) if File.exist?(temp_filename)
+    # file.write(temp_filename)
+
   end
 
   def test_should_initialize_a_recognizer_with_a_valid_file
@@ -48,9 +47,9 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
 
   def test_should_pass_the_configuration_to_recognizer_config
     @recognizer.configure do |config|
-      config.clock_marks_scan_x = 30
+      config.threshold_level = 70
     end
-    assert_equal 30, @recognizer.config.clock_marks_scan_x
+    assert_equal 70, @recognizer.config.threshold_level
   end
 
   def test_should_get_the_default_configuration_of_config_in_group
@@ -74,8 +73,7 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
 
 
   def test_should_return_a_file_with_a_position_flagged
-    @recognizer.current_position = @positions[:invalid_clock]
-    flagged_document = @recognizer.flag_position
+    flagged_document = @recognizer.flag_position @positions[:marked_position]
     assert_equal Magick::Image, flagged_document.class
 
     # temp_filename = "temp_sheet_demo1.png"
@@ -84,19 +82,21 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
   end
 
   def test_should_recognize_marked_position
-    @recognizer.current_position = @positions[:marked_position]
-    assert @recognizer.marked?(20, 20), "The position wasn't recognized as marked"    
+    @recognizer.detect_groups    
+    group = @recognizer.groups[:first]
+    line = group.marks[1]
+    mark = line.first
+    assert mark.marked?, "The position wasn't recognized as marked"    
   end
 
   def test_should_recognize_not_marked_position
-    @recognizer.current_position = @positions[:unmarked_position]
-    assert @recognizer.unmarked?(20, 20), "The position wasn't recognized as unmarked"    
+    @recognizer.detect_groups
+    group = @recognizer.groups[:first]
+    line = group.marks[2]
+    mark = line.first
+    assert mark.unmarked?, "The position wasn't recognized as unmarked"    
   end
 
-  def test_should_recognize_the_recognizer_clock_marks
-    @recognizer.scan_clock_marks
-    assert_equal 20, @recognizer.clock_marks.count
-  end
 
   def test_should_return_the_recognizer_with_all_marks_flagged
     flagged_recognizer = @recognizer.flag_all_marks
@@ -107,47 +107,43 @@ class RubyMarks::RecognizerTest < Test::Unit::TestCase
     flagged_recognizer.write(temp_filename)    
   end
 
-  def test_should_move_the_current_position_in_10_and_20_pixels
-    @recognizer.current_position = @positions[:marked_position]
-    expected_position = {x: 171, y: 814}
-
-    assert_equal expected_position, @recognizer.move_to(10, 20)
-  end
 
   def test_should_scan_the_recognizer_and_get_a_hash_of_marked_marks
     expected_hash = { 
-      clock_1: {  
-        group_first:  ['A'],
-        group_second: ['A']
-      },
-      clock_2: {  
-        group_first:  ['B'],
-        group_second: ['B'],
-        group_third:  ['B']
+      first: {  
+        1 => ['A'],
+        2 => ['B'],
+        3 => ['C'],
+        4 => ['D'],
+        5 => ['E']
       },
-      clock_3: {  
-        group_first:  ['C'],
-        group_second: ['C'], 
-        group_third:  ['D']            
+      second: {  
+        1 => ['A'],
+        2 => ['B'],
+        3 => ['C'],
+        4 => ['D'],
+        5 => ['E']
       },
-      clock_4: {  
-        group_first:  ['D'],
-        group_second: ['D'],
-        group_third:  ['D']       
-      },
-      clock_5: {  
-        group_first:  ['E'],
-        group_second: ['E']
+      third: {  
+        2 => ['B'],
+        3 => ['D'],
+        4 => ['D']       
       }
     }
     assert_equal expected_hash, @recognizer.scan 
   end
 
-  def test_should_make_scan_mark_watcher_raise_up
-    @recognizer.add_watcher :scan_mark_watcher 
+
+  def test_should_make_watcher_raise_up
+    @file = 'assets/sheet_demo1_invalid.png'
+    @recognizer.file = @file 
+
+    @recognizer.add_watcher :incorrect_group_watcher 
 
     @recognizer.scan
-    assert @recognizer.raised_watchers.include?(:scan_mark_watcher)
+    assert @recognizer.raised_watchers.include?(:incorrect_group_watcher)
   end
+
+
 end
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_marks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,17 +37,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/ruby_marks/clock_mark.rb
 - 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/scan_area.rb
 - lib/ruby_marks/support.rb
 - lib/ruby_marks/version.rb
 - lib/ruby_marks/watcher.rb
 - lib/ruby_marks.rb
-- test/ruby_marks/clock_mark_test.rb
-- test/ruby_marks/group_test.rb
 - test/ruby_marks/image_utils_test.rb
 - test/ruby_marks/recognizer_test.rb
 - test/ruby_marks/watcher_test.rb
@@ -55,10 +54,13 @@ files:
 homepage: https://github.com/andrerpbts/ruby_marks.git
 licenses:
 - MIT
-post_install_message: ! "\n      *** IMPORTANT: You are running the ImageMagick under
-  16bits quantum depth. This configuration is used\n          in very specific cases
-  and can cause RMagick work a bit slow. See more details in this forum post\n          http://rubyforge.org/forum/forum.php?thread_id=10975&forum_id=1618
-  ***\n    "
+post_install_message: ! "\n      *** NOTE: You are running the ImageMagick under 16bits
+  quantum depth. This configuration is used\n          in very specific cases and
+  can cause RMagick work a bit slow. See more details in this forum post\n          http://rubyforge.org/forum/forum.php?thread_id=10975&forum_id=1618
+  ***\n\n      We changed the way it recognizes the marks. It's not based on clocks
+  anymore. If you are updating the gem \n      from 0.1.4 version, you should refactor
+  your code to eliminate the clocks parameters and adjust \n      some new configurations.
+  More information can be obtained on README file.\n    "
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +83,6 @@ signing_key:
 specification_version: 3
 summary: A simple OMR tool
 test_files:
-- test/ruby_marks/clock_mark_test.rb
-- test/ruby_marks/group_test.rb
 - test/ruby_marks/image_utils_test.rb
 - test/ruby_marks/recognizer_test.rb
 - test/ruby_marks/watcher_test.rb

data/lib/ruby_marks/clock_mark.rb

@@ -1,65 +0,0 @@
-#encoding: utf-8
-module RubyMarks
-  
-  class ClockMark
-
-    attr_accessor :recognizer, :coordinates
-
-    def initialize(params={})
-      params.each do |k, v|
-        self.send("#{k}=", v) if self.respond_to?("#{k}=")
-      end
-    end
-
-    def valid?
-
-      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]
-
-      colors = []
-
-      y_pos.each do |y|
-        x_pos.each do |x|
-
-          color = self.recognizer.file_str[y][x]
-
-          colors << color
-        end
-      end
-
-      intensity = colors.count(".") * 100 / colors.size
-      return intensity >= 70 ? true : false
-    end
-
-    def invalid?
-      !valid?
-    end
-
-    def width
-      RubyMarks::ImageUtils.calc_width(@coordinates[:x1], @coordinates[:x2])
-    end    
-
-    def height
-      RubyMarks::ImageUtils.calc_height(@coordinates[:y1], @coordinates[:y2])
-    end
-
-    def horizontal_middle_position
-      RubyMarks::ImageUtils.calc_middle_horizontal(@coordinates[:x1], self.width)
-    end
-
-    def vertical_middle_position
-      RubyMarks::ImageUtils.calc_middle_vertical(@coordinates[:y1], self.height)
-    end
-
-    def to_s
-      self.coordinates
-    end
-
-  end 
-end

data/test/ruby_marks/clock_mark_test.rb

@@ -1,44 +0,0 @@
-require "test_helper"
-
-class RubyMarks::ClockMarkTest < Test::Unit::TestCase
-
-  def setup 
-    @file = 'assets/sheet_demo1.png'
-    @recognizer = RubyMarks::Recognizer.new
-    @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}
-  end
-
-  def test_should_obtain_the_clock_mark_width
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:first_clock_position])
-    assert_equal 26, clock.width
-  end
-
-  def test_should_obtain_the_clock_mark_height
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:first_clock_position])
-    assert_equal 12, clock.height
-  end
-
-  def test_should_obtain_the_horizontal_middle_position
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:first_clock_position])
-    assert_equal 62, clock.horizontal_middle_position
-  end  
-
-  def test_should_obtain_the_vertical_middle_position
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:first_clock_position])
-    assert_equal 796, clock.vertical_middle_position
-  end
-
-  def test_should_recognize_a_valid_clock
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:first_clock_position])
-    assert clock.valid?, "Not recognized a valid clock"
-  end
-
-  def test_should_recognize_a_invalid_clock
-    clock = RubyMarks::ClockMark.new(recognizer: @recognizer, coordinates: @positions[:not_a_clock])
-    assert clock.invalid?, "Recognized a invalid clock as a valid one"
-  end
-
-end

data/test/ruby_marks/group_test.rb

@@ -1,26 +0,0 @@
-require "test_helper"
-
-class RubyMarks::GroupTest < Test::Unit::TestCase
-
-  def setup
-    @file = 'assets/sheet_demo1.png'
-    @recognizer = RubyMarks::Recognizer.new
-    @recognizer.file = @file
-    @group = RubyMarks::Group.new(:test, @recognizer)
-  end
-
-  def test_should_convert_fixnum_into_range_in_clocks_range
-    @group.clocks_range = 1
-    assert_equal 1..1, @group.clocks_range
-  end
-
-  def test_should_return_that_group_belongs_to_a_clock
-    @group.clocks_range = 1..10
-    assert @group.belongs_to_clock?(1), "Not recognized that group belongs to group 1"
-  end
-
-  def test_should_not_return_that_group_belongs_to_a_clock
-    @group.clocks_range = 1..10
-    assert !@group.belongs_to_clock?(11), "Recognized that group belongs to group 11"
-  end
-end