From: <bru...@us...> - 2013-03-20 23:01:28
|
Revision: 1357 http://panotools.svn.sourceforge.net/panotools/?rev=1357&view=rev Author: brunopostle Date: 2013-03-20 23:01:21 +0000 (Wed, 20 Mar 2013) Log Message: ----------- Support new Tpp and Tpy parameters Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/ptovariable trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm trunk/Panotools-Script/lib/Panotools/Script/Line/Panorama.pm trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2013-01-31 21:31:23 UTC (rev 1356) +++ trunk/Panotools-Script/Changes 2013-03-20 23:01:21 UTC (rev 1357) @@ -5,6 +5,7 @@ - new tool: pto2gpano - add GPano XMP metadata - ptovariable: support XYZ translation parameters - match-n-shift: create a project based on a CSV list input file + - support new Tpy,Tpp yaw and pitch of remapping plane for translation 0.27 - remove linux desktop entries for tif2svg-gui enblend-svg process-masks-gui qtvr2erect-gui Modified: trunk/Panotools-Script/bin/ptovariable =================================================================== --- trunk/Panotools-Script/bin/ptovariable 2013-01-31 21:31:23 UTC (rev 1356) +++ trunk/Panotools-Script/bin/ptovariable 2013-03-20 23:01:21 UTC (rev 1357) @@ -17,6 +17,8 @@ my @TrX; my @TrY; my @TrZ; +my @Tpp; +my @Tpy; my $view = 0; my $barrel = 0; my $centre = 0; @@ -42,6 +44,8 @@ 'TrX=i' => \@TrX, 'TrY=i' => \@TrY, 'TrZ=i' => \@TrZ, + 'Tpp=i' => \@Tpp, + 'Tpy=i' => \@Tpy, 'vignetting' => \$vignetting, 'vignetting-centre' => \$vignetting_centre, 'response' => \$response, @@ -107,6 +111,9 @@ $variable->{$_}->{TrY} = 1 for (@TrY); $variable->{$_}->{TrZ} = 1 for (@TrZ); +$variable->{$_}->{Tpp} = 1 for (@Tpp); +$variable->{$_}->{Tpy} = 1 for (@Tpy); + $pto->Write ($path_output); __END__ Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm 2013-01-31 21:31:23 UTC (rev 1356) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm 2013-03-20 23:01:21 UTC (rev 1357) @@ -70,6 +70,8 @@ TrX,TrY,TrZ Translation on x axis, y axis, z axis + Tpy,Tpp yaw and pitch of remapping plane for translation + Te0,Te1,Te2,Te3 Test parameters Vm vignetting correction mode (default 0): @@ -124,9 +126,9 @@ %{$self} = (a => 0, b => 0, c => 0, d => 0, e => 0, r => 0, p => 0, y => 0); } -sub _valid { return '^([abcdefghjnprtvwy]|[SCXYZ]|K[0-2][ab]|V[abcdfmxy]|Eev|E[rb]|Te[0123]|Tr[XYZ]|Ti[XYZS]|R[abcde])(.*)' } +sub _valid { return '^([abcdefghjnprtvwy]|[SCXYZ]|K[0-2][ab]|V[abcdfmxy]|Eev|E[rb]|Tp[yp]|Te[0123]|Tr[XYZ]|Ti[XYZS]|R[abcde])(.*)' } -sub _valid_ptoptimizer { return '^([abcdefghnprtvwySC]|Te[0123]|Tr[XYZ]|Ti[XYZS])(.*)' } +sub _valid_ptoptimizer { return '^([abcdefghnprtvwySC]|Tp[yp]|Te[0123]|Tr[XYZ]|Ti[XYZS])(.*)' } sub _sanitise_ptoptimizer { Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Panorama.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Panorama.pm 2013-01-31 21:31:23 UTC (rev 1356) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Panorama.pm 2013-03-20 23:01:21 UTC (rev 1357) @@ -36,6 +36,9 @@ 16 - Equirectangular Panini 17 - Biplane 18 - Triplane + 19 - Panini_General + 20 - Thoby + 21 - Hammer v360 horizontal field of view of panorama (default 360) nPICT Panorama file format, one of: Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm 2013-01-31 21:31:23 UTC (rev 1356) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm 2013-03-20 23:01:21 UTC (rev 1357) @@ -38,6 +38,8 @@ TrX3 Optimise x-coordinate of image 3, mosaic/translation mode TrY2 Optimise y-coordinate of image 2, mosaic/translation mode TrZ1 Optimise z-coordinate of image 1, mosaic/translation mode + Tpp1 Optimise pitch of picture plane of image 1, mosaic/translation mode + Tpy1 Optimise yaw of picture plane of image 1, mosaic/translation mode Additionally, photometric optimisation uses the same system. although this is a secondary process and not simultaneous with geometric optimisation: @@ -63,7 +65,7 @@ =cut -sub _valid { return '^([abcdegprtvyXYZ]|Te[0123]|Tr[XYZ]|Ti[XYZS]|Eev|Er|Eb|Ra|Rb|Rc|Rd|Re|Va|Vb|Vc|Vd|Vx|Vy)(.*)' } +sub _valid { return '^([abcdegprtvyXYZ]|Te[0123]|Tp[py]|Tr[XYZ]|Ti[XYZS]|Eev|Er|Eb|Ra|Rb|Rc|Rd|Re|Va|Vb|Vc|Vd|Vx|Vy)(.*)' } sub Identifier { @@ -76,10 +78,10 @@ my $self = shift; my $string = shift || return 0; my $valid = $self->_valid; - my @res = $string =~ / ([a-zERV]+[0-9]+)/g; + my @res = $string =~ / ([a-zA-Z]+[0-9]+)/g; for my $token (grep { defined $_ } @res) { - my ($param, $image) = $token =~ /([a-zERV]+)([0-9]+)/; + my ($param, $image) = $token =~ /([a-zA-Z]+)([0-9]+)/; next unless defined $image; $self->{$image}->{$param} = 1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |