tracksperanto 1.8.2 → 1.8.4

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.8.4 / 2010-03-10
+
+* Fix PFTrack imports neglecting the feature name if it only contained digits
+
+=== 1.8.3 / 2010-03-04
+
+* Fix faulty remaining trackers report being sent from the pipeline
+
 === 1.8.2 / 2010-03-04
 
 * Fix the bug in the Flame exporter that was convincing Flame that there is only one tracker in the setup

data/Manifest.txt

@@ -94,6 +94,7 @@ 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/pftrack4/sourcefile_pftrack.2dt
+test/import/samples/pftrack5/apft.2dt
 test/import/samples/pftrack5/garage.2dt
 test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk

data/lib/import/pftrack.rb

@@ -7,7 +7,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
     ".2dt"
   end
   
-  CHARACTERS = /[AZaz]/
+  CHARACTERS_OR_QUOTES = /[AZaz"]/
   
   def parse(io)
     trackers = []
@@ -15,7 +15,7 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
       line = io.gets
       next if (!line || line =~ /^#/)
       
-      if line =~ CHARACTERS # Tracker with a name
+      if line =~ CHARACTERS_OR_QUOTES # Tracker with a name
         t = Tracksperanto::Tracker.new{|t| t.name = line.strip.gsub(/"/, '') }
         report_progress("Reading tracker #{t.name}")
         parse_tracker(t, io)
@@ -30,16 +30,15 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
     def parse_tracker(t, io)
       first_tracker_line = io.gets.chomp
       
-      if first_tracker_line =~ CHARACTERS # PFTrack version 5 format
+      if first_tracker_line =~ CHARACTERS_OR_QUOTES # PFTrack version 5 format
         first_tracker_line = io.gets.chomp
       end
       
       num_of_keyframes = first_tracker_line.to_i
       t.keyframes = (1..num_of_keyframes).map do | keyframe_idx |
         report_progress("Reading keyframe #{keyframe_idx} of #{num_of_keyframes} in #{t.name}")
-        Tracksperanto::Keyframe.new do |k| 
-          k.frame, k.abs_x, k.abs_y, k.residual = io.gets.chomp.split
-        end
+        f, x, y, residual = io.gets.chomp.split
+        Tracksperanto::Keyframe.new(:frame => f, :abs_x => x, :abs_y => y, :residual => residual.to_f * 8)
       end
     end
 end

data/lib/pipeline/base.rb

@@ -114,14 +114,14 @@ class Tracksperanto::Pipeline::Base
     
     # Use the width and height provided by the parser itself
     processor.start_export(parser.width, parser.height)
-    trackers.each do | t |
+    trackers.each_with_index do | t, tracker_idx |
       kf_weight = percent_per_tracker / t.keyframes.length
       points += 1
       processor.start_tracker_segment(t.name)
       t.each_with_index do | kf, idx |
         keyframes += 1
         processor.export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual)
-        report_progress(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.name.inspect}, #{trackers.length - idx + 1} trackers to go")
+        report_progress(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.name.inspect}, #{trackers.length - tracker_idx} trackers to go")
       end
       processor.end_tracker_segment
     end

data/lib/tracksperanto.rb

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

data/lib/tracksperanto/keyframe.rb

@@ -25,6 +25,6 @@ class Tracksperanto::Keyframe
   cast_to_int :frame
   
   def inspect
-    [frame, abs_x, abs_y].inspect
+    '#< %.1fx%.1f @%d ~%.2f) >' %  [abs_x, abs_y, frame, residual]
   end
 end

data/test/export/README_EXPORT_TESTS.txt

@@ -12,4 +12,6 @@ that the export works
 The current test set consists of the two parabolic curves that cross. The second
 parabolic curve goes left, the first one - right, and they start at opposite
 corners of the reference 1920x1080 export. At the first point the track has the residual of 0,
-at the end of the curve - the biggest residual (PFTrack marks it red exactly at the last keyframe)
+at the end of the curve - the biggest residual (PFTrack marks it red exactly at the last keyframe).
+
+In the middle of the curves a couple of keyframes is skipped to verify that proper gaps are written into the export.

data/test/import/samples/pftrack5/apft.2dt

@@ -0,0 +1,164 @@
+
+
+"Tracker642"
+"Primary"
+1
+0 960.000 540.000 0.000
+
+
+"1015"
+"Primary"
+47
+627 634787.520 540.000 0.000
+598 404869.440 540.000 0.000
+1790 695366.400 540.000 0.000
+1222 345650.880 540.000 0.000
+1722 666293.760 540.000 0.000
+1737 458792.640 540.000 0.000
+1692 549895.680 540.000 0.000
+746 309381.120 540.000 0.000
+1600 462813.120 540.000 0.000
+1479 587490.240 540.000 0.000
+1579 569565.120 540.000 0.000
+975 542779.200 540.000 0.000
+1574 361905.600 540.000 0.000
+974 425121.600 540.000 0.000
+890 493438.080 540.000 0.000
+1385 566458.560 540.000 0.000
+1177 457404.480 540.000 0.000
+1237 537648.960 540.000 0.000
+1158 553352.640 540.000 0.000
+798 616415.040 540.000 0.000
+1090 401705.280 540.000 0.000
+1419 456401.280 540.000 0.000
+1767 359904.960 540.000 0.000
+512 518300.160 540.000 0.000
+226 269332.800 540.000 0.000
+1181 422601.600 540.000 0.000
+634 615336.960 540.000 0.000
+550 381297.600 540.000 0.000
+679 420613.440 540.000 0.000
+1866 411394.560 540.000 0.000
+331 393144.000 540.000 0.000
+296 318039.360 540.000 0.000
+1111 692649.600 540.000 0.000
+465 807576.960 540.000 0.000
+700 542585.280 540.000 0.000
+450 308083.200 540.000 0.000
+1539 695838.720 540.000 0.000
+1031 311478.720 540.000 0.000
+111 335403.840 540.000 0.000
+1838 379365.120 540.000 0.000
+114 422162.880 540.000 0.000
+1337 418574.400 540.000 0.000
+798 679393.920 540.000 0.000
+1385 446021.760 540.000 0.000
+1477 417858.240 540.000 0.000
+1319 369624.960 540.000 0.000
+526 230364.480 540.000 0.000
+
+
+"1016"
+"Primary"
+47
+627 633088.320 540.000 0.000
+599 403931.520 540.000 0.000
+1790 694467.840 540.000 0.000
+1219 344287.680 540.000 0.000
+1723 665443.200 540.000 0.000
+1738 457272.000 540.000 0.000
+1693 548859.840 540.000 0.000
+741 308281.920 540.000 0.000
+1602 461737.920 540.000 0.000
+1481 587155.200 540.000 0.000
+1584 568606.080 540.000 0.000
+979 541856.640 540.000 0.000
+1572 360683.520 540.000 0.000
+974 423989.760 540.000 0.000
+893 492331.200 540.000 0.000
+1389 565269.120 540.000 0.000
+1179 456397.440 540.000 0.000
+1240 536472.960 540.000 0.000
+1162 552674.880 540.000 0.000
+800 615031.680 540.000 0.000
+1089 400654.080 540.000 0.000
+1421 454997.760 540.000 0.000
+1765 358397.760 540.000 0.000
+516 516946.560 540.000 0.000
+221 268580.160 540.000 0.000
+1182 421466.880 540.000 0.000
+634 613612.800 540.000 0.000
+549 380370.240 540.000 0.000
+680 419506.560 540.000 0.000
+1867 410216.640 540.000 0.000
+332 392214.720 540.000 0.000
+294 317141.760 540.000 0.000
+1111 691561.920 540.000 0.000
+458 805003.200 540.000 0.000
+704 541032.000 540.000 0.000
+446 307290.240 540.000 0.000
+1539 694626.240 540.000 0.000
+1026 310107.840 540.000 0.000
+111 334769.280 540.000 0.000
+1836 378210.240 540.000 0.000
+118 421490.880 540.000 0.000
+1338 417417.600 540.000 0.000
+798 677185.920 540.000 0.000
+1386 444137.280 540.000 0.000
+1477 416895.360 540.000 0.000
+1316 368661.120 540.000 0.000
+518 229589.760 540.000 0.000
+
+
+"1017"
+"Primary"
+47
+628 632196.480 540.000 0.000
+599 403390.080 540.000 0.000
+1791 693854.400 540.000 0.000
+1215 343394.880 540.000 0.000
+1724 665085.120 540.000 0.000
+1739 456325.440 540.000 0.000
+1695 547992.000 540.000 0.000
+736 307735.680 540.000 0.000
+1604 460881.600 540.000 0.000
+1485 585576.960 540.000 0.000
+1588 567917.760 540.000 0.000
+982 541071.360 540.000 0.000
+1569 359643.840 540.000 0.000
+975 423533.760 540.000 0.000
+897 491707.200 540.000 0.000
+1393 564915.840 540.000 0.000
+1181 455552.640 540.000 0.000
+1244 536135.040 540.000 0.000
+1166 551876.160 540.000 0.000
+803 614599.680 540.000 0.000
+1088 399793.920 540.000 0.000
+1423 454463.040 540.000 0.000
+1762 357255.360 540.000 0.000
+520 516820.800 540.000 0.000
+217 268415.040 540.000 0.000
+1182 420693.120 540.000 0.000
+634 612735.360 540.000 0.000
+549 379905.600 540.000 0.000
+682 418885.440 540.000 0.000
+1867 409008.960 540.000 0.000
+334 391773.120 540.000 0.000
+291 316947.840 540.000 0.000
+1112 690716.160 540.000 0.000
+451 803757.120 540.000 0.000
+708 540460.800 540.000 0.000
+443 306330.240 540.000 0.000
+1540 695179.200 540.000 0.000
+1021 309685.440 540.000 0.000
+111 334526.400 540.000 0.000
+1835 377040.960 540.000 0.000
+123 421139.520 540.000 0.000
+1338 416226.240 540.000 0.000
+799 676389.120 540.000 0.000
+1388 444029.760 540.000 0.000
+1477 416146.560 540.000 0.000
+1314 367810.560 540.000 0.000
+510 229207.680 540.000 0.000
+
+

data/test/import/test_pftrack_import.rb

@@ -9,6 +9,16 @@ class PFTrackImportTest < Test::Unit::TestCase
     assert !i.autodetects_size?
   end
   
+  def test_parsing_from_pftrack5_second_file
+    fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack5/apft.2dt')
+    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
+    
+    trackers = parser.parse(fixture)
+    assert_equal 4, trackers.length
+    second_tracker = trackers[1]
+    assert_equal "1015", second_tracker.name
+  end
+  
   def test_parsing_from_importable_pftrack_4
     
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack4/sourcefile_pftrack.2dt')

data/test/test_keyframe.rb

@@ -15,7 +15,7 @@ class KeyframeTest < Test::Unit::TestCase
   
   def test_inspect
     kf = Tracksperanto::Keyframe.new(:frame => 0, :abs_x => 10, :abs_y => 12.0)
-    assert_equal "[0, 10.0, 12.0]", kf.inspect
+    assert_equal "#< 10.0x12.0 @0 ~0.00) >", kf.inspect
   end
   
   def test_frame_translated_to_int

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.8.2
+  version: 1.8.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - test/import/samples/nuke/tracker_with_differing_gaps.nk
 - test/import/samples/nuke/tracker_with_repeating_gaps.nk
 - test/import/samples/pftrack4/sourcefile_pftrack.2dt
+- test/import/samples/pftrack5/apft.2dt
 - test/import/samples/pftrack5/garage.2dt
 - test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 - test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk