From: <da...@us...> - 2007-07-26 19:54:36
|
Revision: 2333 http://hugin.svn.sourceforge.net/hugin/?rev=2333&view=rev Author: dangelo Date: 2007-07-26 12:54:34 -0700 (Thu, 26 Jul 2007) Log Message: ----------- optimize variables in pto file if not specified otherwise Modified Paths: -------------- hugin/branches/ippei/src/tools/autooptimiser.cpp Modified: hugin/branches/ippei/src/tools/autooptimiser.cpp =================================================================== --- hugin/branches/ippei/src/tools/autooptimiser.cpp 2007-07-26 19:53:18 UTC (rev 2332) +++ hugin/branches/ippei/src/tools/autooptimiser.cpp 2007-07-26 19:54:34 UTC (rev 2333) @@ -190,6 +190,8 @@ PTools::optimize(pano); } else if (doAutoOpt) { SmartOptimise::smartOptimize(pano); + } else { + PTools::optimize(pano); } if (doLevel) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-14 22:13:58
|
Revision: 2446 http://hugin.svn.sourceforge.net/hugin/?rev=2446&view=rev Author: dangelo Date: 2007-10-14 15:13:57 -0700 (Sun, 14 Oct 2007) Log Message: ----------- changed options. Geometric optimisation is now optional. Useful if only the straighten function should be applied. Modified Paths: -------------- hugin/branches/ippei/src/tools/autooptimiser.cpp Modified: hugin/branches/ippei/src/tools/autooptimiser.cpp =================================================================== --- hugin/branches/ippei/src/tools/autooptimiser.cpp 2007-10-14 22:12:09 UTC (rev 2445) +++ hugin/branches/ippei/src/tools/autooptimiser.cpp 2007-10-14 22:13:57 UTC (rev 2446) @@ -59,12 +59,18 @@ << endl << " Options:" << endl << " -o file.pto output file. If obmitted, stdout is used." << endl + << endl + << " Optimisation options (if not specified, no optimisation takes place)" << std::endl + << " -a auto align mode, includes various optimisation stages, depending" << endl + << " on the amount and distribution of the control points" << endl << " -p pairwise optimisation of yaw, pitch and roll, starting from" << endl << " first image" << endl - << " -a auto align mode, includes various optimisation stages, depending" << endl - << " on the amount and distribution of the control points" << endl - << " -l level horizon" << endl + << " -n Optimize parameters specified in script file (like PTOptimizer)" << endl + << endl + << " Postprocessing options:" << endl + << " -l level horizon (works best for horizontal panos)" << endl << " -s automatically select a suitable output projection and size" << endl + << " Other options:" << endl << " -q quiet operation (no progress is reported)" << endl << " -v HFOV specify horizontal field of view of input images." << endl << " Used if the .pto file contains invalid HFOV values" << endl @@ -78,11 +84,12 @@ int main(int argc, char *argv[]) { // parse arguments - const char * optstring = "alho:pqsv:"; + const char * optstring = "alho:npqsv:"; int c; string output; bool doPairwise = false; bool doAutoOpt = false; + bool doNormalOpt = false; bool doLevel = false; bool chooseProj = false; bool quiet = false; @@ -102,6 +109,9 @@ case 'a': doAutoOpt = true; break; + case 'n': + doNormalOpt = true; + break; case 'l': doLevel = true; break; @@ -183,15 +193,19 @@ optvars.insert("r"); optvars.insert("p"); optvars.insert("y"); - AutoOptimise::autoOptimise(pano); // do global optimisation + if (!quiet) std::cerr << "*** Pairwise position optimisation" << endl; PTools::optimize(pano); } else if (doAutoOpt) { + if (!quiet) std::cerr << "*** Adaptive geometric optimisation" << endl; SmartOptimise::smartOptimize(pano); + } else if (doNormalOpt) { + if (!quiet) std::cerr << "*** Optimising parameters specified in PTO file" << endl; + PTools::optimize(pano); } else { - PTools::optimize(pano); + if (!quiet) std::cerr << "*** Geometric parameters not optimized" << endl; } if (doLevel) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |