panomosity 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3563096b654b51eb403bbfb8df02d93e76ffd022c34b83959722979a75ab1ccd
-  data.tar.gz: f5dd4f89277ad4749a444aa34e436b79d277188d0ee27c269c3db5ca11cf0f64
+  metadata.gz: fb9cd44443d6029de5bf647ded91415c328b0f3b8feb4394229fbb303d95974b
+  data.tar.gz: 97d16176f84f7a169915582dfb28ad46afcbdef45ce832552990851255e86f93
 SHA512:
-  metadata.gz: d2d655b129aca801c982b9f240ecd69331de19026943530470f665c6fc13f6bed42478665cc3ba7fa106ecf0b5230870e377845230cc52ccfd0b9df37de0c916
-  data.tar.gz: b951e009ee77006653f0b6c5e5ad7eff7124e7c467401039a15f0f6f1f496f4480fb27574bbe85f0f7c24145f27a7a7ba2a1ebed87499b5361e231d8a846870e
+  metadata.gz: ed134bb47e7f1f1fb5f51c821c006cc5c7c16635d909ee13b3b0e9cbeafd97e2e1e497b3ac66ec094dd6dcd25783c622e5c74a76888619f0b31ecd371e041958
+  data.tar.gz: 84d9ce2ba7d27d610b6b2a62e6ac2099caecd96532dd37593a78ffe1a970214204180436c136caafd07ea0f1aa22a8578618e08b34da2e6ad4c5c1848873e142

data/Gemfile.lock

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

data/lib/panomosity/neighborhood.rb

@@ -34,8 +34,17 @@ module Panomosity
       @prx_avg, @prx_std = *calculate_average_and_std(values: control_points.map(&:prx), ignore_empty: true)
       @pry_avg, @pry_std = *calculate_average_and_std(values: control_points.map(&:pry), ignore_empty: true)
 
-      # add in control points that have similar distances (within std)
-      @control_points_within_std = pair_control_points.select { |c| c.prdist.between?(center.prdist - prdist_std, center.prdist + prdist_std) }
+
+      if Pair.panorama.calibration? && @control_points.count == 2
+        # If we are viewing calibration control points we are going to have fewer of them. Increase the standard
+        # deviation so that more control points are included
+        std = prdist_std * 4
+        @control_points_within_std = pair_control_points.select { |c| c.prdist.between?(center.prdist - std, center.prdist + std) }
+      else
+        # add in control points that have similar distances (within std)
+        @control_points_within_std = pair_control_points.select { |c| c.prdist.between?(center.prdist - prdist_std, center.prdist + prdist_std) }
+      end
+
       self
     end
 

data/lib/panomosity/optimizer.rb

@@ -25,7 +25,11 @@ module Panomosity
       end
     end
 
-    def run_position_optimizer
+    def run_position_optimizer(xh_avg: nil, yh_avg: nil, xv_avg: nil, yv_avg: nil)
+      if xh_avg || yh_avg || xv_avg || yv_avg
+        logger.info "applying custom values of xh_avg: #{xh_avg}, yh_avg: #{yh_avg}, xv_avg: #{xv_avg}, yv_avg: #{yv_avg}"
+      end
+
       Pair.calculate_neighborhoods(panorama)
       Pair.calculate_neighborhood_groups
 
@@ -33,8 +37,8 @@ module Panomosity
       es = images.map(&:e).uniq.sort
 
       # get the average error for the best neighborhood group
-      x_avg = NeighborhoodGroup.horizontal.first.x_avg
-      y_avg = NeighborhoodGroup.vertical.first.y_avg
+      x_avg = xh_avg || NeighborhoodGroup.horizontal.first.x_avg
+      y_avg = yv_avg || NeighborhoodGroup.vertical.first.y_avg
 
       # start horizontally
       d_map = {}
@@ -51,8 +55,8 @@ module Panomosity
       logger.debug "created e_map #{e_map}"
 
       # add in the other offset
-      x_avg = NeighborhoodGroup.vertical.first.x_avg
-      y_avg = NeighborhoodGroup.horizontal.first.y_avg
+      x_avg = xv_avg || NeighborhoodGroup.vertical.first.x_avg
+      y_avg = yh_avg || NeighborhoodGroup.horizontal.first.y_avg
 
       de_map = {}
       d_map.each_with_index do |(dk,dv),di|
@@ -73,10 +77,19 @@ module Panomosity
       end
     end
 
-    def run_roll_optimizer
+    def run_roll_optimizer(apply_roll: nil)
       r = images.map(&:r).first
       original_roll = r
       logger.debug "current roll #{r}"
+
+      if apply_roll
+        logger.info "apply rolling custom roll #{apply_roll}"
+        images.each do |image|
+          image.r = apply_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
 

data/lib/panomosity/pair.rb

@@ -8,7 +8,7 @@ module Panomosity
     attr_accessor :pair, :control_points, :neighborhoods, :type
 
     class << self
-      attr_accessor :logger
+      attr_accessor :panorama, :logger
 
       def horizontal
         @horizontal_pairs
@@ -22,8 +22,8 @@ module Panomosity
         @pairs
       end
 
-      def good_control_points_to_keep
-        @pairs.map(&:good_control_points_to_keep).flatten.uniq(&:raw)
+      def good_control_points_to_keep(count: 3)
+        @pairs.map { |pair| pair.good_control_points_to_keep(count: count) }.flatten.uniq(&:raw)
       end
 
       def unconnected

data/lib/panomosity/panorama.rb

@@ -19,8 +19,12 @@ module Panomosity
     end
 
     def clean_control_points
-      Pair.calculate_neighborhoods(self)
-      control_points_to_keep = Pair.good_control_points_to_keep
+      if calibration?
+        Pair.calculate_neighborhoods(self, distance: 30)
+      else
+        Pair.calculate_neighborhoods(self, distance: 100)
+      end
+      control_points_to_keep = Pair.good_control_points_to_keep(count: 2)
       bad_control_points = control_points.reject { |cp| control_points_to_keep.map(&:raw).include?(cp.raw) }
       # far_control_points = control_points.select { |cp| cp.prdist > 50 }
       control_points_to_clean = bad_control_points.uniq(&:raw)
@@ -37,7 +41,11 @@ module Panomosity
     def fix_unconnected_image_pairs
       logger.info 'finding unconnected image pairs'
 
-      Pair.calculate_neighborhoods(self)
+      if calibration?
+        Pair.calculate_neighborhoods(self, distance: 30)
+      else
+        Pair.calculate_neighborhoods(self, distance: 100)
+      end
       Pair.calculate_neighborhood_groups
 
       unconnected_image_pairs = Pair.unconnected
@@ -137,7 +145,7 @@ module Panomosity
       end.join
     end
 
-    def get_neigborhood_info
+    def get_neighborhood_info
       Pair.calculate_neighborhoods(self)
       Pair.calculate_neighborhood_groups
       Pair.info
@@ -282,6 +290,42 @@ module Panomosity
       end
     end
 
+    def create_calibration_report
+      # create a file if one doesn't exist
+      filename = 'calibration_report.json'
+      unless File.file?(filename)
+        logger.info 'creating calibration_report.json since one does not exist'
+        File.open(filename, 'w+') { |f| f.puts '{}' }
+      end
+
+      calibration_report = JSON.parse(File.read(filename))
+
+      if @options[:report_type] == 'position'
+        if calibration?
+          Pair.calculate_neighborhoods(self, distance: 30)
+        else
+          Pair.calculate_neighborhoods(self, distance: 100)
+        end
+        Pair.calculate_neighborhood_groups
+
+        xh_avg = NeighborhoodGroup.horizontal.first.x_avg
+        yh_avg = NeighborhoodGroup.horizontal.first.y_avg
+        xv_avg = NeighborhoodGroup.vertical.first.x_avg
+        yv_avg = NeighborhoodGroup.vertical.first.y_avg
+        calibration_report['position'] = {
+          xh_avg: xh_avg,
+          yh_avg: yh_avg,
+          xv_avg: xv_avg,
+          yv_avg: yv_avg
+        }
+      else
+        calibration_report['roll'] = images.first.r
+      end
+
+      logger.info 'writing calibration_report.json'
+      File.open(filename, 'w+') { |f| f.puts calibration_report.to_json }
+    end
+
     def calibration?
       !!@input.split(/\n/).find { |line| '#panomosity calibration true' }
     end

data/lib/panomosity/runner.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'json'
 
 module Panomosity
   class Runner
@@ -8,11 +9,13 @@ module Panomosity
 
     AVAILABLE_COMMANDS = %w(
       add_calibration_flag
+      apply_calibration_values
       check_position_changes
       clean_control_points
       convert_equaled_image_parameters
       convert_horizontal_lines
       convert_translation_parameters
+      create_calibration_report
       crop_centers
       diagnose
       fix_conversion_errors
@@ -20,7 +23,7 @@ module Panomosity
       generate_border_line_control_points
       get_columns_and_rows
       get_control_point_info
-      get_neigborhood_info
+      get_neighborhood_info
       merge_image_parameters
       nona_grid
       optimize
@@ -64,6 +67,37 @@ module Panomosity
       save_file
     end
 
+    def apply_calibration_values
+      logger.info "applying calibration values from #{@report}"
+      panorama = Panorama.new(@input_file, @options)
+      optimizer = Optimizer.new(panorama)
+      calibration_report = JSON.parse(@report_file)
+
+      if calibration_report.fetch('position')
+        logger.info 'calibration_report.json included position, applying position values'
+        optimizer.run_position_optimizer(xh_avg: calibration_report['position']['xh_avg'],
+                                         yh_avg: calibration_report['position']['yh_avg'],
+                                         xv_avg: calibration_report['position']['xv_avg'],
+                                         yv_avg: calibration_report['position']['yv_avg'])
+      end
+
+      if calibration_report.fetch('roll')
+        logger.info 'calibration_report.json included roll, applying roll values'
+        optimizer.run_roll_optimizer(apply_roll: calibration_report.fetch('roll'))
+      end
+
+      @lines = @input_file.each_line.map do |line|
+        image = optimizer.images.find { |i| i.raw == line }
+        if image
+          image.to_s
+        else
+          next line
+        end
+      end.compact
+
+      save_file
+    end
+
     def check_position_changes
       logger.info 'checking position changes'
       original_images = Image.parse(@input_file)
@@ -175,6 +209,12 @@ module Panomosity
       save_file
     end
 
+    def create_calibration_report
+      logger.info "creating #{@options[:report_type]} calibration report"
+      panorama = Panorama.new(@input_file, @options)
+      panorama.create_calibration_report
+    end
+
     # Uses image magick to crop centers
     def crop_centers
       logger.info 'cropping centers'
@@ -413,10 +453,10 @@ module Panomosity
       end
     end
 
-    def get_neigborhood_info
+    def get_neighborhood_info
       logger.info 'getting detailed neighborhood info'
       panorama = Panorama.new(@input_file, @options)
-      panorama.get_neigborhood_info
+      panorama.get_neighborhood_info
     end
 
     def merge_image_parameters

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.26'
+  VERSION = '0.1.27'
 end

data/lib/panomosity.rb

@@ -66,6 +66,10 @@ module Panomosity
         options[:verbosity] = v
       end
 
+      parser.on('--report-type TYPE', 'Type of report to create (only when running create_calibration_report)') do |type|
+        options[:report_type] = type
+      end
+
       parser.on('-h', '--help', 'Display this screen') do
         puts parser
         exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler