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

Added hooks for ControlPointV0002 log data

parent 93a71598

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

+2 −4
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ namespace Isis { 


    // Create the header

    try {

      ControlNetHeaderV0001 header;

      ControlNetHeaderV0002 header;

      header.networkID = protoNet.networkid().c_str();

      if (protoNet.has_targetname()) {

        header.targetName = protoNet.targetname().c_str();
@@ -877,7 +877,7 @@ namespace Isis { 
              protoPoint(new ControlNetFileProtoV0001_PBControlPoint(protoNet.points(i)));

        QSharedPointer<ControlNetLogDataProtoV0001_Point>

              protoPointLogData(new ControlNetLogDataProtoV0001_Point(protoLogData.points(i)));

        ControlPointV0001 point(protoPoint, protoPointLogData);

        ControlPointV0002 point(protoPoint, protoPointLogData);

        m_points.append( createPoint(point) );

      }

      catch (IException &e) {
@@ -886,8 +886,6 @@ namespace Isis { 
        throw IException(e, IException::User, msg, _FILEINFO_);

      }

    }



    // TODO how to parse the version 1 log data?

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ namespace Isis { 
   * @param oldPoint The old version 1 control point.

   */

  ControlPointV0002::ControlPointV0002(ControlPointV0001 &oldPoint)

   : m_pointData(oldPoint.pointData()) {

   : m_pointData(oldPoint.pointData()), m_logData(oldPoint.logData()) {



  }