Unverified Commit 262a36dc authored by Tyler Wilson's avatar Tyler Wilson Committed by GitHub
Browse files

Merge pull request #25 from makaylas/lidar 

Changed time to be iTime and documented member variables
parents 0cc4ab84 d5b95c16

.gitignore

+6 −10
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ 
# Unignore all dirs

!*/



# Unignore Makefiles, and TestPreferences

!Makefile

!TestPreferences

!*/3rdParty/Makefile



*.cub

*.o
@@ -18,26 +21,19 @@ moc_* 
*.pb.*

*.lbl

*.img



!TestPreferences



print.prt



*.kate-swp

object_script.*.Release

object_script.*.Debug

*_plugin_import.cpp

*.moc

ui_*.h



*/3rdParty/*

!*/3rdParty/Makefile

print.prt



*/3rdParty/*

*/inc/*



*/bin/*



*/lib/*



*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*

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

+8 −26
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;



namespace Isis {

  

  /**

   * Empty LidarControlPoint constructor

   */

  LidarControlPoint::LidarControlPoint() {

    m_time = -1;

    m_range = -1;

    m_sigmaRange = -1;

  }

  



  /**

   * Constructs a LidarControlPoint with the given time, range, and sigma range.
@@ -26,25 +20,13 @@ namespace Isis { 
   * @param range The range of the point.

   * @param sigmaRange The sigmas od the range.

   */

  LidarControlPoint::LidarControlPoint(double time, double range, double sigmaRange) {

  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();

//   }

  

  

  /**

   * Destructor

   */
@@ -57,7 +39,7 @@ namespace Isis { 
   * 

   * @param time The time to set

   */

  void LidarControlPoint::setTime(double time) {

  void LidarControlPoint::setTime(iTime time) {

    if (time < 0.0) {

      QString msg = "The time must be greater then 0.";

      throw IException(IException::Unknown, msg, _FILEINFO_);
@@ -107,7 +89,7 @@ namespace Isis { 
   * 

   * @return double The time

   */

  double LidarControlPoint::time() {

  iTime LidarControlPoint::time() {

    return m_time;

  }

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

+8 −9
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "ControlMeasure.h"

#include "ControlPoint.h"

#include "Cube.h"

#include "iTime.h"



namespace Isis {

  /**
@@ -43,26 +44,24 @@ namespace Isis { 
    

  public:



    LidarControlPoint();

    LidarControlPoint(double time, double range, double sigmaRange);

//     LidarControlPoint(const LidarControlPoint &);

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

    

    ~LidarControlPoint();

    

    void setRange(double range);

    void setSigmaRange(double sigmaRange);

    void setTime(double time);

    void setTime(iTime time);

    

    double range();

    double sigmaRange();

    double time();

    iTime time();

    

    ControlMeasure backProject(Cube cube);

    

  private:

    double m_range;

    double m_sigmaRange;

    double m_time;

    double m_range;       //!< The range

    double m_sigmaRange;  //!< The sigma range

    iTime m_time;         //!< The time the lidar point was taken

    

  };

}