Commit 61285545 authored by Jesse Mapel's avatar Jesse Mapel Committed by Makayla Shepherd
Browse files

Added accessors to the protobuf data for ControlPoint classes

parent f026fe10

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp

+12 −0
Original line number Diff line number Diff line
@@ -263,6 +263,18 @@ namespace Isis { 
  ControlPointV0002::ControlPointV0002(const ControlPointV0001 &oldPoint);





  /**

   * Access the protobuf control point data.

   *

   * @return @b QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> A shared pointer to the

   *                                                                    internal protobuf control

   *                                                                    point data.

   */

  QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> ControlPointV0002::pointData() {

    return m_pointData;

  }





  /**

   * This convenience method takes a boolean value from a PvlKeyword and copies it into a version 2

   * protobuf field.

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis { 
      ControlPointV0002(QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> pointData);

      ControlPointV0002(const ControlPointV0001 &oldPoint);



      Pvl toPvl();

      QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> pointData();



    private:

      // These are intentionally not implemented

isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp

+12 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace Isis { 
   *

   * @param pointObject The control point and its measures in a Pvl object

   */

  ControlPointV0003::ControlPointV0003(const Pvl &pointObject)

  ControlPointV0003::ControlPointV0003(const PvlObject &pointObject)

   : m_pointData(new ControlPointFileEntryV0002) {



    // Copy over strings, doubles, and bools
@@ -255,6 +255,17 @@ namespace Isis { 
  ControlPointV0003::ControlPointV0003(const ControlPointV0002 &oldPoint);





  /**

   * Access the protobuf control point data.

   *

   * @return @b QSharedPointer<ControlPointFileEntryV0002> A shared pointer to the internal

   *                                                       protobuf control point data.

   */

  QSharedPointer<ControlPointFileEntryV0002> ControlPointV0003::pointData() {

    return m_pointData;

  }





  /**

   * This convenience method takes a boolean value from a PvlKeyword and copies it into a version 2

   * protobuf field.

isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h

+3 −3
Original line number Diff line number Diff line
@@ -29,16 +29,16 @@ 


namespace Isis {

  class ControlPointV0002;

  class Pvl;

  class PvlObject;



  //TODO document this

  class ControlPointV0003 {

    public:

      ControlPointV0003(const Pvl &pointObject);

      ControlPointV0003(const PvlObject &pointObject);

      ControlPointV0003(QSharedPointer<ControlPointFileEntryV0002> pointData);

      ControlPointV0003(const ControlPointV0002 &oldPoint);



      Pvl toPvl();

      QSharedPointer<ControlPointFileEntryV0002> pointData();



    private:

      // These are intentionally not implemented