sqed 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b9a6f76959bb89b1fbfbb521ec81418044e429
-  data.tar.gz: 9207ef009d4ef1c3ec0b286152a254ac5d5efd29
+  metadata.gz: 4fc79ffe69e04fb549335328b4cb1e1288cbcf37
+  data.tar.gz: 89e513debbd76b425584416cfb8a32f1e8932aa2
 SHA512:
-  metadata.gz: 3f1ab07c22d9651c0ec758c11e26e070ca9a6771089c6c0b6f27cb3cf3297c07e0052bd5d27db2ff7e622422fed9c5181072ef52eff244660280b008cb33f177
-  data.tar.gz: 97dee84567edca8f41a0ab193d0ccc577a637ba8cdf293d60c62df6b152d09ff0d08a0e7a61d4cddae4e487db403222c4827c46083ba15603169a8acb47f00f9
+  metadata.gz: 7c7b1fc8db47d2efff2fce8767c2c6d7e219f184f23142a55875436c67cd4c07b3503f2ee731467ce62cc47db21ebbd73c62780e365da81f873a6260855c38b8
+  data.tar.gz: 648bf20fed24fb28e8aa003e71c04e0606ba82d748f9fc3b814add434235de283b5f734fea7e26df04e5b39a32cc6139cf20270d01427ac966530e7d536ffe19

data/lib/sqed.rb

@@ -11,7 +11,7 @@ require "rmagick"
 #
 # Return a Sqed::Result
 #    
-#     a = Sqed.new(pattern: :offset_cross, image: image)
+#     a = Sqed.new(pattern: :vertical_offset_cross, image: image)
 #     b = a.result # => Sqed::Result instance
 #
 class Sqed

data/lib/sqed/boundary_finder.rb

@@ -25,6 +25,31 @@ class Sqed::BoundaryFinder
     @boundaries ||= Sqed::Boundaries.new(@layout)
   end
 
+
+  # return [Integer, nil]
+  #   sample more with small images, less with large images
+  #   we want to return larger numbers (= faster sampling)
+  #
+  #
+  def self.get_subdivision_size(image_width)
+    case image_width
+    when nil
+     nil 
+    when 0..140
+       6
+    when 141..640
+       12
+    when 641..1000
+      16
+    when 1001..3000
+      60 
+    when 3001..6400
+      80 
+    else
+      140 
+    end
+  end
+
   # @return
   #   the column (x position) in the middle of the single green vertical line dividing the stage
   #
@@ -43,16 +68,19 @@ class Sqed::BoundaryFinder
   # @param scan
   #   (:rows|:columns), :rows finds vertical borders, :columns finds horizontal borders
   #
-  def self.color_boundary_finder(image: image, sample_subdivision_size: 10, sample_cutoff_factor: nil, scan: :rows, boundary_color: :green) 
+  def self.color_boundary_finder(image: image, sample_subdivision_size: nil, sample_cutoff_factor: nil, scan: :rows, boundary_color: :green)
+    image_width = image.send(scan)
+    sample_subdivision_size = get_subdivision_size(image_width) if sample_subdivision_size.nil?
+    samples_to_take = (image_width / sample_subdivision_size).to_i - 1
+
     border_hits = {}
-    samples_to_take = (image.send(scan) / sample_subdivision_size).to_i - 1
 
     (0..samples_to_take).each do |s|
       # Create a sample image a single pixel tall
       if scan == :rows
-        j = image.crop(0, s * sample_subdivision_size, image.columns, 1)
+        j = image.crop(0, s * sample_subdivision_size, image.columns, 1, true)
       elsif scan == :columns
-        j = image.crop(s * sample_subdivision_size, 0, 1, image.rows)
+        j = image.crop(s * sample_subdivision_size, 0, 1, image.rows, true)
       else
         raise
       end
@@ -101,8 +129,8 @@ class Sqed::BoundaryFinder
     (pixel.red < black_threshold) &&  (pixel.blue < black_threshold) &&  (pixel.green < black_threshold)
   end
 
-  # Takes a frequency hash of position => count key/values and returns
-  # the median position of all positions that have a count greater than the cutoff
+  # return [Array]
+  #   the median 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 
     hit_ranges = [] 

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -21,69 +21,69 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       return if t.nil?
       boundaries.set(0, [0, 0, t[0], img.rows])  # left section of image
       boundaries.set(1, [t[2], 0, img.columns - t[2], img.rows])  # right section of image
-      boundaries.complete = true
 
     when :horizontal_split
       t = Sqed::BoundaryFinder.color_boundary_finder(image: img, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division, (green line)
       return if t.nil?
       boundaries.set(0, [0, 0, img.columns, t[0]])  # upper section of image
       boundaries.set(1, [0, t[2], img.columns, img.rows - t[2]])  # lower section of image
-      boundaries.complete = true
-      # boundaries.coordinates[2] = [0, 0, img.columns, t[1]]  # upper section of image
-      # boundaries.coordinates[3] = [0, t[1], img.columns, img.rows - t[1]]  # lower section of image
 
     when :right_t   # only 3 zones expected, with horizontal division in right-side of vertical division
-      t = Sqed::BoundaryFinder.color_boundary_finder(image: img, boundary_color: @boundary_color)  #defaults to detect vertical division, green line
-      return if t.nil?
+      vertical = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color ).boundaries
+      irt = img.crop(*vertical.for(1), true)
+      right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: @boundary_color ).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)] )  
 
-      left = [0, 0, t[0], img.rows]
-      right = [t[2], 0, img.columns - t[2], img.rows]
+    when :vertical_offset_cross   # 4 zones expected, with (varying) horizontal division in left- and right- sides of vertical division
+      vertical = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color ).boundaries
+    
+      ilt = img.crop(*vertical.for(0), true) 
+      irt = img.crop(*vertical.for(1), true)
 
-      boundaries.set(0, left)            # left section of image
+      left = self.class.new(image: ilt, layout: :horizontal_split, boundary_color: @boundary_color ).boundaries
+      right = self.class.new(image: irt, layout: :horizontal_split, boundary_color: @boundary_color ).boundaries
 
-      # now subdivide right side
-      irt = img.crop(*right, true)
-      rt = Sqed::BoundaryFinder.color_boundary_finder(image: irt, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division, (green line)
-      return if rt.nil?
-      boundaries.set(1, [t[2], 0, img.columns - t[2], rt[0]])                # upper section of image
-      boundaries.set(2, [t[2], rt[2], img.columns - t[2], img.rows - rt[2]]) # lower section of image
-      boundaries.complete = true
-      # will return 1, 2, or 3
+      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 :offset_cross   # 4 zones expected, with horizontal division in right- and left- sides of vertical division
-      t = Sqed::BoundaryFinder.color_boundary_finder(image: img, boundary_color: @boundary_color)  # defaults to detect vertical division, green line
-      raise if t.nil?
+    # No specs for this yet
+    when :horizontal_offset_cross
+      horizontal = self.class.new(image: @img, layout: :horizontal_split, boundary_color: @boundary_color ).boundaries
 
-      left = [0, 0, t[0], img.rows]                               # left section of image
-      right = [t[2], 0, img.columns - t[2], img.rows]             # right section of image
+      itop = img.crop(*horizontal.for(0), true) 
+      ibottom = img.crop(*horizontal.for(1), true)
 
-      # now subdivide left side
-      ilt = img.crop(*left, true)
+      top = self.class.new(image: ilt, layout: :vertical_split, boundary_color: @boundary_color ).boundaries
+      bottom = self.class.new(image: irt, layout: :vertical_split, boundary_color: @boundary_color ).boundaries
 
-      lt = Sqed::BoundaryFinder.color_boundary_finder(image: ilt, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division, (green line)
+      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) ]) 
 
-      if !lt.nil?
-        boundaries.set(0, [0, 0, left[2], lt[0]])                 # upper section of image
-        boundaries.set(3, [0, lt[2], left[2], img.rows - lt[2]])  # lower section of image
-      end
+    when :cross # 4 zones, with perfectly intersected horizontal and vertical division
+      v = self.class.new(image: @img, layout: :vertical_split, boundary_color: @boundary_color ).boundaries
+      h = self.class.new(image: @img, layout: :horizontal_split, boundary_color: @boundary_color ).boundaries 
+  
+      return if v.nil? || h.nil?
 
-      # now subdivide right side
-      irt = img.crop(*right, true)
-      rt = Sqed::BoundaryFinder.color_boundary_finder(image: irt, scan: :columns, boundary_color: @boundary_color)  # set to detect horizontal division, (green line)
-      return if rt.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(1, [t[2], 0, img.columns - t[2], rt[0]])                 # upper section of image
-      boundaries.set(2, [t[2], rt[2], img.columns - t[2], img.rows - rt[2]])  # lower section of image
-      # will return 1, 2, 3, or 4  //// does not handle staggered vertical boundary case
-      
-      boundaries.complete = true if boundaries.populated?
+    else # no @layout provided !?
 
-    else
       boundaries.set(0, [0, 0, img.columns, img.rows])   # totality of image as default
-      # TODO: boundaries.complete status here?
-      return    # return original image boundary if no method implemented
     end
 
+    boundaries.complete = true if boundaries.populated?
+
   end
 
 

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/sqed_config.rb

@@ -19,25 +19,31 @@ module SqedConfig
   # Layouts refer to the arrangement of the divided stage.
   # Windows are enumerated from the top left, moving around the border 
   # in a clockwise position.  For example:
+  #
   #    0  | 1
-  #   ----|----  :equal_cross //probably obviated by offset_cross
+  #   ----|----  :equal_cross (always perfectly divided through the center)
   #    3  | 2
   #  
-  #       | 1
-  #    0  |----  :right_t
-  #       | 2
   #
-  # should be an arbitrary cross layout
+  #    0  | 1
+  #   ----|----  :cross (height of [0, 1], [2,3] same, width of [0,1], [2,3] same, otherwise variable (i.e. height(0) != height(3))
+  #       | 
+  #    3  | 2
+  # 
   #    0  |  1
   #       |
-  #   ---------  :offset_cross //does not match current code
+  #   ---------  :horizontal_offset_cross // NOT CURRENTLY IMPLEMENTED
   #    3   | 2
   #
+  #
   #    0  |  1
   #       |____
-  #   ----|      :offset_cross // matches current code
+  #   ----|      :vertical_offset_cross // matches current code !! 
   #    3  |  2
   #
+  #       | 1
+  #    0  |----  :right_t
+  #       | 2
   #        0
   #    --------  :horizontal_split
   #        1
@@ -53,9 +59,10 @@ module SqedConfig
 
   # Hash values are used to stub out
   # the Sqed::Boundaries instance.
+  # TODO: deprecate for simpler breakdown (cross, split, t)
   LAYOUTS = {
     cross: [0,1,2,3],
-    offset_cross: [0,1,2,3],
+    vertical_offset_cross: [0,1,2,3], 
     horizontal_split: [0,1],
     vertical_split: [0,1],
     right_t: [0,1,2],
@@ -91,9 +98,9 @@ module SqedConfig
       layout: :right_t,
       metadata_map: {0 => :annotated_specimen, 1 => :identifier, 2 =>:image_registration }
     },
-    offset_cross: {
+    vertical_offset_cross: {
       boundary_finder: Sqed::BoundaryFinder::ColorLineFinder,
-      layout: :offset_cross,
+      layout: :vertical_offset_cross,
       metadata_map: {0 => :curator_metadata, 1 => :identifier, 2 => :image_registration, 3 => :specimen }
      # metadata_map: {0 => :annotated_specimen, 1 => :identifier, 2 =>:image_registration }
     },

data/spec/lib/sqed/boundaries_spec.rb

@@ -33,7 +33,7 @@ describe Sqed::Boundaries do
   end
 
   context '#offset' do
-    let(:s) { Sqed.new(image: ImageHelpers.crossy_green_line_specimen, pattern: :offset_cross) }
+    let(:s) { Sqed.new(image: ImageHelpers.crossy_green_line_specimen, pattern: :vertical_offset_cross) }
     let(:offset_boundaries) { 
       s.crop_image
       s.boundaries.offset(s.stage_boundary) 

data/spec/lib/sqed/boundary_finder/color_line_finder_spec.rb

@@ -10,12 +10,12 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
   
   let(:e) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :right_t) }
   let(:f) { e.boundaries }
-  let(:g) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :offset_cross)}
+  let(:g) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :vertical_offset_cross)}
   let(:h) { g.boundaries }
   let(:gv) { Sqed::BoundaryFinder::ColorLineFinder.new(image: d, layout: :vertical_split) }
   let(:hv) { gv.boundaries }
  
-  let(:ah) { ImageHelpers.offset_cross_red }
+  let(:ah) { ImageHelpers.vertical_offset_cross_red }
   let(:bh) { Sqed::BoundaryFinder::StageFinder.new(image: ah) }
   let(:ch) { bh.boundaries }
   let(:dh) { ah.crop(*ch.for(0), true) }
@@ -26,7 +26,7 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
   let(:bbs) { Sqed::BoundaryFinder::StageFinder.new(image: ibs) } 
   let(:cbs) { bbs.boundaries }
   let(:dbs) { ibs.crop(*cbs.for(0), true) }
-  let(:gbs) { Sqed::BoundaryFinder::ColorLineFinder.new(image: dbs, layout: :offset_cross) }
+  let(:gbs) { Sqed::BoundaryFinder::ColorLineFinder.new(image: dbs, layout: :vertical_offset_cross) }
   let(:hbs) { gbs.boundaries }
 
   specify 'initial image columns are as expected for :image above' do
@@ -51,7 +51,7 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
 
   specify "CrossGreenLinesSpecimen using right_t layout should yield 3 rectangular boundaries" do
     # use the f object for right_t
-    f.each do |i, coord| 
+    f.each do |i, coord|
       q = d.crop(*coord, true)
       q.write("tmp/q0#{i}.jpg")
     end
@@ -75,7 +75,7 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
     expect(f.height_for(2)).to be_within(pct*964).of(964)
   end
 
-  specify "CrossGreenLinesSpecimen using offset_cross layout should yield 4 rectangular boundaries" do
+  specify "CrossGreenLinesSpecimen using vertical_offset_cross layout should yield 4 rectangular boundaries" do
     h.each do |i, coord|
       q = d.crop(*coord, true)
       q.write("tmp/q1#{i}.jpg")
@@ -124,7 +124,7 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
     expect(hv.height_for(1)).to be_within(0.02*1990).of(1990)
   end
 
-  specify "boundary_offset_cross_red using horizontal_split layout should yield 2 rectangular boundaries" do
+  specify "boundary_vertical_offset_cross_red using horizontal_split layout should yield 2 rectangular boundaries" do
     hh.each do |k, v|
       q = dh.crop(*v, true)
       q.write("tmp/q3#{k}.jpg")
@@ -164,4 +164,48 @@ describe Sqed::BoundaryFinder::ColorLineFinder do
     expect(hbs.height_for(3)).to be_within(0.02*1677).of(1677)
   end
 
+  context 'thumbnail processing finds reasonable boundaries' do
+
+    let(:thumb) { ImageHelpers.frost_stage_thumb  }
+    let(:finder) { Sqed::BoundaryFinder::ColorLineFinder.new(image: thumb, layout: :cross)}
+    let(:finder_boundaries) { finder.boundaries }
+
+    let(:pct)  { 0.08 }
+
+    before {
+      finder.boundaries.each do |i, coord|
+     #  q = thumb.crop(*coord, true)
+     #  q.write("tmp/thumb#{i}.jpg")
+      end
+    }
+
+    specify "for section 0" do
+      expect(finder_boundaries.x_for(0)).to be_within(pct*thumb.columns).of(0)
+      expect(finder_boundaries.y_for(0)).to be_within(pct*0).of(0)
+      expect(finder_boundaries.width_for(0)).to be_within(pct*66).of(66)
+      expect(finder_boundaries.height_for(0)).to be_within(pct*13).of(13)
+    end
+
+    specify 'for section 1' do
+      expect(finder_boundaries.x_for(1)).to be_within(pct*69).of(69)
+      expect(finder_boundaries.y_for(1)).to be_within(pct*0).of(0)
+      expect(finder_boundaries.width_for(1)).to be_within(pct*32).of(32)
+      expect(finder_boundaries.height_for(1)).to be_within(pct*14).of(14)
+    end
+
+    specify 'for section 2' do
+      expect(finder_boundaries.x_for(2)).to be_within(pct*69).of(69)
+      expect(finder_boundaries.y_for(2)).to be_within(pct*17).of(17)
+      expect(finder_boundaries.width_for(2)).to be_within(pct*32).of(32)
+      expect(finder_boundaries.height_for(2)).to be_within(pct*59).of(59)
+    end
+
+    specify 'for section 3' do
+      expect(finder_boundaries.x_for(3)).to be_within(0).of(0)
+      expect(finder_boundaries.y_for(3)).to be_within(pct*17).of(17)
+      expect(finder_boundaries.width_for(3)).to be_within(pct*65).of(65)
+      expect(finder_boundaries.height_for(3)).to be_within(pct*59).of(59)
+    end
+
+  end
 end

data/spec/lib/sqed/boundary_finder_spec.rb

@@ -7,7 +7,7 @@ describe Sqed::BoundaryFinder do
   end
 
   context 'when initiated with an image' do
-    let(:b) {Sqed::BoundaryFinder.new(image: ImageHelpers.standard_cross_green, layout: :offset_cross)}
+    let(:b) {Sqed::BoundaryFinder.new(image: ImageHelpers.standard_cross_green, layout: :vertical_offset_cross)}
 
     context 'attributes' do
       specify '#img' do
@@ -20,75 +20,79 @@ describe Sqed::BoundaryFinder do
     end
   end
 
-  context '.color_boundary_finder(image: image, sample_subdivision: 10)' do
-    specify 'finds the vertical dividing line in a standard cross, with border still present' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green)[1]
-      expect(center).to be > 492
-      expect(center).to be < 504
-    end
-
-    specify 'finds the vertical dividing line in a standard cross, with border still present, when more precise' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green, sample_cutoff_factor: 0.7)[1]
-      expect(center).to be > 492
-      expect(center).to be < 504
+  context '.color_boundary_finder(image: image)' do
+    context 'with sample_subdivision_size: 10' do
+      specify 'finds the vertical dividing line in a standard cross, with border still present' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green, sample_subdivision_size: 10 )[1]
+        expect(center).to be > 492
+        expect(center).to be < 504
+      end
+      
+      specify 'finds the vertical dividing line in a right t green cross, with border still present' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.right_t_green, sample_subdivision_size: 10)[1]
+        expect(center).to be > 695
+        expect(center).to be < 705 
+      end
     end
 
-    specify 'finds the vertical dividing line in a right t green cross, with border still present' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.right_t_green)[1]
-      expect(center).to be > 695
-      expect(center).to be < 705 
-    end
+    context 'with sample_subdivision_size auto set' do
+      specify 'finds the vertical dividing line in a standard cross, with border still present, when more precise' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green, sample_cutoff_factor: 0.7)[1]
+        expect(center).to be > 492
+        expect(center).to be < 504
+      end
 
-    specify 'finds the vertical dividing line a real image, with border still present' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen)[1]
-      expect(center).to be > 2452
-      expect(center).to be < 2495 
-    end
+      specify 'finds the vertical dividing line a real image, with border still present' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen)[1]
+        expect(center).to be > 2452
+        expect(center).to be < 2495 
+      end
 
-    specify 'finds the vertical dividing line a real image, with border still present, with 10x fewer subsamples' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 100 )[1]
-      expect(center).to be > 2452
-      expect(center).to be < 2495 
-    end
+      specify 'finds the vertical dividing line a real image, with border still present, with 10x fewer subsamples' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 100 )[1]
+        expect(center).to be > 2452
+        expect(center).to be < 2495 
+      end
 
-    specify 'finds the vertical dividing line a real image, with border still present, with 50x fewer subsamples' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 500 )[1]
-      expect(center).to be > 2452
-      expect(center).to be < 2495 
-    end
+      specify 'finds the vertical dividing line a real image, with border still present, with 50x fewer subsamples' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 500 )[1]
+        expect(center).to be > 2452
+        expect(center).to be < 2495 
+      end
 
-    specify 'FAILS to find the vertical dividing line a real image, with border still present, with 200x fewer subsamples' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
-      expect(center).to be nil
-    end
+      specify 'FAILS to find the vertical dividing line a real image, with border still present, with 200x fewer subsamples' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
+        expect(center).to be nil
+      end
 
-    specify 'finds the vertical dividing line another real image, with border still present' do
-      center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image)[1]
-      expect(center).to be > 2445
-      expect(center).to be < 2495
-    end
+      specify 'finds the vertical dividing line another real image, with border still present' do
+        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image)[1]
+        expect(center).to be > 2445
+        expect(center).to be < 2495
+      end
 
-    specify 'finds the vertical dividing line another real image, with border still present, and 20x fewer subsamples' do
-      center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 200)[1]
-      expect(center).to be > 2445
-      expect(center).to be < 2495
-    end
+      specify 'finds the vertical dividing line another real image, with border still present, and 20x fewer subsamples' do
+        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 200)[1]
+        expect(center).to be > 2445
+        expect(center).to be < 2495
+      end
 
-    specify 'finds the vertical dividing line another real image, with border still present, and 50x fewer subsamples' do
-      center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 500)[1]
-      expect(center).to be > 2445
-      expect(center).to be < 2495
-    end
+      specify 'finds the vertical dividing line another real image, with border still present, and 50x fewer subsamples' do
+        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, sample_subdivision_size: 500)[1]
+        expect(center).to be > 2445
+        expect(center).to be < 2495
+      end
 
-    specify 'FAILS to find the vertical dividing line in a standard cross, with border still present, when even more precise' do
-      center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green, sample_cutoff_factor: 1)
-      expect(center).to be nil
-    end
+      specify 'FAILS to find the vertical dividing line in a standard cross, with border still present, when even more precise' do
+        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.standard_cross_green, sample_cutoff_factor: 1)
+        expect(center).to be nil
+      end
 
-    specify 'finds the horizontal dividing line another real image, with border still present' do
-      center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, scan: :columns)[1]
-      expect(center).to be > 1282
-      expect(center).to be < 1332 
+      specify 'finds the horizontal dividing line another real image, with border still present' do
+        center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image, scan: :columns)[1]
+        expect(center).to be > 1282
+        expect(center).to be < 1332 
+      end
     end
 
   end
@@ -107,7 +111,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from crossy_black_line_specimen image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.crossy_black_line_specimen, pattern: :offset_cross, boundary_color: :black)
+      @s = Sqed.new(image: ImageHelpers.crossy_black_line_specimen, pattern: :vertical_offset_cross, boundary_color: :black)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
       true
@@ -136,7 +140,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from black_green_line_specimen image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.black_stage_green_line_specimen, pattern: :offset_cross)
+      @s = Sqed.new(image: ImageHelpers.black_stage_green_line_specimen, pattern: :vertical_offset_cross)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
       true 
@@ -164,7 +168,7 @@ describe Sqed::BoundaryFinder do
 
   context 'offset boundaries from original red_line image ' do
     before(:all) {
-      @s = Sqed.new(image: ImageHelpers.offset_cross_red, pattern: :right_t, boundary_color: :red)
+      @s = Sqed.new(image: ImageHelpers.vertical_offset_cross_red, pattern: :right_t, boundary_color: :red)
       @s.crop_image
       @offset_boundaries = @s.boundaries.offset(@s.stage_boundary)
     }

data/spec/lib/sqed_spec.rb

@@ -69,7 +69,7 @@ describe Sqed do
 
   context 'all together' do
     let(:image) { ImageHelpers.frost_stage }
-    let(:pattern) { :offset_cross }
+    let(:pattern) { :vertical_offset_cross }
     let(:s) { Sqed.new(image: image, pattern: pattern) }
 
     specify '#boundaries returns a Sqed::Boundaries instance' do

data/spec/support/image_helpers.rb

@@ -23,6 +23,16 @@ module ImageHelpers
       get_image 'stage_images/frost_stage.jpg'
     end
 
+    def frost_stage_thumb
+      get_image 'stage_images/frost_stage_thumb.jpg'
+    end
+
+    def frost_stage_medimum
+      get_image 'stage_images/frost_stage_medimum.jpg'
+    end
+
+
+
     def crossy_green_line_specimen
       get_image 'stage_images/CrossyGreenLinesSpecimen.jpg'
     end
@@ -35,7 +45,7 @@ module ImageHelpers
       get_image 'stage_images/black_stage_green_line_specimen.jpg'
     end
 
-    def offset_cross_red
+    def vertical_offset_cross_red
       get_image 'stage_images/boundary_offset_cross_red.jpg'
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqed
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -194,6 +194,8 @@ files:
 - spec/support/files/stage_images/boundary_offset_cross_red.jpg
 - spec/support/files/stage_images/boundary_right_t_green.jpg
 - spec/support/files/stage_images/frost_stage.jpg
+- spec/support/files/stage_images/frost_stage_medium.jpg
+- spec/support/files/stage_images/frost_stage_thumb.jpg
 - spec/support/files/stage_images/greenlineimage.jpg
 - spec/support/files/test0.jpg
 - spec/support/files/test1.jpg
@@ -258,6 +260,8 @@ test_files:
 - spec/support/files/stage_images/boundary_offset_cross_red.jpg
 - spec/support/files/stage_images/boundary_right_t_green.jpg
 - spec/support/files/stage_images/frost_stage.jpg
+- spec/support/files/stage_images/frost_stage_medium.jpg
+- spec/support/files/stage_images/frost_stage_thumb.jpg
 - spec/support/files/stage_images/greenlineimage.jpg
 - spec/support/files/test0.jpg
 - spec/support/files/test1.jpg