mork 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023acadd6339d125a7764a4af516d86b7da951c3
-  data.tar.gz: fffbcdd3a134b60d02f46a380ba5192812c13b76
+  metadata.gz: 8f86f0bbe05ae9f4eb62d0d61598a76fcd595e08
+  data.tar.gz: 547f41d90cc045f797ca98254638723c650fd2f1
 SHA512:
-  metadata.gz: 8bb3ec4c6ec605ce6d7866550ab7d66025520d99961a388ae303b513a2a5f57252818725ae8d8d64f891eab54f55d0f7c3d61cae3c16cea873612f53344ac31a
-  data.tar.gz: ad6e6df8e2ce80126e270760bc2909a2810555d1f68196e919f635feec29d55974444b98bda28e93dfdd510d938566289e4882ce4f96cb04460e0b385f2f3f59
+  metadata.gz: cdfe684595e84ccc61c03f07e30c0a171fa438be0b9a7e46d0cf563e77f17b15772f0b80f8d7e7a69eb3079fab46d971eef3337f6e97661785a515efc864dc45
+  data.tar.gz: 37b009ebc52a62517ee8c03a55e3163747f49632f721fa585d8561bb4a304eefda61dc208430b5b99e298d40905111cc580305f57051abc11ecc19608beee4af

data/lib/mork/grid_omr.rb

@@ -42,6 +42,11 @@ module Mork
       end
     end
     
+    def cell_corner_size
+      d = choice_cell_area(0,0)
+      (d[:w]-d[:h]).abs
+    end
+    
     def barcode_bit_area(bit)
       {
         x: (cx * barcode_bit_x(bit)).round,

data/lib/mork/mimage.rb

@@ -9,6 +9,8 @@ module Mork
       @path = path
       @grom = grom
       @grom.set_page_size width, height
+      @rm   = {} # registration mark centers
+      @rmsa = {} # registration mark search area
       @status = register
       @cmd = []
     end
@@ -54,7 +56,7 @@ module Mork
       @cmd << [:stroke, 'green']
       @cmd << [:strokewidth, '4']
       @cmd << [:fill, 'none']
-      array_of(cells).each do |c|
+      coordinates_of(cells).each do |c|
         roundedness ||= [c[:h], c[:w]].min / 2
         pts = [c[:x], c[:y], c[:x]+c[:w], c[:y]+c[:h], roundedness, roundedness].join ' '
         @cmd << [:draw, "roundrectangle #{pts}"]
@@ -73,7 +75,7 @@ module Mork
       return if cells.empty?
       @cmd << [:stroke, 'none']
       @cmd << [:fill, 'rgba(255, 255, 0, 0.3)']
-      array_of(cells).each do |c|
+      coordinates_of(cells).each do |c|
         roundedness ||= [c[:h], c[:w]].min / 2
         pts = [c[:x], c[:y], c[:x]+c[:w], c[:y]+c[:h], roundedness, roundedness].join ' '
         @cmd << [:draw, "roundrectangle #{pts}"]
@@ -101,32 +103,51 @@ module Mork
       end
     end
     
-    def cross_cells!(cells)
+    def cross(cells)
+      return if cells.empty?
       cells = [cells] if cells.is_a? Hash
-      cells.each do |c|
-        out = Magick::Draw.new
-        out.stroke 'yellow'
-        out.stroke_width 3
-        out.line
+      @cmd << [:stroke, 'red']
+      @cmd << [:strokewidth, '3']
+      coordinates_of(cells).each do |c|
+        pts = [
+          c[:x]+corner,
+          c[:y]+corner,
+          c[:x]+c[:w]-corner,
+          c[:y]+c[:h]-corner
+        ].join ' '
+        @cmd << [:draw, "line #{pts}"]
+        pts = [
+          c[:x]+corner,
+          c[:y]+c[:h]-corner,
+          c[:x]+c[:w]-corner,
+          c[:y]+corner
+        ].join ' '
+        @cmd << [:draw, "line #{pts}"]
       end
     end
     
     # write the underlying MiniMagick::Image to disk;
+    # if no file name is given, image is processed in-place;
     # if the 2nd arg is false, then stretching is not applied
-    def write(fname, reg=true)
-      img = MiniMagick::Image.open @path
-      img.combine_options do |c|
-        c.distort(:perspective, perspective_points) if reg
-        @cmd.each do |cmd|
-          c.send *cmd
-        end
+    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
+      else
+        MiniMagick::Image.new(@path) { |c| exec_mm_cmd c, reg }
       end
-      img.write fname
     end
     
     # ============================================================#
     private                                                       #
     # ============================================================#
+    def exec_mm_cmd(c, reg)
+      c.distort(:perspective, perspective_points) if reg
+      @cmd.each do |cmd|
+        c.send *cmd
+      end
+    end
     
     def img_size
       @img_size ||= IO.read("|identify -format '%w,%h' #{@path}").split ','
@@ -163,20 +184,18 @@ module Mork
       @cmd << [:draw, "polygon #{pts}"]
     end
         
-    def array_of(cells)
-      out = []
-      cells.each_with_index do |q, i|
-        q.each do |c|
-          out << @grom.choice_cell_area(i, c)
-        end
-      end
-      out
+    def coordinates_of(cells)
+      cells.collect.each_with_index do |q, i|
+        q.collect { |c| @grom.choice_cell_area(i, c) }
+      end.flatten
+    end
+    
+    def corner
+      @corner_size ||= @grom.cell_corner_size
     end
 
     def register
       # find the XY coordinates of the 4 registration marks
-      @rm   = {} # registration mark centers
-      @rmsa = {} # registration mark search area
       @rm[:tl] = reg_centroid_on(:tl)
       @rm[:tr] = reg_centroid_on(:tr)
       @rm[:br] = reg_centroid_on(:br)
@@ -192,7 +211,7 @@ module Mork
         @rmsa[corner] = @grom.rm_search_area(corner, i)
         cx, cy = raw_pixels.dark_centroid @rmsa[corner]
         if cx.nil?
-          status = :insufficient_contrast  
+          status = :no_contrast  
         elsif (cx < @grom.rm_edgy_x) or
               (cy < @grom.rm_edgy_y) or
               (cy > @rmsa[corner][:h] - @grom.rm_edgy_y) or

data/lib/mork/sheet_omr.rb

@@ -77,6 +77,17 @@ module Mork
       @mim.outline cells
     end
     
+    def cross(cells)
+      return if not_registered
+      raise "Invalid ‘cells’ argument" unless cells.kind_of? Array
+      @mim.cross cells
+    end
+    
+    def cross_marked
+      return if not_registered
+      @mim.cross mark_array
+    end
+    
     def highlight_marked
       return if not_registered
       @mim.highlight_cells mark_array
@@ -96,12 +107,24 @@ module Mork
       @mim.highlight_reg_area
     end
 
-    def write(fname)
+    # write(output_path_file_name)
+    #
+    # writes out a copy of the source image after registration;
+    # the output image will also contain any previously applied overlays;
+    # if the argument is omitted, the image is created in-place,
+    # i.e. the original source image is overwritten.
+    def write(fname=nil)
       return if not_registered
       @mim.write(fname)
     end
     
-    def write_raw(fname)
+    # write_raw(output_path_file_name)
+    #
+    # writes out a copy of the source image before registration;
+    # the output image will also contain any previously applied overlays
+    # if the argument is omitted, the image is created in-place,
+    # i.e. the original source image is overwritten.
+    def write_raw(fname=nil)
       @mim.write(fname, false)
     end
     

data/lib/mork/version.rb

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

data/mork.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   # dependencies:
   s.add_dependency 'narray',      '~> 0.6'
-  s.add_dependency 'mini_magick', '~> 3.8'
+  s.add_dependency 'mini_magick', '~> 4.0'
   s.add_dependency 'prawn',       '~> 1.3'
   s.add_development_dependency 'rake',          '~> 10.3'
   s.add_development_dependency 'rspec',         '~>  3.1'

data/spec/mork/sheet_omr_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fileutils'
 
 module Mork
   describe SheetOMR do
@@ -24,12 +25,29 @@ module Mork
         sheet.write 'spec/out/marked_highlights.jpg'
       end
 
+      it 'crossed marked cells' do
+        sheet.cross_marked
+        sheet.write 'spec/out/marked_crosses.jpg'
+      end
+
       it 'outlines some responses' do
         sheet.outline [[1],[1],[2],[2],[3,4],[],[0,1,2,3,4], [],[1],[2],[2],[3,4],[],[0,1,2,3,4]]
         sheet.write 'spec/out/outlines.jpg'
       end
 
-      it 'highlights marked cells and outline correct responses', focus: true do
+      it 'cross some responses' do
+        sheet.cross [[1],[1],[2],[2],[3,4],[],[0,1,2,3,4], [],[1],[2],[2],[3,4],[],[0,1,2,3,4]]
+        sheet.write 'spec/out/crosses.jpg'
+      end
+
+      it 'outlines some responses in-place (rewriting the source image)' do
+        FileUtils.cp shinfo.filename, 'spec/out/inplace.jpg'
+        tsheet = SheetOMR.new 'spec/out/inplace.jpg', shinfo.grid_file
+        tsheet.outline [[1],[1],[2],[2],[3,4],[],[0,1,2,3,4], [],[1],[2],[2],[3,4],[],[0,1,2,3,4]]
+        tsheet.write
+      end
+
+      it 'highlights marked cells and outline correct responses' do
         sheet.highlight_marked
         sheet.outline [[1],[1],[2],[2],[3,4],[],[0,1,2,3,4], [],[1],[2],[2],[3,4],[],[0,1,2,3,4]]
         sheet.write 'spec/out/marks_and_outs.jpg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Giuseppe Bertini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement