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

[<brunopostle@us...>]

Revision: 886
          http://panotools.svn.sourceforge.net/panotools/?rev=886&view=rev
Author:   brunopostle
Date:     2008-09-09 21:10:32 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
panostart: pass EXTRA_ARGS to match-n-shift

Modified Paths:
--------------
    trunk/Panotools-Script/Changes
    trunk/Panotools-Script/bin/panostart

Modified: trunk/Panotools-Script/Changes
===================================================================
--- trunk/Panotools-Script/Changes	2008-09-09 20:53:07 UTC (rev 885)
+++ trunk/Panotools-Script/Changes	2008-09-09 21:10:32 UTC (rev 886)
@@ -2,7 +2,9 @@
 
 0.18
     - pafextract tool for using panoglview as a pteditor replacement
-    - panostart allow specifying CLEAN=
+    - panostart allow unsetting CLEAN to keep intermediate images
+    - panostart rename -s parameter to -t
+    - panostart EXTRA_ARGS passed to match-n-shift
 
 0.17
     - match-n-shift workaround PTmender failure with separate /tmp/

Modified: trunk/Panotools-Script/bin/panostart
===================================================================
--- trunk/Panotools-Script/bin/panostart	2008-09-09 20:53:07 UTC (rev 885)
+++ trunk/Panotools-Script/bin/panostart	2008-09-09 21:10:32 UTC (rev 886)
@@ -15,7 +15,7 @@
 my $verbose = 0;
 
 GetOptions ('o|output=s' => \$path_makefile,
-            's|seconds=s' => \$d_inc,
+            't|time=s' => \$d_inc,
             'f|projection=i' => \$projection,
             'v|fov=s' => \$deg_fov,
             'k|selection=s' => \$crop_s,
@@ -96,7 +96,7 @@
     $rule_pto->Targets ("$stub.pto");
     $rule_pto->Prerequisites (@{$group});
     $rule_pto->Command ('match-n-shift', '--stacks', '--align', '--clean',
-                            '--output', "$stub.pto");
+                            '$(EXTRA_ARGS)', '--output', "$stub.pto");
     $rule_pto->Command ('--projection', $projection) if defined $projection;
     $rule_pto->Command ('--fov', $deg_fov) if defined $deg_fov;
     $rule_pto->Command ('--selection', $crop_s) if defined $crop_s;
@@ -148,7 +148,8 @@
 print MAKE $rule_ptos->Assemble;
 print MAKE $rule_mks->Assemble;
 print MAKE $rule_imgs->Assemble;
-print MAKE "CLEAN = clean\n\n";
+print MAKE "CLEAN = clean\n";
+print MAKE "EXTRA_ARGS =\n\n";
 print MAKE map {$_->Assemble} @rules_pto;
 print MAKE map {$_->Assemble} @rules_mk;
 print MAKE map {$_->Assemble} @rules_ldr_blended;
@@ -237,7 +238,7 @@
 
  Options:
   -o | --output name    Filename of created Makefile
-  -s | --seconds        Number of seconds between panoramas
+  -t | --time           Number of seconds between panoramas
   -f | --projection     Panotools style input projection number. Use
                           0 for rectilinear, 2 for circular fisheye and
                           3 for full-frame fisheye images.


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

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

[<brunopostle@us...>]

Revision: 885
          http://panotools.svn.sourceforge.net/panotools/?rev=885&view=rev
Author:   brunopostle
Date:     2008-09-09 20:53:07 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
panostart allow specifying CLEAN=

Modified Paths:
--------------
    trunk/Panotools-Script/Changes
    trunk/Panotools-Script/bin/panostart

Modified: trunk/Panotools-Script/Changes
===================================================================
--- trunk/Panotools-Script/Changes	2008-09-09 20:37:00 UTC (rev 884)
+++ trunk/Panotools-Script/Changes	2008-09-09 20:53:07 UTC (rev 885)
@@ -2,6 +2,7 @@
 
 0.18
     - pafextract tool for using panoglview as a pteditor replacement
+    - panostart allow specifying CLEAN=
 
 0.17
     - match-n-shift workaround PTmender failure with separate /tmp/

Modified: trunk/Panotools-Script/bin/panostart
===================================================================
--- trunk/Panotools-Script/bin/panostart	2008-09-09 20:37:00 UTC (rev 884)
+++ trunk/Panotools-Script/bin/panostart	2008-09-09 20:53:07 UTC (rev 885)
@@ -114,21 +114,21 @@
     my $rule_ldr_blended = new File::Pto::Mk::Rule;
     $rule_ldr_blended->Targets ($stub .".tif");
     $rule_ldr_blended->Prerequisites ("$stub.pto", "$stub.pto.mk", @{$group});
-    $rule_ldr_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub .".tif", 'clean');
+    $rule_ldr_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub .".tif", '$(CLEAN)');
 
     push @rules_ldr_blended, $rule_ldr_blended;
 
     my $rule_ldr_stacked_blended = new File::Pto::Mk::Rule;
     $rule_ldr_stacked_blended->Targets ($stub ."_fused.tif");
     $rule_ldr_stacked_blended->Prerequisites ("$stub.pto", "$stub.pto.mk", @{$group});
-    $rule_ldr_stacked_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub ."_fused.tif", 'clean');
+    $rule_ldr_stacked_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub ."_fused.tif", '$(CLEAN)');
 
     push @rules_ldr_stacked_blended, $rule_ldr_stacked_blended;
 
     my $rule_hdr_blended = new File::Pto::Mk::Rule;
     $rule_hdr_blended->Targets ($stub ."_hdr.exr");
     $rule_hdr_blended->Prerequisites ("$stub.pto", "$stub.pto.mk", @{$group});
-    $rule_hdr_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub ."_hdr.exr", 'clean');
+    $rule_hdr_blended->Command ('make', '-e', '-f', "$stub.pto.mk", $stub ."_hdr.exr", '$(CLEAN)');
 
     push @rules_hdr_blended, $rule_hdr_blended;
 }
@@ -148,6 +148,7 @@
 print MAKE $rule_ptos->Assemble;
 print MAKE $rule_mks->Assemble;
 print MAKE $rule_imgs->Assemble;
+print MAKE "CLEAN = clean\n\n";
 print MAKE map {$_->Assemble} @rules_pto;
 print MAKE map {$_->Assemble} @rules_mk;
 print MAKE map {$_->Assemble} @rules_ldr_blended;
@@ -220,7 +221,7 @@
 sub _quoteshell
 {
     my $string = shift;
-    $string =~ s/(['"\[\] `&*()+~#:<?>|])/\\$1/g;
+    $string =~ s/(['"\[\] `&*+~#:<?>|])/\\$1/g;
     return $string;
 }
 


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

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

[<brunopostle@us...>]

Revision: 884
          http://panotools.svn.sourceforge.net/panotools/?rev=884&view=rev
Author:   brunopostle
Date:     2008-09-09 20:37:00 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
pafextract, tool for using panoglview as a pteditor replacement

Modified Paths:
--------------
    trunk/Panotools-Script/Changes
    trunk/Panotools-Script/Makefile.PL

Added Paths:
-----------
    trunk/Panotools-Script/bin/pafextract

Modified: trunk/Panotools-Script/Changes
===================================================================
--- trunk/Panotools-Script/Changes	2008-09-07 22:55:12 UTC (rev 883)
+++ trunk/Panotools-Script/Changes	2008-09-09 20:37:00 UTC (rev 884)
@@ -1,5 +1,8 @@
 Revision history for Panotools::Script.
 
+0.18
+    - pafextract tool for using panoglview as a pteditor replacement
+
 0.17
     - match-n-shift workaround PTmender failure with separate /tmp/
     - match-n-shift write output even if no points found

Modified: trunk/Panotools-Script/Makefile.PL
===================================================================
--- trunk/Panotools-Script/Makefile.PL	2008-09-07 22:55:12 UTC (rev 883)
+++ trunk/Panotools-Script/Makefile.PL	2008-09-09 20:37:00 UTC (rev 884)
@@ -3,7 +3,7 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
     'NAME'              => 'Panotools::Script',
-    'EXE_FILES'         => [ 'bin/cubic2erect', 'bin/erect2cubic',
+    'EXE_FILES'         => [ 'bin/cubic2erect', 'bin/erect2cubic', 'bin/pafextract',
         'bin/jpeg2qtvr', 'bin/erect2qtvr', 'bin/enblend-mask', 'bin/match-n-shift',
         'bin/process-masks', 'bin/erect2planet', 'bin/pto2tiff', 'bin/ptograph',
         'bin/tif2svg', 'bin/enblend-svg', 'bin/pto2fulla', 'bin/ptoinfo', 'bin/ptopath',

Added: trunk/Panotools-Script/bin/pafextract
===================================================================
--- trunk/Panotools-Script/bin/pafextract	                        (rev 0)
+++ trunk/Panotools-Script/bin/pafextract	2008-09-09 20:37:00 UTC (rev 884)
@@ -0,0 +1,122 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use Panotools::Script;
+use Math::Trig;
+use Image::Size;
+use File::Spec;
+
+die "Usage: $0 project.paf" unless (defined $ARGV[0] and -e $ARGV[0]);
+
+my $path_paf = File::Spec->rel2abs ($ARGV[0]);
+open (PAF, '<'. $path_paf);
+my $paf = {};
+for my $line (<PAF>)
+{
+    if ($line =~ /^(.+)=(.+)$/)
+    {
+        my ($key, $value) = ($1, $2);
+        $key =~ s/\\ / /g;
+        $paf->{$key} = $value;
+    }
+}
+
+my ($v, $d, $f) = File::Spec->splitpath ($path_paf);
+my $path_equirect = File::Spec->catpath ($v, $d, $paf->{'Panorama Image'});
+
+my ($px_width_equirect, $px_height_equirect) = imgsize ($path_equirect);
+die unless ($px_width_equirect * $px_height_equirect > 0);
+
+my $deg_hfov_equirect = $paf->{'Image Maximum Pan'} - $paf->{'Image Minimum Pan'};
+$deg_hfov_equirect = 360 if $deg_hfov_equirect < 1;
+
+my $px_radius_equirect = ($deg_hfov_equirect / 360) * $px_width_equirect / (2 * atan2(0,-1));
+
+my $rad_vfov = $paf->{'Initial FOV'} * atan2(0,-1) / 180;
+
+my $px_height = int (tan ($rad_vfov/2) * $px_radius_equirect * 2);
+my $px_width = int ($px_height * 4/3);
+
+my $rad_hfov = 2 * asin (sin ($rad_vfov/2) * $px_width / $px_height);
+
+# create a .pto project to extract the rectilinear view stored in the .paf file
+my $pto_extract = new Panotools::Script;
+$pto_extract->Panorama->Set (w => $px_width, h => $px_height,
+                             n => 'TIFF',
+                             v => ($rad_hfov * 180 / atan2(0,-1)),
+                             f => 0);
+
+my $equirect = new Panotools::Script::Line::Image;
+$equirect->Set (w => $px_width_equirect, h => $px_height_equirect, f => 4,
+                v => $deg_hfov_equirect, r => 0, p => 0, y => 0,
+                n => '"'. $path_equirect .'"');
+push @{$pto_extract->Image}, $equirect;
+
+$pto_extract->Transform (0, 0, 0 - $paf->{'Initial Pan'});
+$pto_extract->Transform (0, $paf->{'Initial Tilt'}, 0);
+
+my $path_temp_pto = $path_paf .'.'. $$ .'.temp.pto';
+
+$pto_extract->Write ($path_temp_pto);
+
+# render the rectilinear view, delete the .pto project
+system ('nona', '-o', $path_paf .'.extract', $path_temp_pto);
+unlink $path_temp_pto;
+
+# create a .pto that reprojects the extracted rectilinear back into the original image
+my $pto_insert = new Panotools::Script;
+$pto_insert->Panorama->Set (w => $px_width_equirect, h => $px_height_equirect,
+                            v => $deg_hfov_equirect, n => 'TIFF');
+
+my $rectilinear = new Panotools::Script::Line::Image;
+$rectilinear->Set (w => $px_width, h => $px_height,
+                   f => 0, v => ($rad_hfov * 180 / atan2(0,-1)),
+                   n => '"'. $path_paf .'.extract.tif"');
+push @{$pto_insert->Image}, $rectilinear;
+
+$pto_insert->Transform (0, 0 - $paf->{'Initial Tilt'}, 0);
+$pto_insert->Transform (0, 0, $paf->{'Initial Pan'});
+
+$pto_insert->Write ($path_paf .'.extract.pto');
+
+__END__
+
+=head1 NAME
+
+pafextract - render panoglview .paf projects
+
+=head1 SYNOPSIS
+
+  panoglview equirectangular.tif
+  pafextract project.paf
+  gimp project.paf.extract.tif
+  nona -o overlay project.paf.extract.pto
+  composite overlay.tif equirectangular.tif merged.tif
+
+=head1 DESCRIPTION
+
+B<pafextract> takes a panoglview .paf file and renders the saved view as a
+suitably sized .tif file.  This is useful for simply extracting a 'normal' view
+from an equirectangular panorama.
+
+A hugin .pto project is also created, containing all the information necessary
+to reproject the extracted .tif image back into the same equirectangular space
+as the original.  This is useful for merging edits back into the original with
+a tool such as ImageMagick or the Gimp.
+
+=head1 LICENSE
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+=head1 SEE ALSO
+
+L<http://hugin.sourceforge.net/>;
+
+=head1 AUTHOR
+
+Bruno Postle - September 2008.
+
+=cut


Property changes on: trunk/Panotools-Script/bin/pafextract
___________________________________________________________________
Added: svn:executable
   + *


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