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

Merge pull request #322 from jessemapel/ipceCnetHealth 

Fixed health monitor not handling deleting points correctly.
parents c45ab58a 69b9da7b

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

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ namespace Isis { 


    // notify CubeSerialNumbers of the loss of this point

    foreach(ControlMeasure * measure, point->getMeasures()) {

      measureDeleted(measure);

      point->Delete(measure);

    }



    emit pointDeleted(point);

isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp

+6 −0
Original line number Diff line number Diff line
@@ -287,6 +287,12 @@ namespace Isis { 
    }



    m_pointTypeCounts[point->GetType()]--;



    int numValidMeasures= point->GetNumValidMeasures();

    if ( --m_pointMeasureCounts[numValidMeasures] < 1 ) {

      m_pointMeasureCounts.remove(numValidMeasures);

    }



    validate();

  }

isis/src/control/objs/ControlNetVitals/ControlNetVitals.h

+4 −5
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ namespace Isis { 
  *    @history 2018-06-25 Kristin Berry - Fixed problem with getImagesBelowMeasureThreshold().size()

  *                            not matching numImagesBelowMeasureThreshold(). Fixed a similar

  *                            problem with numPointsBelowMeasureThreshold().

  *    @history 2018-07-03 Jesse Mapel - Fixed deleting control points not properly updating the

  *                            point counters.

  */

  class ControlNetVitals : public QObject {

    Q_OBJECT
@@ -124,9 +126,6 @@ namespace Isis { 
    private:

      void addMeasureToCounts(ControlMeasure *measure);

      void removeMeasureFromCounts(ControlMeasure *measure);

      // TESTING JAM

      QString countersToString();

      // TESTING JAM



      //! The Control Network that the vitals class is observing.

      ControlNet *m_controlNet;