Commit 261a169f authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Added HasChooserName() and HasDateTime() methods to ControlMeasure.

parent 88e811f7

isis/src/control/objs/ControlMeasure/ControlMeasure.cpp

+11 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ namespace Isis { 
   */

  ControlMeasure::Status ControlMeasure::SetResidual(double sampResidual,

      double lineResidual) {

        

    MeasureModified();

    p_sampleResidual = sampResidual;

    p_lineResidual   = lineResidual;
@@ -553,6 +554,10 @@ namespace Isis { 
    }

  }



  //! Returns true if the choosername is not empty.

  bool ControlMeasure::HasChooserName() const {

    return !p_chooserName->isEmpty();

  }



  //! Return the serial number of the cube containing the coordinate

  QString ControlMeasure::GetCubeSerialNumber() const {
@@ -570,6 +575,12 @@ namespace Isis { 
    }

  }



  //! Returns true if the datetime is not empty.

  bool ControlMeasure::HasDateTime() const {

    return !p_dateTime->isEmpty();

  }







  //! Return the diameter of the crater in pixels (0 implies no crater)

  double ControlMeasure::GetDiameter() const {

isis/src/control/objs/ControlMeasure/ControlMeasure.h

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ namespace Isis { 
   *   @history 2017-12-21 Adam Goins - Removed protobuf references.

   *   @history 2018-01-04 Adam Goins - Moved sample/line initialization from the constructor

   *                           to the InitToNull() method.

   *   @history 2018-01-05 Adam Goins - Added HasDateTime() and HasChooserName() methods to allow

   *                           to allow the value of these variables to be read without being

   *                           overriden if they're empty. (Getters override if they're empty).

   */

  class ControlMeasure : public QObject {
@@ -279,8 +282,10 @@ namespace Isis { 
      double GetAprioriSample() const;

      Isis::Camera *Camera() const;

      QString GetChooserName() const;

      bool HasChooserName() const;

      QString GetCubeSerialNumber() const;

      QString GetDateTime() const;

      bool HasDateTime() const;

      double GetDiameter() const;

      ControlMeasureLogData GetLogData(long dataType) const;

      bool IsEditLocked() const;