tracksperanto 3.3.11 → 3.3.12

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.3.12
+
+* Fix the bug in MatchMover imports that caused the import to fail if the file contained a multiline path
+
 === 3.3.11
 
 * Fix the bug that caused CLI short flags to be ignored

data/lib/import/match_mover.rb

@@ -26,9 +26,24 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
     last_line = lines[-1]
     int_groups = last_line.scan(/(\d+)/).flatten.map{|e| e.to_i }
     @width, @height = int_groups.shift, int_groups.shift
+    unless @width && @height
+      raise "Cannot detect the dimensions of the comp from the file"
+    end
+    
     # Next the starting frame of the sequence. The preamble ends with the p(0 293 1)
-    # which is p( first_frame length framestep )
-    @first_frame_of_sequence, length, frame_step = int_groups[-3], int_groups[-2], int_groups[-1]
+    # which is p( first_frame length framestep ). Some files export the path to the sequence
+    # as multiline, so we will need to succesively scan until we find our line that contains the dimensions
+    frame_steps_re = /b\( (\d+) (\d+) (\d+) \)/ # b( 0 293 1 )
+    until @first_frame_of_sequence
+      digit_groups = last_line.scan(frame_steps_re).flatten
+      if digit_groups.any?
+        @first_frame_of_sequence, length, frame_step = digit_groups.map{|e| e.to_i }
+        return
+      end
+      last_line = io.gets
+    end
+    
+    raise "Cannot detect the start frame of the sequence"
   end
   
   def extract_trackers(io)

data/lib/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.3.11'
+  VERSION = '3.3.12'
   
   module Import; end
   module Export; end

data/test/import/test_match_mover_import.rb

@@ -7,6 +7,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   P = File.dirname(__FILE__) + '/samples/match_mover/kipPointsMatchmover.rz2'
   P2 = File.dirname(__FILE__) + '/samples/match_mover/NonSequentialMatchmoverPoints.rz2'
   P3 = File.dirname(__FILE__) + '/samples/match_mover/cha_171_1020_atb_v001.rz2'
+  P4 = File.dirname(__FILE__) + '/samples/match_mover/2dtracks.rz2'
   
   def test_introspects_properly
     i = Tracksperanto::Import::MatchMover
@@ -59,4 +60,25 @@ class MatchMoverImportTest < Test::Unit::TestCase
     assert_in_delta 0.027457, last_kf.residual, DELTA
   end
   
+  def test_parsing_from_matchmover_with_multiline_sequence_path
+    fixture = File.open(P4)
+    
+    parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
+    trackers = parser.to_a
+    
+    assert_equal 2156, parser.width
+    assert_equal 1804, parser.height
+    
+    assert_equal 18, trackers.length
+    
+    first_t = trackers[0]
+    assert_equal "Track_01", first_t.name
+    assert_equal 137, first_t.length
+    first_kf = first_t[0]
+    
+    assert_equal 119, first_kf.frame
+    assert_in_delta 10.715, first_kf.abs_x, DELTA 
+    assert_in_delta 461.36, first_kf.abs_y, DELTA
+    assert_in_delta 0.2, first_kf.residual, DELTA
+  end
 end

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.3.11"
+  s.version = "3.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-10-08"
+  s.date = "2013-11-07"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.3.11
+  version: 3.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -456,7 +456,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1946567942053195815
+      hash: -3669593721904683814
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: