From: <bru...@us...> - 2008-03-04 00:05:10
|
Revision: 823 http://panotools.svn.sourceforge.net/panotools/?rev=823&view=rev Author: brunopostle Date: 2008-03-03 14:54:48 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Tool to create undirected graphs describing links within pto projects Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/bin/erect2planet Added Paths: ----------- trunk/Panotools-Script/bin/ptograph Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-02-19 23:52:49 UTC (rev 822) +++ trunk/Panotools-Script/Changes 2008-03-03 22:54:48 UTC (rev 823) @@ -1,5 +1,9 @@ Revision history for Panotools::Script. +0.14 + - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) + - new tool ptograph to visualise connections within a project + 0.13 - new match-n-shift control point finder tool - fix crash in ptoinfo Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-02-19 23:52:49 UTC (rev 822) +++ trunk/Panotools-Script/MANIFEST 2008-03-03 22:54:48 UTC (rev 823) @@ -13,6 +13,7 @@ bin/process-masks bin/process-masks-gui bin/pto2fulla +bin/ptograph bin/ptoinfo bin/pto2tiff bin/ptoinfo-gui Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-02-19 23:52:49 UTC (rev 822) +++ trunk/Panotools-Script/Makefile.PL 2008-03-03 22:54:48 UTC (rev 823) @@ -5,7 +5,7 @@ 'NAME' => 'Panotools::Script', 'EXE_FILES' => [ 'bin/cubic2erect', 'bin/erect2cubic', 'bin/jpeg2qtvr', 'bin/erect2qtvr', 'bin/enblend-mask', 'bin/match-n-shift', - 'bin/process-masks', 'bin/erect2planet', 'bin/pto2tiff', + 'bin/process-masks', 'bin/erect2planet', 'bin/pto2tiff', 'bin/ptograph', 'bin/tif2svg', 'bin/enblend-svg', 'bin/pto2fulla', 'bin/ptoinfo', 'bin/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', Modified: trunk/Panotools-Script/bin/erect2planet =================================================================== --- trunk/Panotools-Script/bin/erect2planet 2008-02-19 23:52:49 UTC (rev 822) +++ trunk/Panotools-Script/bin/erect2planet 2008-03-03 22:54:48 UTC (rev 823) @@ -24,6 +24,7 @@ } else { + # set v => 253.7398 to get the horizon halfway between centre and edge $stereographic->Panorama->Set (v => 270, f => 4, u => 0, w => $face, h => $face, n => '"TIFF"'); $stereographic->Image->[0] = new Panotools::Script::Line::Image; $stereographic->Image->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$file\""); Added: trunk/Panotools-Script/bin/ptograph =================================================================== --- trunk/Panotools-Script/bin/ptograph (rev 0) +++ trunk/Panotools-Script/bin/ptograph 2008-03-03 22:54:48 UTC (rev 823) @@ -0,0 +1,82 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use Panotools::Script; +use GraphViz; + +for my $path_pto (@ARGV) +{ + my $pto = new Panotools::Script; + $pto->Read ($path_pto); + + #my $g = GraphViz->new (directed => 0, layout => 'neato', concentrate => 1, overlap => 'false'); + my $g = GraphViz->new (directed => 0, layout => 'circo', concentrate => 1, overlap => 'false'); + + for my $index (0 .. scalar (@{$pto->Image}) - 1) + { + $g->add_node ($index, shape => 'circle'); + + # summarise control points for this image + my $results = {}; + for my $control (@{$pto->Control}) + { + my $N = $control->{N}; + my $n = $control->{n}; + next unless ($n == $index or $N == $index); + $results->{$N} += 1; + $results->{$n} += 1; + } + delete $results->{$index}; + for my $key (sort keys %{$results}) + { + next if ($index gt $key); + $g->add_edge ($index => $key, weight => $results->{$key}, label => $results->{$key}); + } + } + + my $svg = $g->as_svg; + open (OUTFILE, ">$path_pto.svg"); + print OUTFILE $svg; + close OUTFILE; +} + +__END__ + +=head1 NAME + +ptograph - generates undirected graph reports for .pto files + +=head1 Synopsis + + ptograph project1.pto [project2.pto ...] + +=head1 DESCRIPTION + +Takes one or more hugin .pto projects and writes an SVG report using +the same file path with .svg appended. + +Each node represents one of the input photos in the project and the edges +represent control-points connecting photos together. + +=head1 Calling syntax + + ptograph <pto-file> <pto-file> ... + +=head1 License + +This program is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + +=head1 See Also + +L<http://hugin.sourceforge.net/> +L<GraphViz> + +=head1 Author + +Bruno Postle, E<lt>bruno (at) postle.netE<gt> + +=cut + Property changes on: trunk/Panotools-Script/bin/ptograph ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-03-06 00:06:59
|
Revision: 825 http://panotools.svn.sourceforge.net/panotools/?rev=825&view=rev Author: brunopostle Date: 2008-03-05 16:07:04 -0800 (Wed, 05 Mar 2008) Log Message: ----------- Remove dependency on Math::Matrix Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/META.yml trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/README trunk/Panotools-Script/lib/Panotools/Matrix.pm trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm trunk/Panotools-Script/t/031.matrix.t Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/Changes 2008-03-06 00:07:04 UTC (rev 825) @@ -3,6 +3,7 @@ 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) - new tool ptograph to visualise connections within a project + - remove dependency on Math::Matrix 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/META.yml =================================================================== --- trunk/Panotools-Script/META.yml 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/META.yml 2008-03-06 00:07:04 UTC (rev 825) @@ -6,7 +6,6 @@ installdirs: site requires: Image::Size: 2.9 - Math::Matrix: 0.4 Storable: 2 distribution_type: module Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/Makefile.PL 2008-03-06 00:07:04 UTC (rev 825) @@ -11,7 +11,7 @@ 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION - 'PREREQ_PM' => {'Math::Matrix' => 0.4, 'Image::Size' => 2.9, 'Storable' => 2.0}, + 'PREREQ_PM' => {'Image::Size' => 2.9, 'Storable' => 2.0}, ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Panotools/Script.pm', # retrieve abstract from module AUTHOR => 'Bruno Postle <br...@po...>') : ()), Modified: trunk/Panotools-Script/README =================================================================== --- trunk/Panotools-Script/README 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/README 2008-03-06 00:07:04 UTC (rev 825) @@ -20,7 +20,6 @@ Dependencies ------------ -Math::Matrix Image::Size Some of the scripts require 'nona', 'freepv', 'enblend', 'autotrace' and Modified: trunk/Panotools-Script/lib/Panotools/Matrix.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Matrix.pm 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/lib/Panotools/Matrix.pm 2008-03-06 00:07:04 UTC (rev 825) @@ -12,7 +12,7 @@ =head1 DESCRIPTION -rollpitchyaw2matrix returns a Math::Matrix object that encapsulates a +rollpitchyaw2matrix returns a matrix arrayref that encapsulates a transformation suitable for rotating a vector/point by three degrees of freedom (roll, pitch and yaw). @@ -24,22 +24,16 @@ =head1 USAGE -use Math::Matrix; +use Panotools::Matrix qw(matrix2rollpitchyaw rollpitchyaw2matrix multiply); -use Panotools::Matrix; +my $point = [[$x1], [$y1], [$z1]]; -my $point = new Math::Matrix ([$x1], [$y1], [$z1]); - my $matrix = rollpitchyaw2matrix ($roll, $pitch, $yaw); -my $result = $matrix->multiply ($point); +my $result = multiply ($matrix, $point); ($x2, $y2, $z2) = ($result->[0][0], $result->[1][0], $result->[2][0]); -=head1 FILES - -Requires Math::Matrix as this is all matrix mathematics. - =head1 COPYRIGHT Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. This @@ -47,11 +41,10 @@ the same terms as Perl itself. This module is partly based on Math::Geometry by Greg McCarroll -<gr...@mc...> +and Math::Matrix by Various. =cut -use Math::Matrix; use Math::Trig; use Math::Trig ':radial'; use strict; @@ -59,7 +52,7 @@ use Exporter; use vars qw(@ISA @EXPORT); @ISA = qw(Exporter); -@EXPORT = qw(rollpitchyaw2matrix matrix2rollpitchyaw); +@EXPORT = qw(rollpitchyaw2matrix matrix2rollpitchyaw multiply); sub rollpitchyaw2matrix { my ($roll, $pitch, $yaw) = @_; @@ -71,21 +64,72 @@ my $cosy = cos ($yaw); my $siny = sin (0 - $yaw); - my $rollm = new Math::Matrix ([ 1, 0, 0 ], - [ 0, $cosr,-1*$sinr ], - [ 0, $sinr, $cosr ]); + my $rollm = [[ 1, 0, 0 ], + [ 0, $cosr,-1*$sinr ], + [ 0, $sinr, $cosr ]]; - my $pitchm = new Math::Matrix ([ $cosp, 0, $sinp ], - [ 0, 1, 0 ], - [ -1*$sinp, 0, $cosp ]); + my $pitchm = [[ $cosp, 0, $sinp ], + [ 0, 1, 0 ], + [ -1*$sinp, 0, $cosp ]]; - my $yawm = new Math::Matrix ([ $cosy,-1*$siny, 0 ], - [ $siny, $cosy, 0 ], - [ 0, 0, 1 ]); + my $yawm = [[ $cosy,-1*$siny, 0 ], + [ $siny, $cosy, 0 ], + [ 0, 0, 1 ]]; - $yawm->multiply ($pitchm)->multiply ($rollm); + my $foo = multiply ($yawm, $pitchm); + multiply ($foo, $rollm); } +sub transpose +{ + my $matrix_in = shift; + my $matrix_out; + + my $n = 0; + for my $row (@{$matrix_in}) + { + my $m = 0; + for my $column (@{$row}) + { + $matrix_out->[$m]->[$n] = $matrix_in->[$n]->[$m]; + $m++; + } + $n++; + } + return $matrix_out; +} + +sub multiply +{ + my $matrix_a = shift; + my $transposed_b = transpose (shift); + my $matrix_out; + + return undef if (scalar @{$matrix_a->[0]} != scalar @{$transposed_b->[0]}); + for my $row (@{$matrix_a}) + { + my $rescol = []; + for my $column (@{$transposed_b}) + { + push (@{$rescol}, vekpro ($row, $column)); + } + push (@{$matrix_out}, $rescol); + } + return $matrix_out; +} + +sub vekpro +{ + my ($a, $b) = @_; + my $result = 0; + + for my $i (0 .. scalar @{$a} - 1) + { + $result += $a->[$i] * $b->[$i]; + } + $result; +} + # following copied from a spreadsheet by Stuart Milne sub matrix2rollpitchyaw Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Image.pm 2008-03-06 00:07:04 UTC (rev 825) @@ -3,7 +3,7 @@ use strict; use warnings; use Panotools::Script::Line; -use Panotools::Matrix qw(matrix2rollpitchyaw rollpitchyaw2matrix); +use Panotools::Matrix qw(matrix2rollpitchyaw rollpitchyaw2matrix multiply); use Math::Trig; use vars qw /@ISA/; @@ -157,7 +157,7 @@ my $transform_matrix = rollpitchyaw2matrix (@transform_rpy); my @rpy = map (deg2rad ($_), ($self->{r}, $self->{p}, $self->{y})); my $matrix = rollpitchyaw2matrix (@rpy); - my $result = $transform_matrix->multiply ($matrix); + my $result = multiply ($transform_matrix, $matrix); my ($r, $p, $y) = map (rad2deg ($_), matrix2rollpitchyaw ($result)); $self->{r} = $r; $self->{p} = $p; Modified: trunk/Panotools-Script/t/031.matrix.t =================================================================== --- trunk/Panotools-Script/t/031.matrix.t 2008-03-05 22:33:46 UTC (rev 824) +++ trunk/Panotools-Script/t/031.matrix.t 2008-03-06 00:07:04 UTC (rev 825) @@ -15,7 +15,7 @@ # 5, -5, 10 my $foo = rollpitchyaw2matrix (map (deg2rad ($_),(5, -5, 10))); -my $result = $pitch45->multiply ($foo); +my $result = Panotools::Matrix::multiply ($pitch45, $foo); my @rpy = matrix2rollpitchyaw ($result); @@ -25,3 +25,9 @@ like ($rpy[1], '/-49.0553302/'); like ($rpy[2], '/15.3057553/'); +my $matrix = [[0,1,2],[3,4,5],[6,7,8]]; + +my $transposed = Panotools::Matrix::transpose ($matrix); +is ($matrix->[1]->[2], $transposed->[2]->[1]); +is ($matrix->[0]->[2], $transposed->[2]->[0]); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-03-12 23:48:11
|
Revision: 828 http://panotools.svn.sourceforge.net/panotools/?rev=828&view=rev Author: brunopostle Date: 2008-03-12 16:48:11 -0700 (Wed, 12 Mar 2008) Log Message: ----------- fixes suggested by CPANTS Modified Paths: -------------- trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/bin/ptograph trunk/Panotools-Script/lib/Panotools/Matrix.pm trunk/Panotools-Script/lib/Panotools/Script.pm Added Paths: ----------- trunk/Panotools-Script/LICENCE Added: trunk/Panotools-Script/LICENCE =================================================================== --- trunk/Panotools-Script/LICENCE (rev 0) +++ trunk/Panotools-Script/LICENCE 2008-03-12 23:48:11 UTC (rev 828) @@ -0,0 +1,341 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-03-07 05:10:25 UTC (rev 827) +++ trunk/Panotools-Script/MANIFEST 2008-03-12 23:48:11 UTC (rev 828) @@ -1,4 +1,3 @@ -.cvsignore bin/cubic2erect bin/enblend-mask bin/enblend-svg @@ -43,6 +42,7 @@ lib/Panotools/Script/Line/Output.pm lib/Panotools/Script/Line/Panorama.pm lib/Panotools/Script/Line/Variable.pm +LICENSE Makefile.PL MANIFEST This list of files META.yml Module meta-data (added by MakeMaker) Modified: trunk/Panotools-Script/bin/ptograph =================================================================== --- trunk/Panotools-Script/bin/ptograph 2008-03-07 05:10:25 UTC (rev 827) +++ trunk/Panotools-Script/bin/ptograph 2008-03-12 23:48:11 UTC (rev 828) @@ -11,7 +11,7 @@ my $pto = new Panotools::Script; $pto->Read ($path_pto); - my $g = GraphViz->new (directed => 0, layout => 'fdp', concentrate => 1, overlap => 'false'); + my $g = GraphViz->new (directed => 0, layout => 'neato', overlap => 'false'); for my $index (0 .. scalar (@{$pto->Image}) - 1) { Modified: trunk/Panotools-Script/lib/Panotools/Matrix.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Matrix.pm 2008-03-07 05:10:25 UTC (rev 827) +++ trunk/Panotools-Script/lib/Panotools/Matrix.pm 2008-03-12 23:48:11 UTC (rev 828) @@ -34,20 +34,12 @@ ($x2, $y2, $z2) = ($result->[0][0], $result->[1][0], $result->[2][0]); -=head1 COPYRIGHT - -Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. This -module is Free Software. It may be used, redistributed and/or modified under -the same terms as Perl itself. - -This module is partly based on Math::Geometry by Greg McCarroll -and Math::Matrix by Various. - =cut use Math::Trig; use Math::Trig ':radial'; use strict; +use warnings; use Exporter; use vars qw(@ISA @EXPORT); Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-03-07 05:10:25 UTC (rev 827) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-03-12 23:48:11 UTC (rev 828) @@ -333,5 +333,25 @@ } } +=head1 COPYRIGHT + +Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. + +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. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public +License along with this software; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +=cut + 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jim...@us...> - 2008-03-15 04:55:40
|
Revision: 829 http://panotools.svn.sourceforge.net/panotools/?rev=829&view=rev Author: jim0watters Date: 2008-03-14 21:55:46 -0700 (Fri, 14 Mar 2008) Log Message: ----------- Renamed remotely Added Paths: ----------- trunk/Panotools-Script/LICENSE Removed Paths: ------------- trunk/Panotools-Script/LICENCE Deleted: trunk/Panotools-Script/LICENCE =================================================================== --- trunk/Panotools-Script/LICENCE 2008-03-12 23:48:11 UTC (rev 828) +++ trunk/Panotools-Script/LICENCE 2008-03-15 04:55:46 UTC (rev 829) @@ -1,341 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - 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. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Copied: trunk/Panotools-Script/LICENSE (from rev 828, trunk/Panotools-Script/LICENCE) =================================================================== --- trunk/Panotools-Script/LICENSE (rev 0) +++ trunk/Panotools-Script/LICENSE 2008-03-15 04:55:46 UTC (rev 829) @@ -0,0 +1,341 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-03-15 15:34:41
|
Revision: 830 http://panotools.svn.sourceforge.net/panotools/?rev=830&view=rev Author: brunopostle Date: 2008-03-15 08:34:46 -0700 (Sat, 15 Mar 2008) Log Message: ----------- More cpants suggested fixes Modified Paths: -------------- trunk/Panotools-Script/META.yml trunk/Panotools-Script/Makefile.PL Modified: trunk/Panotools-Script/META.yml =================================================================== --- trunk/Panotools-Script/META.yml 2008-03-15 04:55:46 UTC (rev 829) +++ trunk/Panotools-Script/META.yml 2008-03-15 15:34:46 UTC (rev 830) @@ -1,12 +1,24 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# +--- #YAML:1.0 name: Panotools-Script +abstract: 'Read, write and manipulate hugin script files' version: 0.13 +license: 'GPLv2+' +author: + - 'Bruno Postle <br...@po...>' +url: 'http://search.cpan.org/dist/Panotools-Script' version_from: lib/Panotools/Script.pm installdirs: site requires: + bytes: 0 + File::Copy: 1 + File::Spec: 3 + File::Temp: 0.1 + Getopt::Long: 2 + GraphViz: 1 Image::Size: 2.9 + Math::Trig: 0.1 + Pod::Usage: 1 Storable: 2 - + Test::More: 0.1 distribution_type: module generated_by: ExtUtils::MakeMaker version 6.17 Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-03-15 04:55:46 UTC (rev 829) +++ trunk/Panotools-Script/Makefile.PL 2008-03-15 15:34:46 UTC (rev 830) @@ -11,7 +11,10 @@ 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION - 'PREREQ_PM' => {'Image::Size' => 2.9, 'Storable' => 2.0}, + 'PREREQ_PM' => {'bytes' => 0.0, 'File::Copy' => 1.0, + 'Getopt::Long' => 2.0, 'Pod::Usage' => 1.0, 'GraphViz' => 1.0, + 'Test::More' => 0.1, 'Math::Trig' => 0.1, 'File::Temp' => 0.1, + 'File::Spec' => 3.0, 'Image::Size' => 2.9, 'Storable' => 2.0}, ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Panotools/Script.pm', # retrieve abstract from module AUTHOR => 'Bruno Postle <br...@po...>') : ()), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-03-17 23:12:00
|
Revision: 831 http://panotools.svn.sourceforge.net/panotools/?rev=831&view=rev Author: brunopostle Date: 2008-03-17 16:11:55 -0700 (Mon, 17 Mar 2008) Log Message: ----------- More cpants fixes, unify licenses Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/META.yml trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/README trunk/Panotools-Script/bin/cubic2erect trunk/Panotools-Script/bin/enblend-mask trunk/Panotools-Script/bin/enblend-svg trunk/Panotools-Script/bin/erect2cubic trunk/Panotools-Script/bin/erect2planet trunk/Panotools-Script/bin/match-n-shift trunk/Panotools-Script/bin/nona-mask trunk/Panotools-Script/bin/process-masks trunk/Panotools-Script/bin/pto2fulla trunk/Panotools-Script/bin/pto2tiff trunk/Panotools-Script/bin/ptograph trunk/Panotools-Script/bin/ptoinfo trunk/Panotools-Script/bin/qtvr2erect trunk/Panotools-Script/bin/tif2svg trunk/Panotools-Script/bin/transform-pano Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/Changes 2008-03-17 23:11:55 UTC (rev 831) @@ -4,6 +4,7 @@ - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) - new tool ptograph to visualise connections within a project - remove dependency on Math::Matrix + - rationalise mixed licenses, now GPLv2+ 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/META.yml =================================================================== --- trunk/Panotools-Script/META.yml 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/META.yml 2008-03-17 23:11:55 UTC (rev 831) @@ -11,7 +11,7 @@ requires: bytes: 0 File::Copy: 1 - File::Spec: 3 + File::Spec: 0.8 File::Temp: 0.1 Getopt::Long: 2 GraphViz: 1 Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/Makefile.PL 2008-03-17 23:11:55 UTC (rev 831) @@ -14,7 +14,7 @@ 'PREREQ_PM' => {'bytes' => 0.0, 'File::Copy' => 1.0, 'Getopt::Long' => 2.0, 'Pod::Usage' => 1.0, 'GraphViz' => 1.0, 'Test::More' => 0.1, 'Math::Trig' => 0.1, 'File::Temp' => 0.1, - 'File::Spec' => 3.0, 'Image::Size' => 2.9, 'Storable' => 2.0}, + 'File::Spec' => 0.8, 'Image::Size' => 2.9, 'Storable' => 2.0}, ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Panotools/Script.pm', # retrieve abstract from module AUTHOR => 'Bruno Postle <br...@po...>') : ()), Modified: trunk/Panotools-Script/README =================================================================== --- trunk/Panotools-Script/README 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/README 2008-03-17 23:11:55 UTC (rev 831) @@ -37,8 +37,10 @@ Copyright and licence --------------------- -This module is free software and is distributed under the -same license as Perl itself. +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. Copyright (C) 2002 Bruno Postle Modified: trunk/Panotools-Script/bin/cubic2erect =================================================================== --- trunk/Panotools-Script/bin/cubic2erect 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/cubic2erect 2008-03-17 23:11:55 UTC (rev 831) @@ -69,8 +69,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +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 Modified: trunk/Panotools-Script/bin/enblend-mask =================================================================== --- trunk/Panotools-Script/bin/enblend-mask 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/enblend-mask 2008-03-17 23:11:55 UTC (rev 831) @@ -105,7 +105,10 @@ =head1 License -This software is distributed under the same terms as enblend itself. +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 Modified: trunk/Panotools-Script/bin/enblend-svg =================================================================== --- trunk/Panotools-Script/bin/enblend-svg 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/enblend-svg 2008-03-17 23:11:55 UTC (rev 831) @@ -85,7 +85,10 @@ =head1 License -This software is distributed under the same terms as enblend itself. +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 Modified: trunk/Panotools-Script/bin/erect2cubic =================================================================== --- trunk/Panotools-Script/bin/erect2cubic 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/erect2cubic 2008-03-17 23:11:55 UTC (rev 831) @@ -92,8 +92,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +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 Modified: trunk/Panotools-Script/bin/erect2planet =================================================================== --- trunk/Panotools-Script/bin/erect2planet 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/erect2planet 2008-03-17 23:11:55 UTC (rev 831) @@ -55,7 +55,10 @@ =head1 License -This software is distributed under the same terms as hugin. +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 Modified: trunk/Panotools-Script/bin/match-n-shift =================================================================== --- trunk/Panotools-Script/bin/match-n-shift 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/match-n-shift 2008-03-17 23:11:55 UTC (rev 831) @@ -303,7 +303,10 @@ =head1 LICENSE -This file is licensed under the same terms as autopano-sift-C itself +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 Modified: trunk/Panotools-Script/bin/nona-mask =================================================================== --- trunk/Panotools-Script/bin/nona-mask 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/nona-mask 2008-03-17 23:11:55 UTC (rev 831) @@ -116,7 +116,10 @@ =head1 License -This software is distributed under the same terms as nona itself. +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 Modified: trunk/Panotools-Script/bin/process-masks =================================================================== --- trunk/Panotools-Script/bin/process-masks 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/process-masks 2008-03-17 23:11:55 UTC (rev 831) @@ -76,7 +76,10 @@ =head1 License -This software is distributed under the same terms as enblend itself. +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 Modified: trunk/Panotools-Script/bin/pto2fulla =================================================================== --- trunk/Panotools-Script/bin/pto2fulla 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/pto2fulla 2008-03-17 23:11:55 UTC (rev 831) @@ -59,8 +59,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +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 Modified: trunk/Panotools-Script/bin/pto2tiff =================================================================== --- trunk/Panotools-Script/bin/pto2tiff 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/pto2tiff 2008-03-17 23:11:55 UTC (rev 831) @@ -69,7 +69,10 @@ =head1 License -This software is distributed under the same terms as enblend and hugin. +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 Modified: trunk/Panotools-Script/bin/ptograph =================================================================== --- trunk/Panotools-Script/bin/ptograph 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/ptograph 2008-03-17 23:11:55 UTC (rev 831) @@ -77,8 +77,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +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 Modified: trunk/Panotools-Script/bin/ptoinfo =================================================================== --- trunk/Panotools-Script/bin/ptoinfo 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/ptoinfo 2008-03-17 23:11:55 UTC (rev 831) @@ -85,8 +85,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +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 Modified: trunk/Panotools-Script/bin/qtvr2erect =================================================================== --- trunk/Panotools-Script/bin/qtvr2erect 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/qtvr2erect 2008-03-17 23:11:55 UTC (rev 831) @@ -68,8 +68,10 @@ =head1 License -This program is free software; you can redistribute it and/or modify -it under the same terms as perl itself. +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 Modified: trunk/Panotools-Script/bin/tif2svg =================================================================== --- trunk/Panotools-Script/bin/tif2svg 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/tif2svg 2008-03-17 23:11:55 UTC (rev 831) @@ -112,7 +112,10 @@ =head1 License -This software is distributed under the same terms as enblend itself. +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 Modified: trunk/Panotools-Script/bin/transform-pano =================================================================== --- trunk/Panotools-Script/bin/transform-pano 2008-03-15 15:34:46 UTC (rev 830) +++ trunk/Panotools-Script/bin/transform-pano 2008-03-17 23:11:55 UTC (rev 831) @@ -33,7 +33,10 @@ =head1 License -This software is distributed under the same terms as hugin. +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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-04-02 16:54:37
|
Revision: 834 http://panotools.svn.sourceforge.net/panotools/?rev=834&view=rev Author: brunopostle Date: 2008-04-02 09:52:50 -0700 (Wed, 02 Apr 2008) Log Message: ----------- support optimising photometric parameters for vig_optimize Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm trunk/Panotools-Script/t/004.parse-variable.t Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-03-19 07:07:28 UTC (rev 833) +++ trunk/Panotools-Script/Changes 2008-04-02 16:52:50 UTC (rev 834) @@ -5,6 +5,7 @@ - new tool ptograph to visualise connections within a project - remove dependency on Math::Matrix - rationalise mixed licenses, now GPLv2+ + - support optimising photometric parameters for vig_optimize 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm 2008-03-19 07:07:28 UTC (rev 833) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Variable.pm 2008-04-02 16:52:50 UTC (rev 834) @@ -43,7 +43,7 @@ =cut -sub _valid { return '^([abcdegprtvyXYZ])(.*)' } +sub _valid { return '^([abcdegprtvyXYZ]|Eev|Er|Eb|Ra|Rb|Rc|Rd|Re|Va|Vb|Vc|Vd|Vx|Vy)(.*)' } sub Identifier { @@ -56,10 +56,10 @@ my $self = shift; my $string = shift || return 0; my $valid = $self->_valid; - my @res = $string =~ / ([a-z][0-9]+)/g; + my @res = $string =~ / ([a-zERV]+[0-9]+)/g; for my $token (grep { defined $_ } @res) { - my ($param, $image) = $token =~ /([a-z])([0-9]+)/; + my ($param, $image) = $token =~ /([a-zERV]+)([0-9]+)/; next unless defined $image; $self->{$image}->{$param} = 1; } @@ -99,6 +99,8 @@ my $index = shift; my @report; + my $i = $self->{$index}; + push @report, 'Roll' if $self->{$index}->{r}; push @report, 'Pitch' if $self->{$index}->{p}; push @report, 'Yaw' if $self->{$index}->{y}; @@ -111,6 +113,12 @@ push @report, 'g' if $self->{$index}->{g}; push @report, 't' if $self->{$index}->{t}; + push @report, 'Exposure' if $i->{Eev}; + push @report, 'Colour balance' if $i->{Er} or $i->{Eb}; + push @report, 'Response curve' if $i->{Ra} or $i->{Rb} or $i->{Rc} or $i->{Rd} or $i->{Re}; + push @report, 'Vignetting' if $i->{Va} or $i->{Vb} or $i->{Vc} or $i->{Vd}; + push @report, 'Vignetting centre' if $i->{Vx} or $i->{Vy}; + [[('Optimise parameters', (join ',', @report))]]; } Modified: trunk/Panotools-Script/t/004.parse-variable.t =================================================================== --- trunk/Panotools-Script/t/004.parse-variable.t 2008-03-19 07:07:28 UTC (rev 833) +++ trunk/Panotools-Script/t/004.parse-variable.t 2008-04-02 16:52:50 UTC (rev 834) @@ -12,11 +12,14 @@ is (%{$variable}, 0, 'image variables are undef'); -$variable->Parse ("v v0 r0 p0 r1 p1 y1 e1 e2 b7\n\n"); +$variable->Parse ("v v0 r0 p0 r1 p1 y1 e1 e2 b7 Eev7\n\n"); ok (exists $variable->{2}->{e}, 'e parameter of image 2 will be optimised'); is ($variable->{0}->{e}, undef, 'e parameter of image 0 will not be optimised'); +ok (exists $variable->{7}->{Eev}, 'Eev parameter of image 7 will be optimised'); +is ($variable->{0}->{Eev}, undef, 'Eev parameter of image 0 will not be optimised'); + #use Data::Dumper; die Dumper $variable->Assemble; like ($variable->Assemble, '/ e1/', 'optimise image-1 e-parameter written as e1'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-04-02 16:56:03
|
Revision: 835 http://panotools.svn.sourceforge.net/panotools/?rev=835&view=rev Author: brunopostle Date: 2008-04-02 09:56:09 -0700 (Wed, 02 Apr 2008) Log Message: ----------- ptosort utility renumbers control points in top down spatial order Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/Makefile.PL Added Paths: ----------- trunk/Panotools-Script/bin/ptosort Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-04-02 16:52:50 UTC (rev 834) +++ trunk/Panotools-Script/Changes 2008-04-02 16:56:09 UTC (rev 835) @@ -6,6 +6,7 @@ - remove dependency on Math::Matrix - rationalise mixed licenses, now GPLv2+ - support optimising photometric parameters for vig_optimize + - ptosort for renumbering control points in spatial order 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-04-02 16:52:50 UTC (rev 834) +++ trunk/Panotools-Script/MANIFEST 2008-04-02 16:56:09 UTC (rev 835) @@ -16,6 +16,7 @@ bin/ptoinfo bin/pto2tiff bin/ptoinfo-gui +bin/ptosort bin/qtvr2erect bin/qtvr2erect-gui bin/tif2svg Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-04-02 16:52:50 UTC (rev 834) +++ trunk/Panotools-Script/Makefile.PL 2008-04-02 16:56:09 UTC (rev 835) @@ -7,7 +7,7 @@ '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/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', + 'bin/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', 'bin/ptosort', 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION Added: trunk/Panotools-Script/bin/ptosort =================================================================== --- trunk/Panotools-Script/bin/ptosort (rev 0) +++ trunk/Panotools-Script/bin/ptosort 2008-04-02 16:56:09 UTC (rev 835) @@ -0,0 +1,18 @@ +#!/usr/bin/perl + +# sorts control points, putting them in vertical order. Useful if you want to +# be able to select and delete 'sky' points in hugin. + +use strict; +use warnings; +use Panotools::Script; + +my ($pto_in, $pto_out) = @ARGV; + +my $pto = new Panotools::Script; +$pto->Read ($pto_in); + +@{$pto->Control} = sort {$a->{y} <=> $b->{y}} @{$pto->Control}; + +$pto->Write ($pto_out); + Property changes on: trunk/Panotools-Script/bin/ptosort ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-04-27 20:40:04
|
Revision: 839 http://panotools.svn.sourceforge.net/panotools/?rev=839&view=rev Author: brunopostle Date: 2008-04-27 13:40:04 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Move script to build .exe files so it doesn't get installed Modified Paths: -------------- trunk/Panotools-Script/MANIFEST Added Paths: ----------- trunk/Panotools-Script/dos/ trunk/Panotools-Script/dos/make_exe.pl Removed Paths: ------------- trunk/Panotools-Script/make_exe.pl Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-04-14 21:07:45 UTC (rev 838) +++ trunk/Panotools-Script/MANIFEST 2008-04-27 20:40:04 UTC (rev 839) @@ -12,9 +12,9 @@ bin/process-masks bin/process-masks-gui bin/pto2fulla +bin/pto2tiff bin/ptograph bin/ptoinfo -bin/pto2tiff bin/ptoinfo-gui bin/ptosort bin/qtvr2erect @@ -23,14 +23,15 @@ bin/tif2svg-gui bin/transform-pano Changes -doc/match-n-shift.svg -desktop/README +desktop/enblend-svg.desktop +desktop/erect2qtvr-gui.desktop +desktop/process-masks-gui.desktop desktop/ptoinfo-gui.desktop desktop/qtvr2erect-gui.desktop +desktop/README desktop/tif2svg-gui.desktop -desktop/process-masks-gui.desktop -desktop/erect2qtvr-gui.desktop -desktop/enblend-svg.desktop +doc/match-n-shift.svg +dos/make_exe.pl lib/Panotools/Matrix.pm lib/Panotools/Script.pm lib/Panotools/Script/Line.pm @@ -47,7 +48,6 @@ Makefile.PL MANIFEST This list of files META.yml Module meta-data (added by MakeMaker) -make_exe.pl README t/001.parse-control.t t/002.parse-panorama.t Copied: trunk/Panotools-Script/dos/make_exe.pl (from rev 838, trunk/Panotools-Script/make_exe.pl) =================================================================== --- trunk/Panotools-Script/dos/make_exe.pl (rev 0) +++ trunk/Panotools-Script/dos/make_exe.pl 2008-04-27 20:40:04 UTC (rev 839) @@ -0,0 +1,33 @@ +#!/usr/bin/perl + +# Requires p2e from App::Packer + +# Par::Packer might work better: +# http://par.wikia.com/wiki/Main_Page + +my @stubs = qw/ +cubic2erect +enblend-mask +enblend-svg +erect2cubic +erect2planet +erect2qtvr +jpeg2qtvr +match-n-shift +nona-mask +process-masks +pto2fulla +pto2tiff +ptograph +ptoinfo +ptosort +qtvr2erect +tif2svg +transform-pano/; + +for my $stub (@stubs) +{ + system ('copy', "bin\\$stub", "$stub.pl"); + system ('p2e', '--add-module=Win32', '--add-module=File::Spec::Win32', "--output-file=$stub.exe", "$stub.pl"); + unlink ("$stub.pl"); +} Deleted: trunk/Panotools-Script/make_exe.pl =================================================================== --- trunk/Panotools-Script/make_exe.pl 2008-04-14 21:07:45 UTC (rev 838) +++ trunk/Panotools-Script/make_exe.pl 2008-04-27 20:40:04 UTC (rev 839) @@ -1,33 +0,0 @@ -#!/usr/bin/perl - -# Requires p2e from App::Packer - -# Par::Packer might work better: -# http://par.wikia.com/wiki/Main_Page - -my @stubs = qw/ -cubic2erect -enblend-mask -enblend-svg -erect2cubic -erect2planet -erect2qtvr -jpeg2qtvr -match-n-shift -nona-mask -process-masks -pto2fulla -pto2tiff -ptograph -ptoinfo -ptosort -qtvr2erect -tif2svg -transform-pano/; - -for my $stub (@stubs) -{ - system ('copy', "bin\\$stub", "$stub.pl"); - system ('p2e', '--add-module=Win32', '--add-module=File::Spec::Win32', "--output-file=$stub.exe", "$stub.pl"); - unlink ("$stub.pl"); -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-04-27 20:46:02
|
Revision: 840 http://panotools.svn.sourceforge.net/panotools/?rev=840&view=rev Author: brunopostle Date: 2008-04-27 13:46:09 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Fix nona-mask to allow -o parameter anywhere (Felix Hagemann) Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/nona-mask Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-04-27 20:40:04 UTC (rev 839) +++ trunk/Panotools-Script/Changes 2008-04-27 20:46:09 UTC (rev 840) @@ -7,6 +7,7 @@ - rationalise mixed licenses, now GPLv2+ - support optimising photometric parameters for vig_optimize - ptosort for renumbering control points in spatial order + - Fix nona-mask to allow -o parameter anywhere (Felix Hagemann) 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/bin/nona-mask =================================================================== --- trunk/Panotools-Script/bin/nona-mask 2008-04-27 20:40:04 UTC (rev 839) +++ trunk/Panotools-Script/bin/nona-mask 2008-04-27 20:46:09 UTC (rev 840) @@ -17,17 +17,27 @@ while (@ARGV) { my $arg = shift @ARGV; - if ($arg =~ /-o/) + if ($arg =~ /^-o/) { $outfile = File::Spec->rel2abs (shift @ARGV); - $script = File::Spec->rel2abs (shift @ARGV); - while (@ARGV) - { - push @files, (shift @ARGV); - } - next; } - else {push @parameters, $arg} + elsif ($arg =~ /^-v/ || $arg =~ /^-c/ ) + { + push @parameters, $arg; + } + elsif ($arg =~ /^-/) + { + push @parameters, $arg; + push @parameters, (shift @ARGV); + } + elsif ( ! $script ) + { + $script = File::Spec->rel2abs ( $arg ); + } + else + { + push @files, $arg; + } } die "Usage: $0 [options] -o output project_file (image files)" unless ($outfile && $script); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-05-10 22:48:42
|
Revision: 841 http://panotools.svn.sourceforge.net/panotools/?rev=841&view=rev Author: brunopostle Date: 2008-05-10 15:48:47 -0700 (Sat, 10 May 2008) Log Message: ----------- nona-mask: use -i parameter sanely (Felix Hagemann) Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/nona-mask Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-04-27 20:46:09 UTC (rev 840) +++ trunk/Panotools-Script/Changes 2008-05-10 22:48:47 UTC (rev 841) @@ -7,7 +7,7 @@ - rationalise mixed licenses, now GPLv2+ - support optimising photometric parameters for vig_optimize - ptosort for renumbering control points in spatial order - - Fix nona-mask to allow -o parameter anywhere (Felix Hagemann) + - Fix nona-mask to allow -o parameter anywhere, use -i parameter sanely (Felix Hagemann) 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/bin/nona-mask =================================================================== --- trunk/Panotools-Script/bin/nona-mask 2008-04-27 20:46:09 UTC (rev 840) +++ trunk/Panotools-Script/bin/nona-mask 2008-05-10 22:48:47 UTC (rev 841) @@ -8,6 +8,7 @@ my @parameters; my @files; +my %images; my $outfile; my $script; my $tempdir = tempdir (CLEANUP => 1); @@ -25,6 +26,12 @@ { push @parameters, $arg; } + elsif ($arg =~ /^-i/) + { + my $img = shift @ARGV; + $img =~ s/^([0-9]+)[^0-9]*$/$1/g; + $images{$img} = 1; + } elsif ($arg =~ /^-/) { push @parameters, $arg; @@ -55,9 +62,10 @@ $index++; } +my $i = 0; for my $image (@{$pano->Image}) { - my $tempfile = File::Spec->catfile ($tempdir, "$index.tif"); + my $tempfile = File::Spec->catfile ($tempdir, "$i.tif"); my $name = $image->{n}; $name =~ s/(^"|"$)//g; my $prefix = $name; @@ -67,6 +75,14 @@ $name = "$prefix.tif" if (-e "$prefix.tif"); $name = "$prefix.svg" if (-e "$prefix.svg"); + # skip mask generation if -i argument given and no mask images for those + if ( keys %images && ! exists $images{$i} ) + { + $i++; + $image->{n} = "\"$name\""; + next; + } + my $mask = $prefix . '_mask.tif'; if (-e $mask) { @@ -84,11 +100,16 @@ { $image->{n} = "\"$name\""; } - $index++; + $i++; } my $pto_temp = "$script.nona-mask.$$.pto"; $pano->Write ($pto_temp); + +foreach (keys %images) { + push @parameters,"-i"; + push @parameters,$_; +} system ('nona', @parameters, '-o', $outfile, $pto_temp); unlink $pto_temp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-03 22:50:41
|
Revision: 844 http://panotools.svn.sourceforge.net/panotools/?rev=844&view=rev Author: brunopostle Date: 2008-06-03 15:50:49 -0700 (Tue, 03 Jun 2008) Log Message: ----------- Fix enblend-svg mask output (Serge Droz) Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/enblend-svg Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-05-15 21:56:21 UTC (rev 843) +++ trunk/Panotools-Script/Changes 2008-06-03 22:50:49 UTC (rev 844) @@ -8,6 +8,7 @@ - support optimising photometric parameters for vig_optimize - ptosort for renumbering control points in spatial order - Fix nona-mask to allow -o parameter anywhere, use -i parameter sanely (Felix Hagemann) + - enblend-svg, fix mask output (Serge Droz) 0.13 - new match-n-shift control point finder tool Modified: trunk/Panotools-Script/bin/enblend-svg =================================================================== --- trunk/Panotools-Script/bin/enblend-svg 2008-05-15 21:56:21 UTC (rev 843) +++ trunk/Panotools-Script/bin/enblend-svg 2008-06-03 22:50:49 UTC (rev 844) @@ -36,7 +36,7 @@ my $out = "$file-enblend-svg-$$-$index.svg"; $xml =~ s/<image/<rect/g; - $xml =~ s/style=".*?"/style="fill:#FFFFFF"/g; + $xml =~ s/style=".*?"/style="fill:#00FF00"/g; $xml =~ s/xlink:href="(.*?)"//; my $image = $1; push @files, $image; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-08 22:01:41
|
Revision: 846 http://panotools.svn.sourceforge.net/panotools/?rev=846&view=rev Author: brunopostle Date: 2008-06-08 15:01:11 -0700 (Sun, 08 Jun 2008) Log Message: ----------- Update VERSION to 0.14 Modified Paths: -------------- trunk/Panotools-Script/META.yml trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/META.yml =================================================================== --- trunk/Panotools-Script/META.yml 2008-06-08 21:49:52 UTC (rev 845) +++ trunk/Panotools-Script/META.yml 2008-06-08 22:01:11 UTC (rev 846) @@ -1,7 +1,7 @@ --- #YAML:1.0 name: Panotools-Script abstract: 'Read, write and manipulate hugin script files' -version: 0.13 +version: 0.14 license: 'GPLv2+' author: - 'Bruno Postle <br...@po...>' Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-08 21:49:52 UTC (rev 845) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-08 22:01:11 UTC (rev 846) @@ -36,7 +36,7 @@ use Storable qw/ dclone /; -our $VERSION = 0.13; +our $VERSION = 0.14; our $CLEANUP = 1; $CLEANUP = 0 if defined $ENV{DEBUG}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-12 09:12:38
|
Revision: 847 http://panotools.svn.sourceforge.net/panotools/?rev=847&view=rev Author: brunopostle Date: 2008-06-12 02:12:47 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Fix for ptograph negative coordinates (Felix Hagemann) Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/ptograph Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-06-08 22:01:11 UTC (rev 846) +++ trunk/Panotools-Script/Changes 2008-06-12 09:12:47 UTC (rev 847) @@ -1,5 +1,8 @@ Revision history for Panotools::Script. +0.15 + - Fix for ptograph negative coordinates (Felix Hagemann) + 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) - new tool ptograph to visualise connections within a project Modified: trunk/Panotools-Script/bin/ptograph =================================================================== --- trunk/Panotools-Script/bin/ptograph 2008-06-08 22:01:11 UTC (rev 846) +++ trunk/Panotools-Script/bin/ptograph 2008-06-12 09:12:47 UTC (rev 847) @@ -40,7 +40,7 @@ my @nodes = $svg =~ /(<ellipse.*?\/text>)/gs; for my $xml_old (@nodes) { - my ($cx, $cy, $index_real) = $xml_old =~ /cx="([0-9]+)".*cy="([0-9]+)".*>([0-9]+)<\/text>$/s; + my ($cx, $cy, $index_real) = $xml_old =~ /cx="([-,0-9]+)".*cy="([-,0-9]+)".*>([0-9]+)<\/text>$/s; $cx += -18; $cy += -27; my $path_image = $pto->Image->[$index_real]->{n}; my $xml_new = "<image x=\"$cx\" y=\"$cy\" style=\"display:inline\" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-12 20:19:29
|
Revision: 848 http://panotools.svn.sourceforge.net/panotools/?rev=848&view=rev Author: brunopostle Date: 2008-06-12 13:19:36 -0700 (Thu, 12 Jun 2008) Log Message: ----------- ptosort now removes duplicate points too Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/ptosort trunk/Panotools-Script/lib/Panotools/Script/Line/Control.pm trunk/Panotools-Script/lib/Panotools/Script.pm trunk/Panotools-Script/t/001.parse-control.t Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-06-12 09:12:47 UTC (rev 847) +++ trunk/Panotools-Script/Changes 2008-06-12 20:19:36 UTC (rev 848) @@ -2,6 +2,7 @@ 0.15 - Fix for ptograph negative coordinates (Felix Hagemann) + - ptosort now removes duplicate points too 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) Modified: trunk/Panotools-Script/bin/ptosort =================================================================== --- trunk/Panotools-Script/bin/ptosort 2008-06-12 09:12:47 UTC (rev 847) +++ trunk/Panotools-Script/bin/ptosort 2008-06-12 20:19:36 UTC (rev 848) @@ -13,6 +13,24 @@ @{$points} = sort {$a->{y} <=> $b->{y}} @{$points}; +my $packed_seen = {}; +my $points_uniq = []; +for my $point (@{$points}) +{ + my $packed = $point->Packed; + if (defined $packed_seen->{$packed}) + { + print STDERR "Duplicate point removed: $packed\n"; + } + else + { + push @{$points_uniq}, $point; + } + $packed_seen->{$packed} = 'TRUE'; +} + +$pto->Control ($points_uniq); + $pto->Write ($pto_out); __END__ @@ -30,6 +48,8 @@ Sorts control points, putting them in vertical order. Useful if you want to be able to select and delete 'sky' points in hugin. +Also removes duplicate points. + =head1 Calling syntax ptoinfo <pto-file> <pto-file> Modified: trunk/Panotools-Script/lib/Panotools/Script/Line/Control.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script/Line/Control.pm 2008-06-12 09:12:47 UTC (rev 847) +++ trunk/Panotools-Script/lib/Panotools/Script/Line/Control.pm 2008-06-12 20:19:36 UTC (rev 848) @@ -48,5 +48,33 @@ return "c"; } +=pod + +Get a simplified description of a control point useful for identifying +duplicates like so: + + print $point->Packed; + +Format is first image, x, y, second image, x, y, point type + +e.g: 2,123,456,3,234,567,0 + +=cut + +sub Packed +{ + my $self = shift; + if ($self->{n} < $self->{N}) + { + return join ',', $self->{n}, int ($self->{x}), int ($self->{y}), + $self->{N}, int ($self->{X}), int ($self->{Y}), $self->{t}; + } + else + { + return join ',', $self->{N}, int ($self->{X}), int ($self->{Y}), + $self->{n}, int ($self->{x}), int ($self->{y}), $self->{t}; + } +} + 1; Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-12 09:12:47 UTC (rev 847) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-12 20:19:36 UTC (rev 848) @@ -256,6 +256,7 @@ sub Control { my $self = shift; + $self->{control} = shift if scalar @_; $self->{control}; } Modified: trunk/Panotools-Script/t/001.parse-control.t =================================================================== --- trunk/Panotools-Script/t/001.parse-control.t 2008-06-12 09:12:47 UTC (rev 847) +++ trunk/Panotools-Script/t/001.parse-control.t 2008-06-12 20:19:36 UTC (rev 848) @@ -22,3 +22,6 @@ like ($control->Assemble, '/ X239.52/', 'second image x position written as X239.52'); unlike ($control->Assemble, '/ p3/', 'bogus p3 parameter didn\'t survive'); +is ($control->Packed, '0,1066,844,1,239,804,0', 'packed ok'); +$control->Parse ("c N0 n1 X1066.5 Y844.333 x239.52 y804.64 t0"); +is ($control->Packed, '0,1066,844,1,239,804,0', 'reverse order packed the same'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-14 17:31:30
|
Revision: 850 http://panotools.svn.sourceforge.net/panotools/?rev=850&view=rev Author: brunopostle Date: 2008-06-14 10:31:38 -0700 (Sat, 14 Jun 2008) Log Message: ----------- move duplicate control point removal to the library Modified Paths: -------------- trunk/Panotools-Script/bin/ptosort trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/bin/ptosort =================================================================== --- trunk/Panotools-Script/bin/ptosort 2008-06-12 21:08:55 UTC (rev 849) +++ trunk/Panotools-Script/bin/ptosort 2008-06-14 17:31:38 UTC (rev 850) @@ -13,24 +13,11 @@ @{$points} = sort {$a->{y} <=> $b->{y}} @{$points}; -my $packed_seen = {}; -my $points_uniq = []; -for my $point (@{$points}) +for my $dupe (@{$pto->Duplicates}) { - my $packed = $point->Packed; - if (defined $packed_seen->{$packed}) - { - print STDERR "Duplicate point removed: $packed\n"; - } - else - { - push @{$points_uniq}, $point; - } - $packed_seen->{$packed} = 'TRUE'; + print STDERR "Duplicate point removed: ". $dupe->Packed ."\n"; } -$pto->Control ($points_uniq); - $pto->Write ($pto_out); __END__ Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-12 21:08:55 UTC (rev 849) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-14 17:31:38 UTC (rev 850) @@ -334,6 +334,39 @@ } } +=pod + +Remove duplicate control points from the project, returns a list of deleted +points: + + my $deleted = $p->Duplicates; + +=cut + +sub Duplicates +{ + my $self = shift; + my $packed_seen = {}; + my $points_uniq = []; + my $points_deleted = []; + for my $point (@{$self->Control}) + { + my $packed = $point->Packed; + if (defined $packed_seen->{$packed}) + { + push @{$points_deleted}, $point; + } + else + { + push @{$points_uniq}, $point; + } + $packed_seen->{$packed} = 'TRUE'; + } + + $self->Control ($points_uniq); + return $points_deleted; +} + =head1 COPYRIGHT Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-06-30 20:28:50
|
Revision: 852 http://panotools.svn.sourceforge.net/panotools/?rev=852&view=rev Author: brunopostle Date: 2008-06-30 13:28:55 -0700 (Mon, 30 Jun 2008) Log Message: ----------- new tools ptopath and erect2mercator Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/dos/make_exe.pl Added Paths: ----------- trunk/Panotools-Script/bin/erect2mercator trunk/Panotools-Script/bin/ptopath Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-06-30 20:18:56 UTC (rev 851) +++ trunk/Panotools-Script/Changes 2008-06-30 20:28:55 UTC (rev 852) @@ -2,7 +2,9 @@ 0.15 - Fix for ptograph negative coordinates (Felix Hagemann) - - ptosort now removes duplicate points too + - ptosort now removes duplicate points too, Duplicates() method + - ptopath changes absolute to relative paths in .pto projects + - erect2mercator creates a pto project for generating mercator views 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-06-30 20:18:56 UTC (rev 851) +++ trunk/Panotools-Script/MANIFEST 2008-06-30 20:28:55 UTC (rev 852) @@ -3,6 +3,7 @@ bin/enblend-svg bin/enblend-svg-gui bin/erect2cubic +bin/erect2mercator bin/erect2planet bin/erect2qtvr bin/erect2qtvr-gui @@ -16,6 +17,7 @@ bin/ptograph bin/ptoinfo bin/ptoinfo-gui +bin/ptopath bin/ptosort bin/qtvr2erect bin/qtvr2erect-gui Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-06-30 20:18:56 UTC (rev 851) +++ trunk/Panotools-Script/Makefile.PL 2008-06-30 20:28:55 UTC (rev 852) @@ -6,9 +6,10 @@ 'EXE_FILES' => [ 'bin/cubic2erect', 'bin/erect2cubic', '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/tif2svg', 'bin/enblend-svg', 'bin/pto2fulla', 'bin/ptoinfo', 'bin/ptopath', 'bin/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', 'bin/ptosort', 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', + 'bin/erect2mercator', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION 'PREREQ_PM' => {'bytes' => 0.0, 'File::Copy' => 1.0, Added: trunk/Panotools-Script/bin/erect2mercator =================================================================== --- trunk/Panotools-Script/bin/erect2mercator (rev 0) +++ trunk/Panotools-Script/bin/erect2mercator 2008-06-30 20:28:55 UTC (rev 852) @@ -0,0 +1,69 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use File::Spec; +use Panotools::Script; +use Image::Size; + +my $img_erect = shift or die "usage\n $0 equirectangular.tif"; + +my $pto_mercator = $img_erect; +$pto_mercator =~ s/\.([[:alnum:]]+)$/-mercator.pto/; + +my ($width, $height) = imgsize ($img_erect); +my $height_m = int (0.6180339887 * $width); +my ($volume, $directories, $file) = File::Spec->splitpath ($img_erect); + +my $mercator = new Panotools::Script; +if (-e $pto_mercator) +{ + $mercator->Read ($pto_mercator); + $mercator->Panorama->Set (w => $width, h => $height_m); + $mercator->Image->[0]->Set (w => $width, h => $height); +} +else +{ + $mercator->Panorama->Set (v => 360, f => 5, u => 0, w => $width, h => $height_m, n => '"TIFF"'); + $mercator->Image->[0] = new Panotools::Script::Line::Image; + $mercator->Image->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$file\""); +} +$mercator->Write ($pto_mercator); + +__END__ + +=head1 NAME + +erect2mercator - Extract a mercator projection from an equirectangular image + +=head1 Synopsis + + erect2mercator equirectangular.tif + +=head1 DESCRIPTION + +Generates a suitably sized mercator .pto project from a 360 degree +equirectangular image. Input is in any image format understood by hugin, +output is in TIFF format with an aspect ratio of 1.618:1 (a golden rectangle). + +The output filename is derived automatically from the input filename with +'-mercator.pto' appended. Existing .pto files will not be clobbered but +will be updated when input images change size. + +L<http://hugin.sourceforge.net/> + +=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<perl>, L<Panotools::Script> + +=head1 Author + +Bruno Postle <bruno AT postle.net> + Property changes on: trunk/Panotools-Script/bin/erect2mercator ___________________________________________________________________ Name: svn:executable + * Added: trunk/Panotools-Script/bin/ptopath =================================================================== --- trunk/Panotools-Script/bin/ptopath (rev 0) +++ trunk/Panotools-Script/bin/ptopath 2008-06-30 20:28:55 UTC (rev 852) @@ -0,0 +1,63 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Panotools::Script; +use File::Spec; + +my ($pto_in, $pto_out) = @ARGV; + +my $pto = new Panotools::Script; +$pto->Read ($pto_in); + +my ($volume, $directories, $file) = File::Spec->splitpath ($pto_out); +my $base = $volume . $directories; + +for my $image (@{$pto->Image}) +{ + my $abs_path = $image->{n}; + $abs_path =~ s/(^"|"$)//g; + my $rel_path = '"'. File::Spec->abs2rel ($abs_path, $base) .'"'; + $image->Set (n => $rel_path); +} + +$pto->Write ($pto_out); + +__END__ + +=head1 NAME + +ptopath - removes absolute paths from .pto projects + +=head1 Synopsis + + ptopath project_in.pto project_out.pto + +=head1 DESCRIPTION + +Rewrites 'n' parameters of 'i' lines, swapping absolute paths with paths +relative to the .pto file itself + +=head1 Calling syntax + + ptopath <pto-file> <pto-file> + +(input and output can be the same file) + +=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, E<lt>bruno (at) postle.netE<gt> + +=cut + Property changes on: trunk/Panotools-Script/bin/ptopath ___________________________________________________________________ Name: svn:executable + * Modified: trunk/Panotools-Script/dos/make_exe.pl =================================================================== --- trunk/Panotools-Script/dos/make_exe.pl 2008-06-30 20:18:56 UTC (rev 851) +++ trunk/Panotools-Script/dos/make_exe.pl 2008-06-30 20:28:55 UTC (rev 852) @@ -10,6 +10,7 @@ enblend-mask enblend-svg erect2cubic +erect2mercator erect2planet erect2qtvr jpeg2qtvr @@ -20,6 +21,7 @@ pto2tiff ptograph ptoinfo +ptopath ptosort qtvr2erect tif2svg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-07-02 16:56:04
|
Revision: 853 http://panotools.svn.sourceforge.net/panotools/?rev=853&view=rev Author: brunopostle Date: 2008-07-02 09:56:12 -0700 (Wed, 02 Jul 2008) Log Message: ----------- ptosplit extracts subsets of .pto projects Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/dos/make_exe.pl trunk/Panotools-Script/lib/Panotools/Script.pm Added Paths: ----------- trunk/Panotools-Script/bin/ptosplit Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-06-30 20:28:55 UTC (rev 852) +++ trunk/Panotools-Script/Changes 2008-07-02 16:56:12 UTC (rev 853) @@ -5,6 +5,7 @@ - ptosort now removes duplicate points too, Duplicates() method - ptopath changes absolute to relative paths in .pto projects - erect2mercator creates a pto project for generating mercator views + - ptosplit extracts subsets of .pto projects 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-06-30 20:28:55 UTC (rev 852) +++ trunk/Panotools-Script/MANIFEST 2008-07-02 16:56:12 UTC (rev 853) @@ -19,6 +19,7 @@ bin/ptoinfo-gui bin/ptopath bin/ptosort +bin/ptosplit bin/qtvr2erect bin/qtvr2erect-gui bin/tif2svg Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-06-30 20:28:55 UTC (rev 852) +++ trunk/Panotools-Script/Makefile.PL 2008-07-02 16:56:12 UTC (rev 853) @@ -9,7 +9,7 @@ 'bin/tif2svg', 'bin/enblend-svg', 'bin/pto2fulla', 'bin/ptoinfo', 'bin/ptopath', 'bin/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', 'bin/ptosort', 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', - 'bin/erect2mercator', + 'bin/erect2mercator', 'bin/ptosplit', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION 'PREREQ_PM' => {'bytes' => 0.0, 'File::Copy' => 1.0, Added: trunk/Panotools-Script/bin/ptosplit =================================================================== --- trunk/Panotools-Script/bin/ptosplit (rev 0) +++ trunk/Panotools-Script/bin/ptosplit 2008-07-02 16:56:12 UTC (rev 853) @@ -0,0 +1,71 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Panotools::Script; + +die "usage $0 0 2-4 8 [..] infile.pto outfile.pto" + unless (scalar @ARGV > 2); + +my $path_out = pop @ARGV; +my $path_in = pop @ARGV; + +my $pto_in = new Panotools::Script; +$pto_in->Read ($path_in); + +my @images; +for my $item (@ARGV) +{ + push (@images, $item) if ($item =~ /^[0-9]+$/); + push (@images, ($1 .. $2)) if ($item =~ /^([0-9]+)-([0-9]+)$/); +} + +my $pto_out = $pto_in->Subset (@images) + or die "invalid image specification"; + +$pto_out->Write ($path_out); + +__END__ + +=head1 NAME + +ptosplit - extracts a subset pto project + +=head1 Synopsis + + ptosplit 0 2-4 8 [..] infile.pto outfile.pto + +=head1 DESCRIPTION + +Extracts just the specified images from a .pto project and writes a new +project containing just these images, related control points and +optimisation settings. + +Images can be requested in any order, but they will be returned in the same +order as the 'parent' project. Note image numbers start at 0. + +Ranges can be used, '2-5' is the same as '2 3 4 5'. + +=head1 Calling syntax + + ptosplit <number> <number ...> <pto-file> <pto-file> + +(input and output can be the same file) + +=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, E<lt>bruno (at) postle.netE<gt> + +=cut + Property changes on: trunk/Panotools-Script/bin/ptosplit ___________________________________________________________________ Name: svn:executable + * Modified: trunk/Panotools-Script/dos/make_exe.pl =================================================================== --- trunk/Panotools-Script/dos/make_exe.pl 2008-06-30 20:28:55 UTC (rev 852) +++ trunk/Panotools-Script/dos/make_exe.pl 2008-07-02 16:56:12 UTC (rev 853) @@ -23,6 +23,7 @@ ptoinfo ptopath ptosort +ptosplit qtvr2erect tif2svg transform-pano/; Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-06-30 20:28:55 UTC (rev 852) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-02 16:56:12 UTC (rev 853) @@ -367,6 +367,86 @@ return $points_deleted; } +=pod + +Extract a new object consisting of just the requested images, related +control points and optimisation settings: + + my $subset = $p->Subset (1, 2, 34, 56); + +Images can be requested in any order, but they will be returned in the same +order as the 'parent' project. + +=cut + +sub Subset +{ + my $self = shift; + my @selection = sort {$a <=> $b} @_; + + my $mapping; + for my $index (0 .. scalar @selection -1) + { + return 0 unless $selection[$index] =~ /^[0-9]+$/; + return 0 if $selection[$index] >= scalar @{$self->{image}}; + $mapping->{$selection[$index]} = $index; + } + return 0 unless scalar keys %{$mapping} == scalar @selection; + + my $pto_out = $self->Clone; + + # only use selected images + $pto_out->{image} = []; + $pto_out->{imagemetadata} = []; + $pto_out->{variable} = new Panotools::Script::Line::Variable; + + for my $index (0 .. scalar @{$self->{image}} -1) + { + next unless defined $mapping->{$index}; + + # copy metadata for selected image + $pto_out->{imagemetadata}->[$mapping->{$index}] + = $self->{imagemetadata}->[$index]->Clone; + + # copy selected image but resolve '=0' style references + my $image = $self->{image}->[$index]->Clone; + for my $key (keys %{$image}) + { + # resolve references as anchor image may be gone + if ($image->{$key} =~ /^=([0-9]+)$/) + { + $image->{$key} = $self->{image}->[$1]->{$key}; + } + # rereference to image 0 if possible + if (scalar @{$pto_out->{image}} > 0 + and $image->{$key} eq $pto_out->{image}->[0]->{$key} + and $key =~ /^([abcdev]|R[abcde]|V[abcdxy])$/) + { + $image->{$key} = '=0'; + } + } + $pto_out->{image}->[$mapping->{$index}] = $image; + + # copy only optimisation parameters for selected image + $pto_out->{variable}->{$mapping->{$index}} + = {%{$self->{variable}->{$index}}}; + } + + # copy only control points related to selected images + $pto_out->{control} = []; + for my $control (@{$self->{control}}) + { + next unless defined $mapping->{$control->{n}}; + next unless defined $mapping->{$control->{N}}; + my $clone = $control->Clone; + $clone->{n} = $mapping->{$control->{n}}; + $clone->{N} = $mapping->{$control->{N}}; + push @{$pto_out->{control}}, $clone; + } + + return $pto_out; +} + =head1 COPYRIGHT Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-07-02 22:49:08
|
Revision: 854 http://panotools.svn.sourceforge.net/panotools/?rev=854&view=rev Author: brunopostle Date: 2008-07-02 15:49:15 -0700 (Wed, 02 Jul 2008) Log Message: ----------- ptomerge merges .pto project files, not much testing Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/MANIFEST trunk/Panotools-Script/Makefile.PL trunk/Panotools-Script/dos/make_exe.pl trunk/Panotools-Script/lib/Panotools/Script.pm Added Paths: ----------- trunk/Panotools-Script/bin/ptomerge Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-07-02 16:56:12 UTC (rev 853) +++ trunk/Panotools-Script/Changes 2008-07-02 22:49:15 UTC (rev 854) @@ -6,6 +6,7 @@ - ptopath changes absolute to relative paths in .pto projects - erect2mercator creates a pto project for generating mercator views - ptosplit extracts subsets of .pto projects + - ptomerge merges .pto projects 0.14 - match-n-shift uses PTmender instead of nona/ImageMagick (now much slower) Modified: trunk/Panotools-Script/MANIFEST =================================================================== --- trunk/Panotools-Script/MANIFEST 2008-07-02 16:56:12 UTC (rev 853) +++ trunk/Panotools-Script/MANIFEST 2008-07-02 22:49:15 UTC (rev 854) @@ -17,6 +17,7 @@ bin/ptograph bin/ptoinfo bin/ptoinfo-gui +bin/ptomerge bin/ptopath bin/ptosort bin/ptosplit Modified: trunk/Panotools-Script/Makefile.PL =================================================================== --- trunk/Panotools-Script/Makefile.PL 2008-07-02 16:56:12 UTC (rev 853) +++ trunk/Panotools-Script/Makefile.PL 2008-07-02 22:49:15 UTC (rev 854) @@ -9,7 +9,7 @@ 'bin/tif2svg', 'bin/enblend-svg', 'bin/pto2fulla', 'bin/ptoinfo', 'bin/ptopath', 'bin/qtvr2erect-gui', 'bin/tif2svg-gui', 'bin/ptoinfo-gui', 'bin/ptosort', 'bin/process-masks-gui', 'bin/enblend-svg-gui', 'bin/erect2qtvr-gui', - 'bin/erect2mercator', 'bin/ptosplit', + 'bin/erect2mercator', 'bin/ptosplit', 'bin/ptomerge', 'bin/transform-pano', 'bin/nona-mask', 'bin/qtvr2erect' ], 'VERSION_FROM' => 'lib/Panotools/Script.pm', # finds $VERSION 'PREREQ_PM' => {'bytes' => 0.0, 'File::Copy' => 1.0, Added: trunk/Panotools-Script/bin/ptomerge =================================================================== --- trunk/Panotools-Script/bin/ptomerge (rev 0) +++ trunk/Panotools-Script/bin/ptomerge 2008-07-02 22:49:15 UTC (rev 854) @@ -0,0 +1,63 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Panotools::Script; + +my $path_base = shift @ARGV; +my $path_out = pop @ARGV; + +my $base = new Panotools::Script; +$base->Read ($path_base); + +for my $path_extra (@ARGV) +{ + my $extra = new Panotools::Script; + $extra->Read ($path_extra); + $base->Merge ($extra); +} + +$base->Write ($path_out); + +__END__ + +=head1 NAME + +ptomerge - merges pto projects + +=head1 Synopsis + + ptomerge infile1.pto infile2.pto infile3.pto [...] outfile.pto + +=head1 DESCRIPTION + +Takes a list of .pto projects and joins them together into a single .pto +project. Projects at the begining of the list get priority, existing image +entries are not clobbered by subsequent entries. + +Images are identified by file paths (n parameters). + +Control points are imported anyway even if points already exist in other +projects, duplicates points are however not imported. + +=head1 Calling syntax + + ptomerge <pto-file> <pto-file ...> <pto-file> + +=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, E<lt>bruno (at) postle.netE<gt> + +=cut + Property changes on: trunk/Panotools-Script/bin/ptomerge ___________________________________________________________________ Name: svn:executable + * Modified: trunk/Panotools-Script/dos/make_exe.pl =================================================================== --- trunk/Panotools-Script/dos/make_exe.pl 2008-07-02 16:56:12 UTC (rev 853) +++ trunk/Panotools-Script/dos/make_exe.pl 2008-07-02 22:49:15 UTC (rev 854) @@ -19,6 +19,7 @@ process-masks pto2fulla pto2tiff +ptomerge ptograph ptoinfo ptopath Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-02 16:56:12 UTC (rev 853) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-02 22:49:15 UTC (rev 854) @@ -447,6 +447,79 @@ return $pto_out; } +=pod + +Merge a project with another: + + $p->Merge ($newstuff); + +This adds extra images from $newstuff, skipping duplicates. All control points +except exact duplicates are imported regardless. + +=cut + +sub Merge +{ + my $self = shift; + my $b = shift || return 0; + + # create lookup table relating filenames to index in final project + my $mapping = {}; + + for my $index (0 .. scalar @{$self->Image} -1) + { + $mapping->{$self->Image->[$index]->{n}} = $index; + } + + my $index = scalar keys %{$mapping}; + for my $image (@{$b->Image}) + { + unless (defined $mapping->{$image->{n}}) + { + $mapping->{$image->{n}} = $index; + $index++; + } + } + + # insert metadata, image and variable info if a new filename + for my $index (0 .. scalar @{$b->Image} -1) + { + my $filename = $b->Image->[$index]->{n}; + next if defined $self->Image->[$mapping->{$filename}]; + + my $metadata = $b->ImageMetadata->[$index]->Clone; + $self->ImageMetadata->[$mapping->{$filename}] = $metadata; + + my $image = $b->Image->[$index]->Clone; + for my $key (keys %{$image}) + { + # update references + if ($image->{$key} =~ /^=([0-9]+)$/) + { + my $index_new = $mapping->{$b->Image->[$1]->{n}}; + $image->{$key} = "=$index_new"; + } + } + $self->Image->[$mapping->{$filename}] = $image; + + my $variable = $b->Variable->Clone; + $self->Variable->{$mapping->{$filename}} = $variable->{$index}; + } + + # append control points + for my $control (@{$b->Control}) + { + my $clone = $control->Clone; + $clone->{n} = $mapping->{$b->Image->[$clone->{n}]->{n}}; + $clone->{N} = $mapping->{$b->Image->[$clone->{N}]->{n}}; + push @{$self->Control}, $clone; + } + + $self->Duplicates; + + return 1; +} + =head1 COPYRIGHT Copyright (c) 2001 Bruno Postle <br...@po...>. All Rights Reserved. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-07-06 15:31:15
|
Revision: 855 http://panotools.svn.sourceforge.net/panotools/?rev=855&view=rev Author: brunopostle Date: 2008-07-06 08:31:24 -0700 (Sun, 06 Jul 2008) Log Message: ----------- Update to 0.15 Modified Paths: -------------- trunk/Panotools-Script/META.yml trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/META.yml =================================================================== --- trunk/Panotools-Script/META.yml 2008-07-02 22:49:15 UTC (rev 854) +++ trunk/Panotools-Script/META.yml 2008-07-06 15:31:24 UTC (rev 855) @@ -1,7 +1,7 @@ --- #YAML:1.0 name: Panotools-Script abstract: 'Read, write and manipulate hugin script files' -version: 0.14 +version: 0.15 license: 'GPLv2+' author: - 'Bruno Postle <br...@po...>' Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-02 22:49:15 UTC (rev 854) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-06 15:31:24 UTC (rev 855) @@ -36,7 +36,7 @@ use Storable qw/ dclone /; -our $VERSION = 0.14; +our $VERSION = 0.15; our $CLEANUP = 1; $CLEANUP = 0 if defined $ENV{DEBUG}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-07-09 22:36:04
|
Revision: 857 http://panotools.svn.sourceforge.net/panotools/?rev=857&view=rev Author: brunopostle Date: 2008-07-09 15:36:05 -0700 (Wed, 09 Jul 2008) Log Message: ----------- Read() and Write() accept STDIN and STDOUT using '-' placeholder Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/lib/Panotools/Script.pm Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-07-06 16:17:15 UTC (rev 856) +++ trunk/Panotools-Script/Changes 2008-07-09 22:36:05 UTC (rev 857) @@ -1,5 +1,8 @@ Revision history for Panotools::Script. +0.16 + - Read() and Write() accept STDIN and STDOUT using '-' placeholder + 0.15 - Fix for ptograph negative coordinates (Felix Hagemann) - ptosort now removes duplicate points too, Duplicates() method Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-06 16:17:15 UTC (rev 856) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-07-09 22:36:05 UTC (rev 857) @@ -80,7 +80,14 @@ { my $self = shift; my $path = shift || return 0; - open FILE, "<", $path or die "cannot read-open $path"; + if ($path eq '-') + { + open FILE, '<-'; + } + else + { + open FILE, "<", $path or die "cannot read-open $path"; + } my @raw = <FILE>; close FILE; @@ -146,7 +153,14 @@ my $self = shift; my $path = shift || return 0; my $vector = shift || ''; - open FILE, ">", $path or die "cannot write-open $path"; + if ($path eq '-') + { + open FILE, '>-'; + } + else + { + open FILE, ">", $path or die "cannot write-open $path"; + } print FILE "# Created by ". (ref $self) ." $VERSION\n\n"; print FILE $self->Panorama->Assemble; print FILE $self->Mode->Assemble; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-07-10 22:28:22
|
Revision: 858 http://panotools.svn.sourceforge.net/panotools/?rev=858&view=rev Author: brunopostle Date: 2008-07-10 15:28:30 -0700 (Thu, 10 Jul 2008) Log Message: ----------- ptosort now allows sorting on various .pto parameters (Felix Hagemann) Modified Paths: -------------- trunk/Panotools-Script/Changes trunk/Panotools-Script/bin/ptosort Modified: trunk/Panotools-Script/Changes =================================================================== --- trunk/Panotools-Script/Changes 2008-07-09 22:36:05 UTC (rev 857) +++ trunk/Panotools-Script/Changes 2008-07-10 22:28:30 UTC (rev 858) @@ -2,6 +2,7 @@ 0.16 - Read() and Write() accept STDIN and STDOUT using '-' placeholder + - ptosort now allows sorting many aspects of .pto projects (Felix Hagemann) 0.15 - Fix for ptograph negative coordinates (Felix Hagemann) Modified: trunk/Panotools-Script/bin/ptosort =================================================================== --- trunk/Panotools-Script/bin/ptosort 2008-07-09 22:36:05 UTC (rev 857) +++ trunk/Panotools-Script/bin/ptosort 2008-07-10 22:28:30 UTC (rev 858) @@ -3,60 +3,225 @@ use strict; use warnings; use Panotools::Script; +use Getopt::Long; +use Pod::Usage; -my ($pto_in, $pto_out) = @ARGV; +my $pto_in; +my $pto_out; +my $image_sort = "n"; +my $point_sort = "nNy"; +my $help; +sub point_compare ( $$ ) +{ + foreach (split //,$point_sort) + { + return $_[0]->{$_} <=> $_[1]->{$_} + if ($_[0]->{$_} != $_[1]->{$_}); + } + return 0; +} +sub image_compare ( $$ ) +{ + foreach (split //,$image_sort) + { + if ( /n/ ) + { + return $_[0]->{$_} cmp $_[1]->{$_} + if ($_[0]->{$_} ne $_[1]->{$_}); + } + return $_[0]->{$_} <=> $_[1]->{$_} + if ($_[0]->{$_} != $_[1]->{$_}); + } + return 0; +} + +GetOptions ('i|image=s' => \$image_sort, + 'p|point=s' => \$point_sort, + 'h|help' => \$help ); + +pod2usage (-verbose => 2) if $help; +pod2usage (2) unless scalar @ARGV == 2; + +$pto_in = shift @ARGV; +$pto_out = shift @ARGV; + my $pto = new Panotools::Script; $pto->Read ($pto_in); -my $points = $pto->Control; +# treat image sorting first +my $image_list = $pto->Image; -@{$points} = sort {$a->{y} <=> $b->{y}} @{$points}; +my $sorted_image_list; +@{$sorted_image_list} = sort image_compare @$image_list; -for my $dupe (@{$pto->Duplicates}) +# create a mapping of what the sort did +my $mapping; +for my $i ( 0 .. scalar @$image_list - 1 ) { - print STDERR "Duplicate point removed: ". $dupe->Packed ."\n"; + for my $j ( 0 .. scalar @$sorted_image_list - 1) + { + if ( @{$image_list}[$i] eq @{$sorted_image_list}[$j] ) + { + $mapping->{$i} = $j; + last; + } + } } -$pto->Write ($pto_out); +my $sorted_pto = $pto->Clone; +# take care of the implicit assumption k0 if no k is present +if ( ! exists $pto->Panorama->{"k"} && $mapping->{0} != 0 ) +{ + $pto->Panorama->{k} = 0; +} +# fix the anchor reference in the "panorama" line +for my $key ("k","b","d") +{ + if (exists $pto->Panorama->{$key}) + { + $sorted_pto->Panorama->{$key} = $mapping->{$pto->Panorama->{$key}} + } +} + +# reorder "image", "imagemetadata" and "variable" lines +for my $index (0 .. scalar @{$pto->Image} - 1) +{ + next if $index == $mapping->{$index}; + @{$sorted_pto->{image}}[$mapping->{$index}] + = @{$pto->{image}}[$index]; + @{$sorted_pto->{imagemetadata}}[$mapping->{$index}] + = @{$pto->{imagemetadata}}[$index]; + $sorted_pto->Variable->{$index} + = $pto->Variable->{$mapping->{$index}}; +} + +# take care of hugins "anchor for position" image +if ( exists $pto->Option->{optimizeReferenceImage} ) +{ + $sorted_pto->Option->{optimizeReferenceImage} = $mapping->{$pto->Option->{optimizeReferenceImage}}; +} + +# change references in "image" lines +for my $index (0 .. scalar @{$sorted_pto->Image} - 1) +{ + my $image = $sorted_pto->{image}->[$index]; + for my $key (keys %{$image}) + { + if ( $image->{$key} =~ /^=([0-9]+)$/ ) + { + my $no = $1; + $image->{$key} =~ s/^=$no$/=$mapping->{$no}/; + } + } +} +# clean references up, so that they always reference to a lower image number +for my $index (0 .. scalar @{$sorted_pto->Image} - 1) +{ + my $image = $sorted_pto->{image}->[$index]; + for my $key (keys %{$image}) + { + if ( $image->{$key} =~ /^=([0-9]+)$/ ) + { + my $no = $1; + if ( $no > $index) + { + $image->{$key} = $sorted_pto->Image->[$no]->{$key}; + $sorted_pto->Image->[$no]->{$key} = "=".$index; + + # all later references to $no need to point to $index as well: + for my $k ($index + 1 .. scalar @{$sorted_pto->Image} - 1) + { + my $later_img = $sorted_pto->{image}->[$k]; + foreach (keys %{$later_img}) + { + $later_img->{$_} =~ s/^=$no$/=$index/; + } + } + } + } + } +} + +# change control points +for my $index ( 0 .. scalar @{$sorted_pto->Control} - 1 ) +{ + my $cp = $sorted_pto->{control}->[$index]; + $cp->{n} = $mapping->{$cp->{n}}; + $cp->{N} = $mapping->{$cp->{N}}; +} + +# change controlmorph points +for my $index ( 0 .. scalar @{$sorted_pto->ControlMorph} - 1 ) +{ + my $cp = $sorted_pto->{control}->[$index]; + $cp->{i} = $mapping->{$cp->{i}}; +} + +# sort the control points +my $points = $sorted_pto->Control; +@{$points} = sort point_compare @{$points}; + + +$sorted_pto->Write($pto_out); + +exit 0; + __END__ =head1 NAME -ptosort - sorts .pto control points vertically +B<ptosortng> - sort pto files with variable criteria -=head1 Synopsis +=head1 SYNOPSIS - ptosort project_in.pto project_out.pto +ptosortng [options] infile.pto outfile.pto + Options: + -p | --point order Provide a sorting order for control points + -i | --image order Provide a sorting order for images + -h | --help Show the full manpage + +=cut + =head1 DESCRIPTION -Sorts control points, putting them in vertical order. Useful if you want to -be able to select and delete 'sky' points in hugin. +B<ptosortng> takes a pto file as input, sorts it and writes a sorted +pto file as output. By default images are sorted according to their +filename and control points are sorted by left image number, right +image number and y pixel coordinate. -Also removes duplicate points. +The --point and --image command line options can be used to modify the +sorting order. The order string should consist of a list letters +identifying the values to be taken for the comparison, e.g. for images +y means yaw or r means roll. -=head1 Calling syntax +=head1 EXAMPLES - ptoinfo <pto-file> <pto-file> +=over 5 -(input and output can be the same file) +=item ptosortng --image n --point nNy in.pto out.pto -=head1 License +Sort the images by filename and the control points by left image +number, right image number and y pixel coordinate. This is identical +to the default behaviour without options. +=item ptosortng --image y in.pto out.pto + +Sort images by yaw and control points using the default. + +=back + +=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 +=head1 AUTHOR -L<http://hugin.sourceforge.net/> +Felix Hagemann, July 2008 -=head1 Author - -Bruno Postle, E<lt>bruno (at) postle.netE<gt> - =cut - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |