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

Fixed coding standards in ControlPointV001

parent 09c09382

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

+38 −23
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ namespace Isis { 
    }



    // Ground points were previously flagged by the Held keyword being true.

    if ( (pointObject.hasKeyword("Held") && pointObject["Held"][0] == "True") ||

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

    if ( (pointObject.hasKeyword("Held") && pointObject["Held"][0] == "True")

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

      m_pointData->set_type(ControlNetFileProtoV0001_PBControlPoint::Ground);

    }

    else if (pointObject["PointType"][0] == "Tie") {
@@ -148,16 +148,19 @@ namespace Isis { 
        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::User);

      }

      else if (source == "AverageOfMeasures") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

        m_pointData->set_apriorisurfpointsource(

                           ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

      }

      else if (source == "Reference") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Reference);

        m_pointData->set_apriorisurfpointsource(

                           ControlNetFileProtoV0001_PBControlPoint::Reference);

      }

      else if (source == "Basemap") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Basemap);

      }

      else if (source == "BundleSolution") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

        m_pointData->set_apriorisurfpointsource(

                         ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

      }

      else {

        QString msg = "Invalid AprioriXYZSource [" + source + "]";
@@ -175,16 +178,19 @@ namespace Isis { 
        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::User);

      }

      else if (source == "AverageOfMeasures") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

        m_pointData->set_apriorisurfpointsource(

                         ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

      }

      else if (source == "Reference") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Reference);

        m_pointData->set_apriorisurfpointsource(

                           ControlNetFileProtoV0001_PBControlPoint::Reference);

      }

      else if (source == "Basemap") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::Basemap);

      }

      else if (source == "BundleSolution") {

        m_pointData->set_apriorisurfpointsource(ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

        m_pointData->set_apriorisurfpointsource(

                           ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

      }

      else {

        QString msg = "Invalid AprioriLatLonSource [" + source + "]";
@@ -202,7 +208,8 @@ namespace Isis { 
        m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::User);

      }

      else if (source == "AverageOfMeasures") {

        m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

        m_pointData->set_aprioriradiussource(

                           ControlNetFileProtoV0001_PBControlPoint::AverageOfMeasures);

      }

      else if (source == "Ellipsoid") {

        m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::Ellipsoid);
@@ -211,7 +218,8 @@ namespace Isis { 
        m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::DEM);

      }

      else if (source == "BundleSolution") {

        m_pointData->set_aprioriradiussource(ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

        m_pointData->set_aprioriradiussource(

                           ControlNetFileProtoV0001_PBControlPoint::BundleSolution);

      }

      else {

        QString msg = "Invalid AprioriRadiusSource, [" + source + "]";
@@ -604,16 +612,18 @@ namespace Isis { 
                               QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,

                               void (ControlNetFileProtoV0001_PBControlPoint::*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") {

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

    }

  }





  /**
@@ -635,8 +645,9 @@ namespace Isis { 
                               QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,

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



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



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

    container.deleteKeyword(keyName);
@@ -663,8 +674,9 @@ namespace Isis { 
                               QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> point,

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



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }



    QString value = container[keyName][0];

    container.deleteKeyword(keyName);
@@ -691,16 +703,18 @@ namespace Isis { 
                               ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,

                               void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*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);

    }

  }





  /**
@@ -757,8 +771,9 @@ namespace Isis { 
                               void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)

                                      (const std::string &)) {



    if (!container.hasKeyword(keyName))

    if (!container.hasKeyword(keyName)) {

      return;

    }





    QString value = container[keyName][0];

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

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ namespace Isis { 
      void copy(PvlContainer &container,

                QString keyName,

                ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,

                void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(const std::string &));

                void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(

                            const std::string &));



      QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> m_pointData;

      /**< Protobuf container that holds information used to create a control point.*/