panomosity 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 508c47f3caa59487c8e85f4787044dd174b9e43a63fce0ee0ecfc210c88ecef7
-  data.tar.gz: d7e9a8a263379d90f984746e0b3f2215943322418c59ce4f9f25012563fbce82
+  metadata.gz: 43cc742ee7f3a7e491f8e2ffe3a2f47096c649949e4c9a7cc144c7a2baea819c
+  data.tar.gz: 2754ed973a428206f5d2fa4a2327a77fa43a5fedb7151be499f7aaa029d0ca50
 SHA512:
-  metadata.gz: 73a953315be6abba6b26a8371dbf5f0ad131fbae1733b59c12e243d6e31e531a2b9bf3e908b2d5b5d03423ef3006347dd15be55dafcd38c019735e57ea998ad4
-  data.tar.gz: 380b7ac01f1306116cbdc2c5982760f2495ca107321a6564bfca266b449e6c631ec8752b40228e12b8ffb8127f8f3305c3451a93a5ba2a084a91f3bd838ad30d
+  metadata.gz: b1a7250d3b3c71680547decb6062086889c5dc60b03ba32a0bff7331264696fb435131fb9239a8b9c37e0aec0e90e6e5dcc56156eb2b7424ec7013cbe364928d
+  data.tar.gz: f430213bf4698399eae2607930ba443c529da150df03034f2e3100e68a45d43d18d228a8e64fc74f63561518a89e26db04b653d9a0e751de70a38c059f887c38

data/lib/panomosity/runner.rb

@@ -230,12 +230,19 @@ module Panomosity
       logger.debug "cropping to #{percent}%"
       unless @options[:without_cropping]
         images = Image.parse(@input_file)
-        images.each do |image|
+
+        crop_center_commands = images.map do |image|
           width_offset = (image.w.to_f * (1 - scale_factor) / 2).round
           height_offset = (image.h.to_f * (1 - scale_factor) / 2).round
           logger.debug "cropping #{image.name}"
-          `convert #{image.name} -crop "#{percent}%x#{percent}%+#{width_offset}+#{height_offset}" #{image.name}`
+
+          "convert #{image.name} -crop '#{percent}%x#{percent}%+#{width_offset}+#{height_offset}' #{image.name}"
         end
+
+        crop_centers_command = crop_center_commands.join("\n")
+        parallel_command = "cat <<'EOF' | parallel \n%s\nEOF"
+        crop_centers_command = parallel_command % crop_centers_command
+        `#{crop_centers_command}`
       end
 
       # Since all images have been cropped, we need to change d,e params to move images based on how much was cropped
@@ -641,6 +648,7 @@ module Panomosity
         save_file
         logger.debug "running nona #{@output}"
         output = "nona --save-intermediate-images --intermediate-suffix=intermediate -v -m TIFF_m --seam=blend #{@output} -o #{res}_res_stitch_section_c#{column.to_s.rjust(5, '0')}_"
+        # output = "nona-mask #@output -m TIFF_m -o #{res}_res_stitch_section_c#{column.to_s.rjust(5, '0')}_"
         logger.debug output
         output
       end

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.40'
+  VERSION = '0.1.41'
 end

data/panomosity.gemspec

@@ -6,7 +6,7 @@ require 'panomosity/version'
 Gem::Specification.new do |spec|
   spec.name          = 'panomosity'
   spec.version       = Panomosity::VERSION
-  spec.authors       = ['Oliver Garcia']
+  spec.authors       = ['Oliver Garcia', 'Joshua Stowers']
   spec.email         = ['ogarci5@gmail.com']
 
   spec.summary       = %q{Wrapper for the PTO file parsing needed for PanoTools.}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - Oliver Garcia
+- Joshua Stowers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler