Commit d8b6ebac authored by Adam Goins's avatar Adam Goins
Browse files

Fixed merge conflicts

parent 088b404a

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

+0 −6
Original line number Diff line number Diff line
@@ -399,10 +399,7 @@ namespace Isis { 
          ControlMeasure *cm = measures[j];

          if (!cm->IsIgnored()) {

            QString sn = cm->GetCubeSerialNumber();

<<<<<<< HEAD



=======

>>>>>>> f024deed7876ee9acb8ea442cfec337575e089fa

            // 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.)
@@ -667,11 +664,8 @@ namespace Isis { 
    ASSERT(measure);

    QString serial = measure->GetCubeSerialNumber();

    ASSERT(m_vertexMap.contains(serial));

<<<<<<< HEAD



    emit measureRemoved(measure);

=======

>>>>>>> f024deed7876ee9acb8ea442cfec337575e089fa



    // Remove connections to and from this node

    if (!measure->IsIgnored() && !measure->Parent()->IsIgnored()) {

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

+0 −6
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ namespace Isis { 
   *   @history 2018-06-06 Jesse Mapel - Added a method to get all adjacent images to ControlNet.

   *                           Previously this functionality was only available through the

   *                           ControlCubeGraphNode class. References #5434.

<<<<<<< HEAD

   *   @history 2018-06-06 Jesse Mapel - Added a method to get all adjacent images to ControlNet.

   *                           Previously this functionality was only available through the

   *                           ControlCubeGraphNode class. References #5434.
@@ -246,8 +245,6 @@ namespace Isis { 
   *                           These signals exist for the purpose of communication between the

   *                           ControlNetVitals class, and the network that it is observing.

   *                           Fixes #5435.

=======

>>>>>>> f024deed7876ee9acb8ea442cfec337575e089fa

   */

  class ControlNet : public QObject {

      Q_OBJECT
@@ -257,14 +254,11 @@ namespace Isis { 


    public:



<<<<<<< HEAD

      enum ModType {

        Swapped,

        GraphModified

      };



=======

>>>>>>> f024deed7876ee9acb8ea442cfec337575e089fa

      ControlNet();

      ControlNet(const ControlNet &other);

      ControlNet(const QString &filename, Progress *progress = 0);