Unverified Commit 3a42d984 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #304 from AgoinsUSGS/bugginess 

Added m_numPoints and m_numMeasures member variable to cnetvitals.
parents 9cc64e5b 34da9d8b

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

+11 −5
Original line number Diff line number Diff line
@@ -56,8 +56,10 @@ namespace Isis { 


    m_islandList = m_controlNet->GetSerialConnections();



    m_numPoints = 0;

    m_numPointsIgnored = 0;

    m_numPointsLocked = 0;

    m_numMeasures = m_controlNet->GetNumMeasures();



    m_pointMeasureCounts.clear();

    m_imageMeasureCounts.clear();
@@ -117,7 +119,9 @@ namespace Isis { 
   *  @param point The ControlPoint being added to the network.

   */

  void ControlNetVitals::addPoint(ControlPoint *point) {



    emitHistoryEntry("Control Point Added", point->GetId(), "", "");

    m_numPoints++;



    if (point->IsIgnored()) {

      m_numPointsIgnored++;
@@ -271,6 +275,7 @@ namespace Isis { 
  void ControlNetVitals::deletePoint(ControlPoint *point) {



    emitHistoryEntry("Control Point Deleted", point->GetId(), "", "");

    m_numPoints--;



    if (point->IsIgnored()) {

      m_numPointsIgnored--;
@@ -305,6 +310,8 @@ namespace Isis { 
   */

  void ControlNetVitals::addMeasure(ControlMeasure *measure) {

    emitHistoryEntry("Control Measure Added", measure->GetCubeSerialNumber(), "", "");

    m_numMeasures++;





    ControlPoint *point = measure->Parent();

    if (point) {
@@ -390,7 +397,7 @@ namespace Isis { 
  void ControlNetVitals::deleteMeasure(ControlMeasure *measure) {



    emitHistoryEntry("Control Measure Deleted", measure->GetCubeSerialNumber(), "", "");



    m_numMeasures--;



    ControlPoint *point = measure->Parent();

    if (point) {
@@ -499,13 +506,12 @@ namespace Isis { 




  /**

   *  This method is designed to return the number of points in the observed Control Network.

   *  It is a wrapper for the ControlNet::GetNumPoints() call of the observed Control Network.

   *  This method is designed to return the number of points in the Control Network.

   *

   *  @return The number of points in the Control Network.

   */

  int ControlNetVitals::numPoints() {

    return m_controlNet->GetNumPoints();

    return m_numPoints;

  }
@@ -599,7 +605,7 @@ namespace Isis { 
   *  @return The number of measures in the Control Network.

   */

  int ControlNetVitals::numMeasures() {

    return m_controlNet->GetNumMeasures();

    return m_numMeasures;

  }

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

+5 −1
Original line number Diff line number Diff line
@@ -148,10 +148,14 @@ namespace Isis { 
      //! This map at key ControlPoint::Fixed and it would return how many fixed points there are.

      QMap<ControlPoint::PointType, int> m_pointTypeCounts;



      //! The number of points in the network.

      int m_numPoints;

      //! The number of ignored points in the network.

      int m_numPointsIgnored;

      //! The number of edit locked points in the network.

      int m_numPointsLocked;

      //! The number of measures in the network.

      int m_numMeasures;

  };

};