From: <bru...@us...> - 2007-04-13 21:32:47
|
Revision: 688 http://svn.sourceforge.net/panotools/?rev=688&view=rev Author: brunopostle Date: 2007-04-13 14:32:47 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Allow specification of alternative tools via STITCHER and OPTIMISER environment Modified Paths: -------------- trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2007-04-13 15:29:36 UTC (rev 687) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2007-04-13 21:32:47 UTC (rev 688) @@ -65,8 +65,8 @@ $self->{output} = []; $self->{control} = []; $self->{controlmorph} = []; - $self->{stitcher} = 'nona'; # nona, PTmender, PTStitcher, Tmender - $self->{optimiser} = 'PTOptimizer'; # PToptimizer PTOptimizer, autooptimiser + $self->{stitcher} = $ENV{STITCHER} || 'nona'; # nona, PTmender, PTStitcher, Tmender + $self->{optimiser} = $ENV{OPTIMISER} || 'PTOptimizer'; # PToptimizer PTOptimizer, autooptimiser $self->{basedir} = File::Spec->rel2abs (File::Spec->curdir); } @@ -280,13 +280,14 @@ { my $self = shift; my $outfile = shift; + my @options = @_; my ($fh, $tempfile) = tempfile (SUFFIX => '.txt', UNLINK => $CLEANUP); $self->Image2Output; my $vector = File::Spec->abs2rel ($self->{basedir}, File::Spec->tmpdir); $self->Write ($tempfile, $vector); my $cwd = File::Spec->curdir; chdir (File::Spec->tmpdir); - my @args = ($self->{stitcher}, '-o', $outfile, $tempfile); + my @args = ($self->{stitcher}, @options, '-o', $outfile, $tempfile); system (@args); chdir ($cwd); return 0 unless ($? == 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2007-07-26 20:54:55
|
Revision: 726 http://panotools.svn.sourceforge.net/panotools/?rev=726&view=rev Author: brunopostle Date: 2007-07-26 13:54:55 -0700 (Thu, 26 Jul 2007) Log Message: ----------- autooptimise pairwise by default Modified Paths: -------------- trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2007-07-25 20:27:03 UTC (rev 725) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2007-07-26 20:54:55 UTC (rev 726) @@ -290,7 +290,7 @@ my $try = new Panotools::Script; if ($self->{optimiser} =~ /autooptimiser/) { - system ($self->{optimiser}, '-o', $outfile, $tempfile); + system ($self->{optimiser}, '-p', '-o', $outfile, $tempfile); return 0 unless ($? == 0); $try->Read ($outfile) || return 0; $try->Image2Output; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-05 00:39:09
|
Revision: 774 http://panotools.svn.sourceforge.net/panotools/?rev=774&view=rev Author: brunopostle Date: 2008-01-04 16:39:12 -0800 (Fri, 04 Jan 2008) Log Message: ----------- Remove Optimise() method Modified Paths: -------------- trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-01-05 00:38:29 UTC (rev 773) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-01-05 00:39:12 UTC (rev 774) @@ -243,47 +243,6 @@ $self->{controlmorph}; } -# deprecated Optimise() method - -sub Optimise -{ - my $self = shift; - $self->Image2Output; - my $tempdir = tempdir (CLEANUP => $CLEANUP); - my $tempfile = File::Spec->catfile ($tempdir, 'optimise.txt'); - my $outfile = File::Spec->catfile ($tempdir, 'outfile.txt'); - my $clone = $self->Clone; - for my $image (@{$clone->Image}) - { - $image->_sanitise_ptoptimizer; - } - $clone->Write ($tempfile); - my $try = new Panotools::Script; - if ($self->{optimiser} =~ /autooptimiser/) - { - system ($self->{optimiser}, '-p', '-o', $outfile, $tempfile); - return 0 unless ($? == 0); - $try->Read ($outfile) || return 0; - $try->Image2Output; - } - else - { - system ($self->{optimiser}, $tempfile); - return 0 unless ($? == 0); - $try->Read ($tempfile) || return 0; - } - for my $index (0 .. scalar (@{$try->Output}) - 1) - { - for my $key (keys %{$try->Output->[$index]}) - { - my $value = $try->Output->[$index]->{$key}; - $self->Output->[$index]->Set ($key => $value); - } - } - $self->Output2Image; - return 1; -} - =pod Rotate transform all the images in a project, angles in degrees: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-12 21:08:52
|
Revision: 849 http://panotools.svn.sourceforge.net/panotools/?rev=849&view=rev Author: brunopostle Date: 2008-06-12 14:08:55 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Update description Modified Paths: -------------- trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-12 20:19:36 UTC (rev 848) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-12 21:08:55 UTC (rev 849) @@ -10,11 +10,11 @@ =head1 DESCRIPTION -Panorama Tools script files are used by several tools, including PTStitcher, -PTOptimizer, autooptimiser, nona and PTmender. +Library and utilities for manipulating project files created by the hugin photo +stitching software. -There are GUI tools to help create them: hugin, PTGui, PTAssembler, -autopano-sift and PTMac. +This file format is shared with various other tools, in particular this module +is also capable of working with Panorama Tools script files. =cut This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |