panomosity 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d366644df2f67d22fe909ff9913131973bb46261c9cf81ff7056e17da26a65
-  data.tar.gz: 3d7b2d7ac5ffedc109b3bf526bce19d734e253aa97dbf44cff43cb459c98c0be
+  metadata.gz: 6f704a392239564cf8f6044105a0194af7188c2fa38c3ba1f0d50dfd5fd2c4fe
+  data.tar.gz: 8c4791a5f3f410c0bb92b8fe0134ec4fc472aa057c1f1aa586ef4b9a1a990b1a
 SHA512:
-  metadata.gz: 3c7996dbe5fd3f7b585ee9d0e04202b11d98ddcd11a9152932801fa6f01b0548442c7854e302ad452b1d3fa30abd2a357f725057f7a6f9a8dda75e79a74cbd66
-  data.tar.gz: 7f55d5a9102b69bf435ce04bd774398d26fcf1d25beb521228428f12153f8ce09c3a8885d512fb70eaccb8a6f9802ec65052262e7efbcdc15b8bafde94da53f5
+  metadata.gz: c9f0bacac4a47b8e20d161bffe87a8c2494339ffebe0df3b5851a687e21c098c98744b9227f230424e993445034e4d36c30e785a208a9c56360c590f927a4df7
+  data.tar.gz: e219691995299477b7cfc0fa747152d21ad160a48abbf7e214943405dc99fdbc14353f3f1de4dccf3b2c64d73bdd0e59b7275b724876cc63d48c0728f1bdcced

data/Gemfile.lock

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

data/exe/diagnosity

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'panomosity'
+ARGV.unshift('diagnose')
+Panomosity.parse(ARGV)

data/lib/panomosity/neighborhood_group.rb

@@ -99,11 +99,25 @@ module Panomosity
     def calculate
       @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))
-      @y_avg = calculate_average(values: control_points.map(&:py))
+      @x_avg = calculate_average(values: control_points.map(&:prx))
+      @y_avg = calculate_average(values: control_points.map(&:pry))
       @prdist_avg = center.prdist_avg
       @prdist_std = center.prdist_std
       self
     end
+
+    def serialize
+      delta_cp_x = calculate_average(values: control_points.map { |cp| cp.x2 - cp.x1 })
+      delta_cp_y = calculate_average(values: control_points.map { |cp| cp.y2 - cp.y1 })
+      {
+        x_avg: x_avg,
+        y_avg: y_avg,
+        prdist_avg: prdist_avg,
+        prdist_std: prdist_std,
+        cp_count: control_points.count,
+        delta_cp_x: delta_cp_x,
+        delta_cp_y: delta_cp_y
+      }
+    end
   end
 end

data/lib/panomosity/pair.rb

@@ -50,6 +50,7 @@ module Panomosity
           next if column == columns.last
           image_1 = images.find { |i| i.row == row && i.column == column }
           image_2 = images.find { |i| i.row == row && i.column == column.next }
+          next if @panorama.calibration? && (image_1.nil? || image_2.nil?)
           control_points = @panorama.control_points.select { |cp| [cp.n1, cp.n2].sort == [image_1.id, image_2.id].sort }
           @pairs << Pair.new([image_1, image_2].sort_by(&:id), control_points: control_points, type: :horizontal)
         end
@@ -61,6 +62,7 @@ module Panomosity
           next if row == rows.last
           image_1 = images.find { |i| i.column == column && i.row == row }
           image_2 = images.find { |i| i.column == column && i.row == row.next }
+          next if @panorama.calibration? && (image_1.nil? || image_2.nil?)
           control_points = @panorama.control_points.select { |cp| [cp.n1, cp.n2].sort == [image_1.id, image_2.id].sort }
           @pairs << Pair.new([image_1, image_2].sort_by(&:id), control_points: control_points, type: :vertical)
         end

data/lib/panomosity/panorama.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Panomosity
   class Panorama
     include Panomosity::Utils
@@ -147,13 +149,21 @@ module Panomosity
       Pair.calculate_neighborhood_groups
 
       recommendations = []
+      messages = []
 
       logger.debug "total number of control points: #{control_points.count}"
       logger.debug "total number of generated control points: #{control_points.select(&:generated?).count}"
       logger.debug "total number of not generated control points: #{control_points.select(&:not_generated?).count}"
 
       control_point_pair_ratio = Pair.without_enough_control_points(ignore_connected: true).count.to_f / Pair.all.count
-      logger.warn "More than 50% (#{(control_point_pair_ratio*100).round(4)}%) of pairs have fewer than 3 control points. May potentially cause issues." if control_point_pair_ratio >= 0.5
+      if control_point_pair_ratio >= 0.5
+        message = <<~MESSAGE
+          More than 50% (#{(control_point_pair_ratio*100).round(4)}%) of pairs have fewer than 3 control points.
+          May potentially cause issues.
+        MESSAGE
+        logger.warn message
+        messages << message
+      end
 
       control_point_generated_ratio = control_points.select(&:generated?).count.to_f / control_points.select(&:not_generated?).count
       if control_point_generated_ratio >= 0.3
@@ -162,6 +172,7 @@ module Panomosity
           This indicates a failure to find control points between images pairs due to poor lighting or insufficient complexity.
         MESSAGE
         logger.warn message
+        messages << message
       end
 
       # neighborhood group tests
@@ -172,6 +183,7 @@ module Panomosity
           This can mean either low variation in control points distances or that not enough control points could be found.
         MESSAGE
         logger.warn message
+        messages << message
       end
 
       group_std_avg = calculate_average(values: NeighborhoodGroup.horizontal[0..4].map(&:prdist_std))
@@ -184,6 +196,7 @@ module Panomosity
           This also means that the images may represent a 3D object that has perspective differences.
         MESSAGE
         logger.warn message
+        messages << message
       end
 
       group_control_points = NeighborhoodGroup.horizontal.first.control_points.count
@@ -197,6 +210,7 @@ module Panomosity
           There will very likely be seams horizontally.
         MESSAGE
         logger.warn message
+        messages << message
         recommendations << 'horizontal'
       end
 
@@ -207,6 +221,7 @@ module Panomosity
           This can mean either low variation in control points distances or that not enough control points could be found.
         MESSAGE
         logger.warn message
+        messages << message
       end
 
       group_std_avg = calculate_average(values: NeighborhoodGroup.vertical[0..4].map(&:prdist_std))
@@ -219,6 +234,7 @@ module Panomosity
           This also means that the images may represent a 3D object that has perspective differences.
         MESSAGE
         logger.warn message
+        messages << message
       end
 
       group_control_points = NeighborhoodGroup.vertical.first.control_points.count
@@ -235,6 +251,28 @@ module Panomosity
         recommendations << 'vertical'
       end
 
+      logger.info 'creating diagnostic_report.json'
+
+      pair = Pair.horizontal.first
+      delta_d = pair.first_image.d - pair.last_image.d
+      roll = pair.first_image.r
+      pair = Pair.vertical.first
+      delta_e = pair.first_image.e - pair.last_image.e
+
+      diagnostic_report = {
+        messages: messages,
+        recommendations: recommendations,
+        data: {
+          delta_d: delta_d,
+          delta_e: delta_e,
+          roll: roll,
+          horizontal: NeighborhoodGroup.horizontal.first.serialize,
+          vertical: NeighborhoodGroup.vertical.first.serialize
+        }
+      }
+
+      File.open('diagnostic_report.json', 'w+') { |f| f.puts diagnostic_report.to_json }
+
       if recommendations.empty?
         logger.warn 'No recommendations'
         puts 'none'
@@ -243,5 +281,9 @@ module Panomosity
         puts recommendations.join(',')
       end
     end
+
+    def calibration?
+      !!@input.split(/\n/).find { |line| '#panomosity calibration true' }
+    end
   end
 end

data/lib/panomosity/runner.rb

@@ -7,6 +7,7 @@ module Panomosity
     attr_reader :logger
 
     AVAILABLE_COMMANDS = %w(
+      add_calibration_flag
       check_position_changes
       clean_control_points
       convert_equaled_image_parameters
@@ -34,10 +35,11 @@ module Panomosity
       @output = options[:output]
       @csv = options[:csv]
       @compare = options[:compare]
+      @report = options[:report]
       @input_file = File.new(@input, 'r').read rescue puts('You must have at least one argument')
       @output_file = File.new(@output, 'w') if @output
       @csv_file = File.new(@csv, 'r').read if @csv
-      @compare_file = File.new(@compare, 'r').read if @compare
+      @report_file = File.new(@report, 'r').read if @report
       @logger = Panomosity.logger
 
       if options[:verbose] || options[:verbosity] > 0
@@ -55,6 +57,12 @@ module Panomosity
       end
     end
 
+    def add_calibration_flag
+      logger.info 'adding panomosity calibration flag'
+      @lines = @input_file.each_line.map { |line| line } + ["#panomosity calibration true\n"]
+      save_file
+    end
+
     def check_position_changes
       logger.info 'checking position changes'
       original_images = Image.parse(@input_file)

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

data/lib/panomosity.rb

@@ -38,6 +38,10 @@ module Panomosity
         options[:compare] = pto
       end
 
+      parser.on('-r', '--report [REPORT]', 'Include a report (when adding calibration control points)') do |report|
+        options[:report] = report
+      end
+
       parser.on('--without-cropping', 'Do not crop when running "crop_centers" (usually when the original run failed)') do |wc|
         options[:without_cropping] = wc
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Oliver Garcia
@@ -57,6 +57,7 @@ email:
 - ogarci5@gmail.com
 executables:
 - control_point_info.pl
+- diagnosity
 - panomosity
 extensions: []
 extra_rdoc_files: []
@@ -72,6 +73,7 @@ files:
 - bin/console
 - bin/setup
 - exe/control_point_info.pl
+- exe/diagnosity
 - exe/panomosity
 - lib/panomosity.rb
 - lib/panomosity/control_point.rb