Commit e9093f9c authored by acpaquette's avatar acpaquette Committed by Jesse Mapel
Browse files

Bundleout Reformat (#3447) 

* Updated bundle text output to match expected output

* Further formatting for the bundle text output

* Added history comments

* Reformat of RMS output in bundleout.txt

* Updated BundleSolutionInfo unittest
parent fef6a704

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

+24 −27
Original line number Diff line number Diff line
@@ -1044,14 +1044,14 @@ namespace Isis { 


    sprintf(buf, "\nIMAGE MEASURES SUMMARY\n==========================\n\n");

    fpOut << buf;

    sprintf(buf,"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tMeasures\t\t\t\t\t\t\t\tRMS(pixels)\n");

    sprintf(buf,"                                      Measures                        RMS(pixels)\n");

    fpOut << buf;

    sprintf(buf,"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t******************************  "

                "**************************************************\n");

    sprintf(buf,"                              ************************  "

                "**************************************\n");

    fpOut << buf;



    sprintf(buf,"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t|Accepted\t\t|\t\tTotal|\t|Samples\t\t|\t\t"

                "Lines\t\t|\t\tTotal|\n");

    sprintf(buf,"                              |Accepted    |    Total|   |Samples    |    "

                "Lines    |    Total|\n");

    fpOut << buf;



    int numMeasures;
@@ -1086,13 +1086,13 @@ namespace Isis { 


        numUsed = numMeasures - numRejectedMeasures;



        sprintf(buf,"%-*s\t\t\t\t\t",45,bundleImage->fileName().toLatin1().data());

        sprintf(buf,"%30s" ,bundleImage->fileName().toLatin1().data());

        fpOut << buf;



        sprintf(buf,"%*d\t\t\t%*d\t\t\t",5,numUsed,5,numMeasures);

        sprintf(buf,"%5d            %5d      ",numUsed,numMeasures);

        fpOut << buf;



        sprintf(buf,"%-15.4lf\t\t%-15.4lf\t\t%-15.4lf \n",

        sprintf(buf,"%-15.4lf%-15.4lf%-15.4lf \n",

                rmsSampleResiduals,rmsLineResiduals,rmsLandSResiduals);



        fpOut << buf;
@@ -1102,9 +1102,9 @@ namespace Isis { 


    sprintf(buf,"\nTotal RMS:");

    fpOut << buf;

    sprintf(buf,"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t");

    sprintf(buf,"                                                ");

    fpOut << buf;

    sprintf(buf,"%-15.4lf\t\t%-15.4lf\t\t%-15.4lf\n",

    sprintf(buf,"%-15.4lf%-15.4lf%-15.4lf\n",

    rmsSamplesTotal.Rms(),rmsLinesTotal.Rms(),rmsTotals.Rms());

    fpOut << buf;
@@ -1276,15 +1276,12 @@ namespace Isis { 
        sprintf(buf, "\nImage Serial Number: %s\n", image->serialNumber().toLatin1().data());

        fpOut << buf;



        sprintf(buf,"Image         Initial                     Total                  "

                    "Final                                      Accuracy\n");

        sprintf(buf,"Image           Initial                 Total                  Final                                      Accuracy\n");

        fpOut << buf;

        sprintf(buf,"Parameter         Value                       Correction"

                    "             Value                      Initial           "

                    "Final           Units\n");

        sprintf(buf,"Parameter       Value                   Correction             Value                      Initial           Final           Units\n");

        fpOut << buf;



        sprintf(buf,"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"

        sprintf(buf,"                                                                                          "

                    "***************************************\n");

        fpOut << buf;

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

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ namespace Isis { 
   *                           csv file with BundleObservation::bundleOutputCSV.

   *                           BundleObservation::formatBundleOutputString was removed

   *                           from ISIS3 because it had become unmaintainable.

   *   @history 2019-06-03 Adam Paquette - Updated the header for the bundleout.txt file for

   *                           more human readable formatting in the bundleout.txt file.

   *

   */

  class BundleSolutionInfo : public QObject {

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

+36 −32
Original line number Diff line number Diff line
@@ -1273,6 +1273,9 @@ QString BundleObservation::formatBundleOutputString(bool errorPropagation, bool 
        correctionUnitList;



    QString str("%1(%2)  ");

    QString str2("%1(%2) ");

    QString strN("%1(%2)");





    if (nPositionCoefficients > 0) {

      for (int j = 0; j < nPositionCoefficients;j++) {
@@ -1286,17 +1289,18 @@ QString BundleObservation::formatBundleOutputString(bool errorPropagation, bool 
        } //end inner-if



        else if (j==1) {

          parameterNamesListX.append( str.arg("     ").arg("km/s") );

          parameterNamesListY.append( str.arg("     ").arg("km/s") );

          parameterNamesListZ.append( str.arg("     ").arg("km/s") );

          parameterNamesListX.append( str2.arg("    ").arg("km/s") );

          parameterNamesListY.append( str2.arg("    ").arg("km/s") );

          parameterNamesListZ.append( str2.arg("    ").arg("km/s") );

          correctionUnitListX.append("m/s");

          correctionUnitListY.append("m/s");

          correctionUnitListZ.append("m/s");

        }

        else {

          parameterNamesListX.append(str.arg("     ").arg("km/s^"+toString(j) ) );

          parameterNamesListY.append(str.arg("     ").arg("km/s^"+toString(j) ) );

          parameterNamesListZ.append(str.arg("     ").arg("km/s^"+toString(j) ) );

          QString str("%1(%2)");

          parameterNamesListX.append(strN.arg("   ").arg("km/s^"+toString(j) ) );

          parameterNamesListY.append(strN.arg("   ").arg("km/s^"+toString(j) ) );

          parameterNamesListZ.append(strN.arg("   ").arg("km/s^"+toString(j) ) );

          correctionUnitListX.append("m/s^"+toString(j));

          correctionUnitListY.append("m/s^"+toString(j));

          correctionUnitListZ.append("m/s^"+toString(j));
@@ -1316,17 +1320,17 @@ QString BundleObservation::formatBundleOutputString(bool errorPropagation, bool 
        } //end inner-if



        else if (j==1) {

          parameterNamesListRA.append( str.arg("     ").arg("dd/s") );

          parameterNamesListDEC.append( str.arg("     ").arg("dd/s") );

          parameterNamesListTWI.append( str.arg("     ").arg("dd/s") );

          parameterNamesListRA.append( str2.arg("    ").arg("dd/s") );

          parameterNamesListDEC.append( str2.arg("    ").arg("dd/s") );

          parameterNamesListTWI.append( str2.arg("    ").arg("dd/s") );

          correctionUnitListRA.append("dd/s");

          correctionUnitListDEC.append("dd/s");

          correctionUnitListTWI.append("dd/s");

        }

        else {

          parameterNamesListRA.append(str.arg("     ").arg("dd/s^"+toString(j) ) );

          parameterNamesListDEC.append(str.arg("     ").arg("dd/s^"+toString(j) ) );

          parameterNamesListTWI.append(str.arg("     ").arg("dd/s^"+toString(j) ) );

          parameterNamesListRA.append(strN.arg("   ").arg("dd/s^"+toString(j) ) );

          parameterNamesListDEC.append(strN.arg("   ").arg("dd/s^"+toString(j) ) );

          parameterNamesListTWI.append(strN.arg("   ").arg("dd/s^"+toString(j) ) );

          correctionUnitListRA.append("dd/s^"+toString(j));

          correctionUnitListDEC.append("dd/s^"+toString(j));

          correctionUnitListTWI.append("dd/s^"+toString(j));
@@ -1368,30 +1372,30 @@ QString BundleObservation::formatBundleOutputString(bool errorPropagation, bool 
        sigma = ( IsSpecial(m_aprioriSigmas[i]) ? "FREE" : toString(m_aprioriSigmas[i], 8) );

      }



      sprintf(buf,"%-*s",17,parameterNamesList.at(i).toStdString().c_str() );

      sprintf(buf,"%s",parameterNamesList.at(i).toStdString().c_str() );

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",finalParameterValues[i] - correction);

      sprintf(buf,"%18.8lf  ",finalParameterValues[i] - correction);

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",correction);

      sprintf(buf,"%20.8lf  ",correction);

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",finalParameterValues[i]);

      sprintf(buf,"%23.8lf  ",finalParameterValues[i]);

      fpOut << buf;

      sprintf(buf,"\t\t\t");

      sprintf(buf,"            ");

      fpOut << buf;

      sprintf(buf,"%-*s",7,sigma.toStdString().c_str());

      sprintf(buf,"%6s",sigma.toStdString().c_str());

      fpOut << buf;

      sprintf(buf,"\t\t\t\t");

      sprintf(buf,"            ");

      fpOut << buf;

      if (errorPropagation) {

        sprintf(buf,"%*s",7,adjustedSigma.toStdString().c_str());

        sprintf(buf,"%s",adjustedSigma.toStdString().c_str());

      }

      else {

        sprintf(buf,"%s","N/A");

      }

      fpOut<<buf;

      sprintf(buf,"\t\t\t\t");

      sprintf(buf,"        ");

      fpOut<<buf;

      sprintf(buf,"%-*s\n",10,correctionUnitList.at(i).toStdString().c_str() );

      sprintf(buf,"%s\n",correctionUnitList.at(i).toStdString().c_str() );

      fpOut<<buf;



    }
@@ -1429,30 +1433,30 @@ QString BundleObservation::formatBundleOutputString(bool errorPropagation, bool 
        sigma = "N/A";

      }



      sprintf(buf,"%-*s",17,parameterNamesList.at(i).toStdString().c_str() );

      sprintf(buf,"%s",parameterNamesList.at(i).toStdString().c_str() );

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",(finalParameterValues[i]*RAD2DEG - correction*RAD2DEG));

      sprintf(buf,"%18.8lf  ",(finalParameterValues[i]*RAD2DEG - correction*RAD2DEG));

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",(correction*RAD2DEG));

      sprintf(buf,"%20.8lf  ",(correction*RAD2DEG));

      fpOut << buf;

      sprintf(buf,"%20.8lf\t",(finalParameterValues[i]*RAD2DEG));

      sprintf(buf,"%23.8lf  ",(finalParameterValues[i]*RAD2DEG));

      fpOut << buf;

      sprintf(buf,"\t\t\t");

      sprintf(buf,"            ");

      fpOut << buf;

      sprintf(buf,"%-*s",7,sigma.toStdString().c_str());

      sprintf(buf,"%6s",sigma.toStdString().c_str());

      fpOut << buf;

      sprintf(buf,"\t\t\t\t");

      sprintf(buf,"            ");

      fpOut << buf;

      if (errorPropagation) {

        sprintf(buf,"%*s",7,adjustedSigma.toStdString().c_str());

        sprintf(buf,"%s",adjustedSigma.toStdString().c_str());

      }

      else {

        sprintf(buf,"%s","N/A");

      }

      fpOut<<buf;

      sprintf(buf,"\t\t\t\t");

      sprintf(buf,"        ");

      fpOut<<buf;

      sprintf(buf,"%-*s\n",10,correctionUnitList.at(i).toStdString().c_str() );

      sprintf(buf,"%s\n",correctionUnitList.at(i).toStdString().c_str() );

      fpOut<<buf;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ namespace Isis { 
   *                            formatBundleOutputString but with reduced code duplication.

   *   @history 2019-08-15  Adam Paquette - Readded the formatBundleOutputString function

   *                            and added deprication warnings to formatBundleOutputString.

   *   @history 2019-09-10  Adam Paquette - Changed how bundleOutputString formats the text

   *                            that is written to the bundleout.txt file.

   *

   */

  class BundleObservation : public QVector<BundleImageQsp> {

isis/src/control/objs/BundleUtilities/BundleUtilities.truth

+104 −104

File changed.

Contains only whitespace changes.