panomosity 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d7d65793e972cbf9d8367f1530b60910163841a24a5517bbfea254a21e0a583c
-  data.tar.gz: cac1ed82d1567b8b0ede45b4697dd273d9383d1f951ee5eace80b95734d7e1f5
+SHA1:
+  metadata.gz: 7c4ae12aafbe71dafef734aa8d3cf7135e6b621f
+  data.tar.gz: 75f253b42482a6320150ef4021470892ffcef765
 SHA512:
-  metadata.gz: 8476d6c4ef2615c878b18232b929828ac03db88d133c654b9b04104db64ef370e5c13feb5f47573f8513397f612cc48a8c19d3fa551b01e9586c9332bdee68e9
-  data.tar.gz: f411883b85d56232f9b38f67161c80e32d682f56c842d87b1d0b31352c157748065922751f1ce99315e9cf67151c2ff173e09def1c6da8b08f3ca1295aa43d5e
+  metadata.gz: 70e0a23cd375a3448ddbf5ad079eb9d00c8919560151e2ac8e3b6109a28a9be1717bbc075c285c00fc2eff30e60bf7a4be5dd66dc99b354051868d843034d17a
+  data.tar.gz: 67e15c8220e398c9f1b556bac173bcbcc17b8f042b543d707e1c1169f038cc3000f2a95e29be60784b6739ff04e62491574c4ebbed6ad001bbd90ba8280a0ae1

data/lib/panomosity/runner.rb

@@ -100,7 +100,7 @@ module Panomosity
         average_y, y_std = *calculate_average_and_std(name: :y, values: cps.map(&:py))
 
         max_removal = ((@options[:max_removal] || 0.2) * cps.count).floor
-        min_cps = 10
+        min_cps = 8
         max_iterations = 10
         iterations = 0
         bad_cps = cps.select { |cp| (cp.px - average_x).abs >= x_std || (cp.py - average_y).abs >= y_std }
@@ -322,7 +322,10 @@ module Panomosity
       logger.info unconnected_image_pairs.map { |i| { type: i[:type], pair: i[:pair].map(&:id) } }
 
       logger.info 'finding control points with unrealistic distances (<1)'
-      fake_control_points = control_points.select { |cp| cp.pdist <= 1.0 }
+      bad_control_points = control_points.select { |cp| cp.pdist <= 1.0 }
+      logger.info 'adding pairs that have do not have enough control points (<3)'
+      changing_control_points_pairs = control_points.group_by { |cp| [cp.n1, cp.n2] }.select { |_, cps| cps.count < 3 }
+      changed_pairs = []
 
       logger.info 'writing new control points'
       control_point_lines_started = false
@@ -374,9 +377,11 @@ module Panomosity
           end
         else
           control_point_lines_started = true
-          fake_control_point = fake_control_points.find { |cp| cp.raw == line }
-          if fake_control_point
-            if fake_control_point.conn_type == :horizontal
+          bad_control_point = bad_control_points.find { |cp| cp.raw == line }
+          changing_control_point_pair = changing_control_points_pairs.find { |_, cps| cps.find { |cp| cp.raw == line } }
+
+          if bad_control_point
+            if bad_control_point.conn_type == :horizontal
               control_point = horizontal_control_points_of_pair.first
             else
               control_point = vertical_control_points_of_pair.first
@@ -388,8 +393,8 @@ module Panomosity
             x1 = x_diff <= 0 ? -x_diff + 15 : 0
             y1 = y_diff <= 0 ? -y_diff + 15 : 0
 
-            control_point[:n] = fake_control_point[:n]
-            control_point[:N] = fake_control_point[:N]
+            control_point[:n] = bad_control_point[:n]
+            control_point[:N] = bad_control_point[:N]
             control_point[:x] = x1
             control_point[:X] = x1 + x_diff
             control_point[:y] = y1
@@ -411,6 +416,44 @@ module Panomosity
               end
               control_point.to_s
             end.join
+          elsif changing_control_point_pair && !changed_pairs.include?(changing_control_point_pair.first)
+            changed_pairs << changing_control_point_pair.first
+            bad_control_point = changing_control_point_pair.last.first
+            if bad_control_point.conn_type == :horizontal
+              control_point = horizontal_control_points_of_pair.first
+            else
+              control_point = vertical_control_points_of_pair.first
+            end
+
+            x_diff = control_point.x2 - control_point.x1
+            y_diff = control_point.y2 - control_point.y1
+
+            x1 = x_diff <= 0 ? -x_diff + 15 : 0
+            y1 = y_diff <= 0 ? -y_diff + 15 : 0
+
+            control_point[:n] = bad_control_point[:n]
+            control_point[:N] = bad_control_point[:N]
+            control_point[:x] = x1
+            control_point[:X] = x1 + x_diff
+            control_point[:y] = y1
+            control_point[:Y] = y1 + y_diff
+
+            logger.debug "adding control points connecting #{control_point.n1} <> #{control_point.n2}"
+            i = images.first
+            3.times.map do
+              if control_point.conn_type == :horizontal
+                control_point[:x] += 5
+                control_point[:X] += 5
+                control_point[:y] += i.h * 0.25
+                control_point[:Y] += i.h * 0.25
+              else
+                control_point[:x] += i.w * 0.25
+                control_point[:X] += i.w * 0.25
+                control_point[:y] += 5
+                control_point[:Y] += 5
+              end
+              control_point.to_s
+            end.join
           else
             next line
           end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Wrapper for the PTO file parsing needed for PanoTools.