Commit b9a42c6c authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Changed ControlCubeGraphNodes to serial numbers in cneteditor filters.

parent ddbdb5d8

isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp

+4 −5
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
namespace Isis {

  APrioriLatitudeFilter::APrioriLatitudeFilter(

    AbstractFilter::FilterEffectivenessFlag flag,

    int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {

    ControlNet *network,

    int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {

  }
@@ -22,9 +23,8 @@ namespace Isis { 
  }





  bool APrioriLatitudeFilter::evaluate(

    const ControlCubeGraphNode *node) const {

    return evaluateImageFromPointFilter(node);

  bool APrioriLatitudeFilter::evaluate(const QString *imageSerial) const {

    return evaluateImageFromPointFilter(imageSerial);

  }
@@ -64,4 +64,3 @@ namespace Isis { 
        descriptionSuffix();

  }

}

isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h

+5 −4
Original line number Diff line number Diff line
@@ -25,17 +25,19 @@ namespace Isis { 
   *

   * @internal

   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.

   *   @history 2018-06-01 Jesse Mapel - Changed ControlCubeGraphNode to image serial number.

   *                           References #5434.

   */

  class APrioriLatitudeFilter : public AbstractNumberFilter {

      Q_OBJECT



    public:

      APrioriLatitudeFilter(AbstractFilter::FilterEffectivenessFlag flag,

          int minimumForSuccess = -1);

          ControlNet *network, int minimumForSuccess = -1);

      APrioriLatitudeFilter(const APrioriLatitudeFilter &other);

      virtual ~APrioriLatitudeFilter();



      bool evaluate(const ControlCubeGraphNode *) const;

      bool evaluate(const QString *) const;

      bool evaluate(const ControlPoint *) const;

      bool evaluate(const ControlMeasure *) const;
@@ -47,4 +49,3 @@ namespace Isis { 
}



#endif

isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp

+4 −5
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
namespace Isis {

  APrioriLatitudeSigmaFilter::APrioriLatitudeSigmaFilter(

    AbstractFilter::FilterEffectivenessFlag flag,

    int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {

    ControlNet *network,

    int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {

  }
@@ -22,9 +23,8 @@ namespace Isis { 
  }





  bool APrioriLatitudeSigmaFilter::evaluate(

    const ControlCubeGraphNode *node) const {

    return evaluateImageFromPointFilter(node);

  bool APrioriLatitudeSigmaFilter::evaluate(const QString *imageSerial) const {

    return evaluateImageFromPointFilter(imageSerial);

  }
@@ -64,4 +64,3 @@ namespace Isis { 
        descriptionSuffix();

  }

}

isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h

+6 −5
Original line number Diff line number Diff line
@@ -25,17 +25,19 @@ namespace Isis { 
   *

   * @internal

   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.

   *   @history 2018-06-01 Jesse Mapel - Changed ControlCubeGraphNode to image serial number.

   *                           References #5434.

   */

  class APrioriLatitudeSigmaFilter : public AbstractNumberFilter {

      Q_OBJECT



    public:

      APrioriLatitudeSigmaFilter(AbstractFilter::FilterEffectivenessFlag flag,

          int minimumForSuccess = -1);

          ControlNet *network, int minimumForSuccess = -1);

      APrioriLatitudeSigmaFilter(const APrioriLatitudeSigmaFilter &other);

      virtual ~APrioriLatitudeSigmaFilter();



      bool evaluate(const ControlCubeGraphNode *) const;

      bool evaluate(const QString *) const;

      bool evaluate(const ControlPoint *) const;

      bool evaluate(const ControlMeasure *) const;
@@ -47,4 +49,3 @@ namespace Isis { 
}



#endif

isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp

+4 −5
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
namespace Isis {

  APrioriLongitudeFilter::APrioriLongitudeFilter(

    AbstractFilter::FilterEffectivenessFlag flag,

    int minimumForSuccess) : AbstractNumberFilter(flag, minimumForSuccess) {

    ControlNet *network,

    int minimumForSuccess) : AbstractNumberFilter(flag, network, minimumForSuccess) {

  }
@@ -22,9 +23,8 @@ namespace Isis { 
  }





  bool APrioriLongitudeFilter::evaluate(

    const ControlCubeGraphNode *node) const {

    return evaluateImageFromPointFilter(node);

  bool APrioriLongitudeFilter::evaluate(const QString *imageSerial) const {

    return evaluateImageFromPointFilter(imageSerial);

  }
@@ -64,4 +64,3 @@ namespace Isis { 
        descriptionSuffix();

  }

}