Commit f53f881b authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Fixed coding standards in ControlPointV0003

parent 9afa2e39

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

+17 −13
Original line number Diff line number Diff line
@@ -75,15 +75,15 @@ namespace Isis { 
    // In version 4, these were changed to fixed, free, and constrained respectively.

    // The protobuf file version was not changed, fixed and free were simply added to the

    // enumeration and the old names were flagged as obsolete.

    if (pointObject["PointType"][0] == "Fixed" ||

        pointObject["PointType"][0] == "Ground") {

    if (pointObject["PointType"][0] == "Fixed"

        || pointObject["PointType"][0] == "Ground") {

      m_pointData->set_type(ControlPointFileEntryV0002::Fixed);

    }

    else if (pointObject["PointType"][0] == "Constrained") {

      m_pointData->set_type(ControlPointFileEntryV0002::Constrained);

    }

    else if (pointObject["PointType"][0] == "Free" ||

             pointObject["PointType"][0] == "Tie") {

    else if (pointObject["PointType"][0] == "Free"

             || pointObject["PointType"][0] == "Tie") {

      m_pointData->set_type(ControlPointFileEntryV0002::Free);

    }

    else {
@@ -240,7 +240,6 @@ namespace Isis { 
          throw IException(IException::Programmer, msg, _FILEINFO_);

        }

        else {



          ControlPointFileEntryV0002_Measure_MeasureLogData protoBufDataEntry;



          protoBufDataEntry.set_doubledatatype(interpreter.GetDataType());
@@ -587,9 +586,10 @@ namespace Isis { 
    container.deleteKeyword(keyName);

    value = value.toLower();



    if (value == "true" || value == "yes")

    if (value == "true" || value == "yes") {

      (point.data()->*setter)(true);

    }

  }





  /**
@@ -640,8 +640,9 @@ namespace Isis { 
                               QSharedPointer<ControlPointFileEntryV0002> point,

                               void (ControlPointFileEntryV0002::*setter)(const std::string&)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    QString value = container[keyName][0];

    container.deleteKeyword(keyName);
@@ -668,16 +669,18 @@ namespace Isis { 
                               ControlPointFileEntryV0002_Measure &measure,

                               void (ControlPointFileEntryV0002_Measure::*setter)(bool)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    QString value = container[keyName][0];

    container.deleteKeyword(keyName);

    value = value.toLower();



    if (value == "true" || value == "yes")

    if (value == "true" || value == "yes") {

      (measure.*setter)(true);

    }

  }





  /**
@@ -699,8 +702,9 @@ namespace Isis { 
                               ControlPointFileEntryV0002_Measure &measure,

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



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



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

    container.deleteKeyword(keyName);