pano 0.0.6 → 0.0.7

data/bin/pntool

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby 
 
-require 'pano'
+require "bundler/setup"
 require 'fileutils'
 
 set = Pano::ImageFileSet.new FileUtils.pwd

data/lib/pano.rb

@@ -1,5 +1,5 @@
 require 'JSON'
-require 'active_support'
+require 'active_support/core_ext/object'
 
 TOOL_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 

data/lib/pano/image.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'active_support'
 
 module Pano
   module Image

data/lib/pano/image_file.rb

@@ -7,10 +7,10 @@ module Pano
     def initialize path
       if path =~ /\.jpg$/i
         @jpg_path = path
-        @raw_path = path.sub(/\.jpg$/i, ".CR2")
+        @raw_path = path.sub(/\.jpg$/i, ".NEF")
       else
         @raw_path = path
-        @jpg_path = path.sub(/\.cr2$/i, ".JPG")
+        @jpg_path = path.sub(/\.nef$/i, ".JPG")
       end
       
       if File.exist?(@jpg_path)
@@ -23,16 +23,11 @@ module Pano
     end
     
     def for_pano?
-      @for_pano ||= @info[:fov] > 95 && @info["SelfTimer"] == "2 s" && @info["Orientation"] == "Rotate 270 CW"
+      @for_pano ||= @info[:fov] > 95 && bracketed?
     end
     
     def bracketed?
-      @bracketed ||= @info["BracketMode"] == "AEB" && @info["BracketShotNumber"] == 0
-    end
-    
-    def bracketing_number
-      b = @info["BracketValue"]
-      b == 0 ? 0 : b < 0 ? 1 : 2
+      @bracketed ||= @info["ShootingMode"] =~ /Bracketing/i
     end
     
     def list_info
@@ -46,7 +41,7 @@ module Pano
     end
     
     def copy_to dest_dir
-      FileUtils.mkpath dest_dir;
+      FileUtils.mkpath dest_dir
       FileUtils.cp(@raw_path, dest_dir) if File.exist?(@raw_path)
       FileUtils.cp(@jpg_path, dest_dir) if File.exist?(@jpg_path)
     end

data/lib/pano/image_file_set.rb

@@ -2,6 +2,7 @@ module Pano
 
   class ImageFileSet
     
+    BRACKETS = 5
     attr_reader :base_path, :files
     
     def initialize dir_path
@@ -19,7 +20,7 @@ module Pano
       while i < @files.length 
         file = @files[i]
         if file.for_pano?
-          if pano.length < 13 * 3
+          if pano.length < 13 * BRACKETS
             pano << file
           else
             last = pano.last
@@ -54,7 +55,7 @@ module Pano
           file.copy_to pano_dir
         end
         i = 0
-        pano.each_slice(3) do |files|
+        pano.each_slice(BRACKETS) do |files|
           i+=1
           fused = enfuse(File.join(pano_dir, "fused"), "%02d" % i, files)
           if apply_mask
@@ -84,13 +85,14 @@ module Pano
     def enfuse dir, name, files = []
       return if files.blank?
       FileUtils.mkpath dir
-      contrast_weight = 0.6
-      entropy_weight = 0.4
-      exposure_weight = 0.5
-      saturation_weight = 0.2
+#      contrast_weight = 0.6
+#      entropy_weight = 0.4
+#      exposure_weight = 0.5
+#      saturation_weight = 0.2
       target = File.join(dir, name + ".tif")
       input = files.map {|file| file.jpg_path }.join(" ")
-      options = "--contrast-weight=#{contrast_weight} --entropy-weight=#{entropy_weight} --exposure-weight=#{exposure_weight} --saturation-weight=#{saturation_weight} --compression=LZW"
+      #options = "--contrast-weight=#{contrast_weight} --entropy-weight=#{entropy_weight} --exposure-weight=#{exposure_weight} --saturation-weight=#{saturation_weight} --compression=LZW"
+      options = "--compression=LZW"
       system "enfuse #{options} -o #{target} #{input}"
 
       target

data/lib/pano/version.rb

@@ -0,0 +1,3 @@
+module Pano
+  VERSION = "0.0.7"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Yury Korolev
@@ -16,21 +16,8 @@ cert_chain: []
 
 date: 2009-12-28 00:00:00 +03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: Split and fuse images for pano
 email: 
 - yury.korolev@gmail.com
@@ -44,12 +31,13 @@ files:
 - lib/pano/image.rb
 - lib/pano/image_file.rb
 - lib/pano/image_file_set.rb
+- lib/pano/version.rb
 - lib/pano.rb
 - bin/pntool
 - lib/mask.png
 - lib/mask_last.png
 has_rdoc: true
-homepage: http://anjlab.com
+homepage: http://github.com/yury/pano
 licenses: []
 
 post_install_message: 
@@ -58,6 +46,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -65,20 +54,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 1
       - 3
-      - 5
-      version: 1.3.5
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: rubyfish
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "\"Just prepare photos for pano\""
+summary: Just prepare photos for pano
 test_files: []