mork 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d8680deb48b3f4cfa54e859ecc4070513a4c7c
-  data.tar.gz: f7f0e1946eb795913a3460ddda3222fe5a706193
+  metadata.gz: 3929e72d06e1a597ab7bdd0dcc207487da5e3bcc
+  data.tar.gz: e4edcffb033afeed7317f439e7857611d45f6b7a
 SHA512:
-  metadata.gz: 23fb14992bb44471554dc8c27b0bf5f28a2109848fd4e4c51c791969dccf32e4e34ead8c67a40b4c4a768f096a087e96818ec6f3adad43612b23971c31a7f231
-  data.tar.gz: c7c205813250d74ce995cd212c1eb37dca022269a17b2965e0bf6e1db81c93f4c3edb6fac964848cff5902c2ab16a4611ab1db25d0de5f92ce557aad4489475c
+  metadata.gz: fc76809688ef966f779724a0eb358de007d79eaa4a1b14bbe37a0791f7e77da0678d68219b2fb184d57c2bc3cbdaeaf03fd14f03b9e8a74eebc823633557cc77
+  data.tar.gz: a410e9ad165da458bcc27cd7d3928af11a548ae78c51dfcc0410b9e683012c3837ff571fcea7a3d2400d9530f5ba281ccb10d73417bea1ea1eaf8a7b23fec72d

data/lib/mork/mimage.rb

@@ -19,12 +19,36 @@ module Mork
       end
     end
     
+    # outline!(cells, roundedness)
+    # 
+    # draws on the Mimage a set of cell outlines
+    # typically used to highlight the expected responses
+    def outline!(cells, roundedness=nil)
+      out = Magick::Draw.new
+      out.stroke 'green'
+      out.stroke_width 4
+      out.fill_opacity 0
+      cells = [cells] if cells.is_a? Hash
+      roundedness ||= [cells[0][:h], cells[0][:w]].min / 2
+      cells.each do |c|
+        out.roundrectangle c[:x], c[:y], c[:x]+c[:w], c[:y]+c[:h], roundedness, roundedness
+        out.draw @image
+      end
+    end
+    
     # =============
     # = Highlight =
     # =============
-    def highlight!(c)
-      m = Magick::Image.new(c[:w], c[:h]) { self.background_color = "yellow" }
-      @image.composite! m, c[:x], c[:y], Magick::CopyYellowCompositeOp
+    def highlight!(cells, roundedness=nil)
+      cells = [cells] if cells.is_a? Hash
+      roundedness ||= [cells[0][:h], cells[0][:w]].min / 2
+      cells.each do |c|
+        out = Magick::Draw.new
+        out.fill 'yellow'
+        out.opacity '40%'
+        out.roundrectangle c[:x], c[:y], c[:x]+c[:w], c[:y]+c[:h], roundedness, roundedness
+        out.draw @image
+      end
     end
     
     def join!(p)

data/lib/mork/sheet.rb

@@ -85,33 +85,27 @@ module Mork
     # = HIGHLIGHTING =
     # ================
     
-    def highlight_all
+    def outline(cells)
       return if not_registered
-      @grid.max_questions.times do |i|
-        @grid.max_choices_per_question.times do |j|
-          highlight_choice i, j
-        end
-      end
-      @crop.highlight! @grid.ctrl_area_dark
-      @crop.highlight! @grid.ctrl_area_light
+      @crop.outline! array_of cells
     end
     
-    def highlight
+    def highlight_ctrl
       return if not_registered
-      mark_array.each_with_index do |qa, i|
-        qa.each do |cho|
-          highlight_choice i, cho
-        end
-      end
-      @crop.highlight! @grid.ctrl_area_dark
-      @crop.highlight! @grid.ctrl_area_light
+      @crop.highlight! [@grid.ctrl_area_dark, @grid.ctrl_area_light]
     end
     
-    def highlight_choice(q, c)
+    def highlight_all
       return if not_registered
-      @crop.highlight! @grid.choice_cell_area(q, c)
+      cells = (0...@grid.max_questions).collect { |i| (0...@grid.max_choices_per_question).to_a }
+      @crop.highlight! array_of cells
     end
-
+    
+    def highlight
+      return if not_registered
+      @crop.highlight! array_of mark_array
+    end
+    
     def highlight_code_areas
       return if not_registered
       @grid.code_bits.times do |bit|
@@ -157,6 +151,16 @@ module Mork
     end
     
   private
+  
+    def array_of(cells)
+      out = []
+      cells.each_with_index do |q, i|
+        q.each do |c|
+          out << @grid.choice_cell_area(i, c)
+        end
+      end
+      out
+    end
 
     def question_range(r)
       if r.nil?

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/mork/sheet_spec.rb

@@ -26,6 +26,17 @@ module Mork
         sheet.highlight_light_calibration_bit
         sheet.write "tmp/light_code_bit.jpg"
       end
+
+      it "should highlight the control cells" do
+        sheet.highlight_ctrl
+        sheet.write "tmp/controls.jpg"
+      end
+
+      it "should outline the correct responses" do
+        sheet.highlight
+        sheet.outline [[1],[1],[2],[2],[3,4],[],[0,1,2,3,4]]
+        sheet.write "tmp/outline.jpg"
+      end
     end
 
     context "a nicely printed and scanned sheet" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Giuseppe Bertini
@@ -178,6 +178,7 @@ files:
 - spec/samples/sample01.jpg
 - spec/samples/sample02.jpg
 - spec/samples/sample03.jpg
+- spec/samples/sample04.jpg
 - spec/samples/two_pages.pdf
 - spec/spec_helper.rb
 homepage: ''
@@ -221,5 +222,6 @@ test_files:
 - spec/samples/sample01.jpg
 - spec/samples/sample02.jpg
 - spec/samples/sample03.jpg
+- spec/samples/sample04.jpg
 - spec/samples/two_pages.pdf
 - spec/spec_helper.rb