From: Pablo d'A. <da...@us...> - 2006-02-05 20:28:34
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6639/src/hugin Modified Files: VigCorrDialog.cpp Log Message: honor active images (can be used to exclude some images from the estimation, by deselecting them in the Preview panel) Index: VigCorrDialog.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/VigCorrDialog.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VigCorrDialog.cpp 5 Feb 2006 14:47:58 -0000 1.3 +++ VigCorrDialog.cpp 5 Feb 2006 20:28:26 -0000 1.4 @@ -38,6 +38,7 @@ #include <vigra_ext/VigQuotientEstimator.h> #include <PT/RandomPointSampler.h> +#include "hugin/config_defaults.h" #include "hugin/huginApp.h" #include "hugin/VigCorrDialog.h" #include "hugin/CommandHistory.h" @@ -294,8 +295,19 @@ unsigned lensNr = m_pano.getImage(m_imgNr).getLensNr(); UIntSet imgs; + bool useActive = wxConfigBase::Get()->Read(wxT("/General/UseOnlySelectedImages"),HUGIN_USE_SELECTED_IMAGES) != 0; + UIntSet activeImgs; + if (useActive) + { + // use only selected images. + activeImgs = m_pano.getActiveImages(); + } // select all images of current lens for (unsigned i=0; i < m_pano.getNrOfImages(); i++) { + // skip images that are not active. + if (useActive && (!set_contains(activeImgs,i))) { + continue; + } if (m_pano.getImage(i).getLensNr() == lensNr) { SrcPanoImage src = m_pano.getSrcImage(i); @@ -339,6 +351,10 @@ } } + if (grayImgs.size() < 2) { + wxMessageBox(_("Not enought images selected. Please ensure that more than two images are associated with the current lens."), _("Cannot estimate vignetting"), wxOK | wxICON_HAND); + return; + } // advance progress progress.increase(); progress.setMessage("remapping"); |