[panotools-cvs] SF.net SVN: panotools: [705] trunk/Panotools-Script

[<bru...@us...>]

Revision: 705
          http://svn.sourceforge.net/panotools/?rev=705&view=rev
Author:   brunopostle
Date:     2007-05-09 14:47:43 -0700 (Wed, 09 May 2007)

Log Message:
-----------
default to autooptimiser instead of PTOptimizer

Modified Paths:
--------------
    trunk/Panotools-Script/Changes
    trunk/Panotools-Script/README
    trunk/Panotools-Script/lib/Panotools/Script.pm
    trunk/Panotools-Script/t/010.read-stitch.t

Modified: trunk/Panotools-Script/Changes
===================================================================
--- trunk/Panotools-Script/Changes	2007-05-09 20:59:56 UTC (rev 704)
+++ trunk/Panotools-Script/Changes	2007-05-09 21:47:43 UTC (rev 705)
@@ -8,7 +8,7 @@
     - pass options to Stitch()
     - New Clone() and Preview() methods
     - New accessor methods: Mode(), Panorama(), Variable(), Image(), Output(), Control(), ControlMorph()
-    - Only pass optimisable variables to PTOptimizer
+    - Only pass optimisable variables to PTOptimizer but default to autooptimiser
     - New exposure, white balance, output mode, bitdepth and camera response parameters supported by hugin/nona
     - erect2qtvr add --yaw and --outfile options
 

Modified: trunk/Panotools-Script/README
===================================================================
--- trunk/Panotools-Script/README	2007-05-09 20:59:56 UTC (rev 704)
+++ trunk/Panotools-Script/README	2007-05-09 21:47:43 UTC (rev 705)
@@ -23,7 +23,7 @@
 Math::Matrix
 Image::Magick
 
-This module requires 'PTOptimizer' from pano12 and 'nona' from hugin.  Some of
+This module requires 'autooptimiser' and 'nona' from hugin.  Some of
 the scripts require 'enblend' and ImageMagick command-line tools.
 
 

Modified: trunk/Panotools-Script/lib/Panotools/Script.pm
===================================================================
--- trunk/Panotools-Script/lib/Panotools/Script.pm	2007-05-09 20:59:56 UTC (rev 704)
+++ trunk/Panotools-Script/lib/Panotools/Script.pm	2007-05-09 21:47:43 UTC (rev 705)
@@ -68,7 +68,7 @@
     $self->{control} = [];
     $self->{controlmorph} = [];
     $self->{stitcher} = $ENV{STITCHER} || 'nona';  # nona, PTmender, PTStitcher, Tmender
-    $self->{optimiser} = $ENV{OPTIMISER} || 'PTOptimizer'; # PToptimizer PTOptimizer, autooptimiser
+    $self->{optimiser} = $ENV{OPTIMISER} || 'autooptimiser'; # PToptimizer PTOptimizer, autooptimiser
     $self->{basedir} = File::Spec->rel2abs (File::Spec->curdir);
 }
 
@@ -280,16 +280,27 @@
     my $self = shift;
     $self->Image2Output;
     my ($fh, $tempfile) = tempfile (SUFFIX => '.txt', UNLINK => $CLEANUP);
+    my ($fh2, $outfile) = tempfile (SUFFIX => '.txt', UNLINK => $CLEANUP);
     my $clone = $self->Clone;
     for my $image (@{$clone->Image})
     {
         $image->_sanitise_ptoptimizer;
     }
     $clone->Write ($tempfile);
-    system ($self->{optimiser}, $tempfile);
-    return 0 unless ($? == 0);
     my $try = new Panotools::Script;
-    $try->Read ($tempfile) || return 0;
+    if ($self->{optimiser} =~ /autooptimiser/)
+    {
+        system ($self->{optimiser}, '-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]})

Modified: trunk/Panotools-Script/t/010.read-stitch.t
===================================================================
--- trunk/Panotools-Script/t/010.read-stitch.t	2007-05-09 20:59:56 UTC (rev 704)
+++ trunk/Panotools-Script/t/010.read-stitch.t	2007-05-09 21:47:43 UTC (rev 705)
@@ -56,6 +56,6 @@
 
 }
 
-ok ($p->Optimise == 0, 'optimisation fails because of no control points');
+#ok ($p->Optimise == 0, 'optimisation fails because of no control points');
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.