tracksperanto 1.2.4 → 1.2.6

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.2.6 / 2009-09-21
+
+* Add const_name to the classes being introspected most often
+
+=== 1.2.5 / 2009-09-21
+
+* Reset residual on Syntheyes imports to 0
+
 === 1.2.4 / 2009-09-21
 
 * Write to files in binary mode

data/Manifest.txt

@@ -33,6 +33,7 @@ lib/pipeline/base.rb
 lib/tracksperanto.rb
 lib/tracksperanto/block_init.rb
 lib/tracksperanto/casts.rb
+lib/tracksperanto/const_name.rb
 lib/tracksperanto/format_detector.rb
 lib/tracksperanto/keyframe.rb
 lib/tracksperanto/safety.rb
@@ -91,6 +92,7 @@ test/middleware/test_scaler_middleware.rb
 test/middleware/test_shift_middleware.rb
 test/middleware/test_slip_middleware.rb
 test/pipeline/test_pipeline_base.rb
+test/test_const_name.rb
 test/test_format_detector.rb
 test/test_keyframe.rb
 test/test_tracker.rb

data/lib/export/base.rb

@@ -3,6 +3,7 @@
 # exporter will be notified when a tracker will be exported and when a tracker has been passed
 # (the last keyframe has been sent)
 class Tracksperanto::Export::Base
+  include Tracksperanto::ConstName
   
   attr_reader :io
   

data/lib/import/base.rb

@@ -6,6 +6,7 @@ class Tracksperanto::Import::Base
   include Tracksperanto::Casts
   include Tracksperanto::BlockInit
   include Tracksperanto::ZipTuples
+  include Tracksperanto::ConstName
   
   # Tracksperanto will assign a proc that reports the status of the import to the caller.
   # This block is automatically used by report_progress IF the proc is assigned. Should
@@ -29,7 +30,8 @@ class Tracksperanto::Import::Base
   cast_to_int :width, :height
   safe_reader :width, :height
   
-  # Used to register your importer in the list of supported formats
+  # Used to register your importer in the list of supported formats.
+  # Normally you would not need to override this
   def self.inherited(by)
     Tracksperanto.importers << by
     super

data/lib/import/syntheyes.rb

@@ -7,7 +7,7 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
   def parse(io)
     trackers = []
     io.each_line do | line |
-      name, frame, x, y, corr = line.split
+      name, frame, x, y, frame_status = line.split
       
       # Do we already have this tracker?
       t = trackers.find {|e| e.name == name}
@@ -22,7 +22,6 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
         e.frame = frame
         e.abs_x = convert_from_uv(width, x)
         e.abs_y = height - convert_from_uv(height, y) # Convert TL to BL
-        e.residual = corr
       end
       report_progress("Adding keyframe #{frame} to #{name}")
     end
@@ -31,6 +30,8 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
   end
   
   private
+    # Syntheyes exports UV coordinates that go from -1 to 1, up and right and 0
+    # is the center
     def convert_from_uv(absolute_side, uv_value)
       # First, start from zero (-.1 becomes .4)
       value_off_corner = (uv_value.to_f / 2) + 0.5

data/lib/middleware/base.rb

@@ -4,7 +4,16 @@
 class Tracksperanto::Middleware::Base
   include Tracksperanto::Casts
   include Tracksperanto::BlockInit
+  include Tracksperanto::ConstName
   
+  # Used to automatically register your middleware in Tracksperanto.middlewares
+  # Normally you wouldn't need to override this
+  def self.inherited(by)
+    Tracksperanto.middlewares << by
+    super
+  end
+  
+  # Constructor accepts the exporter that will be wrapped
   def initialize(exporter, *args_for_block_init)
     @exporter = exporter
     super(*args_for_block_init)

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'delegate'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.2.4'
+  VERSION = '1.2.6'
   
   module Import; end
   module Export; end
@@ -23,14 +23,26 @@ module Tracksperanto
     
     # Returns the names of all the importers
     def importer_names
-      importers.map{|e| e.to_s.split('::').pop }
+      importers.map{|e| e.const_name }
     end
+    
+    # Returns the names of all the exporters
+    def exporter_names
+      exporters.map{|e| e.const_name }
+    end
+    
+    # Returns the names of all the middlewares
+    def middleware_names
+      middlewares.map{|e| e.const_name }
+    end
+    
   end
+  
   self.exporters, self.importers, self.middlewares = [], [], []
   
 end
 
-%w( casts block_init safety zip_tuples keyframe tracker format_detector).each do | submodule |
+%w( const_name casts block_init safety zip_tuples keyframe tracker format_detector).each do | submodule |
   require File.join(Tracksperanto::PATH, "tracksperanto", submodule)
 end
 

data/lib/tracksperanto/const_name.rb

@@ -0,0 +1,16 @@
+module Tracksperanto::ConstName
+  module C
+    def const_name
+      to_s.split('::').pop
+    end
+  end
+  
+  def const_name
+    self.class.const_name
+  end
+  
+  def self.included(into)
+    into.extend(C)
+    super
+  end
+end

data/test/import/test_syntheyes_import.rb

@@ -25,6 +25,6 @@ class SyntheyesImportTest < Test::Unit::TestCase
     assert_equal 0, first_kf.frame
     assert_in_delta 715.839, first_kf.abs_x, DELTA
     assert_in_delta 886.212, first_kf.abs_y, DELTA
-    assert_in_delta 30.0, first_kf.residual, DELTA
+    assert_in_delta 0.0, first_kf.residual, DELTA
   end
 end

data/test/test_const_name.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/helper'
+
+class ConstNameTest < Test::Unit::TestCase
+  
+  def test_const_name
+    assert_equal "Scaler", Tracksperanto::Middleware::Scaler.const_name
+    assert_equal "Scaler", Tracksperanto::Middleware::Scaler.new(nil).const_name
+    assert_equal "ShakeScript", Tracksperanto::Import::ShakeScript.const_name
+    assert_equal "ShakeText", Tracksperanto::Export::ShakeText.const_name
+  end
+  
+end

data/tracksperanto.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "1.2.2"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-22}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Tracksperanto is a universal 2D-track translator between many apps.}
   s.email = ["me@julik.nl"]
   s.executables = ["tracksperanto"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".DS_Store", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/tracksperanto", "lib/.DS_Store", "lib/export/base.rb", "lib/export/match_mover.rb", "lib/export/mux.rb", "lib/export/nuke_script.rb", "lib/export/pftrack.rb", "lib/export/pftrack_5.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/flame_stabilizer.rb", "lib/import/match_mover.rb", "lib/import/nuke_script.rb", "lib/import/pftrack.rb", "lib/import/shake_grammar/catcher.rb", "lib/import/shake_grammar/lexer.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/golden.rb", "lib/middleware/reformat.rb", "lib/middleware/scaler.rb", "lib/middleware/shift.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "lib/tracksperanto/block_init.rb", "lib/tracksperanto/casts.rb", "lib/tracksperanto/format_detector.rb", "lib/tracksperanto/keyframe.rb", "lib/tracksperanto/safety.rb", "lib/tracksperanto/tracker.rb", "lib/tracksperanto/zip_tuples.rb", "test/.DS_Store", "test/export/.DS_Store", "test/export/README_EXPORT_TESTS.txt", "test/export/samples/ref_NukeScript.nk", "test/export/samples/ref_NukeScript.nk.autosave", "test/export/samples/ref_PFTrack.2dt", "test/export/samples/ref_PFTrack5.2dt", "test/export/samples/ref_ShakeText.txt", "test/export/samples/ref_Syntheyes.txt", "test/export/samples/ref_matchmover.rz2", "test/export/test_match_mover_export.rb", "test/export/test_mux.rb", "test/export/test_nuke_export.rb", "test/export/test_pftrack5_export.rb", "test/export/test_pftrack_export.rb", "test/export/test_shake_export.rb", "test/export/test_syntheyes_export.rb", "test/helper.rb", "test/import/.DS_Store", "test/import/samples/.DS_Store", "test/import/samples/flyover2DP_syntheyes.txt", "test/import/samples/four_tracks_in_one_matchmove.shk", "test/import/samples/four_tracks_in_one_stabilizer.shk", "test/import/samples/fromCombustion_fromMidClip_wSnap.stabilizer", "test/import/samples/garage.2dt", "test/import/samples/hugeFlameSetup.stabilizer", "test/import/samples/kipPointsMatchmover.rz2", "test/import/samples/megaTrack.action.3dtrack.stabilizer", "test/import/samples/one_shake_tracker.txt", "test/import/samples/one_shake_tracker_from_first.txt", "test/import/samples/one_tracker_with_break.nk", "test/import/samples/one_tracker_with_break_in_grp.nk", "test/import/samples/shake_tracker_nodes.shk", "test/import/samples/shake_tracker_nodes_to_syntheyes.txt", "test/import/samples/sourcefile_pftrack.2dt", "test/import/samples/three_tracks_in_one_stabilizer.shk", "test/import/samples/two_shake_trackers.txt", "test/import/samples/two_tracks_in_one_tracker.shk", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/pipeline/test_pipeline_base.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_tracker.rb", "tracksperanto.gemspec"]
+  s.files = [".DS_Store", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/tracksperanto", "lib/.DS_Store", "lib/export/base.rb", "lib/export/match_mover.rb", "lib/export/mux.rb", "lib/export/nuke_script.rb", "lib/export/pftrack.rb", "lib/export/pftrack_5.rb", "lib/export/shake_text.rb", "lib/export/syntheyes.rb", "lib/import/base.rb", "lib/import/flame_stabilizer.rb", "lib/import/match_mover.rb", "lib/import/nuke_script.rb", "lib/import/pftrack.rb", "lib/import/shake_grammar/catcher.rb", "lib/import/shake_grammar/lexer.rb", "lib/import/shake_script.rb", "lib/import/shake_text.rb", "lib/import/syntheyes.rb", "lib/middleware/base.rb", "lib/middleware/golden.rb", "lib/middleware/reformat.rb", "lib/middleware/scaler.rb", "lib/middleware/shift.rb", "lib/middleware/slipper.rb", "lib/pipeline/base.rb", "lib/tracksperanto.rb", "lib/tracksperanto/block_init.rb", "lib/tracksperanto/casts.rb", "lib/tracksperanto/const_name.rb", "lib/tracksperanto/format_detector.rb", "lib/tracksperanto/keyframe.rb", "lib/tracksperanto/safety.rb", "lib/tracksperanto/tracker.rb", "lib/tracksperanto/zip_tuples.rb", "test/.DS_Store", "test/export/.DS_Store", "test/export/README_EXPORT_TESTS.txt", "test/export/samples/ref_NukeScript.nk", "test/export/samples/ref_NukeScript.nk.autosave", "test/export/samples/ref_PFTrack.2dt", "test/export/samples/ref_PFTrack5.2dt", "test/export/samples/ref_ShakeText.txt", "test/export/samples/ref_Syntheyes.txt", "test/export/samples/ref_matchmover.rz2", "test/export/test_match_mover_export.rb", "test/export/test_mux.rb", "test/export/test_nuke_export.rb", "test/export/test_pftrack5_export.rb", "test/export/test_pftrack_export.rb", "test/export/test_shake_export.rb", "test/export/test_syntheyes_export.rb", "test/helper.rb", "test/import/.DS_Store", "test/import/samples/.DS_Store", "test/import/samples/flyover2DP_syntheyes.txt", "test/import/samples/four_tracks_in_one_matchmove.shk", "test/import/samples/four_tracks_in_one_stabilizer.shk", "test/import/samples/fromCombustion_fromMidClip_wSnap.stabilizer", "test/import/samples/garage.2dt", "test/import/samples/hugeFlameSetup.stabilizer", "test/import/samples/kipPointsMatchmover.rz2", "test/import/samples/megaTrack.action.3dtrack.stabilizer", "test/import/samples/one_shake_tracker.txt", "test/import/samples/one_shake_tracker_from_first.txt", "test/import/samples/one_tracker_with_break.nk", "test/import/samples/one_tracker_with_break_in_grp.nk", "test/import/samples/shake_tracker_nodes.shk", "test/import/samples/shake_tracker_nodes_to_syntheyes.txt", "test/import/samples/sourcefile_pftrack.2dt", "test/import/samples/three_tracks_in_one_stabilizer.shk", "test/import/samples/two_shake_trackers.txt", "test/import/samples/two_tracks_in_one_tracker.shk", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/pipeline/test_pipeline_base.rb", "test/test_const_name.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_tracker.rb", "tracksperanto.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://guerilla-di.org/tracksperanto}
   s.rdoc_options = ["--main", "README.txt"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{guerilla-di}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Tracksperanto is a universal 2D-track translator between many apps.}
-  s.test_files = ["test/export/test_match_mover_export.rb", "test/export/test_mux.rb", "test/export/test_nuke_export.rb", "test/export/test_pftrack5_export.rb", "test/export/test_pftrack_export.rb", "test/export/test_shake_export.rb", "test/export/test_syntheyes_export.rb", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/pipeline/test_pipeline_base.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_tracker.rb"]
+  s.test_files = ["test/export/test_match_mover_export.rb", "test/export/test_mux.rb", "test/export/test_nuke_export.rb", "test/export/test_pftrack5_export.rb", "test/export/test_pftrack_export.rb", "test/export/test_shake_export.rb", "test/export/test_syntheyes_export.rb", "test/import/test_flame_import.rb", "test/import/test_match_mover_import.rb", "test/import/test_nuke_import.rb", "test/import/test_pftrack_import.rb", "test/import/test_shake_catcher.rb", "test/import/test_shake_lexer.rb", "test/import/test_shake_script_import.rb", "test/import/test_shake_text_import.rb", "test/import/test_syntheyes_import.rb", "test/middleware/test_golden_middleware.rb", "test/middleware/test_reformat_middleware.rb", "test/middleware/test_scaler_middleware.rb", "test/middleware/test_shift_middleware.rb", "test/middleware/test_slip_middleware.rb", "test/pipeline/test_pipeline_base.rb", "test/test_const_name.rb", "test/test_format_detector.rb", "test/test_keyframe.rb", "test/test_tracker.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +02:00
+date: 2009-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/tracksperanto.rb
 - lib/tracksperanto/block_init.rb
 - lib/tracksperanto/casts.rb
+- lib/tracksperanto/const_name.rb
 - lib/tracksperanto/format_detector.rb
 - lib/tracksperanto/keyframe.rb
 - lib/tracksperanto/safety.rb
@@ -137,6 +138,7 @@ files:
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
 - test/pipeline/test_pipeline_base.rb
+- test/test_const_name.rb
 - test/test_format_detector.rb
 - test/test_keyframe.rb
 - test/test_tracker.rb
@@ -191,6 +193,7 @@ test_files:
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
 - test/pipeline/test_pipeline_base.rb
+- test/test_const_name.rb
 - test/test_format_detector.rb
 - test/test_keyframe.rb
 - test/test_tracker.rb