panomosity 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a24ffd1b51c93f06e28be5531393d9ef4fa2390dfabc1a3a0cebd92e0fe8ea2
-  data.tar.gz: 6f01ff9088ce77b29b1d0b75c7ecc419962fa81b988d3b8c41b4f13a4ff29d61
+  metadata.gz: 55acfc2af5503c105113d6f4b22464b2052915ebc265f64369f28a37733cd811
+  data.tar.gz: 7edea562a3ecd287ee4ec60bc209636d7494b52be234d2edb106b016b5d749fc
 SHA512:
-  metadata.gz: d8ce529cfbcfc347df7ff571a585d4f081ed35cc0c7ac7890f613a0d7e83a0da58d2c6cf5656571690eef8d793f65eb50277fd886763fbad34bc74f4e50c7ec9
-  data.tar.gz: 43f8377b355628dc3b896deec813be6c56ca6969d1c9f7731e774ca08abe01bd5694d66ac87e4a63ceefde84e787e262e50624fea73574312e92336492a9a38b
+  metadata.gz: 227237855e4a0c4e38282837fed553b7add73ffd92d439bbf8a3678196589b0bd91b36c013e415a27e4699fc94f97fbe56fc946b3d5c94486eae1e9edf920ec5
+  data.tar.gz: 40b14486b54d7efaf753943c1886bb147a2646b6f10e6ea5e75907c575367db27ce3ad22e0a36a06178ee27160a126f4f16b0d623e2cb47a68ae465748438825

data/Gemfile.lock

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

data/exe/control_point_info.pl

@@ -0,0 +1,21 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Panotools::Script;
+use Getopt::Long qw(GetOptions);
+use Data::Dumper;
+
+my $pto_file;
+my $control_point;
+GetOptions(
+  'input=s' => \$pto_file,
+  'control_point=s' => \$control_point
+) or die "Usage: $0 --input PTO_FILE --control_point CONTROL_POINT\n";
+
+my $pano = new Panotools::Script;
+$pano->Read ($pto_file);
+
+for my $point (@{$pano->Control}) {
+  print "@{[$point->Packed]} @{[$point->Distance($pano)]}\n";
+}

data/lib/panomosity/control_point.rb

@@ -31,7 +31,7 @@ module Panomosity
     end
 
     def self.get_detailed_info(pto_file_path, cp_type: nil)
-      result = `perl control_point_info.pl --input #{pto_file_path}`
+      result = `control_point_info.pl --input #{pto_file_path}`
       parse(result, cp_type: cp_type, compact: true)
     end
 

data/lib/panomosity/runner.rb

@@ -11,10 +11,11 @@ module Panomosity
       convert_translation_parameters
       crop_centers
       fix_conversion_errors
+      fix_unconnected_image_pairs
       generate_border_line_control_points
+      get_detailed_control_point_info
       merge_image_parameters
       prepare_for_pr0ntools
-      remove_long_lines
       remove_anchor_variables
       standardize_roll
     )
@@ -216,6 +217,12 @@ module Panomosity
       save_file
     end
 
+    def fix_unconnected_image_pairs
+      logger.info 'fixing unconnected image pairs'
+      images = Image.parse(@input_file)
+
+    end
+
     def generate_border_line_control_points
       logger.info 'generating border line control points'
       images = Image.parse(@input_file)
@@ -340,6 +347,22 @@ module Panomosity
       save_file
     end
 
+    def get_detailed_control_point_info
+      logger.info 'removing long lines'
+
+      images = Image.parse(@input_file)
+      control_points = ControlPoint.get_detailed_info(@input, cp_type: :normal)
+      control_points.each do |cp|
+        image1 = images.find { |i| cp.n1 == i.id }
+        image2 = images.find { |i| cp.n2 == i.id }
+        # dist = ((image1.normal_x + cp.x1) - (image2.normal_x + cp.x2)) ** 2 + ((image1.normal_y + cp.y1) - (image2.normal_y + cp.y2)) ** 2
+        dx = (image1.d - cp.x1) - (image2.d - cp.x2)
+        dy = (image1.e - cp.y1) - (image2.e - cp.y2)
+        logger.debug "#{cp.to_s} distrt #{Math.sqrt(dx**2+dy**2)} iy1 #{image1.normal_y} iy2 #{image2.normal_y}"
+      end
+      logger.debug "avg #{control_points.map(&:dist).reduce(:+)/control_points.count.to_f}"
+    end
+
     def merge_image_parameters
       logger.info 'merging image parameters'
       control_points = ControlPoint.parse(@compare_file)
@@ -414,22 +437,6 @@ module Panomosity
       save_file
     end
 
-    def remove_long_lines
-      logger.info 'removing long lines'
-
-      images = Image.parse(@input_file)
-      control_points = ControlPoint.get_detailed_info(@input, cp_type: :normal)
-      control_points.each do |cp|
-        image1 = images.find { |i| cp.n1 == i.id }
-        image2 = images.find { |i| cp.n2 == i.id }
-        # dist = ((image1.normal_x + cp.x1) - (image2.normal_x + cp.x2)) ** 2 + ((image1.normal_y + cp.y1) - (image2.normal_y + cp.y2)) ** 2
-        dx = (image1.d - cp.x1) - (image2.d - cp.x2)
-        dy = (image1.e - cp.y1) - (image2.e - cp.y2)
-        logger.debug "#{cp.to_s} distrt #{Math.sqrt(dx**2+dy**2)} iy1 #{image1.normal_y} iy2 #{image2.normal_y}"
-      end
-      logger.debug "avg #{control_points.map(&:dist).reduce(:+)/control_points.count.to_f}"
-    end
-
     def standardize_roll
       logger.info 'standardizing roll'
       images = Image.parse(@input_file)

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Oliver Garcia
@@ -56,6 +56,7 @@ description: Custom scripts to help with PTO parsing and different strategies.
 email:
 - ogarci5@gmail.com
 executables:
+- control_point_info.pl
 - panomosity
 extensions: []
 extra_rdoc_files: []
@@ -71,6 +72,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/control_point_info.pl
 - exe/panomosity
 - lib/panomosity.rb
 - lib/panomosity/control_point.rb