Changed ControlCubeGraphNodes to serial numbers in cneteditor filters. (b9a42c6c) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,8 @@
	namespace Isis {		namespace Isis {
	APrioriLatitudeFilter::APrioriLatitudeFilter(		APrioriLatitudeFilter::APrioriLatitudeFilter(
	AbstractFilter::FilterEffectivenessFlag flag,		AbstractFilter::FilterEffectivenessFlag flag,
	int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {		ControlNet *network,
			int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {
	}		}


	@@ -22,9 +23,8 @@ namespace Isis {
	}		}


	bool APrioriLatitudeFilter::evaluate(		bool APrioriLatitudeFilter::evaluate(const QString *imageSerial) const {
	const ControlCubeGraphNode *node) const {		return evaluateImageFromPointFilter(imageSerial);
	return evaluateImageFromPointFilter(node);
	}		}


	@@ -64,4 +64,3 @@ namespace Isis {
	descriptionSuffix();		descriptionSuffix();
	}		}
	}		}

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -25,17 +25,19 @@ namespace Isis {
	*		*
	* @internal		* @internal
	* @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.		* @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
			* @history 2018-06-01 Jesse Mapel - Changed ControlCubeGraphNode to image serial number.
			* References #5434.
	*/		*/
	class APrioriLatitudeFilter : public AbstractNumberFilter {		class APrioriLatitudeFilter : public AbstractNumberFilter {
	Q_OBJECT		Q_OBJECT

	public:		public:
	APrioriLatitudeFilter(AbstractFilter::FilterEffectivenessFlag flag,		APrioriLatitudeFilter(AbstractFilter::FilterEffectivenessFlag flag,
	int minimumForSuccess = -1);		ControlNet *network, int minimumForSuccess = -1);
	APrioriLatitudeFilter(const APrioriLatitudeFilter &other);		APrioriLatitudeFilter(const APrioriLatitudeFilter &other);
	virtual ~APrioriLatitudeFilter();		virtual ~APrioriLatitudeFilter();

	bool evaluate(const ControlCubeGraphNode *) const;		bool evaluate(const QString *) const;
	bool evaluate(const ControlPoint *) const;		bool evaluate(const ControlPoint *) const;
	bool evaluate(const ControlMeasure *) const;		bool evaluate(const ControlMeasure *) const;

	@@ -47,4 +49,3 @@ namespace Isis {
	}		}

	#endif		#endif

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,8 @@
	namespace Isis {		namespace Isis {
	APrioriLatitudeSigmaFilter::APrioriLatitudeSigmaFilter(		APrioriLatitudeSigmaFilter::APrioriLatitudeSigmaFilter(
	AbstractFilter::FilterEffectivenessFlag flag,		AbstractFilter::FilterEffectivenessFlag flag,
	int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {		ControlNet *network,
			int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {
	}		}


	@@ -22,9 +23,8 @@ namespace Isis {
	}		}


	bool APrioriLatitudeSigmaFilter::evaluate(		bool APrioriLatitudeSigmaFilter::evaluate(const QString *imageSerial) const {
	const ControlCubeGraphNode *node) const {		return evaluateImageFromPointFilter(imageSerial);
	return evaluateImageFromPointFilter(node);
	}		}


	@@ -64,4 +64,3 @@ namespace Isis {
	descriptionSuffix();		descriptionSuffix();
	}		}
	}		}

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -25,17 +25,19 @@ namespace Isis {
	*		*
	* @internal		* @internal
	* @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.		* @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
			* @history 2018-06-01 Jesse Mapel - Changed ControlCubeGraphNode to image serial number.
			* References #5434.
	*/		*/
	class APrioriLatitudeSigmaFilter : public AbstractNumberFilter {		class APrioriLatitudeSigmaFilter : public AbstractNumberFilter {
	Q_OBJECT		Q_OBJECT

	public:		public:
	APrioriLatitudeSigmaFilter(AbstractFilter::FilterEffectivenessFlag flag,		APrioriLatitudeSigmaFilter(AbstractFilter::FilterEffectivenessFlag flag,
	int minimumForSuccess = -1);		ControlNet *network, int minimumForSuccess = -1);
	APrioriLatitudeSigmaFilter(const APrioriLatitudeSigmaFilter &other);		APrioriLatitudeSigmaFilter(const APrioriLatitudeSigmaFilter &other);
	virtual ~APrioriLatitudeSigmaFilter();		virtual ~APrioriLatitudeSigmaFilter();

	bool evaluate(const ControlCubeGraphNode *) const;		bool evaluate(const QString *) const;
	bool evaluate(const ControlPoint *) const;		bool evaluate(const ControlPoint *) const;
	bool evaluate(const ControlMeasure *) const;		bool evaluate(const ControlMeasure *) const;

	@@ -47,4 +49,3 @@ namespace Isis {
	}		}

	#endif		#endif

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,8 @@
	namespace Isis {		namespace Isis {
	APrioriLongitudeFilter::APrioriLongitudeFilter(		APrioriLongitudeFilter::APrioriLongitudeFilter(
	AbstractFilter::FilterEffectivenessFlag flag,		AbstractFilter::FilterEffectivenessFlag flag,
	int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {		ControlNet *network,
			int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {
	}		}


	@@ -22,9 +23,8 @@ namespace Isis {
	}		}


	bool APrioriLongitudeFilter::evaluate(		bool APrioriLongitudeFilter::evaluate(const QString *imageSerial) const {
	const ControlCubeGraphNode *node) const {		return evaluateImageFromPointFilter(imageSerial);
	return evaluateImageFromPointFilter(node);
	}		}


	@@ -64,4 +64,3 @@ namespace Isis {
	descriptionSuffix();		descriptionSuffix();
	}		}
	}		}