From: <da...@us...> - 2007-07-27 15:36:28
|
Revision: 2339 http://hugin.svn.sourceforge.net/hugin/?rev=2339&view=rev Author: dangelo Date: 2007-07-27 08:36:25 -0700 (Fri, 27 Jul 2007) Log Message: ----------- disable fine tune and estimate if a vert/horizontal control point is added to th e same image. Modified Paths: -------------- hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp 2007-07-27 15:35:49 UTC (rev 2338) +++ hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp 2007-07-27 15:36:25 UTC (rev 2339) @@ -846,7 +846,7 @@ thisImg->showPosition(p); } else { // run auto estimate procedure? - if (estimate && currentPoints.size() > 0) { + if (estimate && (thisImgNr != otherImgNr) && currentPoints.size() > 0) { estimateAndAddOtherPoint(p, left, thisImg, thisImgNr, THIS_POINT, THIS_POINT_RETRY, otherImg, otherImgNr, OTHER_POINT, OTHER_POINT_RETRY); @@ -858,7 +858,7 @@ } else if (cpCreationState == THIS_POINT) { thisImg->showPosition(p); - if (estimate && currentPoints.size() > 0) { + if (estimate && (thisImgNr != otherImgNr) && currentPoints.size() > 0) { estimateAndAddOtherPoint(p, left, thisImg, thisImgNr, THIS_POINT, THIS_POINT_RETRY, otherImg, otherImgNr, OTHER_POINT, OTHER_POINT_RETRY); @@ -868,7 +868,7 @@ if (cpCreationState == OTHER_POINT) { // other point already selected, finalize point. - if (m_fineTuneCB->IsChecked()) { + if (m_fineTuneCB->IsChecked() && (thisImgNr != otherImgNr) ) { CorrelationResult corrRes; FDiff2D newPoint = otherImg->getNewPoint(); @@ -1922,7 +1922,7 @@ { DEBUG_TRACE(cpCreationState << " --> " << newState); // handle global state changes. - bool fineTune = m_fineTuneCB->IsChecked(); + bool fineTune = m_fineTuneCB->IsChecked() && (thisImgNr != otherImgNr); switch(newState) { case NO_POINT: // disable all drawing search boxes. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |