Commit 0538a9e3 authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Fixed fault where point ignore was set where measure ignore should have been. 

Initialized double values to Isis::Null by default.
parent c157f0f5

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

+11 −8
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ namespace Isis { 
         m_pointData, &ControlNetFileProtoV0001_PBControlPoint::set_longitudeconstrained);

    copy(pointObject, "RadiusConstrained",

         m_pointData, &ControlNetFileProtoV0001_PBControlPoint::set_radiusconstrained);



    // Copy over the adjusted surface point

    if ( pointObject.hasKeyword("Latitude")

         && pointObject.hasKeyword("Longitude")
@@ -408,7 +407,7 @@ namespace Isis { 
        }

        catch (...) {

          value = 0;

          m_pointData->set_ignore(true);

          measure.set_ignore(true);

        }

        measure.mutable_measurement()->set_sample(value);

        group.deleteKeyword("Sample");
@@ -422,7 +421,7 @@ namespace Isis { 
        }

        catch (...) {

          value = 0;

          m_pointData->set_ignore(true);

          measure.set_ignore(true);

        }

        measure.mutable_measurement()->set_line(value);

        group.deleteKeyword("Line");
@@ -558,6 +557,7 @@ namespace Isis { 
                    "points or measures";

      throw IException(IException::Io, msg, _FILEINFO_);

    }



  }
@@ -720,11 +720,13 @@ namespace Isis { 
                               ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,

                               void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(double)) {



    if (!container.hasKeyword(keyName))

      return;



    double value = toDouble(container[keyName][0]);

    double value = Isis::Null;

    if ( container.hasKeyword(keyName) ) {

      value = toDouble(container[keyName][0]);

      container.deleteKeyword(keyName);



    }



    (measure.*setter)(value);

  }
@@ -752,6 +754,7 @@ namespace Isis { 
    if (!container.hasKeyword(keyName)) 

      return;





    QString value = container[keyName][0];

    container.deleteKeyword(keyName);

    (measure.*setter)(value.toLatin1().data());