Commit 2eaa6731 authored by Kristin Berry's avatar Kristin Berry
Browse files

Remove unneeded ControlCubeGraphNode from ControlMeasure

parent d336f5f5
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@
#include "ControlMeasureLogData.h"
#include "ControlNet.h"
#include "ControlPoint.h"
#include "ControlCubeGraphNode.h"
#include "IString.h"
#include "iTime.h"
#include "SpecialPixel.h"
@@ -84,7 +83,6 @@ namespace Isis {
    p_sampleResidual = other.p_sampleResidual;
    p_lineResidual = other.p_lineResidual;
    p_camera = other.p_camera;
    associatedCSN = other.associatedCSN;
  }


@@ -116,7 +114,6 @@ namespace Isis {
    p_measuredEphemerisTime = Null;

    parentPoint = NULL;
    associatedCSN = NULL;
  }


@@ -144,7 +141,6 @@ namespace Isis {
      p_loggedData = NULL;
    }

    associatedCSN = NULL;
  }


@@ -1054,7 +1050,6 @@ namespace Isis {
    p_focalPlaneMeasuredY = other.p_focalPlaneMeasuredY;
    p_focalPlaneComputedX = other.p_focalPlaneComputedX;
    p_focalPlaneComputedY = other.p_focalPlaneComputedY;
    associatedCSN = other.associatedCSN;

    return *this;
  }
+0 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@
 */

#include <QObject>
#include "ControlCubeGraphNode.h"

template< class A> class QVector;
template< class A> class QList;
@@ -181,7 +180,6 @@ namespace Isis {
      Q_OBJECT

      friend class ControlPoint;
      friend class ControlCubeGraphNode;
    public:
      /**
       * @brief Control network measurement types
@@ -249,7 +247,6 @@ namespace Isis {
      ~ControlMeasure();

      ControlPoint *Parent() { return parentPoint; }
      ControlCubeGraphNode *ControlSN() { return associatedCSN; }

      Status SetAprioriLine(double aprioriLine);
      Status SetAprioriSample(double aprioriSample);
@@ -333,7 +330,6 @@ namespace Isis {

    private: // data
      ControlPoint *parentPoint;  //!< Pointer to parent ControlPoint, may be null
      ControlCubeGraphNode *associatedCSN;  //!< Pointer to the Serial Number
      // structure connecting measures in an image

      QString *p_serialNumber;