sqed 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97003b6e21e84313180a638df393052b18a7eb25
-  data.tar.gz: e125134f5ed864b06fd4b8280228261e7d1eac40
+  metadata.gz: d47942c64d4e9dfee4eefdb864de8b537aad0166
+  data.tar.gz: e6a282b0b85f83615315c291bf2cbf66fe26b15c
 SHA512:
-  metadata.gz: cd0e7287ef11ba6fef8784be32c24898784125dde881e2b8082b15d1f19a5995c55e434924057f2bdd8ef27419a51b9e118351f20ebbff594b9a7d7e4f500a6b
-  data.tar.gz: 2e87fa5f7e6cd1bb0f5db13158e6c5e41e812a547cd2f90f44ce5104de8105d6595a60c86a2794ff5804615a5a5659da51c9daaed5ede8236661d0a85fb39c0b
+  metadata.gz: e53e4bbc42260cd2723eaa4ef917a2f8b1c99b8947bb3af3675beeffcee07ad6567c753a601a38b82e0ae86d27e103bd6b06de06d8517d38394b228dc606c64b
+  data.tar.gz: 861e69ad4e87e8e7261f3020f4d9aef5c1ce1a2bf3962dae1ac4eef898ac5ddf27f85d3a53c3a448e04bd401305be79c5a014a0f5f9b099ea9f8fb94b1f23261

data/.travis.yml

@@ -2,7 +2,7 @@
 #bundler_args: --without development
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.4.3
 #before_install:
 #  - sudo add-apt-repository -y ppa:moti-p/cc
 #  - sudo apt-get update

data/lib/sqed/boundary_finder.rb

@@ -223,19 +223,44 @@ class Sqed
     end
 
     # @return [Array]
-    #  like [0,1,2]
+    #    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)
+    def corrected_frequency(frequency_stats, width_factor = 3.0, max_width = nil)
       v0 = frequency_stats[0]
       m = frequency_stats[1]
       v2 = frequency_stats[2]
 
-      a = m - v0
-      b = v2 - m
+      width_pct = nil
 
-      largest = (a > b ? a : b)
+      # If the width of the detected line is > 5 percent then
+      # assume the center is good measure, and use an arbitrary percentage width.
+      if !max_width.nil?
+        width_pct = (v2 - v0).to_f / max_width.to_f
+      end
+
+      if !width_pct.nil? && width_pct >= 0.05
+        half_width = max_width * 0.025
+        z = [m - half_width, m, m + half_width]
+        return z
+      end
+
+      #  a = m - v0
+      #  b = v2 - m
+
+      #  largest = (a > b ? a : b)
+
+      #  c = a * width_factor
+      #  d = b * width_factor
+
+      #  if c > largest || d > largest
+      #    e = c > largest ? ((m - b) / 2).to_i : v0
+      #    f = d > largest ? ((m + a) / 2).to_i : v2
+      #    [e, m, f]
+      #  else
+      #    frequency_stats
+      #  end
 
       if a * width_factor > largest
         [(m - (v2 - m) / 2).to_i, m, v2]

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -41,19 +41,18 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       right_top_image = image.crop( left_right_split[2], 0, image.columns - left_right_split[2], top_bottom_split[0] , true) # sections 1,2
       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 = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_top_image, boundary_color: boundary_color)) # vertical line b/w 1 & 2, use "corrected_frequency" to account for color bleed from previous crop
+      right_top_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_top_image, boundary_color: boundary_color), 1.8, 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(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 = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_image, 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
+      right_bottom_split = corrected_frequency(Sqed::BoundaryFinder.color_boundary_finder(image: right_bottom_image, scan: :columns, sample_subdivision_size: 2, boundary_color: boundary_color), 1.8, 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
 
-      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_image.rows ])
-      boundaries.set(5, [ left_right_split[2], top_bottom_split[2], right_top_split[0], bottom_right_top_image.rows])
+      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_image.rows ])
+      boundaries.set(5, [left_right_split[2], top_bottom_split[2], right_top_split[0], bottom_right_top_image.rows])
 
-      # ! not high enough
       boundaries.set(4, [left_right_split[2], top_bottom_split[2] + right_bottom_split[2], image.columns - left_right_split[2], right_bottom_image.rows ])
 
     when :vertical_split 

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/lib/stage_handling/seven_slot_spec.rb

@@ -36,7 +36,7 @@ describe 'handling 7 slot stages' do
 
     specify 'boundaries are reasonable' do
       s.result
-      c = s.boundaries.coordinates 
+      c = s.boundaries.coordinates
       c.each do |section, values|
         c[section].each_with_index do |v, i|
           msg = "section #{section}, index #{i} has a bad value '#{v}'"
@@ -49,9 +49,10 @@ describe 'handling 7 slot stages' do
   context 'trickier boundaries - with_thumbnail' do
     let(:s) { Sqed.new(image: ImageHelpers.inhs_stage_7_slot2, use_thumbnail: true, pattern: :seven_slot, boundary_color: :red, has_border: false ) }
 
+
     specify 'boundaries are reasonable' do
       s.result
-      c = s.boundaries.coordinates 
+      c = s.boundaries.coordinates
       c.each do |section, values|
         c[section].each_with_index do |v, i|
           msg = "section #{section}, index #{i} has a bad value '#{v}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqed
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake