photo-utils 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d478e0579f15d1fdba607ac85c84827ba8cea2
-  data.tar.gz: 53980404437217abd59062595727a0734aeb8fef
+  metadata.gz: 8258f2f73bf0c39dd9caad5983abe6692f27f602
+  data.tar.gz: cbf48be31fc7cf3c076d633ceda9cd27e09c69a5
 SHA512:
-  metadata.gz: 94bc1d34be20f01ff721d12a681a5487d6278f17a50d9edddb0d1a1472f08195d532ce6d9d61b4d00cfd7e8c8579ea117c4a7c3af2c0bb91b653aed0dcad248e
-  data.tar.gz: fc13ab1c3f0876db872371ee1bbf6082889333702faa349a6ed5f75e4c8474dee0cb9b4a3dd5d7b8e0d8135e4d5ef3382c51a4203085e0e91bd6bbccee5e0403
+  metadata.gz: 7b6671c81225c4140fc36947e8fa56ab85e4167e5e1b20a1ada4c09cb2c9f7cea00664dd72645098fc0a5005a06be66900372199bcd9d696c637fad0fe6bef5d
+  data.tar.gz: 36cd6bb50505fee27d5405df3c7243d20c6235b15a5bc2370108182eea7c30bb78eea93f9d1d00d19d56c23e02d0f0476ad58ee7a3cf1c569a8ec72d50f7b8b3

data/lib/photo_utils/apex.rb

@@ -76,7 +76,7 @@ module PhotoUtils
     end
 
     def compensation=(n)
-      @compensation = n ? Compensation.new_from_v(n) : nil
+      @compensation = Compensation.new(n)
     end
 
     def aperture
@@ -164,7 +164,7 @@ module PhotoUtils
     end
 
     def cv
-      @compensation ? @compensation.to_f : 0
+      @compensation ? @compensation.to_v : 0
     end
 
     def ev
@@ -179,7 +179,7 @@ module PhotoUtils
       n = increment * (steps / 2)
       (-n..n).step(increment).map do |adjustment|
         new_exposure = dup
-        new_exposure.compensation = (@compensation ? @compensation : 0) + adjustment
+        new_exposure.compensation = PhotoUtils::Compensation.new_from_v((@compensation ? @compensation.to_v : 0) + adjustment)
         new_exposure
       end
     end

data/lib/photo_utils/brightness.rb

@@ -18,7 +18,7 @@ module PhotoUtils
     end
 
     def to_v
-      Math.log2(self.to_f / NK)
+      Math.log2(to_f / NK)
     end
 
     def to_cdm2

data/lib/photo_utils/compensation.rb

@@ -2,21 +2,40 @@ module PhotoUtils
 
   class Compensation < Value
 
-    # amount specified in stops
+    # amount specified in factor
+
+    def self.new_from_factor(f)
+      new(f)
+    end
 
     def self.new_from_v(v)
-      new(v)
+      new(2 ** v)
+    end
+
+    def to_factor
+      to_f
+    end
+
+    def to_v
+      Math.log2(to_f)
+    end
+
+    def format_factor
+      "x%.1f" % to_f.format(10)
     end
 
     def format_value
+      v = to_v
       "Cv:%s%s" % [
-        (self < 0) ? '-' : '+',
-        abs.format(10)
+        (v < 0) ? '-' : '+',
+        v.abs.format(10)
       ]
     end
 
-    def to_s(format=:value)
+    def to_s(format=:factor)
       case format
+      when :factor
+        format_factor
       when :value
         format_value
       else

data/lib/photo_utils/tool.rb

@@ -2,14 +2,21 @@ module PhotoUtils
 
   class Tool
 
+    def initialize
+    end
+
+    def name
+      self.class.to_s.downcase
+    end
+
     def usage
+      warn "#{$0} #{name} ..."
     end
 
     def description
     end
 
-    def run(args)
-      raise NotImplementedError, "Tool #{self.class} does not implement \#run"
+    def run
     end
 
   end

data/lib/photo_utils/tools/blur.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class Blur < Tool
 
-      def run(args)
+      def run
         scene = Scene.new
         scene.sensitivity = 100
         scene.subject_distance = 6.feet

data/lib/photo_utils/tools/brightness.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class Brightness < Tool
 
-      def run(args)
+      def run
         scene = Scene.new
         scene.camera = Camera[/Rollei/]
         scene.description = "Salon L'Orient"

data/lib/photo_utils/tools/calc_aperture.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class CalcAperture < Tool
 
-      def run(args)
+      def run
 
         # set up basic scene
 

data/lib/photo_utils/tools/cameras.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class Cameras < Tool
 
-      def run(args)
+      def run
         if Camera.cameras
           Camera.cameras.each do |camera|
             camera.print

data/lib/photo_utils/tools/chart_dof.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class ChartDOF < Tool
 
-      def run(args)
+      def run
 
         # set up basic scene
 
@@ -134,9 +134,8 @@ module PhotoUtils
           end
         end
 
-        raise "Usage: #{$0} output-file.html" unless ARGV.first
-        File.open(ARGV.first, 'w') { |f| f.write(html.target!) }
-
+        output_file = @args.first or raise
+        Path.new(output_file).write(html.target!)
       end
 
     end

data/lib/photo_utils/tools/compare.rb

@@ -9,7 +9,7 @@ module PhotoUtils
 
     class Compare < Tool
 
-      def run(args)
+      def run
         # given:
         #   an image file with EXIF data
         #     extract:

data/lib/photo_utils/tools/dof.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class DOF < Tool
 
-      def run(args)
+      def run
 
         cameras = []
         cameras << Camera[/Bronica/]

data/lib/photo_utils/tools/dof_table.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class DOFTable < Tool
 
-      def run(args)
+      def run
         scene = Scene.new
         scene.camera = Camera[/Eastman/]
 
@@ -14,7 +14,7 @@ module PhotoUtils
         scene.print_camera
         puts
 
-        # Av equivalents of f/4 -- f/64
+        # Av equivalents of f/4 ~ f/64
         apertures = (4..12).map { |av| Aperture.new_from_v(av) }
 
         first = true

data/lib/photo_utils/tools/film_test.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class FilmTest < Tool
 
-      def run(args)
+      def run
         camera = Camera['Hasselblad']
 
         scene = Scene.new

data/lib/photo_utils/tools/focal_length.rb

@@ -6,11 +6,11 @@ module PhotoUtils
 
     class FocalLength < Tool
 
-      def run(args)
-        from_focal_length, from_format = args.shift.split(':')
+      def run
+        from_focal_length, from_format = @args.shift.split(':')
         from_focal_length = from_focal_length.to_i
         from_format = (Format[from_format || '35'] or raise "Unknown format: #{from_format.inspect}")
-        to_formats = args.first ? args.shift.split(',') : %w{1/1.7 APS-C APS-H 35 6x4.5 6x6 6x7 5x7}
+        to_formats = @args.first ? @args.shift.split(',') : %w{1/1.7 APS-C APS-H 35 6x4.5 6x6 6x7 5x7}
         to_formats.map { |f| Format[f] or raise "Unknown format: #{f.inspect}" }.each do |to_format|
           scene = Scene.new
           scene.format = from_format

data/lib/photo_utils/tools/reciprocity.rb

@@ -14,9 +14,9 @@ module PhotoUtils
         }
       end
 
-      def run(args)
-        if args.first
-          r = args.shift.split('-', 2).map { |n| n ? n.to_i : nil }
+      def run
+        if @args.first
+          r = @args.first.split('-', 2).map { |n| n ? n.to_i : nil }
         else
           r = 1..100
         end

data/lib/photo_utils/tools/test.rb

@@ -6,7 +6,7 @@ module PhotoUtils
 
     class Test < Tool
 
-      def run(args)
+      def run
 
         # field_of_view = Frame.new(5.feet, 8.feet)
         subject_distance = 3.feet

data/lib/photo_utils/version.rb

@@ -1,5 +1,5 @@
 module PhotoUtils
 
-  VERSION = '0.2'
+  VERSION = '0.3'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-utils
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - John Labovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashstruct
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Models, formulas, and utilties for photography optics, etc.
@@ -182,4 +182,3 @@ test_files:
 - test/scene_test.rb
 - test/sensitivity_test.rb
 - test/time_test.rb
-has_rdoc: