Commit 0e88404b authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Modifications made to BundleSolutionInfo.cpp/BundleObservation.cpp to... 

Modifications made to BundleSolutionInfo.cpp/BundleObservation.cpp to correctly format the output for the bundleout_images.csv file produced by jigsaw.  Fixes #4314

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

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

+1 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ namespace Isis { 


        BundleImageQsp image = observation->at(j);





        sprintf(buf,image->fileName().toLatin1().data());

        fpOut << buf;

        sprintf(buf,",");

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

+91 −112
Original line number Diff line number Diff line
@@ -885,50 +885,39 @@ namespace Isis { 
    }// end if(!imageCSV)



    else {



      if (nPositionCoefficients > 0) {



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

          finalParameterValues.push_back(coefX[i]);



        }

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

          finalParameterValues.push_back(coefY[i]);



        }

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

          finalParameterValues.push_back(coefZ[i]);



        }

      }

      if (nPointingCoefficients > 0) {

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

          finalParameterValues.push_back(coefRA[i] * RAD2DEG);



        }

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

          finalParameterValues.push_back(coefDEC[i] * RAD2DEG);



        }

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

          finalParameterValues.push_back(coefTWI[i] * RAD2DEG);



          }

        }





    }//end else



    m_parameterNamesList = parameterNamesList;

    QString finalqStr = "";

    QString qStr = "";

    QString sigma = "";



    if (!imageCSV) {

      // position parameters

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



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



        if (errorPropagation) {

          qStr = QString("%1%2%3%4%5%6\n").

          arg( parameterNamesList.at(i) ).
@@ -947,15 +936,12 @@ namespace Isis { 
          arg(sigma, 18).

          arg("N/A", 18);

        }



        finalqStr += qStr;

      }



    // pointing parameters

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



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



        if (errorPropagation) {

          qStr = QString("%1%2%3%4%5%6\n").

          arg( parameterNamesList.at(i) ).
@@ -974,17 +960,13 @@ namespace Isis { 
          arg(sigma, 18).

          arg("N/A", 18);

        }



        finalqStr += qStr;

      }



    }



    else {



      // position parameters

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



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

        qStr="";

        if (errorPropagation) {
@@ -992,7 +974,7 @@ namespace Isis { 
          qStr += toString(m_corrections(i))+",";

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

          qStr += sigma+",";

          qStr += toString(m_adjustedSigmas[i]);

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

        }

        else {       

          qStr += toString(finalParameterValues[i] - m_corrections(i))+",";
@@ -1008,7 +990,6 @@ namespace Isis { 
      for (int i = nPositionParameters; i < nParameters; i++) {        

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

        qStr="";



        if (errorPropagation) {        

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

          qStr+=toString(m_corrections(i) * RAD2DEG)+",";
@@ -1017,14 +998,12 @@ namespace Isis { 
          qStr+=toString(m_adjustedSigmas[i] * RAD2DEG)+",";

        }

        else {



          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;

      }

    }