panomosity 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a840caab3ec6ccf1d6ac9a815037041c2b9b8fa5fb241185f8e5f7fac47371
-  data.tar.gz: 1abc680b6613331381b61047072df57f30242f188bea2e0ba4be1eb433065966
+  metadata.gz: ccef3c9690bcf25e476c65a9f25ef883049ccb26f98695dc58a7b0b8bdf5f868
+  data.tar.gz: e31c54fb190df4d63892dff79b6ccfae9e233cf63b6aae8ade8ad05c983299a6
 SHA512:
-  metadata.gz: 3828862db188158ee5e1101cdff98649c2e90ef9d314f6e370a2ca0d6743b7da88cf9c87571205d554142dae69dd29bfa32eb25ebf68ade0333443673b49d282
-  data.tar.gz: c076ec3e926bfe49972868766660bfe9d72d5fdcc81441943da4a8d5f29eaffc8f57909d142049b523ad1dc054b128aa6dc0a334e877291adc8df369db684afb
+  metadata.gz: 4921ab8f4d713a3e92ba8bab50a8ae3412e05ac7dabe7deb1344fc46434c1064f3fae845e2219f5888deebd87be050c1a9e71566cd92998aa2bd7d704d051954
+  data.tar.gz: b48fdc2849592a0015efa842080b49ede5dadb48ef0a394c9d8a0ffe2e9f30ce6705717ed7abf2d11d3bfabdf42a4810507b0467eae81727a4bbb87ac22a2e06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panomosity (0.1.29)
+    panomosity (0.1.30)
 
 GEM
   remote: https://rubygems.org/

data/lib/panomosity/control_point.rb

@@ -4,7 +4,7 @@
 module Panomosity
   class ControlPoint
     @@attributes = %i(n N x y X Y t g)
-    @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2)
+    @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2 roll)
 
     def self.parse(pto_file, cp_type: nil, compact: false)
       @control_points = pto_file.each_line.map do |line|
@@ -66,12 +66,18 @@ module Panomosity
         cp.pdist = Math.sqrt(cp.px ** 2 + cp.py ** 2)
 
         # pixel distance including roll
+        cp.conn_type = image1.column == image2.column ? :vertical : :horizontal
         r = image1.r * Math::PI / 180
+
+        if cp.conn_type == :horizontal
+          cp.roll = Math.atan(-(cp.y2 - cp.y1) / (cp.x2 - cp.x1)) * 180.0 / Math::PI
+        else
+          cp.roll = Math.atan((cp.x2 - cp.x1) / (cp.y2 - cp.y1)) * 180.0 / Math::PI
+        end
         cp.prx = image1.d - image2.d + Math.cos(r) * (cp.x2 - cp.x1) - Math.sin(r) * (cp.y2 - cp.y1)
-        cp.pry = image1.e - image2.e + Math.cos(r) * (cp.y2 - cp.y1) - Math.sin(r) * (cp.x2 - cp.x1)
+        cp.pry = image1.e - image2.e + Math.cos(r) * (cp.y2 - cp.y1) + Math.sin(r) * (cp.x2 - cp.x1)
         cp.prdist = Math.sqrt(cp.prx ** 2 + cp.pry ** 2)
 
-        cp.conn_type = image1.column == image2.column ? :vertical : :horizontal
         cp.i1 = image1
         cp.i2 = image2
       end
@@ -189,6 +195,11 @@ module Panomosity
       self.prx = i1.d - i2.d + Math.cos(r) * (x2 - x1) - Math.sin(r) * (y2 - y1)
       self.pry = i1.e - i2.e + Math.cos(r) * (y2 - y1) - Math.sin(r) * (x2 - x1)
       self.prdist = Math.sqrt(prx ** 2 + pry ** 2)
+      if conn_type == :horizontal
+        self.roll = Math.atan(-(y2 - y1) / (x2 - x1)) * 180.0 / Math::PI
+      else
+        self.roll = Math.atan((x2 - x1) / (y2 - y1)) * 180.0 / Math::PI
+      end
     end
 
     def detailed_info

data/lib/panomosity/neighborhood_group.rb

@@ -6,7 +6,7 @@ module Panomosity
     extend Panomosity::Utils
 
     attr_accessor :center, :total_neighborhoods, :neighborhoods, :control_points, :prdist_avg, :prdist_std, :x_avg,
-                  :y_avg
+                  :rx_avg, :y_avg, :ry_avg
 
     class << self
       attr_accessor :logger
@@ -81,10 +81,7 @@ module Panomosity
       end
 
       neighborhood_groups.max_by(5) { |ng| ng.control_points.count }.each do |ng|
-        logger.debug "#{ng.prdist_avg} #{ng.prdist_std} #{ng.control_points.count} x#{ng.x_avg} y#{ng.y_avg}"
-        logger.debug "#{calculate_average(values: ng.control_points.map(&:pdist))} x#{calculate_average(values: ng.control_points.map(&:px))} y#{calculate_average(values: ng.control_points.map(&:py))}"
-
-        ng.control_points.each { |point| logger.debug point.detailed_info }
+        logger.debug "#{ng.prdist_avg} #{ng.prdist_std} #{ng.control_points.count} x#{ng.x_avg} y#{ng.y_avg} rx#{ng.rx_avg} ry#{ng.ry_avg}"
       end
 
       self.neighborhood_groups = neighborhood_groups.sort_by { |ng| -ng.control_points.count }
@@ -103,9 +100,10 @@ module Panomosity
       @neighborhoods = total_neighborhoods.select { |n| (n.prdist_avg - center.prdist_avg).abs <= center.prdist_std }
       @control_points = neighborhoods.map(&:control_points_within_std).flatten.uniq(&:raw)
       @x_avg = calculate_average(values: control_points.map(&:px))
+      @rx_avg = calculate_average(values: control_points.map(&:prx))
       @y_avg = calculate_average(values: control_points.map(&:py))
-      @prdist_avg = center.prdist_avg
-      @prdist_std = center.prdist_std
+      @ry_avg = calculate_average(values: control_points.map(&:pry))
+      @prdist_avg, @prdist_std = *calculate_average_and_std(values: control_points.map(&:prdist))
       self
     end
 

data/lib/panomosity/optimizer.rb

@@ -90,6 +90,15 @@ module Panomosity
         return
       end
 
+      roll = calculate_estimated_roll
+      if roll
+        logger.debug "using calculated horizontal roll #{roll}"
+        images.each do |image|
+          image.r = roll
+        end
+        return
+      end
+
       # we grab the top 5 neighborhood groups and get the average distance for them and average that
       dist_avg = calculate_average_distance
 
@@ -143,5 +152,26 @@ module Panomosity
       panorama.control_points = ControlPoint.calculate_distances(panorama.images, panorama.variable)
       calculate_average_distance
     end
+
+    def calculate_estimated_roll
+      return
+      # setting to 0
+      images.each do |image|
+        image.r = 0.0
+      end
+      Pair.calculate_neighborhoods(panorama)
+      Pair.calculate_neighborhood_groups
+      cps = NeighborhoodGroup.horizontal.first.control_points
+      avg, std = *calculate_average_and_std(values: cps.map(&:roll))
+      # 0.1 degrees of std
+      while std > 0.1
+        cps.select!{|c| (avg - c.roll).abs <= std}
+        avg, std = *calculate_average_and_std(values: cps.map(&:roll))
+      end
+      avg
+    rescue
+      logger.debug 'estimating roll failed'
+      nil
+    end
   end
 end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.30'
+  VERSION = '0.1.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler