tracksperanto 2.0.2 → 2.1.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.0 / 2011-02-08
+* Adds PFMatchit import support. Also all PFTrack imported cameras will have a camera name injected into the tracker
+* Adds a PFMatchit exporter (PFMatchit only wants cameras with numbers in the name)
+
 === 2.0.2 / 2011-02-02
 * Compatible with Ruby 1.9.2
 * Scaler middleware now supports negative scaling factors

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/export/match_mover.rb
 lib/export/maya_live.rb
 lib/export/mux.rb
 lib/export/nuke_script.rb
+lib/export/pfmatchit.rb
 lib/export/pftrack.rb
 lib/export/pftrack_5.rb
 lib/export/shake_text.rb
@@ -64,6 +65,7 @@ test/export/README_EXPORT_TESTS.txt
 test/export/samples/ref_Mayalive.txt
 test/export/samples/ref_Mayalive_CustomAspect.txt
 test/export/samples/ref_NukeScript.nk
+test/export/samples/ref_PFMatchit.2dt
 test/export/samples/ref_PFTrack.2dt
 test/export/samples/ref_PFTrack5.2dt
 test/export/samples/ref_ShakeText.txt
@@ -81,6 +83,7 @@ test/export/test_match_mover_export.rb
 test/export/test_maya_live_export.rb
 test/export/test_mux.rb
 test/export/test_nuke_export.rb
+test/export/test_pfmatchit_export.rb
 test/export/test_pftrack5_export.rb
 test/export/test_pftrack_export.rb
 test/export/test_shake_export.rb
@@ -101,6 +104,7 @@ test/import/samples/nuke/one_tracker_with_break.nk
 test/import/samples/nuke/one_tracker_with_break_in_grp.nk
 test/import/samples/nuke/tracker_with_differing_gaps.nk
 test/import/samples/nuke/tracker_with_repeating_gaps.nk
+test/import/samples/pfmatchit/pfmatchit_example.2dt
 test/import/samples/pftrack4/sourcefile_pftrack.2dt
 test/import/samples/pftrack5/apft.2dt
 test/import/samples/pftrack5/garage.2dt

data/lib/export/pfmatchit.rb

@@ -0,0 +1,49 @@
+# Export for PFMatchit
+class Tracksperanto::Export::PFMatchit < Tracksperanto::Export::Base
+  
+  # PFtrack wants cross-platform linebreaks
+  LINEBREAK = "\r\n"
+  KEYFRAME_TEMPLATE = "%s %.3f %.3f %.3f\r\n"
+  
+  def self.desc_and_extension
+    "pfmatchit.2dt"
+  end
+  
+  def self.human_name
+    "PFMatchit .2dt file (single camera)"
+  end
+  
+  def start_tracker_segment(tracker_name)
+    # Setup for the next tracker
+    @frame_count = 0
+    @tracker_name = tracker_name
+    @tracker_io = Tracksperanto::BufferIO.new
+  end
+  
+  # TODO: currently exports to one camera
+  def end_tracker_segment
+    2.times { @io.write(LINEBREAK) }
+    @io.write(@tracker_name.inspect) # autoquotes
+    @io.write LINEBREAK
+    @io.write camera_name # For primary/secondary cam in stereo pair
+    @io.write LINEBREAK
+    @io.write @frame_count
+    @io.write LINEBREAK
+    
+    @tracker_io.rewind
+    @io.write(@tracker_io.read) until @tracker_io.eof?
+    @tracker_io.close!
+  end
+  
+  def export_point(frame, abs_float_x, abs_float_y, float_residual)
+    @frame_count += 1
+    line = KEYFRAME_TEMPLATE % [frame, abs_float_x, abs_float_y, float_residual / 8]
+    @tracker_io.write(line)
+  end
+  
+  private
+  
+  def camera_name
+    "1"
+  end
+end

data/lib/export/pftrack_5.rb

@@ -1,25 +1,17 @@
 # Export for PFTrack .2dt files for version 5
-class Tracksperanto::Export::PFTrack5 < Tracksperanto::Export::PFTrack4
+class Tracksperanto::Export::PFTrack5 < Tracksperanto::Export::PFMatchit
     
     def self.desc_and_extension
       "pftrack_v5.2dt"
     end
     
     def self.human_name
-      "PFTrack v5 .2dt file"
+      "PFTrack v5 .2dt file (single camera)"
     end
     
-    def end_tracker_segment
-      2.times { @io.write(LINEBREAK) }
-      @io.write(@tracker_name.inspect) # autoquotes
-      @io.write(LINEBREAK)
-      @io.write("Primary".inspect) # For primary/secondary cam in stereo pair
-      @io.write(LINEBREAK)
-      @io.write(@frame_count)
-      @io.write(LINEBREAK)
-      
-      @tracker_io.rewind
-      @io.write(@tracker_io.read) until @tracker_io.eof?
-      @tracker_io.close!
+    private
+    
+    def camera_name
+      "Primary".inspect
     end
 end

data/lib/import/pftrack.rb

@@ -1,6 +1,6 @@
 class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
   def self.human_name
-    "PFTrack .2dt file"
+    "PFTrack/PFMatchit .2dt file"
   end
   
   def self.distinct_file_ext
@@ -8,6 +8,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
   end
   
   CHARACTERS_OR_QUOTES = /[AZaz"]/
+  INTS = /^\d+$/
   
   def stream_parse(io)
     until io.eof?
@@ -15,7 +16,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
       next if (!line || line =~ /^#/)
       
       if line =~ CHARACTERS_OR_QUOTES # Tracker with a name
-        t = Tracksperanto::Tracker.new{|t| t.name = line.strip.gsub(/"/, '') }
+        t = Tracksperanto::Tracker.new{|t| t.name = unquote(line.strip) }
         report_progress("Reading tracker #{t.name}")
         parse_tracker(t, io)
         send_tracker(t)
@@ -27,15 +28,31 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
     def parse_tracker(t, io)
       first_tracker_line = io.gets.chomp
       
-      if first_tracker_line =~ CHARACTERS_OR_QUOTES # PFTrack version 5 format
-        first_tracker_line = io.gets.chomp
+      # We will be reading one line too many possibly, so we need to know
+      # where to return to in case we do
+      first_data_offset = io.pos
+      second_tracker_line = io.gets.chomp
+      
+      # Camera name in version 5 format, might be integer might be string
+      if first_tracker_line =~ CHARACTERS_OR_QUOTES || second_tracker_line =~ INTS
+        # Add cam name to the tracker
+        t.name += ("_%s" % unquote(first_tracker_line))
+        num_of_keyframes = second_tracker_line.to_i
+      else
+        num_of_keyframes = first_tracker_line.to_i
+        # Backtrack to where we were on this IO so that the first line read will be the tracker
+        report_progress("Backtracking to the beginning of data block")
+        io.seek(first_data_offset)
       end
       
-      num_of_keyframes = first_tracker_line.to_i
       (1..num_of_keyframes).map do | keyframe_idx |
         report_progress("Reading keyframe #{keyframe_idx} of #{num_of_keyframes} in #{t.name}")
         f, x, y, residual = io.gets.chomp.split
         t.keyframe!(:frame => f, :abs_x => x, :abs_y => y, :residual => residual.to_f * 8)
       end
     end
+    
+    def unquote(s)
+      s.gsub(/"/, '')
+    end
 end

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
   
   module Import; end
   module Export; end

data/test/export/samples/ref_PFMatchit.2dt

@@ -0,0 +1,54 @@
+
+
+"Parabolic_1_from_top_left"
+1
+19
+0 0.000 1080.000 0.000
+1 96.000 874.800 0.006
+2 192.000 691.200 0.012
+3 288.000 529.200 0.018
+4 384.000 388.800 0.024
+5 480.000 270.000 0.030
+6 576.000 172.800 0.036
+7 672.000 97.200 0.042
+8 768.000 43.200 0.048
+9 864.000 10.800 0.054
+12 1152.000 43.200 0.071
+13 1248.000 97.200 0.077
+14 1344.000 172.800 0.083
+15 1440.000 270.000 0.089
+16 1536.000 388.800 0.095
+17 1632.000 529.200 0.101
+18 1728.000 691.200 0.107
+19 1824.000 874.800 0.113
+20 1920.000 1080.000 0.119
+
+
+"Parabolic_2_from_bottom_right"
+1
+19
+0 1920.000 0.000 0.000
+1 1824.000 205.200 0.006
+2 1728.000 388.800 0.012
+3 1632.000 550.800 0.018
+4 1536.000 691.200 0.024
+5 1440.000 810.000 0.030
+6 1344.000 907.200 0.036
+7 1248.000 982.800 0.042
+8 1152.000 1036.800 0.048
+9 1056.000 1069.200 0.054
+12 768.000 1036.800 0.071
+13 672.000 982.800 0.077
+14 576.000 907.200 0.083
+15 480.000 810.000 0.089
+16 384.000 691.200 0.095
+17 288.000 550.800 0.101
+18 192.000 388.800 0.107
+19 96.000 205.200 0.113
+20 0.000 0.000 0.119
+
+
+"SingleFrame"
+1
+1
+0 970.000 550.000 0.000

data/test/export/test_pfmatchit_export.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class PFMatchitExportTest < Test::Unit::TestCase
+  include ParabolicTracks
+  
+  def test_human_name
+    assert_equal "PFMatchit .2dt file (single camera)", Tracksperanto::Export::PFMatchit.human_name
+  end
+  
+  def test_desc_and_ext
+    assert_equal "pfmatchit.2dt", Tracksperanto::Export::PFMatchit.desc_and_extension
+  end
+  
+  P = File.dirname(__FILE__) + "/samples/ref_PFMatchit.2dt"
+  
+  def test_export_output_written
+    ensure_same_output Tracksperanto::Export::PFMatchit, P
+  end
+end

data/test/export/test_pftrack5_export.rb

@@ -4,7 +4,7 @@ class PFTrack5ExportTest < Test::Unit::TestCase
   include ParabolicTracks
   
   def test_human_name
-    assert_equal "PFTrack v5 .2dt file", Tracksperanto::Export::PFTrack5.human_name
+    assert_equal "PFTrack v5 .2dt file (single camera)", Tracksperanto::Export::PFTrack5.human_name
   end
   
   def test_desc_and_ext

data/test/import/samples/pfmatchit/pfmatchit_example.2dt

@@ -0,0 +1,90 @@
+# 2D feature tracks generated by PFTrack 5.0r11-100916
+#
+# format:
+# "name"
+# "camera"
+# <number of frames>
+# <frame number> <x pixel> <y pixel> <residual>
+#
+
+"Feature1"
+1
+37
+1 356.268 150.052 0.000
+2 355.768 148.141 0.000
+3 355.315 146.628 0.000
+4 355.084 145.346 0.004
+5 354.703 143.693 0.004
+6 354.334 141.926 0.004
+7 353.875 139.789 0.004
+8 353.293 137.673 0.004
+9 352.957 135.593 0.005
+10 352.601 133.629 0.006
+11 352.161 131.554 0.005
+12 351.746 129.328 0.006
+13 351.345 126.772 0.005
+14 350.899 124.121 0.005
+15 350.471 121.715 0.005
+16 350.200 119.275 0.005
+17 349.821 116.808 0.005
+18 349.593 114.196 0.006
+19 349.354 111.385 0.006
+20 349.240 108.501 0.007
+21 348.879 105.663 0.007
+22 348.597 102.901 0.007
+23 348.280 99.636 0.007
+24 348.182 95.489 0.007
+25 347.926 90.646 0.008
+26 347.855 85.444 0.007
+27 347.745 79.815 0.007
+28 347.543 73.971 0.008
+29 347.491 68.102 0.008
+30 347.103 62.183 0.009
+31 347.074 56.082 0.009
+32 346.845 49.360 0.009
+33 346.444 42.439 0.010
+34 346.642 36.103 0.010
+35 346.598 30.438 0.010
+36 346.110 24.721 0.011
+37 346.091 18.761 0.011
+
+"Feature1"
+2
+37
+1 356.797 148.595 0.028
+2 356.272 146.782 0.028
+3 355.826 145.174 0.028
+4 355.501 143.803 0.027
+5 355.173 142.312 0.028
+6 354.749 140.375 0.027
+7 354.266 138.306 0.028
+8 353.697 136.171 0.029
+9 353.345 134.160 0.028
+10 352.957 132.128 0.027
+11 352.464 130.070 0.028
+12 352.039 127.815 0.026
+13 351.634 125.371 0.026
+14 351.183 122.809 0.027
+15 350.732 120.310 0.026
+16 350.442 117.903 0.027
+17 350.031 115.412 0.025
+18 349.744 112.833 0.026
+19 349.536 110.071 0.025
+20 349.397 107.185 0.026
+21 349.043 104.349 0.026
+22 348.683 101.514 0.025
+23 348.330 98.224 0.026
+24 348.192 94.154 0.026
+25 347.935 89.365 0.026
+26 347.823 84.114 0.025
+27 347.679 78.538 0.024
+28 347.441 72.707 0.025
+29 347.353 66.879 0.024
+30 346.953 61.081 0.025
+31 346.889 54.821 0.025
+32 346.624 48.160 0.024
+33 346.220 41.433 0.024
+34 346.302 35.097 0.023
+35 346.209 29.303 0.023
+36 345.718 23.658 0.022
+37 345.620 17.699 0.023

data/test/import/test_pftrack_import.rb

@@ -5,7 +5,7 @@ class PFTrackImportTest < Test::Unit::TestCase
   
   def test_introspects_properly
     i = Tracksperanto::Import::PFTrack
-    assert_equal "PFTrack .2dt file", i.human_name
+    assert_equal "PFTrack/PFMatchit .2dt file", i.human_name
     assert !i.autodetects_size?
   end
   
@@ -16,7 +16,7 @@ class PFTrackImportTest < Test::Unit::TestCase
     trackers = parser.parse(fixture)
     assert_equal 4, trackers.length
     second_tracker = trackers[1]
-    assert_equal "1015", second_tracker.name
+    assert_equal "1015_Primary", second_tracker.name
   end
   
   def test_parsing_from_importable_pftrack_4
@@ -53,8 +53,19 @@ class PFTrackImportTest < Test::Unit::TestCase
     parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
     trackers = parser.parse(fixture)
     assert_equal 250, trackers.length
-    assert_equal "Tracker121", trackers[0].name
+    assert_equal "Tracker121_Primary", trackers[0].name
     assert_equal 189, trackers[0].length
   end
   
+  def test_pfmatchit_file
+    fixture = File.open(File.dirname(__FILE__) + '/samples/pfmatchit/pfmatchit_example.2dt')
+    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
+    trackers = parser.parse(fixture)
+    assert_equal 2, trackers.length
+    assert_equal "Feature1_1", trackers[0].name
+    assert_equal 37, trackers[0].length
+    assert_equal "Feature1_2", trackers[1].name
+    assert_equal 37, trackers[1].length
+  end
+  
 end

data/test/test_cli.rb

@@ -49,7 +49,7 @@ class CliTest < Test::Unit::TestCase
     assert_equal 0, status, "Should exit with a normal status"
     fs = %w(. .. 
       flm.stabilizer flm_3de_v3.txt flm_3de_v4.txt flm_boujou_text.txt flm_flame.stabilizer 
-      flm_matchmover.rz2 flm_mayalive.txt flm_nuke.nk flm_pftrack_v4.2dt
+      flm_matchmover.rz2 flm_mayalive.txt flm_nuke.nk flm_pfmatchit.2dt flm_pftrack_v4.2dt
       flm_pftrack_v5.2dt flm_shake_trackers.txt flm_syntheyes_2dt.txt
     )
     

data/test/test_pipeline.rb

@@ -85,7 +85,7 @@ class PipelineTest < Test::Unit::TestCase
     FileUtils.cp("./import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "./input.shk")
     pipeline = Tracksperanto::Pipeline::Base.new
     assert_nothing_raised { pipeline.run("./input.shk", :importer => "Syntheyes", :width => 720, :height => 576) }
-    assert_equal 12, Dir.glob("./input*").length, "Twelve files should be present for the input and outputs"
+    assert_equal 13, Dir.glob("./input*").length, "Twelve files should be present for the input and outputs"
   end
   
   def test_run_with_overridden_importer_and_size_for_file_that_would_be_recognized_differently

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 2
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ files:
 - lib/export/maya_live.rb
 - lib/export/mux.rb
 - lib/export/nuke_script.rb
+- lib/export/pfmatchit.rb
 - lib/export/pftrack.rb
 - lib/export/pftrack_5.rb
 - lib/export/shake_text.rb
@@ -141,6 +142,7 @@ files:
 - test/export/samples/ref_Mayalive.txt
 - test/export/samples/ref_Mayalive_CustomAspect.txt
 - test/export/samples/ref_NukeScript.nk
+- test/export/samples/ref_PFMatchit.2dt
 - test/export/samples/ref_PFTrack.2dt
 - test/export/samples/ref_PFTrack5.2dt
 - test/export/samples/ref_ShakeText.txt
@@ -158,6 +160,7 @@ files:
 - test/export/test_maya_live_export.rb
 - test/export/test_mux.rb
 - test/export/test_nuke_export.rb
+- test/export/test_pfmatchit_export.rb
 - test/export/test_pftrack5_export.rb
 - test/export/test_pftrack_export.rb
 - test/export/test_shake_export.rb
@@ -178,6 +181,7 @@ files:
 - test/import/samples/nuke/one_tracker_with_break_in_grp.nk
 - test/import/samples/nuke/tracker_with_differing_gaps.nk
 - test/import/samples/nuke/tracker_with_repeating_gaps.nk
+- test/import/samples/pfmatchit/pfmatchit_example.2dt
 - test/import/samples/pftrack4/sourcefile_pftrack.2dt
 - test/import/samples/pftrack5/apft.2dt
 - test/import/samples/pftrack5/garage.2dt
@@ -280,6 +284,7 @@ test_files:
 - test/export/test_maya_live_export.rb
 - test/export/test_mux.rb
 - test/export/test_nuke_export.rb
+- test/export/test_pfmatchit_export.rb
 - test/export/test_pftrack5_export.rb
 - test/export/test_pftrack_export.rb
 - test/export/test_shake_export.rb