Commit 4dfb087c authored by Janet Barrett's avatar Janet Barrett
Browse files

(PROG) Modified InterestOperator::FindCnetRef to report status on number of... 

(PROG) Modified InterestOperator::FindCnetRef to report status on number of points instead of number of measures. Modified ControlNetValidMeasure::ValidStandardOptions to initialize the mdDnValue variable. Fixes #2040

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@5741 41f8697f-d340-4b68-9986-7bafba869bb8
parent 6160a6bb

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ namespace Isis { 


    mdEmissionAngle  = 0;

    mdIncidenceAngle = 0;

    mdDnValue        = 0;

    mdResolution     = 0;

    mdSampleResidual = 0;

    mdLineResidual   = 0;

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ namespace Isis { 
    *  @history 2013-01-31 Steven Lambright - Fixed LocationString() to return

    *                          valid text. Also, added a test for this text.

    *                          Fixes #1436. 

    *  @history 2014-03-03 Janet Barrett - Initialize the mdDnValue variable in

    *                          the ValidStandardOptions method. Fixes #2040.

    */



  class ControlNetValidMeasure {

isis/src/control/objs/InterestOperator/InterestOperator.cpp

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


    // Status Report

    mStatus.SetText("Choosing Reference by Interest...");

    mStatus.SetMaximumSteps(pNewNet.GetNumMeasures());

    mStatus.SetMaximumSteps(pNewNet.GetNumPoints());

    mStatus.CheckStatus();



    // Process each existing control point in the network

isis/src/control/objs/InterestOperator/InterestOperator.h

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ namespace Isis { 
   *                           Fixes #589

   *   @history 2013-03-08 Kimberly Oyama and Steven Lambright - Added a try/catch to

   *                           InterestByPoint(). References #825.

   *   @history 2014-03-03 Janet Barrett - Changed the FindCnetRef method to report status on number

   *                           of points processed instead of number of measures. Fixes #2040.

   *  

   */

  class InterestOperator : public ControlNetValidMeasure {