Commit 57843f4d authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Added HasDateTime() and HasChooserName() methods to ControlPoint

parent fd91720a

isis/src/control/objs/ControlPoint/ControlPoint.cpp

+13 −3
Original line number Diff line number Diff line
@@ -1212,6 +1212,16 @@ namespace Isis { 
    }

  }



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

  bool ControlPoint::HasChooserName() const {

    return !chooserName.isEmpty();

  }



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

  bool ControlPoint::HasDateTime() const {

    return !dateTime.isEmpty();

  }





  QString ControlPoint::GetDateTime() const {

    if (dateTime != "") {

isis/src/control/objs/ControlPoint/ControlPoint.h

+5 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ namespace Isis { 
   *                            HasRefMeasure().

   *   @history 2017-12-21 Adam Goins - Removed redundant code following ControlNetVersioner

   *                           refactor.

   *   @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 ControlPoint : public QObject {
@@ -536,6 +539,8 @@ namespace Isis { 
      int GetNumValidMeasures() const;

      int GetNumLockedMeasures() const;

      bool HasSerialNumber(QString serialNumber) const;

      bool HasChooserName() const;

      bool HasDateTime() const;

      int IndexOf(ControlMeasure *, bool throws = true) const;

      int IndexOf(QString sn, bool throws = true) const;

      int IndexOfRefMeasure() const;