tracksperanto 2.12.0 → 3.0.0

data/test/{middleware → tools}/test_scaler_middleware.rb

@@ -1,22 +1,22 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class ScalerMiddlewareTest < Test::Unit::TestCase
+class ScalerToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Scale the comp by a specified factor", Tracksperanto::Middleware::Scaler.action_description
+    assert_equal "Scale the comp by a specified factor", Tracksperanto::Tool::Scaler.action_description
   end
   
   def test_default_factor_set_to_one
     receiver = flexmock
-    m = Tracksperanto::Middleware::Scaler.new(receiver)
+    m = Tracksperanto::Tool::Scaler.new(receiver)
     assert_equal 1.0, m.x_factor
     assert_equal 1.0, m.y_factor
   end
   
   def test_scaler_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Scaler.new(receiver, :x_factor => 1.2)
+    m = Tracksperanto::Tool::Scaler.new(receiver, :x_factor => 1.2)
     assert_equal 1.2, m.x_factor
   end
   
@@ -28,7 +28,7 @@ class ScalerMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Scaler.new(receiver, :x_factor => 2, :y_factor => 3)
+    m = Tracksperanto::Tool::Scaler.new(receiver, :x_factor => 2, :y_factor => 3)
     m.start_export(50, 60)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 60, 30, 0)
@@ -41,7 +41,7 @@ class ScalerMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:start_export).once.with(120, 80)
     receiver.should_receive(:export_point).once.with(1, 100, 20, 0)
 
-    m = Tracksperanto::Middleware::Scaler.new(receiver, :x_factor => -1, :y_factor => -1)
+    m = Tracksperanto::Tool::Scaler.new(receiver, :x_factor => -1, :y_factor => -1)
     m.start_export(120, 80)
     m.export_point(1, 20, 60, 0)
   end
@@ -57,7 +57,7 @@ class ScalerMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Scaler.new(receiver, :x_factor => 1.5, :y_factor => 1.4)
+    m = Tracksperanto::Tool::Scaler.new(receiver, :x_factor => 1.5, :y_factor => 1.4)
     m.start_export(50, 60)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 60, 30, 0.2)

data/test/{middleware → tools}/test_shift_middleware.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class ShiftMiddlewareTest < Test::Unit::TestCase
+class ShiftToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Move all the trackers by a specified number of pixels", Tracksperanto::Middleware::Shift.action_description
+    assert_equal "Move all the trackers by a specified number of pixels", Tracksperanto::Tool::Shift.action_description
   end
   
   def test_shift_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Shift.new(receiver, :x_shift => 1.2)
+    m = Tracksperanto::Tool::Shift.new(receiver, :x_shift => 1.2)
     assert_equal 1.2, m.x_shift
   end
   
@@ -21,7 +21,7 @@ class ShiftMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Shift.new(receiver, :x_shift => 63, :y_shift => 65)
+    m = Tracksperanto::Tool::Shift.new(receiver, :x_shift => 63, :y_shift => 65)
     m.start_export(50, 60)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 60, 30, 0)

data/test/{middleware → tools}/test_slip_middleware.rb

@@ -1,21 +1,21 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class SlipMiddlewareTest < Test::Unit::TestCase
+class SlipToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Slip all the tracker keyframes in time", Tracksperanto::Middleware::Slipper.action_description
+    assert_equal "Slip all the tracker keyframes in time", Tracksperanto::Tool::Slipper.action_description
   end
   
   def test_default_slip_set_to_zero
     receiver = flexmock
-    m = Tracksperanto::Middleware::Slipper.new(receiver)
+    m = Tracksperanto::Tool::Slipper.new(receiver)
     assert_equal 0, m.slip
   end
   
   def test_slip_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Slipper.new(receiver, :slip => -1)
+    m = Tracksperanto::Tool::Slipper.new(receiver, :slip => -1)
     assert_equal -1, m.slip
   end
   
@@ -27,7 +27,7 @@ class SlipMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Slipper.new(receiver, :slip => 32)
+    m = Tracksperanto::Tool::Slipper.new(receiver, :slip => 32)
     m.start_export(120, 120)
     m.start_tracker_segment("Tracker")
     m.export_point(0, 100, 100, 0)

data/test/{middleware → tools}/test_start_trim_middleware.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class StartTrimMiddlewareTest < Test::Unit::TestCase
+class StartTrimToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Remove all the keyframes that are on frames below 1", Tracksperanto::Middleware::StartTrim.action_description
+    assert_equal "Remove all the keyframes that are on frames below 1", Tracksperanto::Tool::StartTrim.action_description
   end
   
   def test_start_mw_works
@@ -16,7 +16,7 @@ class StartTrimMiddlewareTest < Test::Unit::TestCase
     x.should_receive(:end_tracker_segment).once
     x.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::StartTrim.new(x)
+    m = Tracksperanto::Tool::StartTrim.new(x)
     
     m.start_export(720, 576)
     m.start_tracker_segment("TrackerBehind")

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "2.12.0"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-10-01"
+  s.date = "2012-10-23"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -62,24 +62,24 @@ Gem::Specification.new do |s|
     "lib/import/shake_text.rb",
     "lib/import/syntheyes.rb",
     "lib/import/syntheyes_all_tracker_paths.rb",
-    "lib/middleware/base.rb",
-    "lib/middleware/crop.rb",
-    "lib/middleware/flip.rb",
-    "lib/middleware/flop.rb",
-    "lib/middleware/golden.rb",
-    "lib/middleware/length_cutoff.rb",
-    "lib/middleware/lens_disto.rb",
-    "lib/middleware/lerp.rb",
-    "lib/middleware/lint.rb",
-    "lib/middleware/move_to_first.rb",
-    "lib/middleware/pad.rb",
-    "lib/middleware/prefix.rb",
-    "lib/middleware/reformat.rb",
-    "lib/middleware/scaler.rb",
-    "lib/middleware/shift.rb",
-    "lib/middleware/slipper.rb",
-    "lib/middleware/start_trim.rb",
     "lib/pipeline/base.rb",
+    "lib/tools/base.rb",
+    "lib/tools/crop.rb",
+    "lib/tools/flip.rb",
+    "lib/tools/flop.rb",
+    "lib/tools/golden.rb",
+    "lib/tools/length_cutoff.rb",
+    "lib/tools/lens_disto.rb",
+    "lib/tools/lerp.rb",
+    "lib/tools/lint.rb",
+    "lib/tools/move_to_first.rb",
+    "lib/tools/pad.rb",
+    "lib/tools/prefix.rb",
+    "lib/tools/reformat.rb",
+    "lib/tools/scaler.rb",
+    "lib/tools/shift.rb",
+    "lib/tools/slipper.rb",
+    "lib/tools/start_trim.rb",
     "lib/tracksperanto.rb",
     "lib/tracksperanto/block_init.rb",
     "lib/tracksperanto/buffer_io.rb",
@@ -90,6 +90,7 @@ Gem::Specification.new do |s|
     "lib/tracksperanto/format_detector.rb",
     "lib/tracksperanto/keyframe.rb",
     "lib/tracksperanto/parameters.rb",
+    "lib/tracksperanto/pf_coords.rb",
     "lib/tracksperanto/returning.rb",
     "lib/tracksperanto/safety.rb",
     "lib/tracksperanto/simple_export.rb",
@@ -155,22 +156,14 @@ Gem::Specification.new do |s|
     "test/import/test_shake_text_import.rb",
     "test/import/test_syntheyes_all_tracker_paths_import.rb",
     "test/import/test_syntheyes_import.rb",
-    "test/middleware/test_crop_middleware.rb",
-    "test/middleware/test_flip_middleware.rb",
-    "test/middleware/test_flop_middleware.rb",
-    "test/middleware/test_golden_middleware.rb",
-    "test/middleware/test_length_cutoff_middleware.rb",
-    "test/middleware/test_lens_middleware.rb",
-    "test/middleware/test_lerp_middleware.rb",
-    "test/middleware/test_lint_middleware.rb",
-    "test/middleware/test_move_to_first_frame_middleware.rb",
-    "test/middleware/test_pad_middleware.rb",
-    "test/middleware/test_prefix.rb",
-    "test/middleware/test_reformat_middleware.rb",
-    "test/middleware/test_scaler_middleware.rb",
-    "test/middleware/test_shift_middleware.rb",
-    "test/middleware/test_slip_middleware.rb",
-    "test/middleware/test_start_trim_middleware.rb",
+    "test/subpixel/Flame_Smk2013_SubpixSample.stabilizer",
+    "test/subpixel/julik_pftrack.txt",
+    "test/subpixel/shake_subpix_v01.shk",
+    "test/subpixel/subpix_import_test.rb",
+    "test/subpixel/subpixel_grid.ifl",
+    "test/subpixel/subpixel_grid.sni",
+    "test/subpixel/subpixel_grid.tif",
+    "test/subpixel/sy_subpix_2dpaths.txt",
     "test/test_buffer_io.rb",
     "test/test_bufferingreader.rb",
     "test/test_casts.rb",
@@ -185,8 +178,25 @@ Gem::Specification.new do |s|
     "test/test_simple_export.rb",
     "test/test_tracker.rb",
     "test/test_tracksperanto.rb",
+    "test/test_uv_coords.rb",
     "test/test_yield_non_empty.rb",
     "test/test_zip_tuples.rb",
+    "test/tools/test_crop_middleware.rb",
+    "test/tools/test_flip_middleware.rb",
+    "test/tools/test_flop_middleware.rb",
+    "test/tools/test_golden_middleware.rb",
+    "test/tools/test_length_cutoff_middleware.rb",
+    "test/tools/test_lens_middleware.rb",
+    "test/tools/test_lerp_middleware.rb",
+    "test/tools/test_lint_middleware.rb",
+    "test/tools/test_move_to_first_frame_middleware.rb",
+    "test/tools/test_pad_middleware.rb",
+    "test/tools/test_prefix.rb",
+    "test/tools/test_reformat_middleware.rb",
+    "test/tools/test_scaler_middleware.rb",
+    "test/tools/test_shift_middleware.rb",
+    "test/tools/test_slip_middleware.rb",
+    "test/tools/test_start_trim_middleware.rb",
     "tracksperanto.gemspec"
   ]
   s.homepage = "http://guerilla-di.org/tracksperanto"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obuf
@@ -225,24 +225,24 @@ files:
 - lib/import/shake_text.rb
 - lib/import/syntheyes.rb
 - lib/import/syntheyes_all_tracker_paths.rb
-- lib/middleware/base.rb
-- lib/middleware/crop.rb
-- lib/middleware/flip.rb
-- lib/middleware/flop.rb
-- lib/middleware/golden.rb
-- lib/middleware/length_cutoff.rb
-- lib/middleware/lens_disto.rb
-- lib/middleware/lerp.rb
-- lib/middleware/lint.rb
-- lib/middleware/move_to_first.rb
-- lib/middleware/pad.rb
-- lib/middleware/prefix.rb
-- lib/middleware/reformat.rb
-- lib/middleware/scaler.rb
-- lib/middleware/shift.rb
-- lib/middleware/slipper.rb
-- lib/middleware/start_trim.rb
 - lib/pipeline/base.rb
+- lib/tools/base.rb
+- lib/tools/crop.rb
+- lib/tools/flip.rb
+- lib/tools/flop.rb
+- lib/tools/golden.rb
+- lib/tools/length_cutoff.rb
+- lib/tools/lens_disto.rb
+- lib/tools/lerp.rb
+- lib/tools/lint.rb
+- lib/tools/move_to_first.rb
+- lib/tools/pad.rb
+- lib/tools/prefix.rb
+- lib/tools/reformat.rb
+- lib/tools/scaler.rb
+- lib/tools/shift.rb
+- lib/tools/slipper.rb
+- lib/tools/start_trim.rb
 - lib/tracksperanto.rb
 - lib/tracksperanto/block_init.rb
 - lib/tracksperanto/buffer_io.rb
@@ -253,6 +253,7 @@ files:
 - lib/tracksperanto/format_detector.rb
 - lib/tracksperanto/keyframe.rb
 - lib/tracksperanto/parameters.rb
+- lib/tracksperanto/pf_coords.rb
 - lib/tracksperanto/returning.rb
 - lib/tracksperanto/safety.rb
 - lib/tracksperanto/simple_export.rb
@@ -318,22 +319,14 @@ files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_all_tracker_paths_import.rb
 - test/import/test_syntheyes_import.rb
-- test/middleware/test_crop_middleware.rb
-- test/middleware/test_flip_middleware.rb
-- test/middleware/test_flop_middleware.rb
-- test/middleware/test_golden_middleware.rb
-- test/middleware/test_length_cutoff_middleware.rb
-- test/middleware/test_lens_middleware.rb
-- test/middleware/test_lerp_middleware.rb
-- test/middleware/test_lint_middleware.rb
-- test/middleware/test_move_to_first_frame_middleware.rb
-- test/middleware/test_pad_middleware.rb
-- test/middleware/test_prefix.rb
-- test/middleware/test_reformat_middleware.rb
-- test/middleware/test_scaler_middleware.rb
-- test/middleware/test_shift_middleware.rb
-- test/middleware/test_slip_middleware.rb
-- test/middleware/test_start_trim_middleware.rb
+- test/subpixel/Flame_Smk2013_SubpixSample.stabilizer
+- test/subpixel/julik_pftrack.txt
+- test/subpixel/shake_subpix_v01.shk
+- test/subpixel/subpix_import_test.rb
+- test/subpixel/subpixel_grid.ifl
+- test/subpixel/subpixel_grid.sni
+- test/subpixel/subpixel_grid.tif
+- test/subpixel/sy_subpix_2dpaths.txt
 - test/test_buffer_io.rb
 - test/test_bufferingreader.rb
 - test/test_casts.rb
@@ -348,8 +341,25 @@ files:
 - test/test_simple_export.rb
 - test/test_tracker.rb
 - test/test_tracksperanto.rb
+- test/test_uv_coords.rb
 - test/test_yield_non_empty.rb
 - test/test_zip_tuples.rb
+- test/tools/test_crop_middleware.rb
+- test/tools/test_flip_middleware.rb
+- test/tools/test_flop_middleware.rb
+- test/tools/test_golden_middleware.rb
+- test/tools/test_length_cutoff_middleware.rb
+- test/tools/test_lens_middleware.rb
+- test/tools/test_lerp_middleware.rb
+- test/tools/test_lint_middleware.rb
+- test/tools/test_move_to_first_frame_middleware.rb
+- test/tools/test_pad_middleware.rb
+- test/tools/test_prefix.rb
+- test/tools/test_reformat_middleware.rb
+- test/tools/test_scaler_middleware.rb
+- test/tools/test_shift_middleware.rb
+- test/tools/test_slip_middleware.rb
+- test/tools/test_start_trim_middleware.rb
 - tracksperanto.gemspec
 homepage: http://guerilla-di.org/tracksperanto
 licenses:
@@ -366,7 +376,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1672387302820821505
+      hash: 3337018402243873994
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/middleware/start_trim.rb

@@ -1,17 +0,0 @@
-# -*- encoding : utf-8 -*-
-# This middleware removes all keyframes before frame 0, and skips trackers entirely if they are all before frame 0
-class Tracksperanto::Middleware::StartTrim < Tracksperanto::Middleware::Base
-  
-  def self.action_description
-    "Remove all the keyframes that are on frames below 1"
-  end
-  
-  def start_export( img_width, img_height)
-    @exporter = Tracksperanto::Middleware::LengthCutoff.new(@exporter, :min_length => 1) # Ensure at least one keyframe
-    super
-  end
-  
-  def export_point(frame, float_x, float_y, float_residual)
-    return super unless frame < 0
-  end
-end