Loading isis/src/control/objs/ControlNet/ControlNet.cpp +10 −11 Original line number Diff line number Diff line Loading @@ -375,7 +375,9 @@ namespace Isis { } } foreach(ControlMeasure* measure, point->getMeasures()) { QList< ControlMeasure * > measures = point->getMeasures(); for(int i = 0; i < measures.size(); i++) { ControlMeasure* measure = measures[i]; // Add the measure to the corresponding node QString serial = measure->GetCubeSerialNumber(); m_controlGraph[m_vertexMap[serial]].measures[measure->Parent()] = measure; Loading @@ -383,12 +385,10 @@ namespace Isis { // In this measure's node add connections to the other nodes reachable from // its point if (!point->IsIgnored() && !measure->IsIgnored()) { for (int i = 0; i < point->GetNumMeasures(); i++) { ControlMeasure *cm = point->GetMeasure(i); for (int j = i + 1; j < measures.size(); j++) { ControlMeasure *cm = measures[j]; if (!cm->IsIgnored()) { QString sn = cm->GetCubeSerialNumber(); if (QString::compare(sn, serial) != 0) { // If the edge doesn't already exist, this adds and returns the edge. // If the edge already exists, this just returns it. (The use of a set // forces the edges to be unique.) Loading @@ -401,7 +401,6 @@ namespace Isis { } } } } /** Loading Loading
isis/src/control/objs/ControlNet/ControlNet.cpp +10 −11 Original line number Diff line number Diff line Loading @@ -375,7 +375,9 @@ namespace Isis { } } foreach(ControlMeasure* measure, point->getMeasures()) { QList< ControlMeasure * > measures = point->getMeasures(); for(int i = 0; i < measures.size(); i++) { ControlMeasure* measure = measures[i]; // Add the measure to the corresponding node QString serial = measure->GetCubeSerialNumber(); m_controlGraph[m_vertexMap[serial]].measures[measure->Parent()] = measure; Loading @@ -383,12 +385,10 @@ namespace Isis { // In this measure's node add connections to the other nodes reachable from // its point if (!point->IsIgnored() && !measure->IsIgnored()) { for (int i = 0; i < point->GetNumMeasures(); i++) { ControlMeasure *cm = point->GetMeasure(i); for (int j = i + 1; j < measures.size(); j++) { ControlMeasure *cm = measures[j]; if (!cm->IsIgnored()) { QString sn = cm->GetCubeSerialNumber(); if (QString::compare(sn, serial) != 0) { // If the edge doesn't already exist, this adds and returns the edge. // If the edge already exists, this just returns it. (The use of a set // forces the edges to be unique.) Loading @@ -401,7 +401,6 @@ namespace Isis { } } } } /** Loading