Changed time from a double to an iTime (69c0307b) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/LidarControlPoint/LidarControlPoint.cpp

+60 −11

Original line number	Diff line number	Diff line
		#include "LidarControlPoint.h"

		#include <QString>

		#include "ControlMeasure.h"
		#include "ControlPoint.h"
		#include "Cube.h"
		#include "IException.h"
		#include "iTime.h"

		using namespace std;

		@@ -27,22 +30,38 @@ namespace Isis {
		* @param sigmaRange The sigmas od the range.
		*/
		LidarControlPoint::LidarControlPoint(double time, double range, double sigmaRange) {
		m_time = iTime(QString::number(time));
		m_range = range;
		m_sigmaRange = sigmaRange;
		}


		/**
		* Constructs a LidarControlPoint with the given time, range, and sigma range.
		*
		* @param time The time ths point was taken.
		* @param range The range of the point.
		* @param sigmaRange The sigmas od the range.
		*/
		LidarControlPoint::LidarControlPoint(iTime time, double range, double sigmaRange) {
		m_time = time;
		m_range = range;
		m_sigmaRange = sigmaRange;
		}


		// /**
		// * Copy the given LidarControlPoint
		// *
		// * @param other The LidarControlPoint to copy
		// */
		// LidarControlPoint::LidarControlPoint(const LidarControlPoint &other) {
		// m_time = other.time();
		// m_range = other.range();
		// m_sigmaRange = other.sigmaRange();
		// }
		/**
		* Constructs a LidarControlPoint with the given time, range, and sigma range.
		*
		* @param time The time ths point was taken.
		* @param range The range of the point.
		* @param sigmaRange The sigmas od the range.
		*/
		LidarControlPoint::LidarControlPoint(QString time, double range, double sigmaRange) {
		m_time = iTime(time);
		m_range = range;
		m_sigmaRange = sigmaRange;
		}


		/**
		@@ -58,6 +77,21 @@ namespace Isis {
		* @param time The time to set
		*/
		void LidarControlPoint::setTime(double time) {
		if (time < 0.0) {
		QString msg = "The time must be greater then 0.";
		throw IException(IException::Unknown, msg, _FILEINFO_);
		return;
		}
		m_time = iTime(QString::number(time));
		}


		/**
		* Set the time of the LidarControlPoint
		*
		* @param time The time to set
		*/
		void LidarControlPoint::setTime(iTime time) {
		if (time < 0.0) {
		QString msg = "The time must be greater then 0.";
		throw IException(IException::Unknown, msg, _FILEINFO_);
		@@ -67,6 +101,21 @@ namespace Isis {
		}


		/**
		* Set the time of the LidarControlPoint
		*
		* @param time The time to set
		*/
		void LidarControlPoint::setTime(QString time) {
		if (time < 0.0) {
		QString msg = "The time must be greater then 0.";
		throw IException(IException::Unknown, msg, _FILEINFO_);
		return;
		}
		m_time = iTime(time);
		}


		/**
		* Set the range of the LidarControlPoint
		*
		@@ -107,7 +156,7 @@ namespace Isis {
		*
		* @return double The time
		*/
		double LidarControlPoint::time() {
		iTime LidarControlPoint::time() {
		return m_time;
		}

isis/src/control/objs/LidarControlPoint/LidarControlPoint.h

+8 −4

Original line number	Diff line number	Diff line
		@@ -27,8 +27,9 @@
		#include "ControlMeasure.h"
		#include "ControlPoint.h"
		#include "Cube.h"
		#include "iTime.h"

		namespace Isis {
		namespace Isis {e
		/**
		* @brief A lidar control ControlPoint
		*
		@@ -45,24 +46,27 @@ namespace Isis {

		LidarControlPoint();
		LidarControlPoint(double time, double range, double sigmaRange);
		// LidarControlPoint(const LidarControlPoint &);
		LidarControlPoint(iTime time, double range, double sigmaRange);
		LidarControlPoint(QString time, double range, double sigmaRange);

		~LidarControlPoint();

		void setRange(double range);
		void setSigmaRange(double sigmaRange);
		void setTime(double time);
		void setTime(iTime time);
		void setTime(QString time);

		double range();
		double sigmaRange();
		double time();
		iTime time();

		ControlMeasure backProject(Cube cube);

		private:
		double m_range;
		double m_sigmaRange;
		double m_time;
		iTime m_time;

		};
		}