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

Removed references to ControlCubeGraphNode from cnetwinnow

parent 5d00d00b

isis/src/control/apps/cnetwinnow/cnetwinnow.cpp

+29 −31
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "SerialNumber.h"

#include "SerialNumberList.h"

#include "UserInterface.h"

#include "ControlCubeGraphNode.h"



#include "stdio.h"

#include "string.h"
@@ -221,7 +220,7 @@ void IsisMain() { 




  //we will also need to know how many islands we started with

  int numInitialIslands = net.GetNodeConnections().size();

  int numInitialIslands = net.GetSerialConnections().size();



  //user parameters for allowing measure rejection

  double hullReductionLimit = ui.GetDouble("HULL_REDUCTION_PERCENT")/100.0;
@@ -320,7 +319,7 @@ void IsisMain() { 
    }



    //if the number of islands has increased the network has split

    if (net.GetNodeConnections().size() > numInitialIslands) islandFlag = false; //test failed

    if (net.GetSerialConnections().size() > numInitialIslands) islandFlag = false; //test failed

    else islandFlag = true; //test passed



    //Check to see if the network has split
@@ -449,4 +448,3 @@ void cubeConvexHullAndMeasures(QString &serialNum,ControlNet &net, double &area, 
  validMeasures = pts->size()-1; //subtract one because one point is in there twice

  return;

}