Commit 2484d4e7 authored by Adam Goins's avatar Adam Goins
Browse files

Fixed ControlPoint::operator= to use setters

parent 3a42d984
Loading
Loading
Loading
Loading
+20 −16
Original line number Diff line number Diff line
@@ -1955,23 +1955,27 @@ namespace Isis {
        }
      }

      id             = other.id;
      chooserName    = other.chooserName;
      dateTime       = other.dateTime;
      type           = other.type;
      invalid = other.invalid;
      editLock       = other.editLock;
      jigsawRejected = other.jigsawRejected;
      referenceExplicitlySet   = other.referenceExplicitlySet;
      ignore         = other.ignore;
      aprioriSurfacePointSource      = other.aprioriSurfacePointSource;
      aprioriSurfacePointSourceFile  = other.aprioriSurfacePointSourceFile;
      aprioriRadiusSource            = other.aprioriRadiusSource;
      aprioriRadiusSourceFile        = other.aprioriRadiusSourceFile;
      aprioriSurfacePoint            = other.aprioriSurfacePoint;
      adjustedSurfacePoint = other.adjustedSurfacePoint;
      numberOfRejectedMeasures = other.numberOfRejectedMeasures;
      constraintStatus         = other.constraintStatus;

      SetId(other.id);
      SetChooserName(other.chooserName);
      SetDateTime(other.dateTime);
      SetType(other.type);
      SetRejected(other.jigsawRejected);
      SetIgnored(other.ignore);
      SetAprioriSurfacePointSource(other.aprioriSurfacePointSource);
      SetAprioriSurfacePointSourceFile(other.aprioriSurfacePointSourceFile);
      SetAprioriRadiusSource(other.aprioriRadiusSource);
      SetAprioriRadiusSourceFile(other.aprioriRadiusSourceFile);
      SetAprioriSurfacePoint(other.aprioriSurfacePoint);

      SetAdjustedSurfacePoint(other.adjustedSurfacePoint);
      
      // Set edit lock last so the it doesn't intefere with copying the other fields over.
      SetEditLock(other.editLock);
    }

    return *this;
+3 −0
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ namespace Isis {
   *                           to allow for communication between the ControlNetVitals class
   *                           and changes made to the Control Network that it is observing.
   *                           Fixes #5435.
   *  @history 2018-06-29 Adam Goins - Modified to operator= method to use setters when copying
   *                           one Control Point to another so that the proper signals get called.
   *                           Fixes #5435.
   */
  class ControlPoint : public QObject {