Fixed ControlPoint so that it compiles. (3b8ce49f) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/ControlPoint/ControlPoint.cpp

+20 −10

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		#include <QHash>
		#include <QString>
		#include <QStringList>
		#include <QVector>

		#include "Application.h"
		#include "CameraDetectorMap.h"
		@@ -32,6 +31,7 @@

		using boost::numeric::ublas::symmetric_matrix;
		using boost::numeric::ublas::upper;
		using namespace std;

		namespace Isis {
		/**
		@@ -624,7 +624,7 @@ namespace Isis {
		* @returns bool True if a reference measure is set.
		*/
		bool ControlPoint::HasRefMeasure() const {
		return !(referenceMeasure == NULL):
		return !(referenceMeasure == NULL);
		}


		@@ -1419,7 +1419,7 @@ namespace Isis {
		*
		* @return Displacement The adjusted x coordinate.
		*/
		Displacement ContorlPoint::GetAdjustedX() const {
		Displacement ControlPoint::GetAdjustedX() const {
		return adjustedSurfacePoint.GetX();
		}

		@@ -1429,7 +1429,7 @@ namespace Isis {
		*
		* @return Displacement The adjusted y coordinate.
		*/
		Displacement ContorlPoint::GetAdjustedY() const {
		Displacement ControlPoint::GetAdjustedY() const {
		return adjustedSurfacePoint.GetY();
		}

		@@ -1439,7 +1439,7 @@ namespace Isis {
		*
		* @return Displacement The adjusted z coordinate.
		*/
		Displacement ContorlPoint::GetAdjustedZ() const {
		Displacement ControlPoint::GetAdjustedZ() const {
		return adjustedSurfacePoint.GetZ();
		}

		@@ -1712,6 +1712,16 @@ namespace Isis {
		}


		/**
		* Checks to see if the point has been rejected by jigsaw.
		*
		* @return bool true if the point is flagged as rejected by jigsaw
		*/
		bool ControlPoint::IsJigsawRejected() const {
		return jigsawRejected;
		}


		SurfacePoint ControlPoint::GetAprioriSurfacePoint() const {
		return aprioriSurfacePoint;
		}
		@@ -1721,7 +1731,7 @@ namespace Isis {
		*
		* @return Displacement The apriori x coordinate.
		*/
		Displacement ContorlPoint::GetAprioriX() const {
		Displacement ControlPoint::GetAprioriX() const {
		return aprioriSurfacePoint.GetX();
		}

		@@ -1731,7 +1741,7 @@ namespace Isis {
		*
		* @return Displacement The apriori y coordinate.
		*/
		Displacement ContorlPoint::GetAprioriY() const {
		Displacement ControlPoint::GetAprioriY() const {
		return aprioriSurfacePoint.GetY();
		}

		@@ -1741,7 +1751,7 @@ namespace Isis {
		*
		* @return Displacement The apriori z coordinate.
		*/
		Displacement ContorlPoint::GetAprioriZ() const {
		Displacement ControlPoint::GetAprioriZ() const {
		return aprioriSurfacePoint.GetZ();
		}

		@@ -1823,7 +1833,7 @@ namespace Isis {
		*
		* @return bool True if the surface point source file has been set.
		*/
		bool HasAprioriSurfacePointSourceFile() const {
		bool ControlPoint::HasAprioriSurfacePointSourceFile() const {
		return !( aprioriSurfacePointSourceFile.isEmpty() \|\| aprioriSurfacePointSourceFile.isNull() );
		}

		@@ -1947,7 +1957,7 @@ namespace Isis {
		* measure.
		*/
		int ControlPoint::IndexOfRefMeasure() const {
		if (!referenceMeasure) {
		if (!HasRefMeasure()) {
		QString msg = "There is no reference measure for point [" + id + "]."
		" This also means of course that the point is empty!";
		throw IException(IException::Programmer, msg, _FILEINFO_);

isis/src/control/objs/ControlPoint/ControlPoint.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -339,6 +339,7 @@ namespace Isis {
		* HasAprioriSurfacePointSourceFile(), HasAprioriRadiusSourceFile(),
		* GetAprioriX(), GetAprioriY(), GetAprioriZ(), HasAdjustedCoordinates(),
		* GetAdjustedX(), GetAdjustedY(), GetAdjustedZ(), HasRefMeasure().
		* @history 2017-12-19 Kristin Berry - Added IsJigsawRejected().
		*/
		class ControlPoint : public QObject {

		@@ -508,6 +509,7 @@ namespace Isis {
		bool IsValid() const;
		bool IsInvalid() const;
		bool IsFixed() const;
		bool IsJigsawRejected() const;

		bool HasAprioriCoordinates();
		bool HasAdjustedCoordinates();