Commit 84608015 authored by Kristin Berry's avatar Kristin Berry Committed by Makayla Shepherd
Browse files

Switched from initializing ControlMeasure sample, lines to Isis::Null, Isis::Null from 0.0, 0.0

parent 797d40aa

isis/src/control/objs/ControlMeasure/ControlMeasure.cpp

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ namespace Isis { 
    p_jigsawRejected = false;

    p_ignore = false;



    p_sample = 0.0;

    p_line = 0.0;

    p_sample = Isis::Null;//0.0;

    p_line = Isis::Null; //0.0;

  }

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp

+4 −4
Original line number Diff line number Diff line
@@ -454,12 +454,12 @@ namespace Isis { 
          pvlMeasure += PvlKeyword("Ignore", "True");

        }



        if ( controlMeasure.GetSample() != 0.0 ) {

        if ( controlMeasure.GetSample() != Isis::Null) {

          pvlMeasure += PvlKeyword("Sample", toString(controlMeasure.GetSample()));



        }



        if ( controlMeasure.GetLine() != 0.0 ) {

        if ( controlMeasure.GetLine() != Isis::Null ) {

          pvlMeasure += PvlKeyword("Line", toString(controlMeasure.GetLine()));

        }
@@ -1854,11 +1854,11 @@ namespace Isis { 
          protoMeasure.set_jigsawrejected(true);

        }



        if ( controlMeasure.GetSample() != 0.0 ) {

        if ( controlMeasure.GetSample() != Isis::Null ) {

          protoMeasure.set_sample(controlMeasure.GetSample());

        }



        if ( controlMeasure.GetLine() != 0.0 ) {

        if ( controlMeasure.GetLine() != Isis::Null ) {

          protoMeasure.set_line(controlMeasure.GetLine());

        }