panomosity 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43fd51dc7dedb7340d1d49debb7988ba41c222a6
-  data.tar.gz: ac8eda0d88511b85458b34bb98828a145dac89de
+SHA256:
+  metadata.gz: f9429ab38b6928e5b0e731cdedbeeab3e95afba20549ee2acb01c3ee0afda0bf
+  data.tar.gz: 2aa31fef07b269239cfd09bd4e877f5d897caf7f09eef1c13079564b293e4fa1
 SHA512:
-  metadata.gz: b653e9c508061364866c37876161d45aee8aa376ebcdbaa4f909342fc6b21e73f8966759eb3b687e8f69be8d4370f0c0c129f0667a93e6dbbe42d28d68499b4e
-  data.tar.gz: 32c89ec697236944332d1928c2793b7b062ddfc52b04b1bb80e0517448808c84bed473709fa4256cde17cdcd3c4433b6a7f61da5b3a1c95b511bd49ba18ad084
+  metadata.gz: 9c594323f23c9e778737b6a309cce0b006f9e64c500f978075ab9da6e7fec5448df780a90fd4332b0562ccffb597261397e31fdaaa2bae7315009c15a60e6a1f
+  data.tar.gz: 0a1e815356032d427326cecce3ee4668dbbad3b806499854088bf27c061919f075015d5ebf08c379294f3c63a723b765180461720453c62fee31c05d16b70510

data/Gemfile.lock

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

data/lib/panomosity/control_point.rb

@@ -4,7 +4,7 @@
 module Panomosity
   class ControlPoint
     @@attributes = %i(n N x y X Y t)
-    @@calculated_attributes = %i(dist px py pdist conn_type)
+    @@calculated_attributes = %i(dist px py pdist prx pry prdist conn_type i1 i2)
 
     def self.parse(pto_file, cp_type: nil, compact: false)
       @control_points = pto_file.each_line.map do |line|
@@ -55,7 +55,7 @@ module Panomosity
         distance = angle * radius
         cp.dist = distance
 
-        # Pixel distance
+        # pixel distance
         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
@@ -63,9 +63,17 @@ module Panomosity
 
         cp.px = x1 - x2
         cp.py = y1 - y2
-        pixel_distance = Math.sqrt(cp.px**2 + cp.py**2)
-        cp.pdist = pixel_distance
+        cp.pdist = Math.sqrt(cp.px ** 2 + cp.py ** 2)
+
+        # pixel distance including roll
+        r = image1.r * Math::PI / 180
+        cp.prx = image1.d - image2.d + Math.cos(r) * (cp.x2 - cp.x1) - Math.sin(r) * (cp.y2 - cp.y1)
+        cp.pry = image1.e - image2.e + Math.cos(r) * (cp.y2 - cp.y1) - Math.sin(r) * (cp.x2 - cp.x1)
+        cp.prdist = Math.sqrt(cp.prx ** 2 + cp.pry ** 2)
+
         cp.conn_type = image1.d == image2.d ? :vertical : :horizontal
+        cp.i1 = image1
+        cp.i2 = image2
       end
     end
 

data/lib/panomosity/runner.rb

@@ -192,13 +192,14 @@ 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
+      scale_factor = @csv_file.split(/\n/).first.split(',').last.to_f
+      percent = (scale_factor*100).round
+      logger.debug "cropping to #{percent}%"
       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}"
@@ -226,13 +227,13 @@ module Panomosity
       d_diffs = []
       ds.each_with_index do |_, i|
         next if i == 0
-        d_diffs.push((ds[i] - ds[i-1]).abs / 2)
+        d_diffs.push((ds[i] - ds[i-1]).abs * (1-scale_factor))
       end
 
       e_diffs = []
       es.each_with_index do |_, i|
         next if i == 0
-        e_diffs.push((es[i] - es[i-1]).abs / 2)
+        e_diffs.push((es[i] - es[i-1]).abs * (1-scale_factor))
       end
 
       d_map = Hash[ds.map.with_index { |d, i| i == 0 ? [d, d] : [d, d - d_diffs[0..(i-1)].reduce(:+)] }]
@@ -599,7 +600,7 @@ module Panomosity
       control_points = ControlPoint.calculate_distances(images, panorama_variable)
 
       control_points.each do |cp|
-        logger.debug "#{cp.to_s.sub(/\n/, '')} dist #{cp.dist} pixel_dist #{cp.px},#{cp.py},#{cp.pdist} conn_type #{cp.conn_type}"
+        logger.debug "#{cp.to_s.sub(/\n/, '')} dist #{cp.dist.round(4)} pixel_dist #{cp.px.round(4)},#{cp.py.round(4)},#{cp.pdist.round(4)} pixel_r_dist #{cp.prx.round(4)},#{cp.pry.round(4)},#{cp.prdist.round(4)} conn_type #{cp.conn_type}"
       end
     end
 

data/lib/panomosity/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-25 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.4.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Wrapper for the PTO file parsing needed for PanoTools.