From: <yu...@us...> - 2009-01-17 21:13:57
|
Revision: 3585 http://hugin.svn.sourceforge.net/hugin/?rev=3585&view=rev Author: yuv Date: 2009-01-17 21:13:52 +0000 (Sat, 17 Jan 2009) Log Message: ----------- VFOV sliders for Pannini, Architectural, Equi_Pannini (Thomas Modes) Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2009-01-17 21:09:06 UTC (rev 3584) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2009-01-17 21:13:52 UTC (rev 3585) @@ -237,7 +237,10 @@ || f == EQUIRECTANGULAR || f == MERCATOR || f == SINUSOIDAL - || f == MILLER_CYLINDRICAL); + || f == MILLER_CYLINDRICAL + || f == PANINI + || f == ARCHITECTURAL + || f == EQUI_PANINI); //#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-09-12 23:24:04
|
Revision: 4392 http://hugin.svn.sourceforge.net/hugin/?rev=4392&view=rev Author: yuv Date: 2009-09-12 23:23:55 +0000 (Sat, 12 Sep 2009) Log Message: ----------- more libpano cleanup Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2009-09-12 23:22:24 UTC (rev 4391) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2009-09-12 23:23:55 UTC (rev 4392) @@ -229,14 +229,13 @@ bool PanoramaOptions::fovCalcSupported(ProjectionFormat f) const { /* -#ifdef HasPANO13 + // should be like this but does not return BIPLANE, TRIPLANE, etc. pano_projection_features pfeat; if (panoProjectionFeaturesQuery((int) m_projectionFormat, &pfeat)) { return pfeat.maxVFOV <=180; } else { return false; } -#else */ return ( f == RECTILINEAR || f == CYLINDRICAL @@ -249,7 +248,6 @@ || f == EQUI_PANINI || f == BIPLANE || f == TRIPLANE); - //#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-01-08 06:18:50
|
Revision: 4861 http://hugin.svn.sourceforge.net/hugin/?rev=4861&view=rev Author: tmodes Date: 2010-01-08 06:18:41 +0000 (Fri, 08 Jan 2010) Log Message: ----------- Some fixes for changed general panini in libpano13 rev1210 Revision Links: -------------- http://hugin.svn.sourceforge.net/hugin/?rev=1210&view=rev Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-07 20:43:28 UTC (rev 4860) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-08 06:18:41 UTC (rev 4861) @@ -183,7 +183,7 @@ }; if (f == GENERAL_PANINI) { - m_projectionParams[0] = 2.0; + m_projectionParams[0] = 0; }; } setHFOV(hfov, false); @@ -207,7 +207,7 @@ }; if (f == GENERAL_PANINI) { - m_projectionParams[0] = 2.0; + m_projectionParams[0] = 0; }; } double hfov = std::min(getHFOV(), getMaxHFOV()); @@ -450,7 +450,7 @@ double PanoramaOptions::getMaxHFOV() const { - double param; + double param=0; pano_projection_features pfeat; if (panoProjectionFeaturesQuery((int)m_projectionFormat, &pfeat)) { switch(m_projectionFormat) @@ -458,21 +458,18 @@ case BIPLANE: if (m_projectionParams.size()>0) param = m_projectionParams[0]; - else - param = 0; return param + 179; case TRIPLANE: if (m_projectionParams.size()>0) param = m_projectionParams[0]; - else - param = 0; return 2 * param + 179; case GENERAL_PANINI: if (m_projectionParams.size()>0) param = m_projectionParams[0]; + if(param<=0) + return std::min(180.0/PI*acos(1.5/3.0001-75/(50.005-param))-1.0,359.0); else - param = 2.0; - return std::min((180.0*param)-1.0,359.0); + return pfeat.maxHFOV; default: return pfeat.maxHFOV; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-01-21 06:25:14
|
Revision: 4923 http://hugin.svn.sourceforge.net/hugin/?rev=4923&view=rev Author: tmodes Date: 2010-01-21 06:25:05 +0000 (Thu, 21 Jan 2010) Log Message: ----------- Some internal improvements for reset of projection paramters Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-20 15:46:30 UTC (rev 4922) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-01-21 06:25:05 UTC (rev 4923) @@ -183,12 +183,8 @@ panoProjectionFeaturesQuery(f, &m_projFeatures); /* post default projection parameters and corresponding FOV limits */ m_projectionParams.resize(m_projFeatures.numberOfParameters); + // reset projection parameters to default, determine also new fov limits, clip current fovs... resetProjectionParameters(); - // post new params, determine fov limits, clip current fovs... - setProjectionParameters( m_projectionParams ); - // post new fovs - setHFOV(m_hfov, false); - setVFOV(getVFOV()); } @@ -211,7 +207,7 @@ /* get dynamic FOV limits corresponding to the new parameters, clip current fovs to those limits, and post the results */ - double parms[6]; + double parms[PANO_PROJECTION_MAX_PARMS]; double fovs[2]; int i; for( i = 0; i < m_projFeatures.numberOfParameters; i++){ @@ -219,7 +215,6 @@ } if( queryFOVLimits((int)m_projectionFormat, parms, fovs )){ m_projFeatures.maxHFOV = fovs[0]; - m_hfov = std::min(m_hfov, fovs[0]); m_projFeatures.maxVFOV = fovs[1]; } setHFOV( m_hfov, false ); @@ -228,10 +223,12 @@ void PanoramaOptions::resetProjectionParameters() { + std::vector<double> defParam(m_projFeatures.numberOfParameters); for(int i = 0; i < m_projFeatures.numberOfParameters; i++) { - m_projectionParams[i] = m_projFeatures.parm[i].defValue; + defParam[i] = m_projFeatures.parm[i].defValue; }; + setProjectionParameters(defParam); }; bool PanoramaOptions::fovCalcSupported(ProjectionFormat f) const This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-02-01 15:18:53
|
Revision: 4956 http://hugin.svn.sourceforge.net/hugin/?rev=4956&view=rev Author: tmodes Date: 2010-02-01 15:18:44 +0000 (Mon, 01 Feb 2010) Log Message: ----------- Write projection parameters also for PTStitcher script Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-02-01 15:10:49 UTC (rev 4955) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-02-01 15:18:44 UTC (rev 4956) @@ -118,20 +118,20 @@ if (outputPixelType.size() > 0) { o << " T" << outputPixelType; } - if (m_projectionParams.size() > 0) { - o << " P\""; - for (int i=0; i < (int) m_projectionParams.size(); i++) { - o << m_projectionParams[i]; - if (i+1 < (int)m_projectionParams.size()) - o << " "; - } - o << "\""; - } if (m_roi != vigra::Rect2D(m_size)) { o << " S" << m_roi.left() << "," << m_roi.right() << "," << m_roi.top() << "," << m_roi.bottom(); } } + if (m_projectionParams.size() > 0) { + o << " P\""; + for (int i=0; i < (int) m_projectionParams.size(); i++) { + o << m_projectionParams[i]; + if (i+1 < (int)m_projectionParams.size()) + o << " "; + } + o << "\""; + } o << " n\"" << getFormatName(outputFormat); if ( outputFormat == JPEG ) { o << " q" << quality; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-03-08 10:36:30
|
Revision: 5055 http://hugin.svn.sourceforge.net/hugin/?rev=5055&view=rev Author: tmodes Date: 2010-03-08 10:36:21 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Decouple hfov and vfov values (fixes bug introduced in rev. 4911) Modified Paths: -------------- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp =================================================================== --- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-03-07 19:14:58 UTC (rev 5054) +++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.cpp 2010-03-08 10:36:21 UTC (rev 5055) @@ -320,9 +320,13 @@ if (h <= 0) { h = 1; } + double vfov; + if (keepView) { + vfov = getVFOV(); + } m_hfov = std::min(h, getMaxHFOV()); if (keepView) { - setVFOV(std::min(getVFOV(), getMaxVFOV())); + setVFOV(std::min(vfov, getMaxVFOV())); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |