Commit 34d09f0c authored by Kristin Berry's avatar Kristin Berry
Browse files

Switch to actually using QHash for measures from a QList

parent 42309bb3

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

+5 −3
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ namespace Isis { 
      ControlCubeGraphNode *node = (*cubeGraphNodes)[serial];

      node->addMeasure(measure);



      m_controlGraph[m_vertexMap[serial]].measures.append(measure); 

//      m_controlGraph[m_vertexMap[serial]].measures.append(measure); 

         m_controlGraph[m_vertexMap[serial]].measures[measure->Parent()] = measure; 



      // in this measure's node add connections to the other nodes reachable from

      // its point
@@ -503,7 +504,8 @@ namespace Isis { 
    ControlCubeGraphNode *node = (*cubeGraphNodes)[serial];

    node->addMeasure(measure);



    m_controlGraph[m_vertexMap[serial]].measures.append(measure); 

//    m_controlGraph[m_vertexMap[serial]].measures.append(measure); 

       m_controlGraph[m_vertexMap[serial]].measures[measure->Parent()] = measure; 



    // in this measure's node add connections to the other nodes reachable from

    // its point
@@ -641,7 +643,7 @@ namespace Isis { 
    }



    // Remove the measure from the associated node.  

    m_controlGraph[m_vertexMap[serial]].measures.removeAll(measure);

    m_controlGraph[m_vertexMap[serial]].measures.remove(measure->Parent());



    // Decrement the edge strength & remove edge if -> 0 happens in measureIgnored

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

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ namespace Isis { 
      // structs and typedefs for the boost graph

      struct Image {

        QString serial;

        QList<ControlMeasure* > measures;

//        QHash< ControlPoint *, ControlMeasure * > * measures;

//        QList<ControlMeasure* > measures;

        QHash< ControlPoint *, ControlMeasure * > measures;

      };



      struct Connection {