sqed 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 639226420485cffa59f748b6c0e5c66db21b239e
-  data.tar.gz: 425bd2c26e16339e4ef7b61b605f90bf2efb42db
+  metadata.gz: e5f4d8affdf54fbd1921fd0d0ab561017a8f4afc
+  data.tar.gz: 1faccf4ba6649eaceb6a4c4aadc0a4eb21efb574
 SHA512:
-  metadata.gz: 0b40ba1db0b861fb88769d99997c840931f916dacd1731b0f321828c54fbe033e552c879298a0e2a5057b3859a534487c298e8870fbd4ea7316b3351e95a4504
-  data.tar.gz: 7bd37213c089d409778291ad30aa63c5c65a0ebdd10a311ed376388b9eddc2134da234b788600b7d4213042c6290ccb88a120969d5de08aed9571cd9d5c2a2f6
+  metadata.gz: 1cd78f97cf39d56ddbee8ef065e7a2cc8a5fe4ca6cd318e966cb1e50afc9a3b24291361216de4223a946e8e5fef3ea379fd8675c3aae69f1aa969b7e6975e6d4
+  data.tar.gz: 7f7b7f8d30d060f889080733e49dce6d34af01e190cf6ab33e21955f01d0dd55ac31f6f365bb2888ff8a732db41ba3d44fb0a3260fae9b9f86e36b57ea3f5c3c

data/lib/sqed/boundary_finder.rb

@@ -4,6 +4,7 @@
 class Sqed::BoundaryFinder
 
   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) 
 
   # the passed image
   attr_reader :img
@@ -161,15 +162,15 @@ class Sqed::BoundaryFinder
   end
 
   def self.is_green?(pixel)
-    (pixel.green > pixel.red*1.2) && (pixel.green > pixel.blue*1.2)  
+    (pixel.green > pixel.red*COLOR_DELTA) && (pixel.green > pixel.blue*COLOR_DELTA)  
   end
 
   def self.is_blue?(pixel)
-    (pixel.blue > pixel.red*1.2) && (pixel.blue > pixel.green*1.2)   
+    (pixel.blue > pixel.red*COLOR_DELTA) && (pixel.blue > pixel.green*COLOR_DELTA)   
   end
 
   def self.is_red?(pixel)
-    (pixel.red > pixel.blue*1.2) && (pixel.red > pixel.green*1.2)   
+    (pixel.red > pixel.blue*COLOR_DELTA) && (pixel.red > pixel.green*COLOR_DELTA)   
   end
 
   def self.is_black?(pixel)
@@ -210,6 +211,32 @@ class Sqed::BoundaryFinder
     [hit_ranges.first, hit_ranges[(hit_ranges.length / 2).to_i], hit_ranges.last]
   end
 
+  # @return [Array] 
+  #  like [0,1,2]
+  # If median-min or max-median * width_factor are different from one another (by more than width_factor) then replace the larger wth the median +/- 1/2 the smaller
+  # Given [10, 12, 20] and width_factor 2 the result will be [10, 12, 13]  
+  #
+  def corrected_frequency(frequency_stats, width_factor = 3.0 )
+    v0 = frequency_stats[0]
+    m = frequency_stats[1]
+    v2 = frequency_stats[2]
+
+    a = m - v0 
+    b = v2 - m 
+
+    largest = (a > b ? a : b)
+
+    if a * width_factor > largest
+      [(m - (v2 - m)/2).to_i, m, v2]
+    elsif b * width_factor > largest
+      [ v0, m, (m + (m - v0)/2).to_i ]
+    else
+      frequency_stats
+    end
+  end
+
+
+
   # Returns an Integer, the maximum of the pairwise differences of the values in the array
   # For example, given
   #   [1,2,3,9,6,2,0]

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -32,17 +32,17 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       right_top_img = img.crop( left_right_split[2], 0, img.columns - left_right_split[2], top_bottom_split[0] , true) # sections 1,2
       right_bottom_img = img.crop(left_right_split[2], top_bottom_split[2], img.columns - left_right_split[2], img.rows - top_bottom_split[2], true)  # sections 3,4,5
 
-      right_top_split = Sqed::BoundaryFinder.color_boundary_finder(image: right_top_img, boundary_color: @boundary_color) # vertical line b/w 1 & 2                   
-      
-      boundaries.set(1, [left_right_split[2], 0, left_right_split[2] + right_top_split[0], top_bottom_split[0] ])
+      right_top_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_top_img, boundary_color: @boundary_color)) # 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_img.columns - right_top_split[2], top_bottom_split[0] ]   )  
 
-      right_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_img, scan: :columns, sample_subdivision_size: 2, boundary_color: @boundary_color) # horizontal line b/w (5,3) & 4 
+      right_bottom_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_img, scan: :columns, sample_subdivision_size: 2, boundary_color: @boundary_color)) # horizontal line b/w (5,3) & 4, use "corrected_frequency" to account for color bleed from previous crop
       
-      bottom_right_top_img = right_bottom_img.crop(0,0, img.columns - left_right_split[2], right_bottom_split[1], true) # 3,5 - we leave right_bottom_split at [1] (not 2) to take into account possible overlap error (crop gets full line at top of image)
+      bottom_right_top_img = right_bottom_img.crop(0,0, img.columns - left_right_split[2], right_bottom_split[2], true) # 3,5 
 
       boundaries.set(3, [ left_right_split[2] + right_top_split[2], top_bottom_split[2], left_right_split[2] + right_top_split[2], bottom_right_top_img.rows ] )   
-      boundaries.set(5, [ left_right_split[2], top_bottom_split[2], left_right_split[2] + right_top_split[0], bottom_right_top_img.rows ] )
+      boundaries.set(5, [ left_right_split[2], top_bottom_split[2], right_top_split[0], bottom_right_top_img.rows ] )
       
       boundaries.set(4, [ left_right_split[2], top_bottom_split[2] + right_top_split[2], img.columns - left_right_split[2],  right_bottom_img.rows - right_top_split[2] ] ) 
 

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqed
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake