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

Fixed PR requested changes

parent 4c7a5248

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

+407 −188

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −11
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
#include <QVector>



#include "ControlPoint.h"

#include "ControlPointV0001.h"

#include "ControlPointV0002.h"

#include "ControlPointV0003.h"





class QString;
@@ -138,8 +142,6 @@ namespace Isis { 
   *  @history 2017-12-18 Adam Goins and Kristin Berry - Added new write() method.

   *  @history 2017-12-19 Kristin Berry - Corrected method names and general cleanup in toPvl and

   *                            write for refactor.

   *  @histroy 2017-12-20 Jesse Mapel - Made read and createPoint methods match new

   *                          ControlPointV#### classes.

   */

  class ControlNetVersioner {

    class ControlPointV0001;
@@ -180,13 +182,13 @@ namespace Isis { 
        QString description;

        QString userName;

      };

      typedef ControlNetHeaderV0002 ControlNetHeaderV0001;

      typedef ControlNetHeaderV0003 ControlNetHeaderV0001;

      typedef ControlNetHeaderV0004 ControlNetHeaderV0001;

      typedef ControlNetHeaderV0005 ControlNetHeaderV0001;

      typedef ControlNetHeaderV0001 ControlNetHeaderV0002;

      typedef ControlNetHeaderV0001 ControlNetHeaderV0003;

      typedef ControlNetHeaderV0001 ControlNetHeaderV0004;

      typedef ControlNetHeaderV0001 ControlNetHeaderV0005;



      typedef ControlPointV0004 ControlPointV0003;

      typedef ControlPointV0005 ControlPointV0003;

      typedef ControlPointV0003 ControlPointV0004;

      typedef ControlPointV0003 ControlPointV0005;



      void read(const FileName netFile);
@@ -210,8 +212,8 @@ namespace Isis { 


      void setHeader(const ControlNetHeaderV0001 header);



      void writeHeader(ZeroCopyOutputStream *fileStream);

      void writeFirstPoint(ZeroCopyOutputStream *fileStream);

      void writeHeader(google::protobuf::io::ZeroCopyOutputStream *fileStream);

      int writeFirstPoint(google::protobuf::io::ZeroCopyOutputStream *fileStream);



      ControlNetHeaderV0005 m_header; /**< Header containing information about

                                           the whole network.*/