panomosity 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c2657589cca00e16a0f43c63b2ccd7ed15df423e57c69cceaadcffdb43106266
-  data.tar.gz: 8f5aa07ea96cbf4e0c2eac15ca1b30b2809c513a93e15348686a316f80e3db6e
+SHA1:
+  metadata.gz: 43fd51dc7dedb7340d1d49debb7988ba41c222a6
+  data.tar.gz: ac8eda0d88511b85458b34bb98828a145dac89de
 SHA512:
-  metadata.gz: 1c44106456133f47c3241dfce6cbd0e70ce1e96f597067d49c4dc19c7a298143c830d271dcbf6ef65540afaaba8930bc85ae3a0164fa071093c153882776e7af
-  data.tar.gz: dc0156621e3a822f0cd1f8372ee5e5ad4ad8e869ec82bc89d0e66721d09b95fdae825544f7ac6b8c6c04b32381110e18f2eabdc4bdacb27a7585d6eedf0afa77
+  metadata.gz: b653e9c508061364866c37876161d45aee8aa376ebcdbaa4f909342fc6b21e73f8966759eb3b687e8f69be8d4370f0c0c129f0667a93e6dbbe42d28d68499b4e
+  data.tar.gz: 32c89ec697236944332d1928c2793b7b062ddfc52b04b1bb80e0517448808c84bed473709fa4256cde17cdcd3c4433b6a7f61da5b3a1c95b511bd49ba18ad084

data/Gemfile.lock

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

data/lib/panomosity/runner.rb

@@ -192,13 +192,17 @@ module Panomosity
     # Uses image magick to crop centers
     def crop_centers
       logger.info 'cropping centers'
+      scale_factor = @csv.each_line.first.split(',').last.to_f
       unless @options[:without_cropping]
         images = Image.parse(@input_file)
         images.each do |image|
           geometry = `identify -verbose #{image.name} | grep Geometry`.strip
           _, width, height = *geometry.match(/(\d{2,5})x(\d{2,5})(\+|\-)\d{1,5}(\+|\-)\d{1,5}/)
+          percent = (scale_factor*100).round
+          width_offset = (width.to_f * (1 - scale_factor) / 2).round
+          height_offset = (height.to_f * (1 - scale_factor) / 2).round
           logger.debug "cropping #{image.name}"
-          `convert #{image.name} -crop "50%x50%+#{(width.to_f/4).round}+#{(height.to_f/4).round}" #{image.name}`
+          `convert #{image.name} -crop "#{percent}%x#{percent}%+#{width_offset}+#{height_offset}" #{image.name}`
         end
       end
 
@@ -589,38 +593,13 @@ module Panomosity
 
     def get_detailed_control_point_info
       logger.info 'getting detailed control point info'
-
       images = Image.parse(@input_file)
       panorama_variable = PanoramaVariable.parse(@input_file).first
-      first_set_control_points = ControlPoint.parse(@input_file)
-
-      @new_input = 'project_remove_equal_signs.pto'
-      runner = Runner.new(@options.merge(input: @input, output: @new_input, remove_equal_signs: true))
-      runner.run('convert_equaled_image_parameters')
-      @input_file = File.new(@new_input, 'r').read
+      ControlPoint.parse(@input_file)
+      control_points = ControlPoint.calculate_distances(images, panorama_variable)
 
-      second_set_control_points = ControlPoint.get_detailed_info(@new_input)
-      control_points = ControlPoint.merge(first_set_control_points, second_set_control_points)
       control_points.each do |cp|
-        image1 = images.find { |i| cp.n1 == i.id }
-        image2 = images.find { |i| cp.n2 == i.id }
-        point1 = image1.to_cartesian(cp.x1, cp.y1)
-        point2 = image2.to_cartesian(cp.x2, cp.y2)
-
-        angle = Math.acos(point1[0] * point2[0] + point1[1] * point2[1] + point1[2] * point2[2])
-        radius = (panorama_variable.w / 2.0) / Math.tan((panorama_variable.v * Math::PI / 180) / 2)
-
-        x1 = (image1.w / 2.0) - cp.x1 + image1.d
-        y1 = (image1.h / 2.0) - cp.y1 + image1.e
-        x2 = (image2.w / 2.0) - cp.x2 + image2.d
-        y2 = (image2.h / 2.0) - cp.y2 + image2.e
-
-        dist = Math.sqrt((x1 - x2)**2 + (y1 - y2)**2)
-
-        dr = angle * radius
-
-        type = image1.d == image2.d ? :vertical : :horizontal
-        logger.debug "#{cp.to_s.sub(/\n/, '')} dist #{dr} pixel_dist #{x1-x2},#{y1-y2},#{dist} type #{type}"
+        logger.debug "#{cp.to_s.sub(/\n/, '')} dist #{cp.dist} pixel_dist #{cp.px},#{cp.py},#{cp.pdist} conn_type #{cp.conn_type}"
       end
     end
 

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Wrapper for the PTO file parsing needed for PanoTools.