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

Removed references to ControlCubeGraphNodes from cnetedit

parent 0eae9882

isis/src/control/apps/cnetedit/cnetedit.cpp

+5 −10
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <QString>

#include <QTextStream>



#include "ControlCubeGraphNode.h"

#include "ControlMeasure.h"

#include "ControlNet.h"

#include "ControlNetValidMeasure.h"
@@ -878,15 +877,13 @@ void lockMeasures(ControlNet &cnet, 
void checkAllMeasureValidity(ControlNet &cnet, QString cubeList) {

  SerialNumberList serialNumbers(cubeList);



  QList<ControlCubeGraphNode *> graphNodes = cnet.GetCubeGraphNodes();

  QList<QString> cnetSerials = cnet.GetCubeSerials();

  Progress progress;

  progress.SetText("Checking Measure Validity");

  progress.SetMaximumSteps(graphNodes.size());

  progress.SetMaximumSteps(cnetSerials.size());

  progress.CheckStatus();



  for (int sn = 0; sn < graphNodes.size(); sn++) {

    ControlCubeGraphNode *graphNode = graphNodes[sn];

    QString serialNumber = graphNode->getSerialNumber();

  foreach (QString serialNumber, cnetSerials) {



    Cube *cube = NULL;

    Camera *camera = NULL;
@@ -911,7 +908,7 @@ void checkAllMeasureValidity(ControlNet &cnet, QString cubeList) { 
      }

    }



    QList<ControlMeasure *> measures = graphNode->getMeasures();

    QList<ControlMeasure *> measures = cnet.GetMeasuresInCube(serialNumber);

    for (int cm = 0; cm < measures.size(); cm++) {

      ControlMeasure *measure = measures[cm];

      ControlPoint *point = measure->Parent();
@@ -1076,5 +1073,3 @@ void EditDefFile(void) { 


  GuiEditFile::EditFile(ui, sDefFile);

}