Unverified Commit b061755e authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #294 from jessemapel/signals 

Fixed error in ControlNet signal changes
parents 0e132c14 02ae0cba

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

+13 −5
Original line number Diff line number Diff line
@@ -403,10 +403,16 @@ namespace Isis { 
            // 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.)

            ImageConnection connection = boost::add_edge(m_vertexMap[serial],

            ImageConnection connection;

            bool edgeAdded;

            boost::tie(connection, edgeAdded) = boost::add_edge(m_vertexMap[serial],

                                                       m_vertexMap[sn],

                                                         m_controlGraph).first;

                                                       m_controlGraph);

            m_controlGraph[connection].strength++;



            if (edgeAdded) {

              emit networkModified(GraphModified);

            }

          }

        }

      }
@@ -603,9 +609,11 @@ namespace Isis { 
        // 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.)

        ImageConnection connection = boost::add_edge(m_vertexMap[sourceSerial],

        ImageConnection connection;

        bool edgeAdded;

        boost::tie(connection, edgeAdded) = boost::add_edge(m_vertexMap[sourceSerial],

                                                   m_vertexMap[targetSerial],

                                                   m_controlGraph).first;

                                                   m_controlGraph);

        m_controlGraph[connection].strength++;



        if (edgeAdded) {