Unverified Commit 834f9db0 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #28 from jessemapel/codingstandards 

Fixed coding standards in ControlNetVersioner
parents 7deed24c f53f881b

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

+99 −76
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ namespace Isis { 
   * of the point to the caller who is expected to delete it when done with it.

   *

   * @return @b ControlPoint* A pointer to the control point. The caller assumes ownership of the

   *                          ControlPoint and is expected to delete it when done.

   *                          ControlPoint and is expected to delete it when done. If there are no

   *                          points to return, a NULL pointer is returned.

   */

  ControlPoint *ControlNetVersioner::takeFirstPoint() {

    ControlPoint *point = NULL;
@@ -188,7 +189,7 @@ namespace Isis { 
  /**

   * Generates a Pvl file from the currently stored control points and header.

   *

   * @return Pvl& The Pvl version of the network

   * @return Pvl The Pvl version of the network

   */

  Pvl ControlNetVersioner::toPvl(){

    Pvl pvl;
@@ -327,7 +328,8 @@ namespace Isis { 
        pvlPoint += aprioriY;

        pvlPoint += aprioriZ;



        symmetric_matrix<double, upper> aprioriCovarianceMatrix = aprioriSurfacePoint.GetRectangularMatrix();

        symmetric_matrix<double, upper> aprioriCovarianceMatrix =

              aprioriSurfacePoint.GetRectangularMatrix();



        if ( aprioriCovarianceMatrix.size1() > 0 ) {
@@ -388,9 +390,12 @@ namespace Isis { 
      // adj surface point, convert to lat,lon,radius and output as comment

      SurfacePoint adjustedSurfacePoint = controlPoint->GetAdjustedSurfacePoint();

      if ( adjustedSurfacePoint.Valid() ) {

        PvlKeyword adjustedX("AdjustedX", toString(adjustedSurfacePoint.GetX().meters()), "meters");

        PvlKeyword adjustedY("AdjustedY", toString(adjustedSurfacePoint.GetY().meters()), "meters");

        PvlKeyword adjustedZ("AdjustedZ", toString(adjustedSurfacePoint.GetZ().meters()), "meters");

        PvlKeyword adjustedX("AdjustedX",

                             toString(adjustedSurfacePoint.GetX().meters()), "meters");

        PvlKeyword adjustedY("AdjustedY",

                             toString(adjustedSurfacePoint.GetY().meters()), "meters");

        PvlKeyword adjustedZ("AdjustedZ",

                             toString(adjustedSurfacePoint.GetZ().meters()), "meters");



        adjustedX.addComment("AdjustedLatitude = "

                             + toString(adjustedSurfacePoint.GetLatitude().degrees())
@@ -406,7 +411,8 @@ namespace Isis { 
        pvlPoint += adjustedY;

        pvlPoint += adjustedZ;



        symmetric_matrix<double, upper> adjustedCovarianceMatrix = adjustedSurfacePoint.GetRectangularMatrix();

        symmetric_matrix<double, upper> adjustedCovarianceMatrix =

              adjustedSurfacePoint.GetRectangularMatrix();



        if ( adjustedCovarianceMatrix.size1() > 0 ) {
@@ -454,8 +460,7 @@ namespace Isis { 


      for (int j = 0; j < controlPoint->GetNumMeasures(); j++) {

        PvlGroup pvlMeasure("ControlMeasure");

        const ControlMeasure &

            controlMeasure = *controlPoint->GetMeasure(j);

        const ControlMeasure &controlMeasure = *controlPoint->GetMeasure(j);

        pvlMeasure += PvlKeyword("SerialNumber", controlMeasure.GetCubeSerialNumber());



        switch ( controlMeasure.GetType() ) {
@@ -521,7 +526,8 @@ namespace Isis { 


        if ( controlMeasure.GetSampleResidual() != Isis::Null

             && controlMeasure.GetSampleResidual() != 0. ) {

          pvlMeasure += PvlKeyword("SampleResidual", toString(controlMeasure.GetSampleResidual()),

          pvlMeasure += PvlKeyword("SampleResidual",

                                   toString(controlMeasure.GetSampleResidual()),

                                   "pixels");

        }
@@ -539,9 +545,9 @@ namespace Isis { 
          pvlMeasure += log.ToKeyword();

        }



        if ( controlPoint->HasRefMeasure() &&

           controlPoint->IndexOfRefMeasure() == j &&

           controlPoint->IsReferenceExplicit() ) {

        if ( controlPoint->HasRefMeasure()

             && controlPoint->IndexOfRefMeasure() == j

             && controlPoint->IsReferenceExplicit() ) {

          pvlMeasure += PvlKeyword("Reference", "True");

        }

        pvlPoint.addGroup(pvlMeasure);
@@ -882,7 +888,9 @@ namespace Isis { 
   * @param netFile The filename of the control network file.

   * @param progress The progress object to track reading points.

   */

  void ControlNetVersioner::readProtobuf(const Pvl &header, const FileName netFile, Progress *progress) {

  void ControlNetVersioner::readProtobuf(const Pvl &header,

                                         const FileName netFile,

                                         Progress *progress) {

    int version = 1;



    const PvlObject &protoBuf = header.findObject("ProtoBuffer");
@@ -917,7 +925,9 @@ namespace Isis { 
   * @param netFile The filename of the control network file.

   * @param progress The progress object to track reading points.

   */

  void ControlNetVersioner::readProtobufV0001(const Pvl &header, const FileName netFile, Progress *progress) {

  void ControlNetVersioner::readProtobufV0001(const Pvl &header,

                                              const FileName netFile,

                                              Progress *progress) {

    const PvlObject &protoBufferInfo = header.findObject("ProtoBuffer");

    const PvlObject &protoBufferCore = protoBufferInfo.findObject("Core");
@@ -1038,7 +1048,9 @@ namespace Isis { 
   * @param netFile The filename of the control network file.

   * @param progress The progress object to track reading points.

   */

  void ControlNetVersioner::readProtobufV0002(const Pvl &header, const FileName netFile, Progress *progress) {

  void ControlNetVersioner::readProtobufV0002(const Pvl &header,

                                              const FileName netFile,

                                              Progress *progress) {

    // read the header protobuf object

    const PvlObject &protoBufferInfo = header.findObject("ProtoBuffer");

    const PvlObject &protoBufferCore = protoBufferInfo.findObject("Core");
@@ -1155,7 +1167,9 @@ namespace Isis { 
   * @param netFile The filename of the control network file.

   * @param progress The progress object to track reading points.

   */

  void ControlNetVersioner::readProtobufV0005(const Pvl &header, const FileName netFile, Progress *progress) {

  void ControlNetVersioner::readProtobufV0005(const Pvl &header,

                                              const FileName netFile,

                                              Progress *progress) {

    // read the header protobuf object

    const PvlObject &protoBufferInfo = header.findObject("ProtoBuffer");

    const PvlObject &protoBufferCore = protoBufferInfo.findObject("Core");
@@ -1304,8 +1318,7 @@ namespace Isis { 
   *

   * @param point The versioned control point to be updated.

   *

   * @return The latest version ControlPoint constructed from the

   *         given point.

   * @return @b ControlPoint* The ControlPoint constructed from the given point.

   */

  ControlPoint *ControlNetVersioner::createPoint(ControlPointV0001 &point) {

    ControlPointV0002 newPoint(point);
@@ -1322,8 +1335,7 @@ namespace Isis { 
   *

   * @param point The versioned control point to be updated.

   *

   * @return The latest version ControlPoint constructed from the

   *         given point.

   * @return @b ControlPoint* The ControlPoint constructed from the given point.

   */

  ControlPoint *ControlNetVersioner::createPoint(ControlPointV0002 &point) {
@@ -1342,8 +1354,7 @@ namespace Isis { 
   *

   * @param point The versioned control point to be updated.

   *

   * @return The latest version ControlPoint constructed from the

   *         given point.

   * @return @b ControlPoint* The ControlPoint constructed from the given point.

   */

  ControlPoint *ControlNetVersioner::createPoint(ControlPointV0003 &point) {

    ControlPointFileEntryV0002 protoPoint = point.pointData();
@@ -1371,8 +1382,9 @@ namespace Isis { 
        pointType = ControlPoint::PointType::Fixed;

        break;

      default:

        QString msg = "Unable to create ControlPoint [" + toString(protoPoint.id().c_str()) + "] from file. "

                      "Type enumeration [" + toString((int)(protoPoint.type())) + "] is invalid.";

        QString msg = "Unable to create ControlPoint [" + toString(protoPoint.id().c_str())

                      + "] from file. Type enumeration [" + toString((int)(protoPoint.type()))

                      + "] is invalid.";

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

        break;

    }
@@ -1431,7 +1443,8 @@ namespace Isis { 
          break;



        case ControlPointFileEntryV0002_AprioriSource_AverageOfMeasures:

          controlPoint->SetAprioriSurfacePointSource(ControlPoint::SurfacePointSource::AverageOfMeasures);

          controlPoint->SetAprioriSurfacePointSource(

                              ControlPoint::SurfacePointSource::AverageOfMeasures);

          break;



        case ControlPointFileEntryV0002_AprioriSource_Reference:
@@ -1443,7 +1456,8 @@ namespace Isis { 
          break;



        case ControlPointFileEntryV0002_AprioriSource_BundleSolution:

          controlPoint->SetAprioriSurfacePointSource(ControlPoint::SurfacePointSource::BundleSolution);

          controlPoint->SetAprioriSurfacePointSource(

                              ControlPoint::SurfacePointSource::BundleSolution);

          break;



        default:
@@ -1454,7 +1468,8 @@ namespace Isis { 
    }



    if ( protoPoint.has_apriorisurfpointsourcefile() ) {

      controlPoint->SetAprioriSurfacePointSourceFile(protoPoint.apriorisurfpointsourcefile().c_str());

      controlPoint->SetAprioriSurfacePointSourceFile(

                          protoPoint.apriorisurfpointsourcefile().c_str());

    }



    if ( protoPoint.has_apriorix()
@@ -1510,8 +1525,12 @@ namespace Isis { 
    if ( m_header.equatorialRadius.isValid() && m_header.polarRadius.isValid() ) {

      SurfacePoint aprioriSurfacePoint = controlPoint->GetAprioriSurfacePoint();

      SurfacePoint adjustedSurfacePoint = controlPoint->GetAdjustedSurfacePoint();

      aprioriSurfacePoint.SetRadii(m_header.equatorialRadius, m_header.equatorialRadius, m_header.polarRadius);

      adjustedSurfacePoint.SetRadii(m_header.equatorialRadius, m_header.equatorialRadius, m_header.polarRadius);

      aprioriSurfacePoint.SetRadii(m_header.equatorialRadius,

                                   m_header.equatorialRadius,

                                   m_header.polarRadius);

      adjustedSurfacePoint.SetRadii(m_header.equatorialRadius,

                                    m_header.equatorialRadius,

                                    m_header.polarRadius);

      controlPoint->SetAdjustedSurfacePoint(adjustedSurfacePoint);

      controlPoint->SetAprioriSurfacePoint(aprioriSurfacePoint);

    }
@@ -1547,7 +1566,8 @@ namespace Isis { 
   * @return The ControlMeasure constructed from the V0006 version

   *         file.

   */

  ControlMeasure *ControlNetVersioner::createMeasure(const ControlPointFileEntryV0002_Measure &measure) {

  ControlMeasure *ControlNetVersioner::createMeasure(

                                             const ControlPointFileEntryV0002_Measure &measure) {



    ControlMeasure *newMeasure = new ControlMeasure;
@@ -1681,10 +1701,9 @@ namespace Isis { 
      delete [] blankLabel;



      int numMeasures = 0;

      int numPoints = 0;

      int numPoints = m_points.size();

      foreach (ControlPoint *point, m_points) {

        numMeasures += point->GetNumMeasures();

        numPoints += 1;

      }



      streampos startCoreHeaderPos = output.tellp();
@@ -1779,8 +1798,8 @@ namespace Isis { 




 /**

  * This will write the first control point to a ZeroCopyOutputStream.

  * The written point will be removed from the versioner and deleted if the versioner

  * This will write the first control point to a file stream.

  * The written point will be removed from the versioner and then deleted if the versioner

  * has ownership of it.

  *

  * @param output A pointer to the fileStream that we are writing the point to.
@@ -1825,8 +1844,9 @@ namespace Isis { 
          pointType = ControlPointFileEntryV0002_PointType_Fixed;

          break;

        default:

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str()) + "] from file. "

                        "Type enumeration [" + toString((int)(controlPoint->GetType())) + "] is invalid.";

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str())

                        + "] from file. Type enumeration ["

                        + toString((int)(controlPoint->GetType())) + "] is invalid.";

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

          break;

      }
@@ -1858,20 +1878,25 @@ namespace Isis { 
          protoPoint.set_apriorisurfpointsource(ControlPointFileEntryV0002_AprioriSource_User);

          break;

        case ControlPoint::SurfacePointSource::AverageOfMeasures:

          protoPoint.set_apriorisurfpointsource(ControlPointFileEntryV0002_AprioriSource_AverageOfMeasures);

          protoPoint.set_apriorisurfpointsource(

                           ControlPointFileEntryV0002_AprioriSource_AverageOfMeasures);

          break;

        case ControlPoint::SurfacePointSource::Reference:

          protoPoint.set_apriorisurfpointsource(ControlPointFileEntryV0002_AprioriSource_Reference);

          protoPoint.set_apriorisurfpointsource(

                           ControlPointFileEntryV0002_AprioriSource_Reference);

          break;

        case ControlPoint::SurfacePointSource::Basemap:

          protoPoint.set_apriorisurfpointsource(ControlPointFileEntryV0002_AprioriSource_Basemap);

          break;

        case ControlPoint::SurfacePointSource::BundleSolution:

          protoPoint.set_apriorisurfpointsource(ControlPointFileEntryV0002_AprioriSource_BundleSolution);

          protoPoint.set_apriorisurfpointsource(

                           ControlPointFileEntryV0002_AprioriSource_BundleSolution);

          break;

        default:

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str()) + "] from file. "

                        "Type enumeration [" + toString((int)(controlPoint->GetAprioriSurfacePointSource())) + "] is invalid.";

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str())

                        + "] from file. Type enumeration ["

                        + toString((int)(controlPoint->GetAprioriSurfacePointSource()))

                        + "] is invalid.";

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

          break;

      }
@@ -1885,10 +1910,12 @@ namespace Isis { 
          protoPoint.set_aprioriradiussource(ControlPointFileEntryV0002_AprioriSource_User);

          break;

        case ControlPoint::RadiusSource::AverageOfMeasures:

          protoPoint.set_aprioriradiussource(ControlPointFileEntryV0002_AprioriSource_AverageOfMeasures);

          protoPoint.set_aprioriradiussource(

                           ControlPointFileEntryV0002_AprioriSource_AverageOfMeasures);

          break;

        case ControlPoint::RadiusSource::BundleSolution:

          protoPoint.set_aprioriradiussource(ControlPointFileEntryV0002_AprioriSource_BundleSolution);

          protoPoint.set_aprioriradiussource(

                           ControlPointFileEntryV0002_AprioriSource_BundleSolution);

          break;

        case ControlPoint::RadiusSource::Ellipsoid:

          protoPoint.set_aprioriradiussource(ControlPointFileEntryV0002_AprioriSource_Ellipsoid);
@@ -1897,8 +1924,10 @@ namespace Isis { 
          protoPoint.set_aprioriradiussource(ControlPointFileEntryV0002_AprioriSource_DEM);

          break;

        default:

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str()) + "] from file. "

                        "Type enumeration [" + toString((int)(controlPoint->GetAprioriRadiusSource())) + "] is invalid.";

          QString msg = "Unable to create ProtoPoint [" + toString(protoPoint.id().c_str())

                        + "] from file. Type enumeration ["

                        + toString((int)(controlPoint->GetAprioriRadiusSource()))

                        + "] is invalid.";

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

          break;

      }
@@ -1914,7 +1943,8 @@ namespace Isis { 
        protoPoint.set_aprioriy(aprioriSurfacePoint.GetY().meters());

        protoPoint.set_aprioriz(aprioriSurfacePoint.GetZ().meters());



        symmetric_matrix<double, upper> aprioriCovarianceMatrix = aprioriSurfacePoint.GetRectangularMatrix();

        symmetric_matrix<double, upper> aprioriCovarianceMatrix =

              aprioriSurfacePoint.GetRectangularMatrix();

        if ( aprioriCovarianceMatrix.size1() > 0 &&

             aprioriSurfacePoint.GetLatSigmaDistance().meters() != Isis::Null &&

             aprioriSurfacePoint.GetLonSigmaDistance().meters() != Isis::Null &&
@@ -1946,7 +1976,8 @@ namespace Isis { 
        protoPoint.set_adjustedy(adjustedSurfacePoint.GetY().meters());

        protoPoint.set_adjustedz(adjustedSurfacePoint.GetZ().meters());



        symmetric_matrix<double, upper> adjustedCovarianceMatrix = adjustedSurfacePoint.GetRectangularMatrix();

        symmetric_matrix<double, upper> adjustedCovarianceMatrix =

              adjustedSurfacePoint.GetRectangularMatrix();

        if ( adjustedCovarianceMatrix.size1() > 0 ) {

          protoPoint.add_adjustedcovar(adjustedCovarianceMatrix(0, 0));

          protoPoint.add_adjustedcovar(adjustedCovarianceMatrix(0, 1));
@@ -1960,15 +1991,10 @@ namespace Isis { 
      // Converting Measures

      for (int j = 0; j < controlPoint->GetNumMeasures(); j++) {



        const ControlMeasure &

            controlMeasure = *controlPoint->GetMeasure(j);

        const ControlMeasure &controlMeasure = *controlPoint->GetMeasure(j);



        ControlPointFileEntryV0002_Measure protoMeasure;



//??? moved        if ( controlPoint->HasRefMeasure() && controlPoint->IndexOfRefMeasure() == j ) {

//??? moved             protoPoint.set_referenceindex(j);

//??? moved        }



        protoMeasure.set_serialnumber(controlMeasure.GetCubeSerialNumber().toLatin1().data());



        switch ( controlMeasure.GetType() ) {
@@ -1981,11 +2007,13 @@ namespace Isis { 
                break;



            case (ControlMeasure::RegisteredPixel):

                protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_RegisteredPixel);

                protoMeasure.set_type(

                      ControlPointFileEntryV0002_Measure_MeasureType_RegisteredPixel);

                break;



            case (ControlMeasure::RegisteredSubPixel):

                protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_RegisteredSubPixel);

                protoMeasure.set_type(

                      ControlPointFileEntryV0002_Measure_MeasureType_RegisteredSubPixel);

                break;

        }
@@ -2050,9 +2078,7 @@ namespace Isis { 
        }



        QVector<ControlMeasureLogData> measureLogs = controlMeasure.GetLogDataEntries();

        for (int logEntry = 0;

            logEntry < measureLogs.size(); // DNE?

            logEntry ++) {

        for (int logEntry = 0; logEntry < measureLogs.size(); logEntry ++) {



          const ControlMeasureLogData &log = measureLogs[logEntry];
@@ -2066,9 +2092,6 @@ namespace Isis { 
          *protoMeasure.add_log() = logData;

        }



//???        if ( controlPoint->HasRefMeasure() && controlPoint->IndexOfRefMeasure() == j ) {

//???             protoPoint.set_referenceindex(j);

//???        }

        *protoPoint.add_measures() = protoMeasure;

      }

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

+15 −16
Original line number Diff line number Diff line
@@ -424,8 +424,7 @@ namespace Isis { 
      Pvl toPvl();



    private:

      // These three methods are private for safety reasons.

      // TODO write a better reason. JAM

      // These three methods are private to ensure proper memory management

      //! Default constructor. Intentially un-implemented.

      ControlNetVersioner();

      /**

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

File changed.

Preview size limit exceeded, changes collapsed.

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

+37 −22

File changed.

Preview size limit exceeded, changes collapsed.