Commit b04c2bfa authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Removed the underscore added to the BundleSettings output file prefix. 

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

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+8 −12
Original line number Diff line number Diff line
@@ -4184,9 +4184,8 @@ namespace Isis { 
   */

  bool BundleAdjust::outputText() {



   QString ofname("bundleout.txt");

    if ( m_bundleSettings.outputFilePrefix().length() != 0 )

        ofname = m_bundleSettings.outputFilePrefix() + "_" + ofname;

    QString ofname = "bundleout.txt";

    ofname = m_bundleSettings.outputFilePrefix() + ofname;



    std::ofstream fp_out(ofname.toAscii().data(), std::ios::out);

    if (!fp_out)
@@ -4335,9 +4334,8 @@ namespace Isis { 
  bool BundleAdjust::outputPointsCSV() {

    char buf[1056];



    QString ofname("bundleout_points.csv");

    if (!m_bundleSettings.outputFilePrefix().isEmpty())

      ofname = m_bundleSettings.outputFilePrefix() + "_" + ofname;

    QString ofname = "bundleout_points.csv";

    ofname = m_bundleSettings.outputFilePrefix() + ofname;



    std::ofstream fp_out(ofname.toAscii().data(), std::ios::out);

    if (!fp_out)
@@ -4449,9 +4447,8 @@ namespace Isis { 
  bool BundleAdjust::outputResiduals() {

    char buf[1056];



    QString ofname("residuals.csv");

    if (!m_bundleSettings.outputFilePrefix().isEmpty())

      ofname = m_bundleSettings.outputFilePrefix() + "_" + ofname;

    QString ofname = "residuals.csv";

    ofname = m_bundleSettings.outputFilePrefix() + ofname;



    std::ofstream fp_out(ofname.toAscii().data(), std::ios::out);

    if (!fp_out)
@@ -4530,9 +4527,8 @@ namespace Isis { 
/*

    char buf[1056];



    QString ofname("bundleout_images.csv");

    if (!m_bundleSettings.outputFilePrefix().isEmpty())

      ofname = m_bundleSettings.outputFilePrefix() + "_" + ofname;

    QString ofname = "bundleout_images.csv";

    ofname = m_bundleSettings.outputFilePrefix() + ofname;



    std::ofstream fp_out(ofname.toAscii().data(), std::ios::out);

    if (!fp_out)

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+5 −0
Original line number Diff line number Diff line
@@ -191,6 +191,11 @@ namespace Isis { 
   *                           every iteration. Now release every iteration but the last since we

   *   @history 2015-02-20 Jeannie Backer - Updated to be more compliant with ISIS coding standards.

   *   @history 2015-08-17 Jeannie Backer - Updated to be more compliant with ISIS coding standards.

   *   @history 2015-09-03 Jeannie Backer - Removed the underscore that was added to file name when

   *                           BundleSettings::outputFilePrefix() is not empty. This will allow

   *                           users to use the outputFilePrefix to specify a file path without

   *                           adding an underscore to the file name. If the underscore is wanted,

   *                           it should be added to the prefix when entered by the user.

   */

  class BundleAdjust : public QObject {

      Q_OBJECT