mork 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f86f0bbe05ae9f4eb62d0d61598a76fcd595e08
-  data.tar.gz: 547f41d90cc045f797ca98254638723c650fd2f1
+  metadata.gz: 9ce19962ba0e1e21013a7081f9ac040e57d0bfa1
+  data.tar.gz: 2b86b3f7a6338384e6b9ffdf9157cb0a92205dea
 SHA512:
-  metadata.gz: cdfe684595e84ccc61c03f07e30c0a171fa438be0b9a7e46d0cf563e77f17b15772f0b80f8d7e7a69eb3079fab46d971eef3337f6e97661785a515efc864dc45
-  data.tar.gz: 37b009ebc52a62517ee8c03a55e3163747f49632f721fa585d8561bb4a304eefda61dc208430b5b99e298d40905111cc580305f57051abc11ecc19608beee4af
+  metadata.gz: 7d6a2ef2db4358a02a2ba9d3cbdac0505d9208b2b169fbfee67e76a71311844b970a306d19c8a72fbd400288ef269397c645d65f126b284c4832c6283870ba79
+  data.tar.gz: 3efa05963a68fd82f672f4c0aadf06d739e3eec442a7e0f0c70c82f0422c35f699df3495ab5196d264ab4497ccc85cd579eefbaac3819ccfa5d427e47c61bf83

data/lib/mork/grid_omr.rb

@@ -83,7 +83,7 @@ module Mork
     def ppu_x() @px / page_width       end
     def ppu_y() @py / page_height      end
       
-    # finding the width of the registration area based on iteration
+    # finding the x position of the registration area based on iteration
     def rmx(corner, i)
       case corner
       when :tl; reg_off
@@ -93,7 +93,7 @@ module Mork
       end
     end
   
-    # finding the height of the registration area based on iteration
+    # finding the y position of the registration area based on iteration
     def rmy(corner, i)
       case corner
       when :tl; reg_off

data/lib/mork/mimage.rb

@@ -11,12 +11,23 @@ module Mork
       @grom.set_page_size width, height
       @rm   = {} # registration mark centers
       @rmsa = {} # registration mark search area
-      @status = register
+      @valid = register
+      @writing = nil
       @cmd = []
     end
     
+    def valid?
+      @valid
+    end
+    
     def status
-      @status
+      {
+        tl: @rm[:tl][:status],
+        tr: @rm[:tr][:status],
+        br: @rm[:br][:status],
+        bl: @rm[:bl][:status],
+        write: @writing
+      }
     end
     
     def ink_black
@@ -84,7 +95,7 @@ module Mork
     
     def highlight_reg_area
       highlight_rect [@rmsa[:tl], @rmsa[:tr], @rmsa[:br], @rmsa[:bl]]
-      return unless @status
+      return unless valid?
       join [@rm[:tl], @rm[:tr], @rm[:br], @rm[:bl]]
     end
     
@@ -131,9 +142,20 @@ module Mork
     # if the 2nd arg is false, then stretching is not applied
     def write(fname=nil, reg=true)
       if fname
-        img = MiniMagick::Image.open @path
-        img.combine_options {|c| exec_mm_cmd c, reg }
-        img.write fname
+        # img = MiniMagick::Image.open @path
+        # img.combine_options {|c| exec_mm_cmd c, reg }
+        # begin
+        #   img.write fname
+        #   @write = :ok
+        # rescue Exception
+        #   @write = :fail
+        # end
+        MiniMagick::Tool::Convert.new(false) do |img|
+          img << @path
+          img.distort(:perspective, perspective_points) if reg
+          @cmd.each { |cmd| img.send *cmd }
+          img << fname
+        end
       else
         MiniMagick::Image.new(@path) { |c| exec_mm_cmd c, reg }
       end
@@ -144,6 +166,7 @@ module Mork
     # ============================================================#
     def exec_mm_cmd(c, reg)
       c.distort(:perspective, perspective_points) if reg
+      
       @cmd.each do |cmd|
         c.send *cmd
       end
@@ -197,11 +220,14 @@ module Mork
     def register
       # find the XY coordinates of the 4 registration marks
       @rm[:tl] = reg_centroid_on(:tl)
+      # puts "TL: #{@rm[:tl][:status].inspect}"
       @rm[:tr] = reg_centroid_on(:tr)
+      # puts "TR: #{@rm[:tr][:status].inspect}"
       @rm[:br] = reg_centroid_on(:br)
+      # puts "BR: #{@rm[:br][:status].inspect}"
       @rm[:bl] = reg_centroid_on(:bl)
-      # return the status
-      @rm.all? { |k,v| v[:status] == :ok }
+      # puts "BL: #{@rm[:bl][:status].inspect}"
+      @rm.all? { |k,v| v[:status] == :ok }      
     end
     
     # returns the centroid of the dark region within the given area
@@ -209,6 +235,8 @@ module Mork
     def reg_centroid_on(corner)
       1000.times do |i|
         @rmsa[corner] = @grom.rm_search_area(corner, i)
+        # puts "================================================================"
+        # puts "Corner #{corner} - Iteration #{i} - Coo #{@rmsa[corner].inspect}"
         cx, cy = raw_pixels.dark_centroid @rmsa[corner]
         if cx.nil?
           status = :no_contrast  

data/lib/mork/npatch.rb

@@ -34,6 +34,7 @@ module Mork
       # find the intensity trough
       ctr_x = xp.find_index(xp.min)
       ctr_y = yp.find_index(yp.min)
+      # puts "Centroid: #{ctr_x}, #{ctr_y} - MinX #{xp.min/xp.length}, MaxX #{xp.max/xp.length}, MinY #{yp.min/yp.length}, MaxY #{yp.max/yp.length}"
       return ctr_x, ctr_y
     end
     
@@ -49,6 +50,7 @@ module Mork
     end
     
     def sufficient_contrast?(p)
+      # puts "Contrast: #{p.stddev}"
       # tested with the few examples: spec/samples/rm0x.jpeg
       p.stddev > 20
     end

data/lib/mork/sheet_omr.rb

@@ -7,11 +7,14 @@ module Mork
     def initialize(path, grom=nil)
       @grom = GridOMR.new grom
       @mim = Mimage.new path, @grom
-      @ok_reg = @mim.status
     end
     
     def valid?
-      @ok_reg
+      @mim.valid?
+    end
+    
+    def status
+      @mim.status
     end
     
     # barcode
@@ -161,8 +164,8 @@ module Mork
     end
     
     def not_registered
-      unless @ok_reg
-        puts "---=={ Unregistered image. Reason: '#{@rm.inspect}' }==---"
+      unless valid?
+        puts "---=={ Unregistered image. Reason: '#{@mim.status.inspect}' }==---"
         true
       end
     end

data/lib/mork/sheet_pdf.rb

@@ -120,26 +120,3 @@ module Mork
     end
   end
 end
-
-# def control(content)
-#   font_size @grip.control_size do
-#     text_box content[:string], at: @grip.control_xy,
-#                             width: @grip.control_width,
-#                             align: :right
-#     stroke do
-#       stroke_color "ff0000"
-#       # dark
-#       a = @grip.ctrl_area_dark
-#       rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
-#       fill_color "ff0000"
-#       draw_text content[:labels][0], at: @grip.dark_control_letter_xy
-#       # light
-#       a = @grip.ctrl_area_light
-#       rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
-#       fill_color "ff0000"
-#       draw_text content[:labels][1], at: @grip.light_control_letter_xy
-#
-#     end
-#   end
-# end
-#

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/mork/sheet_omr_spec.rb

@@ -3,6 +3,30 @@ require 'fileutils'
 
 module Mork
   describe SheetOMR do
+    # context 'problematic' do
+    #   let(:shinfo) { sample_img 'bianchi' }
+    #   let(:sheet)  { SheetOMR.new shinfo.filename, shinfo.grid_file }
+    #
+    #   it 'has a status' do
+    #     sheet.status.should == {:tl=>:ok, :tr=>:ok, :br=>:ok, :bl=>:ok, :write=>nil}
+    #   end
+    #
+    #   it 'has a barcode' do
+    #     sheet.barcode.should == shinfo.barcode_int
+    #   end
+    #
+    #   it 'writes the registered and marked image' do
+    #     sheet.cross_marked
+    #     sheet.write 'spec/out/bianchi.jpg'
+    #     sheet.status[:write].should == :fail
+    #   end
+    #
+    #   it 'writes the registration areas' do
+    #     sheet.highlight_registration
+    #     sheet.write_raw 'spec/out/reg_bianchi.jpg'
+    #   end
+    #
+    # end
     
     context 'highlighting' do
       # since these specs change the @crop, they must be run in isolation

data/spec/samples/info.yml

@@ -12,30 +12,15 @@ sample-gray:
   grid-file: spec/samples/layout.yml
   width: 1654
   height: 2339
-  
 
-sample01:
-  filename: spec/samples/sample01.jpg
-  pages:     1
-  width:  2334
-  height: 3291
-  
-  reg-marks: # registration marks
-    tl-x:     92
-    tl-y:     90
-    tr-x:   2245
-    tr-y:     97
-    br-x:   2230
-    br-y:   3217
-    bl-x:     78
-    bl-y:   3205
-  q-boxes:
-    q001:
-      tl-x: 175
-      tl-y: 379
-    q160:
-      tl-x: 1818
-      tl-y: 2974
+bianchi:
+  # filename: spec/samples/IMG_20150104_0005.jpg
+  # filename: spec/samples/out0000.jpg
+  # filename: spec/samples/SCN_0001.jpg
+  # filename: spec/samples/IMG_20150104_0011.jpg
+  # filename: spec/samples/IMG_20150104_0009.jpg
+  grid-file: spec/samples/bianchi.yml
+  barcode-int: 9350
   
 reg-mark:
   filename: spec/samples/reg_mark.jpg

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Giuseppe Bertini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -185,9 +185,7 @@ files:
 - spec/samples/rm03.jpeg
 - spec/samples/rm04.jpeg
 - spec/samples/rm05.jpeg
-- spec/samples/sample01.jpg
 - spec/samples/sample02.jpg
-- spec/samples/sample03.jpg
 - spec/samples/sample_gray.jpg
 - spec/samples/sheet.jpg
 - spec/samples/sheet666.jpg