tracksperanto 3.5.7 → 3.5.8

data/Gemfile

@@ -4,8 +4,8 @@ source 'http://rubygems.org'
 gem "bundler"
 
 gem "obuf", "~> 1.1"
-gem "tickly", "~> 2.1.5"
-gem "bychar", "~> 2"
+gem "tickly", "~> 2.1.6"
+gem "bychar", "~> 3"
 gem "progressive_io", "~> 1.0"
 gem "flame_channel_parser", "~> 4.0"
 

data/lib/import/flame_stabilizer.rb

@@ -55,11 +55,6 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
     class StabilizerParser < FlameChannelParser::Parser
       USEFUL_CHANNELS = %w( /shift/x /shift/y /ref/x /ref/y ).map(&Regexp.method(:new))
       
-      # This method tells the importer whether a channel that has been found in the source
-      # setup is needed. If that method returns ++false++ the channel will be discarded and not
-      # kept in memory. Should you need to write a module that scavenges other Flame animation channels
-      # inherit from this class and rewrite this method to either return +true+ always (then all the channels
-      # will be recovered) or to return +true+ only for channels that you actually need.
       def channel_is_useful?(channel_name)
         USEFUL_CHANNELS.any?{|e| channel_name =~ e }
       end

data/lib/import/match_mover.rb

@@ -15,6 +15,7 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
   
   def each
     detect_format(@io)
+    raise "No tracker data after detecting format" if @io.eof?
     extract_trackers(@io) { |t| yield(t) }
   end
   
@@ -35,6 +36,13 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
     # 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
+      # There was nothing fetched, so we just assume the first frame is 0.
+      # Or this line contained "}" which terminates the imageSequence block.
+      if last_line.nil? || last_line.include?('}')
+        @first_frame_of_sequence = 0
+        return
+      end
+      
       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 }
@@ -42,7 +50,6 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
       end
       last_line = io.gets
     end
-    
     raise "Cannot detect the start frame of the sequence"
   end
   
@@ -64,21 +71,26 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
     raise "Track didn't close"
   end
   
-  LINE_PATTERN = /(\d+)(\s+)([\-\d\.]+)(\s+)([\-\d\.]+)(\s+)(.+)/
+  FLOAT_PATTERN = /[\-\d\.]+/
+  LINE_PATTERN = /(\d+)\s+(#{FLOAT_PATTERN})\s+(#{FLOAT_PATTERN})/
   
   def extract_key(line)
-    frame, x, y, residual, rest = line.scan(LINE_PATTERN).flatten.reject{|e| e.strip.empty? }
+    frame, x, y = line.scan(LINE_PATTERN).flatten
     Tracksperanto::Keyframe.new(
       :frame => (frame.to_i - @first_frame_of_sequence),
       :abs_x => x,
       :abs_y => @height - y.to_f, # Top-left in MM
-      :residual => extract_residual(residual)
+      :residual => extract_residual(line)
     )
   end
   
-  def extract_residual(residual_segment)
-    # Parse to the first opening brace and pick the residual from there
-    float_pat = /([\-\d\.]+)/
-    1 - residual_segment.scan(float_pat).flatten.shift.to_f
+  RESIDUAL_SEGMENT = /p[\*\+]\(\s+?(#{FLOAT_PATTERN})\s+?\)/
+  
+  def extract_residual(line)
+    if line =~ RESIDUAL_SEGMENT
+      1- $1.to_f
+    else
+      0
+    end
   end
 end

data/lib/import/nuke_script.rb

@@ -28,7 +28,7 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     parser.add_node_handler_class(CornerPin2D)
     parser.add_node_handler_class(Transform)
     
-    parser.parse(@io) do | node |
+    parser.parse(Bychar.wrap(@io)) do | node |
       node.trackers.each do | t |
         report_progress("Scavenging tracker #{t.name}")
         yield t

data/lib/import/shake_grammar/lexer.rb

@@ -25,17 +25,15 @@ module Tracksperanto::ShakeGrammar
     # You can use the sentinel to collect data from child nodes for example.
     def initialize(with_io, sentinel = nil, limit_to_one_stmt = false, stack_depth = 0)
       # We parse byte by byte, but reading byte by byte is very slow. We therefore use a buffering reader
-      # that will cache in chunks, and then read from there byte by byte. This yields a substantial speedup (4.9 seconds for the test
+      # that will cache in chunks, and then read from there byte by byte.
+      # This yields a substantial speedup (4.9 seconds for the test
       # as opposed to 7.9 without this). We do check for the proper class only once so that when we use nested lexers
       # we only wrap the passed IO once, and only if necessary.
-      with_io = Bychar.wrap(with_io) unless with_io.respond_to?(:read_one_char!)
+      with_io = Bychar.wrap(with_io) unless with_io.respond_to?(:read_one_char)
       @io, @stack, @buf, @sentinel, @limit_to_one_stmt, @stack_depth  = with_io, [], '', sentinel, limit_to_one_stmt, stack_depth
       
       catch(STOP_TOKEN) do
-        begin
-          loop { parse }
-        rescue Bychar::EOF
-        end
+        loop { parse }
       end
       
       @in_comment ? consume_comment! : consume_atom!
@@ -54,8 +52,6 @@ module Tracksperanto::ShakeGrammar
     
     def parse
       
-      c = @io.read_one_char!
-      
       if @buf.length > MAX_BUFFER_SIZE # Wrong format and the buffer is filled up, bail
         raise WrongInputError, "Atom buffer overflow at #{MAX_BUFFER_SIZE} bytes, this is definitely not a Shake script"
       end
@@ -64,6 +60,9 @@ module Tracksperanto::ShakeGrammar
         raise WrongInputError, "Stack overflow at level #{MAX_STACK_DEPTH}, this is probably a LISP program uploaded by accident"
       end
       
+      c = @io.read_one_char
+      throw :__stop if c.nil? # IO has run out
+      
       if c == '/' && (@buf[-1].chr rescue nil) == '/' # Comment start
         # If some other data from this line has been accumulated we first consume that
         @buf = @buf[0..-2] # everything except the opening slash of the comment

data/lib/tracksperanto.rb

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

data/lib/tracksperanto/blacklist.rb

@@ -18,7 +18,7 @@ class Tracksperanto::Blacklist
       /\.(r3d)$/ => 'Tracksperanto is not a tracking application, it converts tracks. We do not support RAW file formats.',
       /\.(dpx|tif(f?)|jp(e?)g|png|gif|tga)$/ => 'Tracksperanto is not a tracking application, it converts tracks. We do not support image file formats.',
       '.sni' => 'We cannot read binary SynthEyes scene files. Export your tracks as one of the supported formats.',
-      /\.(pfb|pfmp)/ => 'We cannot directly open PFTrack projects, export .2dt files instead',
+      /\.(pfb|pfmp|ptp)/ => 'We cannot directly open PFTrack projects, export .2dt files instead',
       '.mmf' => 'We cannot directly open MatchMover projects, please export your tracks as .rz2 instead',
       /\.(doc(x?)|xls(x?)|ppt(x?))/ => 'You really think we can process Microsoft Office files? You need a drink.',
       /\.(abc|fbx)$/ => 'We cannot import 3D scenes such as Alembic or FBX.',

data/test/import/test_match_mover_import.rb

@@ -3,12 +3,6 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class MatchMoverImportTest < Test::Unit::TestCase
   DELTA = 0.01
-  
-  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
     assert_equal "MatchMover REALVIZ Ascii Point Tracks .rz2 file", i.human_name
@@ -16,7 +10,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   end
   
   def test_parsing_with_non_sequential_keyframes
-    fixture = File.open(P2)
+    fixture = File.open(File.dirname(__FILE__) + '/samples/match_mover/NonSequentialMatchmoverPoints.rz2')
     
     parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
     trackers = parser.to_a
@@ -25,7 +19,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   end
   
   def test_parsing_case_nil_exception
-    fixture = File.open(P3)
+    fixture = File.open(File.dirname(__FILE__) + '/samples/match_mover/cha_171_1020_atb_v001.rz2')
     
     parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
     trackers = parser.to_a
@@ -33,7 +27,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   end
   
   def test_parsing_from_matchmover
-    fixture = File.open(P)
+    fixture = File.open(File.dirname(__FILE__) + '/samples/match_mover/kipPointsMatchmover.rz2')
     
     parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
     trackers = parser.to_a
@@ -51,17 +45,17 @@ class MatchMoverImportTest < Test::Unit::TestCase
     assert_equal 0, first_kf.frame
     assert_in_delta 649.523, first_kf.abs_x, DELTA 
     assert_in_delta 656.071, first_kf.abs_y, DELTA
-    assert_in_delta 0.2, first_kf.residual, DELTA
+    assert_in_delta 0.0, first_kf.residual, DELTA
     
-    last_kf = first_t[-1]
-    assert_equal 130, last_kf.frame
-    assert_in_delta 603.148, last_kf.abs_x, DELTA 
-    assert_in_delta 351.54, last_kf.abs_y, DELTA
+    last_kf = first_t[-2]
+    assert_equal 129, last_kf.frame
+    assert_in_delta 598.273, last_kf.abs_x, DELTA 
+    assert_in_delta 367.103, last_kf.abs_y, DELTA
     assert_in_delta 0.027457, last_kf.residual, DELTA
   end
   
   def test_parsing_from_matchmover_with_multiline_sequence_path
-    fixture = File.open(P4)
+    fixture = File.open(File.dirname(__FILE__) + '/samples/match_mover/2dtracks.rz2')
     
     parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
     trackers = parser.to_a
@@ -79,6 +73,29 @@ class MatchMoverImportTest < Test::Unit::TestCase
     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
+    assert_in_delta 0.0, first_kf.residual, DELTA
+  end
+  
+  def test_parsing_from_file_with_shortened_sequence_format
+    fixture = File.open(File.dirname(__FILE__) + '/samples/match_mover/EP_1000_head_trackers_v002.rz2')
+    
+    parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
+    trackers = parser.to_a
+    
+    assert_equal 714, parser.width
+    assert_equal 480, parser.height
+    
+    assert_equal 7, trackers.length
+    
+    first_t = trackers[0]
+    assert_equal "Tracker0002", first_t.name
+    assert_equal 130, first_t.length
+    first_kf = first_t[0]
+    
+    assert_equal 1017, first_kf.frame
+    assert_in_delta 357.89, first_kf.abs_x, DELTA 
+    assert_in_delta 371.96, first_kf.abs_y, DELTA
+    assert_in_delta 0.0, first_kf.residual, DELTA
   end
+  
 end

data/test/test_blacklist.rb

@@ -24,6 +24,7 @@ class TestBlacklist < Test::Unit::TestCase
       file.sni
       file.ma
       file.mb
+      file.ptp
       file.pfb
       file.pfmp
       file.mmf

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.5.7"
+  s.version = "3.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-12-04}
+  s.date = %q{2015-06-04}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Converts 2D track exports between different apps like Flame, MatchMover, PFTrack...}
   s.email = %q{me@julik.nl}
@@ -221,8 +221,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<tickly>, ["~> 2.1.5"])
-      s.add_runtime_dependency(%q<bychar>, ["~> 2"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 2.1.6"])
+      s.add_runtime_dependency(%q<bychar>, ["~> 3"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_runtime_dependency(%q<progressbar>, ["= 0.10.0"])
@@ -237,8 +237,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_dependency(%q<tickly>, ["~> 2.1.5"])
-      s.add_dependency(%q<bychar>, ["~> 2"])
+      s.add_dependency(%q<tickly>, ["~> 2.1.6"])
+      s.add_dependency(%q<bychar>, ["~> 3"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_dependency(%q<progressbar>, ["= 0.10.0"])
@@ -254,8 +254,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<obuf>, ["~> 1.1"])
-    s.add_dependency(%q<tickly>, ["~> 2.1.5"])
-    s.add_dependency(%q<bychar>, ["~> 2"])
+    s.add_dependency(%q<tickly>, ["~> 2.1.6"])
+    s.add_dependency(%q<bychar>, ["~> 3"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
     s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
     s.add_dependency(%q<progressbar>, ["= 0.10.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 5
-  - 7
-  version: 3.5.7
+  - 8
+  version: 3.5.8
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-04 00:00:00 +01:00
+date: 2015-06-04 00:00:00 +02:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,12 +53,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 2
         - 1
-        - 5
-        version: 2.1.5
+        - 6
+        version: 2.1.6
   type: :runtime
   version_requirements: *id003
   prerelease: false
@@ -69,10 +69,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
-        - 2
-        version: "2"
+        - 3
+        version: "3"
   type: :runtime
   version_requirements: *id004
   prerelease: false