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

Created a GetLastModified() accessor in ControlNet.

parent a30f3374

isis/src/control/objs/ControlNet/ControlNet.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,11 @@ namespace Isis { 
    return p_userName;

  }

  

  //! Return the last modified date

  QString ControlNet::GetLastModified() const {

    return p_modified;

  }





  //! Return QList of ControlPoints ordered by point ID

  QList< ControlPoint * > ControlNet::GetPoints() {

isis/src/control/objs/ControlNet/ControlNet.h

+11 −9
Original line number Diff line number Diff line
@@ -28,11 +28,12 @@ 
#include <QObject> // parent class

#include <QSharedPointer>



#include <map>

#include <vector>



#include "ControlNetFile.h"



#include <QString>

#include <QMap>

#include <QVector>



template< typename A, typename B > class QHash;

template< typename T > class QList;
@@ -41,6 +42,7 @@ template< typename T > class QSet; 
class QMutex;

class QString;





namespace Isis {

  class Camera;

  class ControlMeasure;
@@ -204,8 +206,7 @@ namespace Isis { 
   *   @history 2017-08-09 Summer Stapleton - Added throw to caught exception for bad control net

   *                           import in constructor. Also removed p_invalid as it was no longer

   *                           being used anywhere. Fixes #5068.

   *   @history 2017-12-12 Kristin Berry - Updated to use QMap and QVector rather than std::map

   *                            and std::vector. 

   *   @history 2017-12-18 Adam Goins - Added GetLastModified() accessor. References #5258. 

   */

  class ControlNet : public QObject {

      Q_OBJECT
@@ -280,6 +281,7 @@ namespace Isis { 
      int GetNumValidPoints();

      QString GetTarget() const;

      QString GetUserName() const;

      QString GetLastModified() const;

      QList< ControlPoint * > GetPoints();

      QList< QString > GetPointIds() const;

      std::vector<Distance> GetTargetRadii();
@@ -434,12 +436,12 @@ namespace Isis { 
      QString p_modified;              //!< Date Last Modified

      QString p_description;           //!< Textual Description of network

      QString p_userName;              //!< The user who created the network

      QMap<QString, Isis::Camera *> p_cameraMap; //!< A map from serialnumber to camera

      QMap<QString, int> p_cameraValidMeasuresMap; //!< A map from serialnumber to #measures

      QMap<QString, int> p_cameraRejectedMeasuresMap; //!< A map from serialnumber to

      std::map<QString, Isis::Camera *> p_cameraMap; //!< A map from serialnumber to camera

      std::map<QString, int> p_cameraValidMeasuresMap; //!< A map from serialnumber to #measures

      std::map<QString, int> p_cameraRejectedMeasuresMap; //!< A map from serialnumber to

      //!  #rejected measures

      QVector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera

      QVector<Distance> p_targetRadii;        //!< Radii of target body

      std::vector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera

      std::vector<Distance> p_targetRadii;        //!< Radii of target body



      bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object. 

  };