panomosity 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65bc97cd45e178084afa204a41355038ed8071d361fde9cd14ef264717c2471
-  data.tar.gz: '0384cff13bd3d72aa97e09f7efc8b0c40baff294921f9f5c22f3ac2c4c9617a1'
+  metadata.gz: ed12e60dac2b5b41da899dadf401e2c51eaa498508fd78a6d0280d3bb262208f
+  data.tar.gz: 511594cc4b28962db894a9ad399a5e8b81f90808ff1a1ba32de4fab6938a4760
 SHA512:
-  metadata.gz: dbc856dc3727226f568e3a24dc28038dca5900a2e2f19227fe118b51bd6de0a414f503f066a91fc93d5ce972bedcdffd917fee75cc7376075af251d5a7960261
-  data.tar.gz: 2911664ac77d3702b8e43f61238d61abbcc1fb7477e18f6a10ff07780b402137dcf7ac9bae0d12b2630394fbb4044b7a794cb179e665e77fdbca5cc06a890ee6
+  metadata.gz: ab3adea770a98b961b048e456dc8a1b88f69cdd11503f4fa4bef201c436d357b1021d0a7b8e16bd48202669f0b0785955be780312b08dcceb224d2bd9f4847b2
+  data.tar.gz: 29ed19c8aabeb5d6c2d9ca784dc7dea1c7f3f7540537735a72bf5e21af55fde8a296ad48cec08b0c0aa36b6d28c74ff0f653ac42d8456d5e9d35b6d379c50972

data/Gemfile.lock

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

data/lib/panomosity/runner.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'json'
+require 'csv'
 
 module Panomosity
   class Runner
@@ -18,12 +19,14 @@ module Panomosity
       create_calibration_report
       crop_centers
       diagnose
+      export_control_point_csv
       fix_conversion_errors
       fix_unconnected_image_pairs
       generate_border_line_control_points
       get_columns_and_rows
       get_control_point_info
       get_neighborhood_info
+      import_control_point_csv
       merge_image_parameters
       nona_grid
       optimize
@@ -289,6 +292,25 @@ module Panomosity
       panorama.diagnose
     end
 
+    def export_control_point_csv
+      logger.info 'exporting control point csv'
+      panorama = Panorama.new(@input_file, @options)
+      Pair.calculate_neighborhoods(panorama, distance: 30)
+
+      filename = 'control_points.csv'
+      headers = %w(image_1_name image_2_name image_1_id image_2_id type width height d1 e1 d2 e2 x1 y1 x2 y2 rx ry r)
+      CSV.open(filename, 'w+') do |csv|
+        csv << headers
+        panorama.control_points.each do |cp|
+          pair = Pair.all.find { |p| p.control_points.include?(cp) }
+          csv << [cp.i1.name, cp.i2.name, cp.i1.id, cp.i2.id, pair.type, cp.i1.w, cp.i1.h, cp.i1.d, cp.i1.e,
+                  cp.i2.d, cp.i2.e, cp.x1, cp.y1, cp.x2, cp.y2, cp.px, cp.py, cp.pdist]
+        end
+      end
+      
+      logger.info 'Done. Check for control_points.csv'
+    end
+
     def fix_conversion_errors
       logger.info 'fixing conversion errors'
       @lines = @input_file.each_line.map do |line|
@@ -459,6 +481,33 @@ module Panomosity
       panorama.get_neighborhood_info
     end
 
+    def import_control_point_csv
+      logger.info 'importing control point csv'
+      panorama = Panorama.new(@input_file, @options)
+
+      filename = @csv || 'control_points.csv'
+      csv = CSV.read(filename)
+      headers = csv.first
+      csv = csv[1..(csv.length - 1)]
+      data = csv.map { |s| Hash[headers.zip(s)] }
+
+      @lines = @input_file.each_line.map do |line|
+        cp = panorama.control_points.find { |c| c.raw == line }
+        if cp
+          kept_cp = data.find do |d|
+            cp.i1.id == d['image_1_id'].to_i && cp.i2.id == d['image_2_id'].to_i &&
+            cp.x1.round(4) == d['x1'].to_f.round(4) && cp.x2.round(4) == d['x2'].to_f.round(4) &&
+            cp.y1.round(4) == d['y1'].to_f.round(4) && cp.y2.round(4) == d['y2'].to_f.round(4)
+          end
+          cp.to_s if kept_cp
+        else
+          next line
+        end
+      end.compact
+
+      save_file
+    end
+
     def merge_image_parameters
       logger.info 'merging image parameters'
       control_points = ControlPoint.parse(@compare_file)

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.35'
+  VERSION = '0.1.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler