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

Fixed an issue with filenames in ControlNet::Read

parent 2c527b79

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

+5 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "ControlPoint.h"

#include "ControlCubeGraphNode.h"

#include "Distance.h"

#include "FileName.h"

#include "IException.h"

#include "iTime.h"

#include "Progress.h"
@@ -240,7 +241,8 @@ namespace Isis { 
   */

  void ControlNet::ReadControl(const QString &filename, Progress *progress) {



    ControlNetVersioner versionedReader(FileName(filename));

    FileName cnetFileName(filename);

    ControlNetVersioner versionedReader(cnetFileName);



    SetTarget( versionedReader.targetName() );

    p_networkId   = versionedReader.netId();
@@ -251,7 +253,7 @@ namespace Isis { 


    int numPoints = versionedReader.numPoints();

    for (int i = 0; i < numPoints; i++) {

      AddPoint( versionedReader.takeFirstPoint().data() );

      AddPoint( versionedReader.takeFirstPoint() );

    }

  }
@@ -272,7 +274,7 @@ namespace Isis { 
    ControlNetVersioner versionedWriter(this);



    if (pvl) {

      Pvl network

      Pvl network;

      try {

        network = versionedWriter.toPvl();

      }

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ namespace Isis { 
  class ControlCubeGraphNode;

  class Distance;

  class Progress;

  class Pvl;

  class SerialNumberList;



  /**