Commit ec43b665 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Made LidarControlPoint compile

parent 9d59ef34

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

+12 −10
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "ControlMeasure.h"

#include "ControlPoint.h"

#include "Cube.h"

#include "IException.h"



using namespace std;
@@ -32,16 +33,16 @@ namespace Isis { 
  }

  

  

  /**

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

  }

//   /**

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

//   }

  

  

  /**
@@ -115,6 +116,7 @@ namespace Isis { 
   * Returns the sigma range of the point

   * 

   * @return double The sigma range

   */

  double LidarControlPoint::sigmaRange() {

    return m_sigmaRange;

  }

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

+7 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ namespace Isis { 
  public:

    

    LidarControlPoint();

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

    LidarControlPoint(const LidarControlPoint &);

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

//     LidarControlPoint(const LidarControlPoint &);

    

    ~LidarControlPoint();
@@ -64,3 +64,8 @@ namespace Isis { 
    double m_sigmaRange;

    double m_time;

    

  };

}



#endif

isis/src/control/objs/LidarControlPoint/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

	include $(ISISROOT)/make/isismake.objs

endif
 
 No newline at end of file