Commit 5fb501dd authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Removed spaces and other undesired output when creating the... 

Removed spaces and other undesired output when creating the bundleout_images.csv file.  References #4314

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7173 41f8697f-d340-4b68-9986-7bafba869bb8
parent d3528c6c

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+14 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <QDataStream>

#include <QDebug>

#include <QList>

#include <QStringList>

#include <QUuid>

#include <QXmlStreamWriter>
@@ -523,6 +524,7 @@ namespace Isis { 








  /**

   * @brief Outputs the header for the bundleout_images.csv file

   * @param fpOut The output file stream.
@@ -1291,18 +1293,27 @@ namespace Isis { 
        sprintf(buf,",");

        fpOut << buf;



        sprintf(buf,"%0.8f,",rmsImageSampleResiduals[imgIndex].Rms());

        fpOut << toString(rmsImageSampleResiduals[imgIndex].Rms()).toLatin1().data();

        sprintf(buf,",");

        fpOut << buf;



        sprintf(buf,"%0.8f,",rmsImageLineResiduals[imgIndex].Rms());

        fpOut << toString(rmsImageLineResiduals[imgIndex].Rms()).toLatin1().data();

        sprintf(buf,",");

        fpOut << buf;



        sprintf(buf,"%0.8f,",rmsImageResiduals[imgIndex].Rms());

        fpOut << toString(rmsImageResiduals[imgIndex].Rms()).toLatin1().data();

        sprintf(buf,",");

        fpOut << buf;





        QString observationString =

            observation->formatBundleOutputString(errorProp,true);



        //Removes trailing commas

        if (observationString.right(1)==",") {

            observationString.truncate(observationString.length()-1);

        }



        fpOut << (const char*) observationString.toLatin1().data();

        sprintf(buf,"\n");

        fpOut << buf;

isis/src/control/objs/BundleUtilities/BundleObservation.cpp

+33 −36
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include "SpicePosition.h"

#include "SpiceRotation.h"



using namespace std;



namespace Isis {



  /**
@@ -801,6 +803,7 @@ namespace Isis { 
    std::vector<double> coefRA;

    std::vector<double> coefDEC;

    std::vector<double> coefTWI;

    int precision = 11;



    int nPositionCoefficients = m_solveSettings->numberCameraPositionCoefficientsSolved();

    int nPointingCoefficients = m_solveSettings->numberCameraAngleCoefficientsSolved();
@@ -982,56 +985,50 @@ namespace Isis { 
      // position parameters

      for (int i = 0; i < nPositionParameters; i++) {



        sigma = ( IsSpecial(m_aprioriSigmas[i]) ? "N/A" : toString(m_aprioriSigmas[i], 8) );



        sigma = ( IsSpecial(m_aprioriSigmas[i]) ? "-1.0" : toString(m_aprioriSigmas[i]));

        qStr="";

        if (errorPropagation) {

          qStr = QString("%1,%2,%3,%4,%5,").

              //arg( parameterNamesList.at(i) ).

              arg(finalParameterValues[i] - m_corrections(i), 17, 'f', 8).

              arg(m_corrections(i), 21, 'f', 8).

              arg(finalParameterValues[i], 20, 'f', 8).

              arg(sigma, 18).

              arg(m_adjustedSigmas[i], 18, 'f', 8);

          qStr += toString(finalParameterValues[i] - m_corrections(i))+",";

          qStr += toString(m_corrections(i))+",";

          qStr += toString(finalParameterValues[i])+",";

          qStr += sigma+",";

          qStr += toString(m_adjustedSigmas[i]);

        }

        else {       

          qStr = QString("%1,%2,%3,%4,%5,").

              //arg( parameterNamesList.at(i) ).

              arg(finalParameterValues[i] - m_corrections(i), 17, 'f', 8).

              arg(m_corrections(i), 21, 'f', 8).

              arg(finalParameterValues[i], 20, 'f', 8).

              arg(sigma, 18).

              arg("N/A", 18);

          qStr += toString(finalParameterValues[i] - m_corrections(i))+",";

          qStr += toString(m_corrections(i))+",";

          qStr += toString(finalParameterValues[i])+",";

          qStr += sigma+",";

          qStr += "N/A,";

        }



        finalqStr += qStr;

      }



      // pointing parameters

      for (int i = nPositionParameters; i < nParameters; i++) {        



        sigma = ( IsSpecial(m_aprioriSigmas[i]) ? "N/A" : toString(m_aprioriSigmas[i], 8) );

        sigma = ( IsSpecial(m_aprioriSigmas[i]) ? "-1.0" : toString(m_aprioriSigmas[i]) );

        qStr="";



        if (errorPropagation) {        

          qStr = QString("%1,%2,%3,%4,%5,").

              arg((finalParameterValues[i] - m_corrections(i) * RAD2DEG), 17, 'f', 8).

              arg(m_corrections(i) * RAD2DEG, 21, 'f', 8).

              arg(finalParameterValues[i], 20, 'f', 8).

              arg(sigma, 18).

              arg(m_adjustedSigmas[i] * RAD2DEG, 18, 'f', 8);

          qStr+=toString(finalParameterValues[i] - m_corrections(i) * RAD2DEG)+",";

          qStr+=toString(m_corrections(i) * RAD2DEG)+",";

          qStr+=toString(finalParameterValues[i])+",";

          qStr+=sigma+",";

          qStr+=toString(m_adjustedSigmas[i] * RAD2DEG)+",";

        }

        else {

          qStr = QString("%1,%2,%3,%4,%5,").

              arg((finalParameterValues[i] - m_corrections(i) * RAD2DEG), 17, 'f', 8).

              arg(m_corrections(i) * RAD2DEG, 21, 'f', 8).

              arg(finalParameterValues[i], 20, 'f', 8).

              arg(sigma, 18).

              arg("N/A", 18);



          qStr+=toString(finalParameterValues[i] - m_corrections(i) * RAD2DEG)+",";

          qStr+=toString(m_corrections(i) * RAD2DEG)+",";

          qStr+=toString(finalParameterValues[i])+",";

          qStr+=sigma+",";

          qStr+="N/A,";

        }



        finalqStr += qStr;

      }



    }



    return finalqStr;

  }

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h

+1 −1

File changed.

Contains only whitespace changes.