mork 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9368eb34bdddb744f80f7baa1475ba03aedeab
-  data.tar.gz: 129f95cfa8329b81154186ec175f0b14a9ba3b72
+  metadata.gz: 74b53c108c7a1ae34a090aac3b9380805326ee01
+  data.tar.gz: f34f58ad865ffc0995cf51a21e0c2c163b4f8e27
 SHA512:
-  metadata.gz: 82652798819ce990be08645e337199cc19ce8829bbda397212e958f17f6df3d865c62ab86d80eda12340250cd8f7ac09791b9c7f8a68c9ca060b13c88ff2e9c3
-  data.tar.gz: e733b22b1de5c615982da5c8725c04877654d297584a4677c5194aad2cf66c94074171abf4f7dd8a01ee82d5e62ef30c6d0c69f7b594667297ffd563cfde4a03
+  metadata.gz: 55f9f4dff569c87008aa9e15a4029172258d0c3998746700188f440695ece40948a0b529d21a3512dd632537cfc123ee8730e8bfb99b7dd31a6c708150f742a4
+  data.tar.gz: 68b53cf1ab3b9adc014b8da070da4e8d16b8706eb3754f735fa596b8025f6b720b803d8a225efacd1db2d9922b1ba98ae1cba2712b714de694c67b9d1c5f6d6c

data/Guardfile

@@ -3,8 +3,8 @@ guard 'rspec', all_after_pass: false do
   watch(%r{^lib/mork/(.+)\.rb$})     { |m| "spec/mork/#{m[1]}_spec.rb" }
 end
 
-guard :shell do
-  watch "tmp/code_sample.pdf" do
-    system "open tmp/code_sample.pdf"
-  end
-end
+# guard :shell do
+#   watch "tmp/code_sample.pdf" do
+#     system "open tmp/code_sample.pdf"
+#   end
+# end

data/lib/mork/grid.rb

@@ -6,10 +6,19 @@ module Mork
   # All returned values are in the arbitrary units given in the configuration file
   class Grid
     
-    def initialize(type = :default, fname="config/grids.yml")
-      # from the full YAML file, only get the requested grid type
-      c = YAML.load_file(fname)
-      @params = c[type.to_s]
+    def initialize(options = {})
+      case options.class.to_s
+      when "Hash"
+        @params = DGRID.merge! options
+      when "String"
+        @params = DGRID.merge! YAML.load_file(options)
+      else
+        raise "Invalid options parameter: #{options.class.inspect}"
+      end
+    end
+    
+    def options
+      @params
     end
     
     def set_page_size(x, y)
@@ -17,59 +26,47 @@ module Mork
       @py = y.to_f
     end
     
-    def default_chlist
-      [@params["responses"]["max_cells"]] * max_questions
-    end
-    
     def max_questions
       columns * rows
     end
     
     def max_choices_per_question
-      @params["responses"]["max_cells"]
+      @params[:responses][:max_cells]
     end
     
     def code_bits
-      CODE_BITS
+      @params[:code][:bits].to_i
     end
     
-    def header
-      @params["header"]
+    # ====================================================
+    # = Returning {x, y, w, h} hashes for area locations =
+    # ====================================================
+    def reg_mark_tl_search_area
+      reg_mark_search_area 0, 0
     end
     
-    def reg_mark_search_area(n)
-      rmp = REG_MARGIN + REG_SEARCH
-      rmm = REG_MARGIN - REG_SEARCH
-      case n
-      when :top_left
-        reg_mark_sa rmm, rmm
-      when :top_right
-        reg_mark_sa page_width  - rmp, rmm
-      when :bottom_right
-        reg_mark_sa page_width - rmp, page_height - rmp
-      when :bottom_left
-        reg_mark_sa rmm, page_height - rmp
-      end
+    def reg_mark_tr_search_area
+      reg_mark_search_area page_width - reg_search, 0
     end
-
-    def reg_mark_sa(x, y)
-      cw = @px / page_width
-      ch = @py / page_height
-      {
-          x: (cw * x).round,
-          y: (ch * y).round,
-          w: (cw * REG_SEARCH * 2).round,
-          h: (ch * REG_SEARCH * 2).round
-      }      
+        
+    def reg_mark_br_search_area
+      reg_mark_search_area page_width - reg_search, page_height - reg_search
     end
-
+    
+    def reg_mark_bl_search_area
+      reg_mark_search_area 0, page_height - reg_search
+    end
+    
     def choice_cell_area(q, c)
-      {
-        x: (cx * cell_x(q, c)).round,
-        y: (cy * cell_y(q)   ).round,
-        w: (cx * cell_width  ).round,
-        h: (cy * cell_height ).round
-      }
+      cell_area cell_x(q, c), cell_y(q)
+    end
+    
+    def dark_control_cell_area
+      cell_area ctrl_cell_left, ctrl_cell_y
+    end
+    
+    def light_control_cell_area
+      cell_area ctrl_cell_left + cell_spacing, ctrl_cell_y
     end
     
     def white_calibration_area
@@ -92,11 +89,11 @@ module Mork
     end
     
     def pdf_margins
-      REG_MARGIN.mm
+      reg_margin.mm
     end
     
     def pdf_reg_marks
-      r = REG_RADIUS.mm
+      r = @params[:regmarks][:radius].to_f.mm
       [
         { p: [0,                  0                  ], r: r },
         { p: [0,                  reg_frame_height.mm], r: r },
@@ -111,14 +108,14 @@ module Mork
 
     def pdf_code_areas_for(code)
       a = []
-      CODE_BITS.times do |bit|
+      code_bits.times do |bit|
         a << pdf_code_cell_area(bit+1) if code[bit] == 1
       end
       a
     end
 
     def pdf_code_bit_areas
-      (1..CODE_BITS).collect do |bit|
+      (1..code_bits).collect do |bit|
         pdf_code_cell_area bit
       end
     end
@@ -126,8 +123,8 @@ module Mork
     def pdf_code_cell_area(i)
       {
         p: [code_cell_x(i).mm, (reg_frame_height - code_y).mm],
-        w: CODE_WIDTH.mm,
-        h: CODE_HEIGHT.mm * 2
+        w: code_width.mm,
+        h: code_height.mm * 2
       }
     end
 
@@ -142,25 +139,33 @@ module Mork
     def pdf_choice_letter_xy(q, c)
       [
         cell_x(q, c).mm + 2.mm,
-        (reg_frame_height - cell_y(q)).mm - 3.mm
+        (reg_frame_height - cell_y(q)).mm - (cell_height*2)
       ]
     end
 
     def pdf_qnum_xy(q)
       [
-        cell_x(q, 0).mm - pdf_qnum_width - Q_NUM_GAP.mm,
-        (reg_frame_height - cell_y(q)).mm - 0.5.mm
+        cell_x(q, 0).mm - pdf_qnum_width - @params[:responses][:number_margin].to_f.mm,
+        (reg_frame_height - cell_y(q)).mm - cell_height
       ]
     end
+    
+    def pdf_qnum_size
+      @params[:responses][:number_size].to_f
+    end
+    
+    def pdf_chlett_size
+      @params[:responses][:letter_size].to_f
+    end
 
     def pdf_qnum_width
-      Q_NUM_WIDTH.mm
+      @params[:responses][:number_width].to_f.mm
     end
     
     def pdf_header_xy(k)
       [
-        header[k.to_s]["left"].to_f.mm,
-        (reg_frame_height - header[k.to_s]["top"].to_f).mm
+        @params[:header][k][:left].to_f.mm,
+        (reg_frame_height - @params[:header][k][:top].to_f).mm
       ]
     end
     
@@ -169,23 +174,69 @@ module Mork
         1.mm,
         pdf_header_height(k) - 1.mm
       ]
-      
     end
     
     def pdf_header_width(k)
-      header[k.to_s]["width"].to_f.mm
+      @params[:header][k][:width].to_f.mm
     end
 
     def pdf_header_height(k)
-      header[k.to_s]["height"].to_f.mm
+      @params[:header][k][:height].to_f.mm
     end
 
     def pdf_header_size(k)
-      header[k.to_s]["size"].to_f
+      @params[:header][k][:size].to_f
     end
     
     def pdf_header_boxed?(k)
-      header[k.to_s]["box"] == true
+      @params[:header][k][:box] == true
+    end
+    
+    def pdf_dark_control_cell_area
+      {
+        p: [pdf_control_xy[0]+pdf_control_width+ctrl_margin.mm, pdf_control_xy[1]],
+        w: cell_width.mm,
+        h: cell_height.mm
+      }
+    end
+    
+    def pdf_light_control_cell_area
+      {
+        p: [cell_spacing.mm + pdf_control_xy[0]+pdf_control_width+@params[:control][:margin].to_f.mm, pdf_control_xy[1]],
+        w: cell_width.mm,
+        h: cell_height.mm
+      }
+    end
+    
+    def pdf_dark_control_letter_xy
+      xy = pdf_dark_control_cell_area[:p]
+      [
+        xy[0] + 2.mm,
+        xy[1] - 4.mm
+      ]
+    end
+
+    def pdf_light_control_letter_xy
+      xy = pdf_light_control_cell_area[:p]
+      [
+        xy[0] + 2.mm,
+        xy[1] - 4.mm
+      ]
+    end
+    
+    def pdf_control_width
+      @params[:control][:width].to_f.mm
+    end
+    
+    def pdf_control_xy
+      [
+        @params[:control][:left].to_f.mm,
+        (reg_frame_height - ctrl_cell_y).mm
+      ]
+    end
+    
+    def pdf_control_size
+      @params[:control][:size]
     end
 
   private
@@ -198,12 +249,36 @@ module Mork
       @py / reg_frame_height
     end
     
-    # x, y = cell_xy(q,c)
-    # 
-    # the distances from the registration frame of the left and top edges
-    # of the c-th choice cell of the q-th question
-    def cell_xy(q, c)
-      return cell_x(q, c), cell_y(q)
+    def cw
+      @px / page_width
+    end
+    
+    def ch
+      @py / page_height
+    end
+    
+    # {} = cell_area(x, y)
+    #
+    # the 4 values needed to locate a single cell area
+    def cell_area(x,y)
+      {
+        x: (cx * x           ).round,
+        y: (cy * y           ).round,
+        w: (cx * cell_width  ).round,
+        h: (cy * cell_height ).round
+      }
+    end
+
+    # {} = reg_mark_search_area(x, y)
+    #
+    # the 4 values needed to locate a single registration mark
+    def reg_mark_search_area(x, y)
+      {
+        x: (cw * x).round,
+        y: (ch * y).round,
+        w: (cw * reg_search).round,
+        h: (ch * reg_search).round
+      }
     end
     
     # cell_y(q)
@@ -222,46 +297,6 @@ module Mork
       first_x + column_width * (q / rows) + cell_spacing * c - cell_width / 2
     end
     
-    def cell_width
-      @params["responses"]["cell_width"].to_f
-    end
-  
-    def cell_height
-      @params["responses"]["cell_height"].to_f
-    end
-    
-    def cell_spacing
-      @params["responses"]["x_spacing"].to_f
-    end
-    
-    def response_spacing
-      @params["responses"]["y_spacing"].to_f
-    end
-    
-    def column_width
-      @params["responses"]["column_width"].to_f
-    end
-    
-    def row_spacing
-      @params["responses"]["y_spacing"].to_f
-    end
-
-    def first_x
-      @params["responses"]["first_x"].to_f
-    end
-
-    def first_y
-      @params["responses"]["first_y"].to_f
-    end
-    
-    def rows
-      @params["responses"]["rows"]
-    end
-    
-    def columns
-      @params["responses"]["columns"]
-    end
-    
     # ==============
     # = sheet code =
     # ==============
@@ -269,55 +304,50 @@ module Mork
       {
         x: (cx * code_cell_x(i)).round,
         y: (cy * code_y        ).round,
-        w: (cx * CODE_WIDTH    ).round,
-        h: (cy * CODE_HEIGHT   ).round
+        w: (cx * code_width    ).round,
+        h: (cy * code_height   ).round
       }
     end
   
     def code_cell_x(i)
-      CODE_LEFT + CODE_SPACING * i
+      @params[:code][:left] + @params[:code][:spacing] * i
     end
 
     def code_y
-      reg_frame_height - CODE_HEIGHT
+      reg_frame_height - code_height
     end
     
     # ======================
     # = registration sides =
     # ======================
-    def reg_frame_width
-      page_width - REG_MARGIN * 2
-    end
-    
-    def reg_frame_height
-      page_height - REG_MARGIN * 2
-    end
-    
-    def page_width
-      @params["page_size"]["width"].to_f
-    end
-    
-    def page_height
-      @params["page_size"]["height"].to_f
-    end
-
-    # ============
-    # =   Header
-    # ============
-    def name_x
-      @params["header"]["name"]["top"].to_f
-    end
-
-    def name_y
-      @params["header"]["name"]["left"].to_f
-    end
 
-    def name_w
-      @params["header"]["name"]["width"].to_f
-    end
-
-    def name_size
-      @params["header"]["name"]["size"]
-    end
+    # ===============================
+    # = Simple parameter extraction =
+    # ===============================
+    def ctrl_cell_left()    @params[:control][:left].to_f + @params[:control][:width].to_f + ctrl_margin  end
+    def ctrl_margin()       @params[:control][:margin].to_f           end
+    def ctrl_cell_y()       @params[:control][:top].to_f              end
+    def code_height()       @params[:code][:height].to_f              end
+    def code_width()        @params[:code][:width].to_f               end
+    def page_width()        @params[:page_size][:width].to_f          end
+    def page_height()       @params[:page_size][:height].to_f         end
+    def name_x()            @params[:header][:name][:top].to_f        end
+    def name_y()            @params[:header][:name][:left].to_f       end
+    def name_w()            @params[:header][:name][:width].to_f      end
+    def name_size()         @params[:header][:name][:size].to_f       end
+    def cell_width()        @params[:responses][:cell_width].to_f     end
+    def cell_height()       @params[:responses][:cell_height].to_f    end
+    def cell_spacing()      @params[:responses][:x_spacing].to_f      end
+    def response_spacing()  @params[:responses][:y_spacing].to_f      end
+    def column_width()      @params[:responses][:column_width].to_f   end
+    def row_spacing()       @params[:responses][:y_spacing].to_f      end
+    def first_x()           @params[:responses][:first_x].to_f        end
+    def first_y()           @params[:responses][:first_y].to_f        end
+    def rows()              @params[:responses][:rows]                end
+    def columns()           @params[:responses][:columns]             end
+    def reg_margin()        @params[:regmarks][:margin].to_f          end
+    def reg_search()        @params[:regmarks][:search].to_f          end
+    def reg_frame_width()   page_width  - reg_margin * 2              end
+    def reg_frame_height()  page_height - reg_margin * 2              end
   end
 end

data/lib/mork/grid_const.rb

@@ -1,14 +1,84 @@
 module Mork
-  REG_MARGIN    =  7.5
-  REG_RADIUS    =  2.5
-  REG_SEARCH    =  5.0
-  CODE_LEFT     =  7.5
-  CODE_WIDTH    =  2.0
-  CODE_HEIGHT   =  2.5
-  CODE_SPACING  =  2.5
-  CODE_BITS     = 64
-  Q_NUM_GAP     =  2.0  # distance between right side of q num and left side of first choice cell
-  Q_NUM_WIDTH   =  8.0  # width of question number text box
-  Q_NUM_SIZE    = 10
-  CH_LETTER_SZ  =  8
-end
+  # this is the default grid!
+  DGRID = {
+    # default units are millimiters
+    page_size: {
+      # this is A4
+      width:       210.0,
+      height:      297.0
+    }, # page end
+    regmarks: {
+      margin:  10,
+      radius:  2.5,
+      search:  10
+    }, # regmarks end
+    header: {
+      name: {
+        top:        5,
+        left:        7.5,
+        width:     170,
+        size:       14,
+      },
+      title: {
+        top:        15,
+        left:       7.5,
+        width:    180,
+        size:      12
+      },
+      code: {
+        top:         5,
+        left:      165,
+        width:      20,
+        size:       14
+      },
+      signature: {
+        top:        30,
+        left:      7.5,
+        width:     120,
+        height:     15,
+        size:        7,
+        box:      true,
+      }
+    }, # header end
+    responses: {
+      columns:       4, 
+      column_width: 49,
+      rows:         30,
+      # from the top-left registration mark
+      # to the center of the first choice cell
+      first_x:      10.5,
+      first_y:      55.5,
+      # between choices
+      x_spacing:     7.0,
+      # between rows
+      y_spacing:     7.0,
+      # darkened area
+      cell_width:    6.0,
+      cell_height:   5.0,
+      # the maximum number of choices per question
+      max_cells:      5,
+      # font size for the question number
+      number_size:   10,
+      # distance between right side of q num and left side of first choice cell
+      number_width:   8,
+      # width of question number text box
+      number_margin:  2,
+      # font size for the choice letter
+      letter_size:    8
+    }, # responses end
+    code: {
+      bits:    40,
+      left:     15,
+      width:    3.0,
+      height:   2.5,
+      spacing:  4
+    }, # code end
+    control: {
+      top:       40,
+      left:     123,
+      width:     50,
+      size:       9,
+      margin:     2.5
+    } # control end
+  }
+end

data/lib/mork/mimage.rb

@@ -23,8 +23,8 @@ module Mork
     # = Highlight =
     # =============
     def highlight!(c)
-      m = Magick::Image.new(c[:w], c[:h]) { self.background_color = "red" }
-      @image.composite! m, c[:x], c[:y], Magick::CopyCompositeOp
+      m = Magick::Image.new(c[:w], c[:h]) { self.background_color = "yellow" }
+      @image.composite! m, c[:x], c[:y], Magick::CopyYellowCompositeOp
     end
     
     # ============

data/lib/mork/mimage_list.rb

@@ -17,8 +17,8 @@ module Mork
     end
     
     def [] (i)
-      puts "I: #{i}"
-      puts @images[i].inspect
+      # puts "I: #{i}"
+      # puts @images[i].inspect
       Mimage.new @images[i]
     end
     

data/lib/mork/sheet.rb

@@ -20,7 +20,7 @@ module Mork
     
     # code_string
     # 
-    # returns the sheet code as a string of 0s and 1s. The string is CODE_BITS
+    # returns the sheet code as a string of 0s and 1s. The string is code_bits
     # bits long, with most significant bits to the left
     def code_string
       cs = (0...@grid.code_bits).inject("") { |c, v| c << code_cell_value(v) }
@@ -32,9 +32,11 @@ module Mork
     # returns true if the specified question/choice cell has been darkened
     # false otherwise
     def marked?(q, c)
-      shade_of(q, c) < dark_threshold
+      shade_of(q, c) < choice_threshold
     end
     
+    # TODO: define method ‘mark’ to retrieve the choice array for a single item
+    
     # mark_array(range)
     # 
     # returns an array of arrays of marked choices.
@@ -57,10 +59,40 @@ module Mork
       end
     end
     
+    # ================
+    # = HIGHLIGHTING =
+    # ================
+    
+    def highlight_all
+      @grid.max_questions.times do |i|
+        @grid.max_choices_per_question.times do |j|
+          highlight_choice i, j
+        end
+      end
+      @mimage.highlight! @grid.dark_control_cell_area
+      @mimage.highlight! @grid.light_control_cell_area
+    end
+    
+    def highlight
+      mark_array.each_with_index do |qa, i|
+        qa.each do |cho|
+          highlight_choice i, cho
+        end
+      end
+      @mimage.highlight! @grid.dark_control_cell_area
+      @mimage.highlight! @grid.light_control_cell_area
+    end
+    
     def highlight_choice(q, c)
       @mimage.highlight! @grid.choice_cell_area(q, c)
     end
 
+    def highlight_code
+      @grid.code_bits.times do |bit|
+        @mimage.highlight! @grid.code_bit_area bit
+      end
+    end
+    
     def highlight_code_bit(i)
       @mimage.highlight! @grid.code_bit_area(i)
     end
@@ -77,23 +109,8 @@ module Mork
       @mimage.write(fname)
     end
     
-    def dark_code_bit_shade
-      NPatch.new(@mimage.crop @grid.black_calibration_area).average
-    end
-    
-    def light_code_bit_shade
-      NPatch.new(@mimage.crop @grid.white_calibration_area).average
-    end
-    
   private
-    def shade_of(q, c)
-      NPatch.new(@mimage.crop @grid.choice_cell_area(q, c)).average
-    end
 
-    def dark_threshold
-      50000
-    end
-    
     def question_range(r)
       if r.nil?
         (0...@grid.max_questions)
@@ -104,12 +121,29 @@ module Mork
       end
     end
     
+    # =================================
+    # = compute shading with NPatches =
+    # =================================
+    def shade_of(q, c)
+      naverage @grid.choice_cell_area(q, c)
+    end
+    
     def shade_of_code_bit(i)
-      NPatch.new(@mimage.crop @grid.code_bit_area(i)).average
+      naverage @grid.code_bit_area(i)
     end
     
     def code_cell_value(i)
-      shade_of_code_bit(i) < dark_threshold ? "1" : "0"
+      shade_of_code_bit(i) < code_threshold ? "1" : "0"
+    end
+
+    def choice_threshold
+      @choice_threshold ||= (naverage(@grid.dark_control_cell_area)   + 
+                             naverage(@grid.light_control_cell_area)) / 2
+    end
+    
+    def code_threshold
+      @code_threshold ||= (naverage(@grid.black_calibration_area)  +
+                           naverage(@grid.white_calibration_area)) / 2
     end
     
     # ================
@@ -118,10 +152,10 @@ module Mork
     
     def register(img)
       # find the XY coordinates of the 4 registration marks
-      x1, y1 = reg_centroid_on(img, @grid.reg_mark_search_area(:top_left))
-      x2, y2 = reg_centroid_on(img, @grid.reg_mark_search_area(:top_right))
-      x3, y3 = reg_centroid_on(img, @grid.reg_mark_search_area(:bottom_right))
-      x4, y4 = reg_centroid_on(img, @grid.reg_mark_search_area(:bottom_left))
+      x1, y1 = reg_centroid_on(img, @grid.reg_mark_tl_search_area)
+      x2, y2 = reg_centroid_on(img, @grid.reg_mark_tr_search_area)
+      x3, y3 = reg_centroid_on(img, @grid.reg_mark_br_search_area)
+      x4, y4 = reg_centroid_on(img, @grid.reg_mark_bl_search_area)
       # stretch the 4 points to fit the original size and return the resulting image
       img.stretch [
         x1, y1,         0,          0,
@@ -138,5 +172,9 @@ module Mork
       return nil, nil if cx.nil?
       return cx + c[:x], cy + c[:y]
     end
+    
+    def naverage(where)
+      NPatch.new(@mimage.crop where).average
+    end
   end
 end

data/lib/mork/sheet_pdf.rb

@@ -4,12 +4,36 @@ module Mork
   class SheetPDF < Prawn::Document
     def initialize(grid, info)
       @grid = grid
-      @info = info
       super my_page_params
-      registration_marks
-      calibration_and_code @info[:code]
-      header
-      questions_and_choices
+      # @info should be an array of hashes, one per page;
+      # convert to array if a single hash was passed
+      @info = info.class == Hash ? [info] : info
+      process
+    end
+    
+    def save(fn)
+      render_file fn
+    end
+    
+    def to_pdf
+      render
+    end
+
+    private
+
+    def process
+      # for each response sheet
+      @info.each_with_index do |info, i|
+        start_new_page if i>0
+        fill_color "000000"
+        stroke_color "000000"
+        line_width 0.3
+        registration_marks
+        calibration_and_code info[:code]
+        header info[:header]
+        control info[:control] if info[:control]
+        questions_and_choices info[:choices]
+      end
     end
     
     def my_page_params
@@ -20,11 +44,11 @@ module Mork
     end
     
     def registration_marks
-      fill {
+      fill do
         @grid.pdf_reg_marks.each do |r|
           circle r[:p], r[:r]
         end
-      }
+      end
     end
     
     def calibration_and_code(code)
@@ -40,8 +64,31 @@ module Mork
       end
     end
     
-    def header
-      @info[:header].each do |k,v|
+    def control(info)
+      font_size @grid.pdf_control_size do
+        text_box info[:string], at: @grid.pdf_control_xy,
+                                width: @grid.pdf_control_width,
+                                align: :right
+        stroke do
+          font_size 
+          stroke_color "ff0000"
+          # dark
+          a = @grid.pdf_dark_control_cell_area
+          rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
+          fill_color "ff0000"
+          draw_text info[:labels][0], at: @grid.pdf_dark_control_letter_xy
+          # light
+          a = @grid.pdf_light_control_cell_area
+          rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
+          fill_color "ff0000"
+          draw_text info[:labels][1], at: @grid.pdf_light_control_letter_xy
+          
+        end
+      end
+    end
+    
+    def header(info)
+      info.each do |k,v|
         font_size @grid.pdf_header_size(k) do
           if @grid.pdf_header_boxed?(k)
             bounding_box @grid.pdf_header_xy(k), width: @grid.pdf_header_width(k), height: @grid.pdf_header_height(k) do
@@ -57,20 +104,19 @@ module Mork
       end
     end
 
-    def questions_and_choices
+    def questions_and_choices(info)
       stroke do
-        line_width 0.3
-        nquestions.times do |q|
+        info.length.times do |q|
           fill_color "000000"
           text_box "#{q+1}", at: @grid.pdf_qnum_xy(q),
-          width: @grid.pdf_qnum_width,
-          align: :right,
-          size: Q_NUM_SIZE
+                             width: @grid.pdf_qnum_width,
+                             align: :right,
+                             size: @grid.pdf_qnum_size
           stroke_color "ff0000"
-          font_size CH_LETTER_SZ
-          nchoices(q).times do |c|
+          font_size @grid.pdf_chlett_size
+          info[q].times do |c|
             a = @grid.pdf_choice_cell_area q, c
-            rounded_rectangle a[:p], a[:w], a[:h], 2.mm
+            rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
             fill_color "ff0000"
             draw_text (65+c).chr, at: @grid.pdf_choice_letter_xy(q, c)
           end
@@ -78,18 +124,13 @@ module Mork
       end
     end
 
-    def save(fn)
-      render_file fn
-    end
-
-    private
-    def nquestions
-      @info[:choices].length
-    end
-
-    def nchoices(i)
-      @info[:choices][i]
-    end
+    # def nquestions
+    #   @info[:choices].length
+    # end
+    #
+    # def nchoices(i)
+    #   @info[:choices][i]
+    # end
   end
 end
 

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/mork.rb

@@ -1,9 +1,8 @@
-require "mork/version"
+require 'mork/version'
 require 'mork/sheet'
 require 'mork/grid'
 require 'mork/grid_const'
 require 'mork/mimage'
 require 'mork/mimage_list'
-require 'mork/report'
 require 'mork/npatch'
 require 'mork/sheet_pdf'

data/spec/mork/grid_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Mork
   describe Grid do
-    let(:grid) { Grid.new(:default) }
+    let(:grid) { Grid.new }
 
     describe "#initialize" do
       it "returns a Grid object" do

data/spec/mork/sheet_pdf_spec.rb

@@ -2,30 +2,113 @@ require 'spec_helper'
 
 module Mork
   describe SheetPDF do
+    
     it "should create a basic pdf" do
       info = {
-        code: 18446744073709551615,
-        choices: [5] * 100,
+        code: 1099511627775,
+        choices: [5] * 120,
         header: {
-          name: "Bertini Giuseppe VR123456 Bertini Giuseppe VR123456",
-          title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013 Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
+          name:  "Bertini Giuseppe VR123456",
+          title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
           code:  "119.27",
           signature: "Firma"
+        },
+        control: {
+          string: "Annerisci solo la casella ‘V’:",
+          labels: ['V', 'F']
         }
       }
-      s = SheetPDF.new(Grid.new(:default), info)
-      s.save("tmp/f1.pdf")
+      
+      grid_opts = {
+        regmarks: {
+          margin:  10,
+          radius:  2.5,
+          search:  10
+        },
+        header: {
+          name: {
+            top:        5,
+            left:        7.5,
+            width:     170,
+            size:       14,
+          },
+          title: {
+            top:        15,
+            left:       7.5,
+            width:    180,
+            size:      12
+          },
+          code: {
+            top:         5,
+            left:      165,
+            width:      20,
+            size:       14
+          },
+          signature: {
+            top:        30,
+            left:      7.5,
+            width:     120,
+            height:     15,
+            size:        7,
+            box:      true,
+          }
+        }, # header end
+        responses: {
+          columns:       4, 
+          column_width: 49,
+          rows:         30,
+          # from the top-left registration mark
+          # to the center of the first choice cell
+          first_x:      10.5,
+          first_y:      55.5,
+          # between choices
+          x_spacing:     7.0,
+          # between rows
+          y_spacing:     7.0,
+          # darkened area
+          cell_width:    6.0,
+          cell_height:   5.0,
+          # the maximum number of choices per question
+          max_cells:      5,
+          # font size for the question number
+          number_size:   10,
+          # distance between right side of q num and left side of first choice cell
+          number_width:   8,
+          # width of question number text box
+          number_margin:  2,
+          # font size for the choice letter
+          letter_size:    8
+        },
+        code: {
+          bits:    40,
+          left:     15,
+          width:    3.0,
+          height:   2.5,
+          spacing:  4
+        },
+        control: {
+          top:       40,
+          left:     123,
+          width:     50,
+          size:       9,
+          margin:     2.5
+        }
+      }
+
+      # s = SheetPDF.new(Grid.new(grid_opts), info)
+      # s.save("tmp/f1.pdf")
 
       info = {
-        code: 17382938642823887837,
-        choices: [5] * 100,
+        code: 5512,
+        choices: [5] * 160,
         header: {
-          name: "Francesco Gagliardi VR765432",
+          name: "Bonazza Sara vr354320",
           title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
-          code:  "119.28"
+          code:  "201.48",
+          signature: "Firma"
         }
       }
-      s = SheetPDF.new(Grid.new(:default), info)
+      s = SheetPDF.new(Grid.new, info)
       s.save("tmp/f2.pdf")
 
       info = {
@@ -38,9 +121,36 @@ module Mork
           signature: "Firma"
         }
       }
-      s = SheetPDF.new(Grid.new(:default), info)
+      s = SheetPDF.new(Grid.new, info)
       s.save("tmp/f3.pdf")
     end
+
+    it "should create a multipage pdf" do
+      info = [
+        {
+          code: 18446744073709551615,
+          choices: [5] * 100,
+          header: {
+            name: "Bertini Giuseppe VR123456 Bertini Giuseppe VR123456",
+            title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013 Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
+            code:  "119.27",
+            signature: "Firma"
+          }
+        },
+        {
+          code: 5512,
+          choices: [5] * 160,
+          header: {
+            name: "Bonazza Sara vr354320",
+            title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
+            code:  "201.48",
+            signature: "Firma"
+          }
+        }
+      ]
+      s = SheetPDF.new(Grid.new, info)
+      s.save("tmp/p2.pdf")
+    end
   end
 end
 

data/spec/mork/sheet_spec.rb

@@ -4,14 +4,18 @@ module Mork
   describe Sheet do
     context "describing marked choices" do
       before(:all) do
-        fn = sample_img(:sample01).filename
-        @sheet = Sheet.new(fn, Grid.new)
+        @sheet = Sheet.new('spec/samples/sample02.jpg')
       end
 
       describe "#marked?" do
         it "should return true for a darkened choice" do
           @sheet.marked?(0,0).should be_true
         end
+        
+        it "should highlight and show" do
+          @sheet.highlight_all
+          @sheet.write 'tmp/all_highlights.jpg'
+        end
 
         it "should return false for a blank choice" do
           @sheet.marked?(0,1).should be_false
@@ -59,20 +63,20 @@ module Mork
         @cshe = Sheet.new(@smp.filename, Grid.new)
       end
 
-      describe "#dark_code_bit_shade" do
-        it "should be less than a certain amount" do
-          v = @cshe.dark_code_bit_shade
-          v.should < @cshe.send(:dark_threshold)
-        end
-      end
-
-      describe "#light_code_bit_shade" do
-        it "should be more than a certain amount" do
-          v = @cshe.light_code_bit_shade
-          v.should > @cshe.send(:dark_threshold)
-        end
-
-      end
+      # describe "#dark_code_bit_shade" do
+      #   it "should be less than a certain amount" do
+      #     v = @cshe.dark_code_bit_shade
+      #     v.should < @cshe.send(:dark_threshold)
+      #   end
+      # end
+      #
+      # describe "#light_code_bit_shade" do
+      #   it "should be more than a certain amount" do
+      #     v = @cshe.light_code_bit_shade
+      #     v.should > @cshe.send(:dark_threshold)
+      #   end
+      #
+      # end
 
       describe "#code_string" do
         it "should read the bit string" do
@@ -91,7 +95,7 @@ module Mork
       it "should highlight all high bits in red" do
         smp = sample_img(:code_sample) 
         s = Sheet.new(smp.filename, Grid.new)
-        CODE_BITS.times do |i|
+        64.times do |i|
           if smp.code_int[i] == 1
             s.highlight_code_bit i
           end
@@ -112,6 +116,21 @@ module Mork
         s.write "tmp/light_bit.pdf"
       end
     end
+    
+    context "faded, b&w sheet" do
+      before(:all) do
+        @smp = sample_img(:bw_faded_sample)
+        @sheet = Sheet.new(@smp.filename, Grid.new)
+      end
+      
+      it "should return the correct code" do
+        @sheet.code.should == @smp.code_int
+      end
+      
+      it "should return the darkened choices" do
+        @sheet.mark_array(12).should == [[2], [3], [4], [0], [1], [2], [0,4], [], [3], [1], [], []]
+      end
+    end
 
     context "multi-page pdf" do
       before(:all) do

data/spec/samples/info.yml

@@ -30,7 +30,13 @@ sample01:
     q160:
       tl_x: 1818
       tl_y: 2974
-
+bw_faded_sample:
+  filename: spec/samples/qzc006.jpg
+  pages: 1
+  width:    1196
+  height:   1682
+  code_int: 5512
+  
 reg_mark:
   filename: spec/samples/reg_mark.jpg
   centroid_x: 92

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Giuseppe Bertini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -173,7 +173,6 @@ files:
 - lib/mork/mimage.rb
 - lib/mork/mimage_list.rb
 - lib/mork/npatch.rb
-- lib/mork/report.rb
 - lib/mork/sheet.rb
 - lib/mork/sheet_pdf.rb
 - lib/mork/version.rb
@@ -182,7 +181,6 @@ files:
 - spec/mork/mimage_list_spec.rb
 - spec/mork/mimage_spec.rb
 - spec/mork/npatch_spec.rb
-- spec/mork/report_spec.rb
 - spec/mork/sheet_pdf_spec.rb
 - spec/mork/sheet_spec.rb
 - spec/samples/22161694.pdf
@@ -190,9 +188,11 @@ files:
 - spec/samples/code_sample.png
 - spec/samples/code_zero.pdf
 - spec/samples/info.yml
+- spec/samples/qzc006.jpg
 - spec/samples/reg_mark.jpg
 - spec/samples/sample.pages
 - spec/samples/sample01.jpg
+- spec/samples/sample02.jpg
 - spec/samples/sheet1.jpg
 - spec/samples/sheet1.pdf
 - spec/samples/two_pages.pdf
@@ -225,7 +225,6 @@ test_files:
 - spec/mork/mimage_list_spec.rb
 - spec/mork/mimage_spec.rb
 - spec/mork/npatch_spec.rb
-- spec/mork/report_spec.rb
 - spec/mork/sheet_pdf_spec.rb
 - spec/mork/sheet_spec.rb
 - spec/samples/22161694.pdf
@@ -233,9 +232,11 @@ test_files:
 - spec/samples/code_sample.png
 - spec/samples/code_zero.pdf
 - spec/samples/info.yml
+- spec/samples/qzc006.jpg
 - spec/samples/reg_mark.jpg
 - spec/samples/sample.pages
 - spec/samples/sample01.jpg
+- spec/samples/sample02.jpg
 - spec/samples/sheet1.jpg
 - spec/samples/sheet1.pdf
 - spec/samples/two_pages.pdf

data/lib/mork/report.rb

@@ -1,39 +0,0 @@
-module Mork
-  class Report
-    def initialize(im, opts={})
-      grid_type = opts[:grid_type] || :default
-      grid_file = opts[:grid_file] || 'config/grids.yml'
-      @grid = Grid.new grid_type, grid_file
-      @sheet = Sheet.new(im, @grid)
-      @chlist = opts[:chlist] || @grid.default_chlist
-    end
-    
-    def sheet_code
-      @sheet.code
-    end
-    
-    def selected_choices
-      # sc = []
-      # @chlist.each_with_index do |ch, i|
-      #   sc[i] = (0...ch).collect do |x|
-      #     puts "Q.#{i} Ch.#{x}"
-      #     @mimage.darkened? @ruler.cell(i, x)
-      #   end
-      # end
-      # sc
-    end
-    
-    def highlight_all_choices
-      @chlist.each_with_index do |ch, i|
-        (0...ch).each do |x|
-          @sheet.highlight_choice(i, x)
-        end
-      end
-      @sheet.highlight_code
-    end
-    
-    def write_sheet(fname)
-      @sheet.write(fname)
-    end
-  end
-end

data/spec/mork/report_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-module Mork
-  describe Report do
-    let(:smp) { sample_img(:sample01) }
-
-    describe ".new" do
-      it "should create a Report" do
-        Report.new(smp.filename).should be_a(Report)
-      end
-    end
-  end
-end