tracksperanto 1.6.0 → 1.6.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.6.1 / 2009-11-15
+
+* Fixes the Reformat middleware to not suppress the end_export call. Crucial for exporters that
+  use end_export to finalize output
+  
 === 1.6.0 / 2009-11-15
 
 * MatchMover has top-left coordinates - fixed for both import and export

data/lib/export/equalizer3.rb

@@ -14,31 +14,26 @@ class Tracksperanto::Export::Equalizer3 < Tracksperanto::Export::Base
   def start_export( img_width, img_height)
     @w, @h = img_width, img_height
     # 3DE needs to know the number of keyframes in advance
-    @internal_io, @highest_keyframe = Tempfile.new("Tracksperanto_3de"), 0
+    @buffer = Tempfile.new("ts3dex")
+    @highest_keyframe = 0
   end
   
   def start_tracker_segment(tracker_name)
-    @internal_io.puts(tracker_name)
+    @buffer.puts(tracker_name)
   end
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
     off_by_one = frame + 1
-    @internal_io.puts("\t%d\t%.3f\t%.3f" % [off_by_one, abs_float_x, abs_float_y])
+    @buffer.puts("\t%d\t%.3f\t%.3f" % [off_by_one, abs_float_x, abs_float_y])
     @highest_keyframe = off_by_one if (@highest_keyframe < off_by_one)
   end
   
   def end_export
+    @buffer.rewind
     preamble = HEADER.gsub(/2048/, @w.to_s).gsub(/778/, @h.to_s).gsub(/275/, @highest_keyframe.to_s)
     @io.puts(preamble)
-    @internal_io.rewind
-    @io.puts(@internal_io.read)
-    discard_io
+    @io.puts(@buffer.read) until @buffer.eof?
+    @buffer.close!
     @io.puts("") # Newline at end
   end
-  
-  private
-    def discard_io
-      @internal_io.close
-      @internal_io = nil
-    end
 end

data/lib/export/equalizer4.rb

@@ -43,7 +43,6 @@ class Tracksperanto::Export::Equalizer4 < Tracksperanto::Export::Base
   
   private
     def discard_io
-      @internal_io.close
-      @internal_io = nil
+      @internal_io.close!
     end
 end

data/lib/export/syntheyes.rb

@@ -1,5 +1,6 @@
 # Export for Syntheyes tracker UVs
 class Tracksperanto::Export::SynthEyes < Tracksperanto::Export::Base
+  include Tracksperanto::UVCoordinates
   
   def self.desc_and_extension
     "syntheyes_2dt.txt"
@@ -18,18 +19,7 @@ class Tracksperanto::Export::SynthEyes < Tracksperanto::Export::Base
   end
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
-    values = [@tracker_name, frame] + syntheyes_coords(abs_float_x, abs_float_y, @width, @height)
+    values = [@tracker_name, frame] + absolute_to_uv(abs_float_x, abs_float_y, @width, @height)
     @io.puts("%s %d %.6f %.6f 30" % values)
   end
-  
-  private
-    
-    # Syntheyes wants very special coordinates, Y down X right,
-    # 0 is center and values are UV float -1 to 1, doubled
-    def syntheyes_coords(abs_x, abs_y, w, h)
-      x = (abs_x / w.to_f) - 0.5
-      y = (abs_y / h.to_f) - 0.5
-      # .2 to -.3, y is reversed and coords are double
-      [x * 2, y * -2]
-    end
 end

data/lib/import/syntheyes.rb

@@ -1,4 +1,5 @@
 class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
+  include Tracksperanto::UVCoordinates
   
   def self.human_name
     "Syntheyes 2D tracker paths file"
@@ -28,13 +29,5 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
     
     trackers
   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
-      absolute_side * value_off_corner
-    end
+
 end

data/lib/middleware/reformat.rb

@@ -22,5 +22,6 @@ class Tracksperanto::Middleware::Reformat < Tracksperanto::Middleware::Base
   
   def end_export
     @exporter = @stash
+    @exporter.end_export
   end
 end

data/lib/pipeline/base.rb

@@ -162,7 +162,7 @@ class Tracksperanto::Pipeline::Base
   
   # Check that the trackers made by the parser are A-OK
   def validate_trackers!(trackers)
-    raise "Could not recover any trackers from this file. Wrong import format maybe?" if trackers.empty?
-    trackers.reject!{|t| t.empty? }
+    trackers.reject!{|t| t.length < 2 }
+    raise "Could not recover any non-empty trackers from this file. Wrong import format maybe?" if trackers.empty?
   end
 end

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
   
   module Import; end
   module Export; end
@@ -42,7 +42,19 @@ module Tracksperanto
   
 end
 
-%w( const_name casts block_init safety zip_tuples keyframe tracker format_detector ext_io simple_export).each do | submodule |
+%w( 
+  const_name
+  casts
+  block_init
+  safety
+  zip_tuples
+  keyframe
+  tracker
+  format_detector
+  ext_io
+  simple_export
+  uv_coordinates
+).each do | submodule |
   require File.join(Tracksperanto::PATH, "tracksperanto", submodule)
 end
 

data/test/middleware/test_reformat_middleware.rb

@@ -25,9 +25,11 @@ class ReformatMiddlewareTest < Test::Unit::TestCase
     
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920,1080)
+    receiver.should_receive(:end_export).once
     
     m = Tracksperanto::Middleware::Reformat.new(receiver, :width => 1920, :height => 1080)
     
     m.start_export(720, 576)
+    m.end_export
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency