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

Merged in changes from upstream

parent 349ac00f

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

+63 −55
Original line number Diff line number Diff line
@@ -35,12 +35,25 @@ using namespace std; 
namespace Isis {



  ControlNetVersioner::ControlNetVersioner(QSharedPointer<ControlNet> net) {

    // Populate the internal list of points.

    for (int i = 0; i < net.GetNumPoints(); i++) {

        m_points.add( QSharedPointer<ControlPoint>( net.GetPoints().at(i) ) );

    }



    ControlNetHeaderV0001 header;



    header.networkID = net.GetNetworkId();

    header.targetName = net.GetTarget();

    header.created = net.CreatedDate();

    header.lastModified = net.GetLastModified();

    header.description = net.Description();

    header.userName = net.GetUserName();

    createHeader(header);

  }





  ControlNetVersioner::ControlNetVersioner(const FileName netFile) {



    read(netFile);

  }
@@ -565,8 +578,7 @@ namespace Isis { 
    for (int objectIndex = 0; objectIndex < network.objects(); objectIndex ++) {

      try {

        PvlObject &pointObject = network.object(objectIndex);

        ControlPointV0001 point;

        //TODO Fill the ControlPointV0001 object from the PvlObject

        ControlPointV0001 point(pointObject, header.targetName);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {
@@ -604,8 +616,7 @@ namespace Isis { 
    for (int objectIndex = 0; objectIndex < network.objects(); objectIndex ++) {

      try {

        PvlObject &pointObject = network.object(objectIndex);

        ControlPointV0002 point;

        //TODO Fill the ControlPointV0002 object from the PvlObject

        ControlPointV0002 point(pointObject);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {
@@ -643,8 +654,7 @@ namespace Isis { 
    for (int objectIndex = 0; objectIndex < network.objects(); objectIndex ++) {

      try {

        PvlObject &pointObject = network.object(objectIndex);

        ControlPointV0003 point;

        //TODO Fill the ControlPointV0003 object from the PvlObject

        ControlPointV0003 point(pointObject);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {
@@ -682,8 +692,7 @@ namespace Isis { 
    for (int objectIndex = 0; objectIndex < network.objects(); objectIndex ++) {

      try {

        PvlObject &pointObject = network.object(objectIndex);

        ControlPointV0004 point;

        //TODO Fill the ControlPointV0004 object from the PvlObject

        ControlPointV0004 point(pointObject);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {
@@ -721,8 +730,7 @@ namespace Isis { 
    for (int objectIndex = 0; objectIndex < network.objects(); objectIndex ++) {

      try {

        PvlObject &pointObject = network.object(objectIndex);

        ControlPointV0005 point;

        //TODO Fill the ControlPointV0004 object from the PvlObject

        ControlPointV0005 point(pointObject);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {