sqed 0.5.8 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 189f2b34c7f74be111c238f7b8ebc5afdbe9f271defe7fe28eba2fa20fc1a11b
-  data.tar.gz: f45e49206f74d86f6367969010056161af9d3a17e105a786c5279a3c7b3b4529
+  metadata.gz: 0a10699c845a53421c6ea0446eac442be0470448d0c55c876bb849c2ec4a928e
+  data.tar.gz: b15da56bbbd2146e8683c7c19bcf3df8712c9bdb43c4015f173992e111b52520
 SHA512:
-  metadata.gz: 8f7bf2d0a0a89bb0f4ceaf9bb9348a3cd0e29ee146ece899dfb68f784c3b7f838d368b3f1bd25287e55a27b7e090f1ba311160e9e1cd7cc3a22ae40c713fa2af
-  data.tar.gz: 6f1b250541ff6b4ac24a94b529e3bc73df53fd5c6ac8ebf2043d9b6e5ff9b3fa40c7b586dd9bbafb732c688d396071cfa43f77c9a4fe78362e503bdb9e21c523
+  metadata.gz: 1f7b7798e7e21145b3d46da2f68ff8b5bd83f341a7926d894d3f7253e5551eafa8297a26bd5fb0053707acca91c2fec2db42638bc27b54c13d58986b8ab6a051
+  data.tar.gz: b5ba7f2552f5db764f9436c77b874e7c094369d554a6df44ac15342a40177a7a80531fe1c3d87d2a34b725deeef21adec53fab1a311e0de7bf55e4a3ced64194

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.0.2

data/.travis.yml

@@ -3,7 +3,7 @@
 language: ruby
 dist: bionic
 rvm:
-  - 2.6.3
+  - 2.7.1
 #before_install:
 #  - sudo add-apt-repository -y ppa:moti-p/cc
 #  - sudo apt-get update
@@ -12,9 +12,11 @@ rvm:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq tesseract-ocr tesseract-ocr-nld
+  - sudo sed -i 's/name="disk" value="1GiB"/name="disk" value="8GiB"/' /etc/ImageMagick-6/policy.xml
+  - identify -list resource | grep Disk | grep 8GiB # Check ImageMagick setting is actually working.
 branches:
   only:
-    - master
+    - main 
 notifications:
   email:
     - diapriid@gmail.com 

data/lib/sqed/boundaries.rb

@@ -24,7 +24,7 @@ class Sqed
   attr_accessor :complete
 
   def initialize(layout = nil)
-    raise 'unrecognized layout' if layout && !SqedConfig::LAYOUTS.include?(layout)
+    raise Sqed::Error, 'unrecognized layout' if layout && !SqedConfig::LAYOUTS.include?(layout)
     @complete = false
 
     @layout = layout

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -15,7 +15,7 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
     super(image: image, layout: layout, use_thumbnail: use_thumbnail)
 
-    raise 'No layout provided.' if @layout.nil?
+    raise Sqed::Error, 'No layout provided.' if @layout.nil?
 
     # !@#? why this
     @boundary_color = boundary_color
@@ -29,34 +29,39 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
   private
 
+  # boundaries.coordinates are referenced from stage image
+  #
+  # A reminder that boundaries are x1,y1, width, height
   def find_bands
-    case layout    # boundaries.coordinates are referenced from stage image
 
-    when :cross # 4 zones, with perfectly intersected horizontal and vertical division
+    # see config/sqed_config.rb
+    case layout
+
+    when :cross # 4 windows, with perfectly intersected horizontal and vertical division
       v = self.class.new(image: @image, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
-      h = self.class.new(image: @image, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false).boundaries 
+      h = self.class.new(image: @image, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false).boundaries
 
       return if v.nil? || h.nil?
 
-      boundaries.set(0, [0,0, v.width_for(0), h.height_for(0) ]) 
-      boundaries.set(1, [ v.x_for(1), 0, v.width_for(1), h.height_for(0) ]) 
-      boundaries.set(2, [ v.x_for(1), h.y_for(1), v.width_for(1), h.height_for(1) ]) 
-      boundaries.set(3, [0, h.y_for(1), v.width_for(0), h.height_for(1) ]) 
+      boundaries.set(0, [0,0, v.width_for(0), h.height_for(0) ])
+      boundaries.set(1, [ v.x_for(1), 0, v.width_for(1), h.height_for(0) ])
+      boundaries.set(2, [ v.x_for(1), h.y_for(1), v.width_for(1), h.height_for(1) ])
+      boundaries.set(3, [0, h.y_for(1), v.width_for(0), h.height_for(1) ])
 
     # No specs for this yet
     when :horizontal_offset_cross
       horizontal = self.class.new(image: @image, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
 
-      itop = image.crop(*horizontal.for(0), true) 
+      itop = image.crop(*horizontal.for(0), true)
       ibottom = image.crop(*horizontal.for(1), true)
 
       top = self.class.new(image: itop, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
       bottom = self.class.new(image: ibottom, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
 
-      boundaries.set(0, [0, 0, top.width_for(0), top.height_for(0) ]) 
-      boundaries.set(1, [top.x_for(1), 0, top.width_for(1), top.height_for(1) ]) 
-      boundaries.set(2, [bottom.x_for(1), horizontal.y_for(1), bottom.width_for(1), bottom.height_for(1) ]) 
-      boundaries.set(3, [0, horizontal.y_for(1), bottom.width_for(0), bottom.height_for(0) ]) 
+      boundaries.set(0, [0, 0, top.width_for(0), top.height_for(0) ])
+      boundaries.set(1, [top.x_for(1), 0, top.width_for(1), top.height_for(1) ])
+      boundaries.set(2, [bottom.x_for(1), horizontal.y_for(1), bottom.width_for(1), bottom.height_for(1) ])
+      boundaries.set(3, [0, horizontal.y_for(1), bottom.width_for(0), bottom.height_for(0) ])
 
     when :lep_stage
       top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, scan: :columns, boundary_color: boundary_color)              # detect vertical division [array]
@@ -64,9 +69,9 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
       boundaries.set(6, [0, top_bottom_split[2], left_right_split[0], image.rows - top_bottom_split[2]] )
 
-      left_top_image = image.crop( 0, 0, left_right_split[0], top_bottom_split[0], true) 
+      left_top_image = image.crop( 0, 0, left_right_split[0], top_bottom_split[0], true)
 
-      left_top_split = 
+      left_top_split =
         SqedUtils.corrected_frequency(
           Sqed::BoundaryFinder.color_boundary_finder(image: left_top_image, boundary_color: boundary_color),
           max_width: left_top_image.columns,
@@ -74,8 +79,8 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       )
 
       boundaries.set(0, [0, 0, left_top_split[1], top_bottom_split[0]] ) # keep as 1 for safety
-     
-      boundaries.set(1, [left_top_split[2], 0, left_top_image.columns - left_top_split[2], top_bottom_split[0]] ) 
+
+      boundaries.set(1, [left_top_split[2], 0, left_top_image.columns - left_top_split[2], top_bottom_split[0]] )
       boundaries.set(2, [left_right_split[2], 0, image.columns - left_right_split[0], top_bottom_split[0]] )
 
       bottom_right_image =  image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)
@@ -89,7 +94,7 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
       boundaries.set(3, [left_right_split[2] + bottom_right_split[2], top_bottom_split[2], image.columns - bottom_right_split[2], image.rows - top_bottom_split[2] ] )
 
-      bottom_right_left_image = image.crop(left_right_split[2], top_bottom_split[2], bottom_right_split[0], image.rows - top_bottom_split[2], true)  
+      bottom_right_left_image = image.crop(left_right_split[2], top_bottom_split[2], bottom_right_split[0], image.rows - top_bottom_split[2], true)
 
       bottom_right_left_split =
         SqedUtils.corrected_frequency(
@@ -101,25 +106,104 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       boundaries.set(4, [left_right_split[2], top_bottom_split[2], bottom_right_image.columns - bottom_right_left_image.columns, bottom_right_left_split[0] ] )
 
       boundaries.set(5, [
-        left_right_split[2], 
+        left_right_split[2],
         top_bottom_split[2] + bottom_right_left_split[2],
         bottom_right_image.columns - bottom_right_left_image.columns,
-        bottom_right_left_image.rows - bottom_right_left_split[2]  
+        bottom_right_left_image.rows - bottom_right_left_split[2]
       ])
 
+    when :lep_stage2
+      top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, scan: :columns, boundary_color: boundary_color)              # detect vertical division [array]
+      left_right_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, sample_subdivision_size: 2, boundary_color: boundary_color)  # detect horizontal division [array]
+
+      boundaries.set(6, [0, top_bottom_split[2], left_right_split[0], image.rows - top_bottom_split[2]] ) # OK
+
+      left_top_image = image.crop( 0, 0, left_right_split[0], top_bottom_split[0], true)
+
+      left_top_split =
+        SqedUtils.corrected_frequency(
+          Sqed::BoundaryFinder.color_boundary_finder(image: left_top_image, boundary_color: boundary_color),
+          max_width: left_top_image.columns,
+          width_factor: 1.8
+      )
+
+      boundaries.set(0, [0, 0, left_top_split[1], top_bottom_split[0]] ) # OK
+
+      boundaries.set(1, [left_top_split[2], 0, left_top_image.columns - left_top_split[2], top_bottom_split[0]] )
+      boundaries.set(2, [left_right_split[2], 0, image.columns - left_right_split[0], top_bottom_split[0]] )
+
+      bottom_right_image =  image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)
+
+      bottom_right_split =
+        SqedUtils.corrected_frequency(
+          Sqed::BoundaryFinder.color_boundary_finder(image: bottom_right_image, boundary_color: boundary_color, scan: :rows),
+          max_width: bottom_right_image.columns,
+          width_factor: 1.8
+      )
+
+      boundaries.set(3, [
+        left_right_split[2] + bottom_right_split[2],
+        top_bottom_split[2],
+        image.columns - bottom_right_split[2],
+        top_bottom_split[0] ])
+
+      bottom_right_left_image = image.crop(left_right_split[2], top_bottom_split[2], bottom_right_split[0], image.rows - top_bottom_split[2], true)
+
+      bottom_right_left_top_bottom_split =
+        SqedUtils.corrected_frequency(
+          Sqed::BoundaryFinder.color_boundary_finder(image: bottom_right_left_image, scan: :columns, boundary_color: boundary_color),
+          max_width: bottom_right_left_image.columns,
+          width_factor: 1.8
+      )
+
+      boundaries.set(4, [
+        left_right_split[2],
+        top_bottom_split[2] + bottom_right_left_top_bottom_split[2],
+        bottom_right_left_image.columns,
+        bottom_right_left_top_bottom_split[2]
+      ])
+
+
+      boundaries.set(5, [
+        left_right_split[2],
+        top_bottom_split[2],
+        bottom_right_left_image.columns,
+        bottom_right_left_top_bottom_split[0],
+      ])
+
+    when :t
+      horizontal = self.class.new(image: @image, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
+
+      bottom = image.crop(*horizontal.for(1), true)
+      btm_split = self.class.new(image: bottom, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
+
+      boundaries.set(0, horizontal.for(0))
+      boundaries.set(1, [ btm_split.x_for(1), horizontal.height_for(0), btm_split.width_for(1), btm_split.height_for(1) ] )
+      boundaries.set(2, [ 0, horizontal.height_for(0), btm_split.width_for(0), btm_split.height_for(0) ] )
+
+    when :inverted_t
+      horizontal = self.class.new(image: @image, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
+
+      top = image.crop(*horizontal.for(0), true)
+      top_split = self.class.new(image: top, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
+
+      boundaries.set(0, [ 0,0, top_split.width_for(0), top_split.height_for(0)] )
+      boundaries.set(1, [ top_split.width_for(0), 0, top_split.width_for(1), top_split.height_for(1)] )
+      boundaries.set(2, horizontal.for(1))
+
     when :right_t
       vertical = self.class.new(image: @image, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
 
       irt = image.crop(*vertical.for(1), true)
       right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries
 
-      boundaries.set(0, vertical.for(0))    
-      boundaries.set(1, [ vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ] ) 
-      boundaries.set(2, [ vertical.x_for(1), right.y_for(1), right.width_for(1), right.height_for(1)] )  
+      boundaries.set(0, vertical.for(0))
+      boundaries.set(1, [ vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ] )
+      boundaries.set(2, [ vertical.x_for(1), right.y_for(1), right.width_for(1), right.height_for(1)] )
 
     when :seven_slot
       top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, scan: :columns, boundary_color: boundary_color)              # detect vertical division [array]
-      left_right_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, sample_subdivision_size: 2, boundary_color: boundary_color)  # detect horizontal division [array]
+      left_right_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, sample_subdivision_size: 1, boundary_color: boundary_color)  # detect horizontal division [array]
 
       boundaries.set(0, [0, 0, left_right_split[0], top_bottom_split[0]])
       boundaries.set(6, [0, top_bottom_split[2], left_right_split[0], image.rows - top_bottom_split[2]] )
@@ -128,18 +212,22 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       right_bottom_image = image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)  # sections 3,4,5
 
       right_top_split = ::SqedUtils.corrected_frequency(
-        Sqed::BoundaryFinder.color_boundary_finder(image: right_top_image, boundary_color: boundary_color, scan: :rows),
-        width_factor: 1.8,
-        max_width: right_top_image.columns
+        Sqed::BoundaryFinder.color_boundary_finder(
+          image: right_top_image, boundary_color: boundary_color, scan: :rows),
+          width_factor: 1.8,
+          max_width: right_top_image.columns
       ) # vertical line b/w 1 & 2, use "corrected_frequency" to account for color bleed from previous crop
 
       boundaries.set(1, [left_right_split[2], 0, right_top_split[0], top_bottom_split[0]] )
       boundaries.set(2, [left_right_split[2] + right_top_split[2], 0, right_top_image.columns - right_top_split[2], top_bottom_split[0]])
 
       right_bottom_split = SqedUtils.corrected_frequency(
-        Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_image, scan: :columns, sample_subdivision_size: 2, boundary_color: boundary_color),
-        width_factor: 1.8,
-        max_width: right_bottom_image.rows) # horizontal line b/w (5,3) & 4, use "corrected_frequency" to account for color bleed from previous crop
+        Sqed::BoundaryFinder.color_boundary_finder(
+          image: right_bottom_image,
+          scan: :columns,
+          sample_subdivision_size: 2, boundary_color: boundary_color),
+          width_factor: 1.8,
+          max_width: right_bottom_image.rows) # horizontal line b/w (5,3) & 4, use "corrected_frequency" to account for color bleed from previous crop
 
       bottom_right_top_image = right_bottom_image.crop(0,0, image.columns - left_right_split[2], right_bottom_split[0], true) # 3,5
 
@@ -151,18 +239,18 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
     when :vertical_offset_cross   # 4 zones expected, with (varying) horizontal division in left- and right- sides of vertical division
       vertical = self.class.new(image: @image, layout: :vertical_split, boundary_color: boundary_color, use_thumbnail: false).boundaries
 
-      ilt = image.crop(*vertical.for(0), true) 
+      ilt = image.crop(*vertical.for(0), true)
       irt = image.crop(*vertical.for(1), true)
 
       left = self.class.new(image: ilt, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false).boundaries   # fails
       right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: boundary_color, use_thumbnail: false ).boundaries # OK
 
-      boundaries.set(0, [0, 0, left.width_for(0), left.height_for(0) ]) 
-      boundaries.set(1, [vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ]) 
-      boundaries.set(2, [vertical.x_for(1), right.y_for(1), right.width_for(1), right.height_for(1) ]) 
-      boundaries.set(3, [0, left.y_for(1), left.width_for(1), left.height_for(1) ]) 
+      boundaries.set(0, [0, 0, left.width_for(0), left.height_for(0) ])
+      boundaries.set(1, [vertical.x_for(1), 0, right.width_for(0), right.height_for(0) ])
+      boundaries.set(2, [vertical.x_for(1), right.y_for(1), right.width_for(1), right.height_for(1) ])
+      boundaries.set(3, [0, left.y_for(1), left.width_for(1), left.height_for(1) ])
 
-    when :vertical_split 
+    when :vertical_split
       t = Sqed::BoundaryFinder.color_boundary_finder(image: image, boundary_color: boundary_color)  #detect vertical division
       return if t.nil?
       boundaries.set(0, [0, 0, t[0], image.rows])  # left section of image
@@ -175,10 +263,7 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       boundaries.set(0, [0, 0, image.columns, t[0]])  # upper section of image
       boundaries.set(1, [0, t[2], image.columns, image.rows - t[2]])  # lower section of image
 
-
-
     else # no @layout provided !?
-
       boundaries.set(0, [0, 0, image.columns, image.rows])   # totality of image as default
     end
 

data/lib/sqed/boundary_finder.rb

@@ -6,6 +6,7 @@ class Sqed
   #
   class BoundaryFinder
 
+    # Problemantic (e.g. seven slot) seem to resolve at ~360
     THUMB_SIZE = 100
     COLOR_DELTA = 1.3 # color (e.g. red) must be this much be *COLOR_DELTA > than other values (e.g. blue/green)
 
@@ -18,7 +19,8 @@ class Sqed
     # A Sqed::Boundaries instance, stores the coordinates of all of the layout sections
     attr_reader :boundaries
 
-    # Whether to compress the original image to a thumbnail when finding boundaries
+    # @return Boolean
+    # Whether to compress the original image to a thumbnail when finding boundaries at certain steps of the processing
     attr_reader :use_thumbnail
 
     # when we compute using a derived thumbnail we temporarily store the full size image here
@@ -31,8 +33,8 @@ class Sqed
       @layout = opts[:layout]
       @image = opts[:image]
 
-      raise 'No layout provided.' if layout.nil?
-      raise 'No image provided.' if image.nil? || image.class.name != 'Magick::Image'
+      raise Sqed::Error, 'No layout provided.' if layout.nil?
+      raise Sqed::Error, 'No image provided.' if image.nil? || image.class.name != 'Magick::Image'
 
       true
     end
@@ -135,7 +137,7 @@ class Sqed
       while attempts < 5 do
         samples_to_take = (image_width / sample_subdivision_size).to_i - 1
         border_hits = sample_border(image, boundary_color, samples_to_take, sample_subdivision_size, scan)
-        
+
         break if border_hits.select{|k,v| v > 1}.size > 2 || sample_subdivision_size == 1
 
         sample_subdivision_size = (sample_subdivision_size.to_f / 2.0).to_i
@@ -164,7 +166,7 @@ class Sqed
         elsif scan == :columns
           j = image.crop(s * sample_subdivision_size, 0, 1, image.rows, true)
         else
-          raise
+          raise Sqed::Error
         end
 
         j.each_pixel do |pixel, c, r|
@@ -207,7 +209,7 @@ class Sqed
     #   the start, mid, endpoint position of all (pixel) positions that have a count greater than the cutoff
     def self.frequency_stats(frequency_hash, sample_cutoff = 0)
 
-      return nil if sample_cutoff.nil? ||  sample_cutoff < 1
+      return nil if sample_cutoff.nil? || sample_cutoff < 1
       hit_ranges = []
 
       frequency_hash.each do |position, count|
@@ -236,6 +238,11 @@ class Sqed
       [hit_ranges.first, hit_ranges[(hit_ranges.length / 2).to_i], hit_ranges.last]
     end
 
+    def self.max_difference(array)
+      array.max - array.min
+    end
+
+    # Usused
 
     # Returns an Integer, the maximum of the pairwise differences of the values in the array
     # For example, given
@@ -248,10 +255,6 @@ class Sqed
       (0..array.length - 2).map{|i| (array[i] - array[i + 1]).abs }.max
     end
 
-    def self.max_difference(array)
-      array.max - array.min
-    end
-
     def self.derivative_signs(array)
       (0..array.length - 2).map { |i| (array[i + 1] - array[i]) <=> 0 }
     end

data/lib/sqed/error.rb

@@ -0,0 +1,2 @@
+class Sqed::Error < StandardError
+end

data/lib/sqed/extractor.rb

@@ -23,9 +23,9 @@ class Sqed
       @boundaries = opts[:boundaries]
       @image = opts[:image]
 
-      raise Error, 'boundaries not provided or provided boundary is not a Sqed::Boundaries' if boundaries.nil? || !boundaries.class == Sqed::Boundaries
-      raise Error, 'metadata_map not provided or metadata_map not a Hash' if metadata_map.nil? || !metadata_map.class == Hash
-      raise Error, 'image not provided' if image.nil? || !image.class.name == 'Magick::Image'
+      raise Sqed::Error, 'boundaries not provided or provided boundary is not a Sqed::Boundaries' if boundaries.nil? || !boundaries.class.name == 'Sqed::Boundaries'
+      raise Sqed::Error, 'metadata_map not provided or metadata_map not a Hash' if metadata_map.nil? || !metadata_map.class.name == 'Hash'
+      raise Sqed::Error, 'image not provided' if image.nil? || !image.class.name == 'Magick::Image'
     end
 
     def result

data/lib/sqed/parser.rb

@@ -9,8 +9,9 @@ class Sqed::Parser
   attr_accessor :extracted_text
 
   def initialize(image)
+    raise Sqed::Error, 'no image passed to parser' if image.nil?
+    raise Sqed::Error, 'image is not a Magick::Image' if !(image.class.name == 'Magick::Image')
     @image = image
-    raise 'no image provided to parser' if @image && !(@image.class.name == 'Magick::Image')
   end
 
 end

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = '0.5.8'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/lib/sqed.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 recent_ruby = RUBY_VERSION >= '2.4.1'
-raise 'IMPORTANT: sqed gem requires ruby >= 2.4.1' unless recent_ruby
+raise Sqed::Error, 'IMPORTANT: sqed gem requires ruby >= 2.4.1' unless recent_ruby
 
 require 'rmagick'
 require 'sqed_utils'
@@ -17,10 +17,12 @@ require 'sqed_utils'
 #
 class Sqed
 
+  require_relative 'sqed/error'
   require_relative 'sqed_config'
   require_relative 'sqed/extractor'
   require_relative 'sqed/result'
 
+
   # initial image which is an instance of ImageMagick::Image, containing background and stage, or just stage
   attr_accessor :image
 
@@ -68,6 +70,7 @@ class Sqed
   # Provide a metadata map, overrides metadata taken from pattern
   attr_accessor :metadata_map
 
+  # @return [Sqed::BoundaryFinder::<Klass>]
   # Provide a boundary_finder, overrides metadata taken from pattern
   attr_accessor :boundary_finder
 
@@ -165,6 +168,8 @@ class Sqed
     configure_layout(opts)
     configure_metadata_map(opts)
 
+    raise Sqed::Error, 'boundary_finder not provided' if @boundary_finder.nil?
+
     @has_border = opts[:has_border]
     @has_border = true if @has_border.nil?
 
@@ -178,18 +183,18 @@ class Sqed
   def configure_from_pattern(value)
     return if value.nil?
     value = value.to_sym
-    raise "provided extraction pattern '#{value}' not defined" if !SqedConfig::EXTRACTION_PATTERNS.keys.include?(value)
+    raise Sqed::Error, "provided extraction pattern '#{value}' not defined" if !SqedConfig::EXTRACTION_PATTERNS.keys.include?(value)
     @pattern = value
     a = SqedConfig::EXTRACTION_PATTERNS[pattern]
     @boundary_finder = a[:boundary_finder]
     @layout = a[:layout]
     @metadata_map = a[:metadata_map]
+
     true
   end
 
   def configure_boundary_finder(opts)
-    @boundary_finder = opts[:boundary_finder].constantize if !opts[:boundary_finder].nil?
-    @boundary_finder ||= Sqed::BoundaryFinder::CrossFinder
+    @boundary_finder = opts[:boundary_finder] if !opts[:boundary_finder].nil?
   end
 
   def configure_layout(opts)
@@ -212,7 +217,7 @@ class Sqed
   end
 
   def get_section_boundaries
-    boundary_finder.new(section_params).boundaries
+    boundary_finder.new(**section_params).boundaries
   end
 
   # @return [Hash]
@@ -232,7 +237,7 @@ class Sqed
       if boundary.populated?
         @stage_boundary.set(0, boundary.for(0))
       else
-        raise 'error detecting stage'
+        raise Sqed::Error, 'error detecting stage'
       end
     else
       @stage_boundary.set(0, [0, 0, image.columns, image.rows])

data/lib/sqed_config.rb

@@ -17,33 +17,40 @@ require_relative 'sqed/boundary_finder/color_line_finder'
 module SqedConfig
 
   # Layouts refer to the arrangement of the divided stage.
-  # Windows are enumerated from the top left, moving around the border 
+  # Windows are enumerated from the top left, moving around the border
   # in a clockwise position.  For example:
   #
   #    0  | 1
   #   ----|----  :cross (any cross pattern)
   #       |
   #    3  | 2
-  # 
+  #
   #
   #    0  |  1
   #       |
-  #   ---------  :horizontal_offset_cross 
+  #   ---------  :horizontal_offset_cross
   #    3    | 2
-  # 
+  #
   #
   #        0
   #    --------  :horizontal_split
   #        1
-  # 
+  #
   #
   #    0 | 1 | 2
   #   ------------
   #      | 5 |      :lep_stage
-  #    6 |---- 3  
+  #    6 |---- 3
   #      | 4 |
   #
   #
+  #    0 | 1 |  2
+  #   --------------
+  #          | 5 |    :lep_stage2
+  #      6   |---- 3
+  #          | 4 |
+  #
+  #
   #       | 1
   #    0  |----  :right_t
   #       | 2
@@ -55,28 +62,41 @@ module SqedConfig
   #    6 |--------
   #      |   4
   #
-  # 
+  #
   #    0  |  1
   #       |____
-  #   ----|      :vertical_offset_cross 
+  #   ----|      :vertical_offset_cross
   #    3  |  2
-  #  
   #
-  #        |
-  #      0 | 1  :vertical_split
-  #        |
+  #
+  #      |
+  #    0 | 1  :vertical_split
+  #      |
   #
   #   -----
-  #   | 0 |  :internal_box
+  #   | 0 |   :internal_box
   #   -----
-  #  
+  #
+  #   0 | 1   :inverted_t
+  #   -----
+  #     2
+  #
+  #     0     :t
+  #   -----
+  #   2 | 1
+  #
+  #
+  #
   # Hash values are used to stub out
   # the Sqed::Boundaries instance.
   LAYOUTS = {
+    t: [0,1,2],
+    inverted_t: [0, 1, 2],
     cross: [0, 1, 2, 3],
     horizontal_offset_cross: [0, 1, 2, 3],
     horizontal_split: [0, 1],
     lep_stage: [0, 1, 2, 3, 4, 5, 6],
+    lep_stage2: [0, 1, 2, 3, 4, 5, 6],
     right_t: [0, 1, 2],
     seven_slot: [0, 1, 2, 3, 4, 5, 6],
     vertical_offset_cross: [0, 1, 2, 3],
@@ -93,7 +113,7 @@ module SqedConfig
     :identifier,              # the section contains an identifier (e.g. barcode or unique number)
     :image_registration,      # the section contains only image registration information,
     :labels,                  # the section contains collecting event and other non-determination labels
-    :nothing,                 # section is empty 
+    :nothing,                 # section is empty
     :other_labels,            # the section that contains text that misc.
     :specimen,                # the specimen only, no metadata should be present
     :stage,                   # the image contains the full stage
@@ -115,6 +135,18 @@ module SqedConfig
   }.freeze
 
   EXTRACTION_PATTERNS = {
+    t: {
+      boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
+      layout: :t,
+      metadata_map: { 0 => :annotated_specimen, 1 => :identifier, 2 => :image_registration }
+    },
+
+    inverted_t: {
+      boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
+      layout: :inverted_t,
+      metadata_map: { 0 => :identifier, 1 => :image_registration, 2 => :annotated_specimen }
+    },
+
     cross: {
       boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
       layout: :cross,
@@ -139,6 +171,12 @@ module SqedConfig
       metadata_map: { 0 => :curator_metadata, 1 => :collecting_event_labels, 2 => :image_registration, 3 => :identifier, 4 => :other_labels, 5 => :determination_labels, 6 => :specimen }
     },
 
+    lep_stage2: {
+      boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
+      layout: :lep_stage2,
+      metadata_map: { 0 => :curator_metadata, 1 => :collecting_event_labels, 2 => :image_registration, 3 => :identifier, 4 => :other_labels, 5 => :determination_labels, 6 => :specimen }
+    },
+
     right_t: {
       boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
       layout: :right_t,

data/spec/lib/sqed_config_spec.rb

@@ -7,13 +7,11 @@ describe SqedConfig do
   end
 
   specify 'layouts' do
-    expect(SqedConfig.metadata[:layouts].keys).to contain_exactly(:cross, :horizontal_offset_cross, :horizontal_split, :lep_stage, :right_t, :seven_slot, :vertical_offset_cross, :vertical_split)
+    expect(SqedConfig.metadata[:layouts].keys).to contain_exactly(:t, :inverted_t, :cross, :horizontal_offset_cross, :horizontal_split, :lep_stage, :lep_stage2, :right_t, :seven_slot, :vertical_offset_cross, :vertical_split)
   end
 
   specify 'layouts are in patterns' do
-    expect(SqedConfig.metadata[:layouts].keys + [:stage]).to contain_exactly(*SqedConfig::EXTRACTION_PATTERNS.keys) 
+    expect(SqedConfig.metadata[:layouts].keys + [:stage]).to contain_exactly(*SqedConfig::EXTRACTION_PATTERNS.keys)
   end
 
-
-
 end