PROG: Previous change to ControlNet, caused a change in the output that jigsaw... (35557d6f) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+2 −4

Changes for isis/src/control/objs/BundleAdjust/BundleAdjust.cpp: 2 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -398,8 +398,7 @@ static void cholmod_error_handler(int nStatus, const char* file, int nLineNo,
		QString msg = "Images with one or less measures:\n";
		int nImages = m_pSnList->Size();
		for (int i = 0; i < nImages; i++) {
		int nMeasures =
		m_pCnet->GetNumberOfMeasuresInImage(m_pSnList->SerialNumber(i));
		int nMeasures = m_pCnet->GetNumberOfValidMeasuresInImage(m_pSnList->SerialNumber(i));

		if ( nMeasures > 1 )
		continue;
		@@ -6317,8 +6316,7 @@ static void cholmod_error_handler(int nStatus, const char* file, int nLineNo,
		double rmsLineResiduals = m_rmsImageLineResiduals[i].Rms();
		double rmsLandSResiduals = m_rmsImageResiduals[i].Rms();

		nMeasures =
		m_pCnet->GetNumberOfMeasuresInImage(m_pSnList->SerialNumber(i));
		nMeasures = m_pCnet->GetNumberOfValidMeasuresInImage(m_pSnList->SerialNumber(i));
		nRejectedMeasures =
		m_pCnet->GetNumberOfJigsawRejectedMeasuresInImage(
		m_pSnList->SerialNumber(i));

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+3 −0

Changes for isis/src/control/objs/BundleAdjust/BundleAdjust.h: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -160,6 +160,9 @@ namespace Isis {
		* constrained coordinates. Also found that a priori coordinates
		* for these points were not being computed in
		* ControlPoint::ComputeApriori, this has also been fixed.
		* @history 2013-12-18 Tracie Sucharski - The ControlNet::GetNumberOfMeasuresInImage was
		* renamed to ControlNet::GetNumberOfValidMeasuresInImage and
		* only returns the number of valid (Ignore= False) measures.
		*/
		class BundleAdjust {
		public:

isis/src/control/objs/ControlNet/ControlNet.cpp

+8 −5

Changes for isis/src/control/objs/ControlNet/ControlNet.cpp: 8 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -1307,9 +1307,12 @@ namespace Isis {
		* Return the number of measures in image specified by serialNumber
		*
		* @return Number of valid measures in image
		*
		* @history 2013-12-18 Tracie Sucharski - Renamed from GetNumberOfMeasuresInImage, it is
		* returning a count of only valid measures (Ignore=False).
		*/
		int ControlNet::GetNumberOfMeasuresInImage(const QString &serialNumber) {
		return p_cameraMeasuresMap[serialNumber];
		int ControlNet::GetNumberOfValidMeasuresInImage(const QString &serialNumber) {
		return p_cameraValidMeasuresMap[serialNumber];
		}


		@@ -1501,7 +1504,7 @@ namespace Isis {
		try {
		Isis::Camera *cam = CameraFactory::Create(cube);
		p_cameraMap[serialNumber] = cam;
		p_cameraMeasuresMap[serialNumber] = 0;
		p_cameraValidMeasuresMap[serialNumber] = 0;
		p_cameraRejectedMeasuresMap[serialNumber] = 0;
		p_cameraList.push_back(cam);
		}
		@@ -1530,7 +1533,7 @@ namespace Isis {
		curMeasure->SetCamera(p_cameraMap[serialNumber]);

		// increment number of measures for this image (camera)
		p_cameraMeasuresMap[serialNumber]++;
		if (!curMeasure->IsIgnored()) p_cameraValidMeasuresMap[serialNumber]++;
		}
		else {
		IString msg = "Control point [" + curPoint->GetId() +
		@@ -1644,7 +1647,7 @@ namespace Isis {
		std::swap(p_description, other.p_description);
		std::swap(p_userName, other.p_userName);
		std::swap(p_cameraMap, other.p_cameraMap);
		std::swap(p_cameraMeasuresMap, other.p_cameraMeasuresMap);
		std::swap(p_cameraValidMeasuresMap, other.p_cameraValidMeasuresMap);
		std::swap(p_cameraRejectedMeasuresMap, other.p_cameraRejectedMeasuresMap);
		std::swap(p_cameraList, other.p_cameraList);
		std::swap(p_targetRadii, other.p_targetRadii);

isis/src/control/objs/ControlNet/ControlNet.h

+8 −2

Changes for isis/src/control/objs/ControlNet/ControlNet.h: 8 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -179,6 +179,12 @@ namespace Isis {
		* operator to use copy-and-swap idiom which fixed a bug where
		* you couldn't access control points by index after an assignment.
		* @history 2013-11-08 Tracie Sucharski - Add camera to ignored measures. References #1603.
		* @history 2013-12-18 Tracie Sucharski - Previous change caused problems for jigsaw app. It
		* was expecting the method GetNumberOfMeasuresInImage to only return
		* the number of VALID (Ignore=False) measures. Renamed
		* method to GetNumberOfValidMeasuresInImage and the private
		* variable p_cameraMeasuresMap to p_cameraValidMeasuresMap.
		* References #1603.
		*/
		class ControlNet : public QObject {
		Q_OBJECT
		@@ -239,7 +245,7 @@ namespace Isis {
		int GetNumEditLockMeasures();
		int GetNumEditLockPoints();
		int GetNumIgnoredMeasures();
		int GetNumberOfMeasuresInImage(const QString &serialNumber);
		int GetNumberOfValidMeasuresInImage(const QString &serialNumber);
		int GetNumberOfJigsawRejectedMeasuresInImage(const QString &serialNumber);
		void ClearJigsawRejected();
		void IncrementNumberOfRejectedMeasuresInImage(const QString &serialNumber);
		@@ -401,7 +407,7 @@ namespace Isis {
		QString p_description; //!< Textual Description of network
		QString p_userName; //!< The user who created the network
		std::map<QString, Isis::Camera *> p_cameraMap; //!< A map from serialnumber to camera
		std::map<QString, int> p_cameraMeasuresMap; //!< A map from serialnumber to #measures
		std::map<QString, int> p_cameraValidMeasuresMap; //!< A map from serialnumber to #measures
		std::map<QString, int> p_cameraRejectedMeasuresMap; //!< A map from serialnumber to
		//! #rejected measures
		std::vector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera